GNOME.org
 

[gnome-calculator/wip/cdavis/gtk4: 3/9] Updated financial dialogs.


commit ce0110341a63ae58cfc19bc5f900fe9bb400cb85
Author: Robert Roth <robert roth off gmail com>
Date:   Wed Oct 13 00:24:25 2021 +0300

    Updated financial dialogs.
    
    * Use headerbar
    * Make dialogs modal and transient for parent
    * Hide dialog on response
    * Use verbose button names

 src/math-buttons.vala       |   7 +-
 src/math-window.vala        |   2 +-
 src/ui/buttons-financial.ui | 358 +++++++++++++++++++++-----------------------
 3 files changed, 177 insertions(+), 190 deletions(-)
---
diff --git a/src/math-buttons.vala b/src/math-buttons.vala
index f40939bb..2d748c87 100644
--- a/src/math-buttons.vala
+++ b/src/math-buttons.vala
@@ -66,6 +66,8 @@ public class MathButtons : Gtk.Box
 
     private MathConverter converter;
 
+    private MathWindow window;
+
     private Gtk.Builder basic_ui;
     private Gtk.Builder advanced_ui;
     private Gtk.Builder financial_ui;
@@ -121,11 +123,12 @@ public class MathButtons : Gtk.Box
         {"launch-finc-dialog",   on_launch_finc_dialog,   "s"                }
     };
 
-    public MathButtons (MathEquation equation)
+    public MathButtons (MathEquation equation, MathWindow window)
     {
         Object (orientation: Gtk.Orientation.VERTICAL, vexpand_set: true);
         show.connect (load_buttons);
         this.equation = equation;
+        this.window = window;
 
         action_group.add_action_entries (action_entries, this);
         insert_action_group ("cal", action_group);
@@ -644,6 +647,7 @@ public class MathButtons : Gtk.Box
     {
         var name = param.get_string ();
         var dialog = financial_ui.get_object (name) as Gtk.Dialog;
+        dialog.transient_for = this.window as Gtk.Window;
         dialog.show ();
     }
 
@@ -670,6 +674,7 @@ public class MathButtons : Gtk.Box
 
     private void finc_response_cb (Gtk.Widget widget, int response_id)
     {
+        (widget as Gtk.Window).hide ();
         if (response_id != Gtk.ResponseType.OK)
             return;
 
diff --git a/src/math-window.vala b/src/math-window.vala
index 4fa1b102..e9f18fe1 100644
--- a/src/math-window.vala
+++ b/src/math-window.vala
@@ -65,7 +65,7 @@ public class MathWindow : Adw.ApplicationWindow
         _display.show ();
         _display.grabfocus ();
 
-        _buttons = new MathButtons (equation);
+        _buttons = new MathButtons (equation, this);
         grid.attach_next_to(_buttons, _display, Gtk.PositionType.BOTTOM);
 
         remove_buttons = (_buttons.mode != ButtonMode.KEYBOARD) ? true : false;
diff --git a/src/ui/buttons-financial.ui b/src/ui/buttons-financial.ui
index 159caf2e..e8e15100 100644
--- a/src/ui/buttons-financial.ui
+++ b/src/ui/buttons-financial.ui
@@ -3,8 +3,11 @@
   <requires lib="gtk" version="4.0"/>
   <object class="GtkDialog" id="ctrm_dialog">
     <property name="title" translatable="1" comments="Title of Compounding Term dialog">Compounding 
Term</property>
-    <property name="default_width">618</property>
-    <property name="default_width">198</property>
+    <property name="default_width">462</property>
+    <property name="default_height">234</property>
+    <property name="use_header_bar">1</property>
+    <property name="modal">True</property>
+    <property name="destroy_with_parent">True</property>
     <child internal-child="content_area">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="orientation">vertical</property>
@@ -99,31 +102,29 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="-6">button1</action-widget>
-      <action-widget response="-5">button2</action-widget>
+      <action-widget response="cancel">button_ctrm_cancel</action-widget>
+      <action-widget response="ok" default="true">button_ctrm_calculate</action-widget>
     </action-widgets>
-    <child internal-child="action_area">
-      <object class="GtkBox" id="dialog-action_area1">
-        <property name="halign">2</property>
-        <child>
-          <object class="GtkButton" id="button1">
-            <property name="label" translatable="1">_Cancel</property>
-            <property name="use_underline">True</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="button2">
-            <property name="label" translatable="1" comments="Compounding Term Dialog: Calculate 
button">C_alculate</property>
-            <property name="use_underline">True</property>
-          </object>
-        </child>
+    <child type="action">
+      <object class="GtkButton" id="button_ctrm_cancel">
+        <property name="label" translatable="1">_Cancel</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="button_ctrm_calculate">
+        <property name="label" translatable="1" comments="Compounding Term Dialog: Calculate 
button">C_alculate</property>
+        <property name="use_underline">True</property>
       </object>
     </child>
   </object>
   <object class="GtkDialog" id="ddb_dialog">
     <property name="title" translatable="1" comments="Title of Double-Declining Depreciation 
dialog">Double-Declining Depreciation</property>
-    <property name="default_width">618</property>
-    <property name="default_width">198</property>
+    <property name="default_width">462</property>
+    <property name="default_height">220</property>
+    <property name="use_header_bar">1</property>
+    <property name="modal">True</property>
+    <property name="destroy_with_parent">True</property>
     <child internal-child="content_area">
       <object class="GtkBox" id="dialog-vbox2">
         <property name="orientation">vertical</property>
@@ -218,30 +219,29 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="-6">button3</action-widget>
-      <action-widget response="-5">button4</action-widget>
+      <action-widget response="cancel">button_ddb_cancel</action-widget>
+      <action-widget response="ok" default="true">button_ddb_calculate</action-widget>
     </action-widgets>
-    <child internal-child="action_area">
-      <object class="GtkBox" id="dialog-action_area2">
-        <child>
-          <object class="GtkButton" id="button3">
-            <property name="label" translatable="1">_Cancel</property>
-            <property name="use_underline">True</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="button4">
-            <property name="label" translatable="1" comments="Double-Declining Depreciation Dialog: 
Calculate button">C_alculate</property>
-            <property name="use_underline">True</property>
-          </object>
-        </child>
+    <child type="action">
+      <object class="GtkButton" id="button_ddb_cancel">
+        <property name="label" translatable="1">_Cancel</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="button_ddb_calculate">
+        <property name="label" translatable="1" comments="Double-Declining Depreciation Dialog: Calculate 
button">C_alculate</property>
+        <property name="use_underline">True</property>
       </object>
     </child>
   </object>
   <object class="GtkDialog" id="fv_dialog">
     <property name="title" translatable="1" comments="Title of Future Value dialog">Future Value</property>
-    <property name="default_width">618</property>
-    <property name="default_width">198</property>
+    <property name="default_width">462</property>
+    <property name="default_height">234</property>
+    <property name="use_header_bar">1</property>
+    <property name="modal">True</property>
+    <property name="destroy_with_parent">True</property>
     <child internal-child="content_area">
       <object class="GtkBox" id="dialog-vbox3">
         <property name="orientation">vertical</property>
@@ -335,30 +335,29 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="-6">button5</action-widget>
-      <action-widget response="-5">button6</action-widget>
+      <action-widget response="cancel">button_fv_cancel</action-widget>
+      <action-widget response="ok" default="true">button_fv_calculate</action-widget>
     </action-widgets>
-    <child internal-child="action_area">
-      <object class="GtkBox" id="dialog-action_area3">
-        <child>
-          <object class="GtkButton" id="button5">
-            <property name="label" translatable="1">_Cancel</property>
-            <property name="use_underline">True</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="button6">
-            <property name="label" translatable="1" comments="Future Value Dialog: Calculate 
button">C_alculate</property>
-            <property name="use_underline">True</property>
-          </object>
-        </child>
+    <child type="action">
+      <object class="GtkButton" id="button_fv_cancel">
+        <property name="label" translatable="1">_Cancel</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="button_fv_calculate">
+        <property name="label" translatable="1" comments="Future Value Dialog: Calculate 
button">C_alculate</property>
+        <property name="use_underline">True</property>
       </object>
     </child>
   </object>
   <object class="GtkDialog" id="gpm_dialog">
     <property name="title" translatable="1" comments="Title of Gross Profit Margin dialog">Gross Profit 
Margin</property>
-    <property name="default_width">618</property>
-    <property name="default_width">198</property>
+    <property name="default_width">462</property>
+    <property name="default_height">180</property>
+    <property name="use_header_bar">1</property>
+    <property name="modal">True</property>
+    <property name="destroy_with_parent">True</property>
     <child internal-child="content_area">
       <object class="GtkBox" id="dialog-vbox10">
         <property name="orientation">vertical</property>
@@ -430,31 +429,29 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="-6">button19</action-widget>
-      <action-widget response="-5">button20</action-widget>
+      <action-widget response="cancel">button_gpm_cancel</action-widget>
+      <action-widget response="ok" default="true">button_gpm_calculate</action-widget>
     </action-widgets>
-    <child internal-child="action_area">
-      <object class="GtkBox" id="dialog-action_area10">
-        <property name="halign">2</property>
-        <child>
-          <object class="GtkButton" id="button19">
-            <property name="label" translatable="1">_Cancel</property>
-            <property name="use_underline">True</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="button20">
-            <property name="label" translatable="1" comments="Gross Profit Margin Dialog: Calculate 
button">C_alculate</property>
-            <property name="use_underline">True</property>
-          </object>
-        </child>
+    <child type="action">
+      <object class="GtkButton" id="button_gpm_cancel">
+        <property name="label" translatable="1">_Cancel</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="button_gpm_calculate">
+        <property name="label" translatable="1" comments="Gross Profit Margin Dialog: Calculate 
button">C_alculate</property>
+        <property name="use_underline">True</property>
       </object>
     </child>
   </object>
   <object class="GtkDialog" id="pmt_dialog">
     <property name="title" translatable="1" comments="Title of Periodic Payment dialog">Periodic 
Payment</property>
-    <property name="default_width">618</property>
-    <property name="default_width">198</property>
+    <property name="default_width">462</property>
+    <property name="default_height">218</property>
+    <property name="use_header_bar">1</property>
+    <property name="modal">True</property>
+    <property name="destroy_with_parent">True</property>
     <child internal-child="content_area">
       <object class="GtkBox" id="dialog-vbox4">
         <property name="orientation">vertical</property>
@@ -549,31 +546,29 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="-6">button7</action-widget>
-      <action-widget response="-5">button8</action-widget>
+      <action-widget response="cancel">button_pmt_cancel</action-widget>
+      <action-widget response="ok" default="true">button_pmt_calculate</action-widget>
     </action-widgets>
-    <child internal-child="action_area">
-      <object class="GtkBox" id="dialog-action_area4">
-        <property name="halign">2</property>
-        <child>
-          <object class="GtkButton" id="button7">
-            <property name="label" translatable="1">_Cancel</property>
-            <property name="use_underline">True</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="button8">
-            <property name="label" translatable="1" comments="Periodic Payment Dialog: Calculate 
button">C_alculate</property>
-            <property name="use_underline">True</property>
-          </object>
-        </child>
+    <child type="action">
+      <object class="GtkButton" id="button_pmt_cancel">
+        <property name="label" translatable="1">_Cancel</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="button_pmt_calculate">
+        <property name="label" translatable="1" comments="Periodic Payment Dialog: Calculate 
button">C_alculate</property>
+        <property name="use_underline">True</property>
       </object>
     </child>
   </object>
   <object class="GtkDialog" id="pv_dialog">
     <property name="title" translatable="1" comments="Title of Present Value dialog">Present Value</property>
-    <property name="default_width">618</property>
-    <property name="default_width">198</property>
+    <property name="default_width">462</property>
+    <property name="default_height">234</property>
+    <property name="use_header_bar">1</property>
+    <property name="modal">True</property>
+    <property name="destroy_with_parent">True</property>
     <child internal-child="content_area">
       <object class="GtkBox" id="dialog-vbox5">
         <property name="orientation">vertical</property>
@@ -668,31 +663,29 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="-6">button9</action-widget>
-      <action-widget response="-5">button10</action-widget>
+      <action-widget response="cancel">button_pv_cancel</action-widget>
+      <action-widget response="ok" default="true">button_pv_calculate</action-widget>
     </action-widgets>
-    <child internal-child="action_area">
-      <object class="GtkBox" id="dialog-action_area5">
-        <property name="halign">2</property>
-        <child>
-          <object class="GtkButton" id="button9">
-            <property name="label" translatable="1">_Cancel</property>
-            <property name="use_underline">True</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="button10">
-            <property name="label" translatable="1" comments="Present Value Dialog: Calculate 
button">C_alculate</property>
-            <property name="use_underline">True</property>
-          </object>
-        </child>
+    <child type="action">
+      <object class="GtkButton" id="button_pv_cancel">
+        <property name="label" translatable="1">_Cancel</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="button_pv_calculate">
+        <property name="label" translatable="1" comments="Present Value Dialog: Calculate 
button">C_alculate</property>
+        <property name="use_underline">True</property>
       </object>
     </child>
   </object>
   <object class="GtkDialog" id="rate_dialog">
     <property name="title" translatable="1" comments="Title of Periodic Interest Rate dialog">Periodic 
Interest Rate</property>
-    <property name="default_width">618</property>
-    <property name="default_width">198</property>
+    <property name="default_width">462</property>
+    <property name="default_height">218</property>
+    <property name="use_header_bar">1</property>
+    <property name="modal">True</property>
+    <property name="destroy_with_parent">True</property>
     <child internal-child="content_area">
       <object class="GtkBox" id="dialog-vbox6">
         <property name="orientation">vertical</property>
@@ -787,31 +780,29 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="-6">button11</action-widget>
-      <action-widget response="-5">button12</action-widget>
+      <action-widget response="cancel">button_rate_cancel</action-widget>
+      <action-widget response="ok" default="true">button_rate_calculate</action-widget>
     </action-widgets>
-    <child internal-child="action_area">
-      <object class="GtkBox" id="dialog-action_area6">
-        <property name="halign">2</property>
-        <child>
-          <object class="GtkButton" id="button11">
-            <property name="label" translatable="1">_Cancel</property>
-            <property name="use_underline">True</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="button12">
-            <property name="label" translatable="1" comments="Periodic Interest Rate Dialog: Calculate 
button">C_alculate</property>
-            <property name="use_underline">True</property>
-          </object>
-        </child>
+    <child type="action">
+      <object class="GtkButton" id="button_rate_cancel">
+        <property name="label" translatable="1">_Cancel</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="button_rate_calculate">
+        <property name="label" translatable="1" comments="Periodic Interest Rate Dialog: Calculate 
button">C_alculate</property>
+        <property name="use_underline">True</property>
       </object>
     </child>
   </object>
   <object class="GtkDialog" id="sln_dialog">
     <property name="title" translatable="1" comments="Title of Straight-Line Depreciation 
dialog">Straight-Line Depreciation</property>
-    <property name="default_width">618</property>
-    <property name="default_width">198</property>
+    <property name="default_width">462</property>
+    <property name="default_height">254</property>
+    <property name="use_header_bar">1</property>
+    <property name="modal">True</property>
+    <property name="destroy_with_parent">True</property>
     <child internal-child="content_area">
       <object class="GtkBox" id="dialog-vbox7">
         <property name="orientation">vertical</property>
@@ -906,31 +897,29 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="-6">button13</action-widget>
-      <action-widget response="-5">button14</action-widget>
+      <action-widget response="cancel">button_sln_cancel</action-widget>
+      <action-widget response="ok" default="true">button_sln_calculate</action-widget>
     </action-widgets>
-    <child internal-child="action_area">
-      <object class="GtkBox" id="dialog-action_area7">
-        <property name="halign">2</property>
-        <child>
-          <object class="GtkButton" id="button13">
-            <property name="label" translatable="1">_Cancel</property>
-            <property name="use_underline">True</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="button14">
-            <property name="label" translatable="1" comments="Straight-Line Depreciation Dialog: Calculate 
button">C_alculate</property>
-            <property name="use_underline">True</property>
-          </object>
-        </child>
+    <child type="action">
+      <object class="GtkButton" id="button_sln_cancel">
+        <property name="label" translatable="1">_Cancel</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="button_sln_calculate">
+        <property name="label" translatable="1" comments="Straight-Line Depreciation Dialog: Calculate 
button">C_alculate</property>
+        <property name="use_underline">True</property>
       </object>
     </child>
   </object>
   <object class="GtkDialog" id="syd_dialog">
     <property name="title" translatable="1" comments="Title of Sum-of-the-Years’-Digits Depreciation 
dialog">Sum-of-the-Years’-Digits Depreciation</property>
-    <property name="default_width">618</property>
-    <property name="default_width">198</property>
+    <property name="default_width">462</property>
+    <property name="default_height">326</property>
+    <property name="use_header_bar">1</property>
+    <property name="modal">True</property>
+    <property name="destroy_with_parent">True</property>
     <child internal-child="content_area">
       <object class="GtkBox" id="dialog-vbox8">
         <property name="orientation">vertical</property>
@@ -1047,31 +1036,29 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="-6">button15</action-widget>
-      <action-widget response="-5">button16</action-widget>
+      <action-widget response="cancel">button_syd_cancel</action-widget>
+      <action-widget response="ok" default="true">button_syd_calculate</action-widget>
     </action-widgets>
-    <child internal-child="action_area">
-      <object class="GtkBox" id="dialog-action_area8">
-        <property name="halign">2</property>
-        <child>
-          <object class="GtkButton" id="button15">
-            <property name="label" translatable="1">_Cancel</property>
-            <property name="use_underline">True</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="button16">
-            <property name="label" translatable="1" comments="Sum-of-the-Years’-Digits Depreciation Dialog: 
Calculate result button">C_alculate</property>
-            <property name="use_underline">True</property>
-          </object>
-        </child>
+    <child type="action">
+      <object class="GtkButton" id="button_syd_cancel">
+        <property name="label" translatable="1">_Cancel</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="button_syd_calculate">
+        <property name="label" translatable="1" comments="Sum-of-the-Years’-Digits Depreciation Dialog: 
Calculate result button">C_alculate</property>
+        <property name="use_underline">True</property>
       </object>
     </child>
   </object>
   <object class="GtkDialog" id="term_dialog">
     <property name="title" translatable="1" comments="Title of Payment Period dialog">Payment 
Period</property>
-    <property name="default_width">618</property>
-    <property name="default_width">198</property>
+    <property name="default_width">462</property>
+    <property name="default_height">234</property>
+    <property name="use_header_bar">1</property>
+    <property name="modal">True</property>
+    <property name="destroy_with_parent">True</property>
     <child internal-child="content_area">
       <object class="GtkBox" id="dialog-vbox9">
         <property name="orientation">vertical</property>
@@ -1166,24 +1153,19 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="-6">button17</action-widget>
-      <action-widget response="-5">button18</action-widget>
+      <action-widget response="cancel">button_term_cancel</action-widget>
+      <action-widget response="ok" default="true">button_term_calculate</action-widget>
     </action-widgets>
-    <child internal-child="action_area">
-      <object class="GtkBox" id="dialog-action_area9">
-        <property name="halign">2</property>
-        <child>
-          <object class="GtkButton" id="button17">
-            <property name="label" translatable="1">_Cancel</property>
-            <property name="use_underline">True</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="button18">
-            <property name="label" translatable="1" comments="Payment Period Dialog: Button to calculate 
result">C_alculate</property>
-            <property name="use_underline">True</property>
-          </object>
-        </child>
+    <child type="action">
+      <object class="GtkButton" id="button_term_cancel">
+        <property name="label" translatable="1">_Cancel</property>
+        <property name="use_underline">True</property>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="button_term_calculate">
+        <property name="label" translatable="1" comments="Payment Period Dialog: Button to calculate 
result">C_alculate</property>
+        <property name="use_underline">True</property>
       </object>
     </child>
   </object>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]