Skip to content

Commit

Permalink
Update required gtk version in glade files part 2
Browse files Browse the repository at this point in the history
Update the required gtk version in the glade files to version 3.22 and
change any depreciated widgets, this was mainly stop using left/right
margins to start/end margins.
  • Loading branch information
Bob-IT committed Sep 16, 2020
1 parent 413d042 commit 9a948eb
Show file tree
Hide file tree
Showing 33 changed files with 367 additions and 335 deletions.
20 changes: 11 additions & 9 deletions gnucash/gtkbuilder/dialog-lot-viewer.glade
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.2 -->
<!-- Generated with glade 3.36.0 -->
<interface>
<requires lib="gtk+" version="3.10"/>
<requires lib="gtk+" version="3.22"/>
<object class="GtkDialog" id="lot_viewer_dialog">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Lot Viewer</property>
Expand All @@ -10,9 +10,6 @@
<property name="type_hint">dialog</property>
<signal name="destroy" handler="lv_window_destroy_cb" swapped="no"/>
<signal name="response" handler="lv_response_cb" swapped="no"/>
<child>
<placeholder/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
Expand Down Expand Up @@ -128,7 +125,7 @@
<object class="GtkGrid" id="table1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_right">6</property>
<property name="margin_end">6</property>
<property name="row_spacing">3</property>
<property name="column_spacing">6</property>
<child>
Expand Down Expand Up @@ -172,6 +169,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">Enter any notes you want to make about this lot.</property>
<property name="margin_start">3</property>
<property name="margin_end">3</property>
<property name="hexpand">True</property>
<property name="wrap_mode">word</property>
<property name="accepts_tab">False</property>
Expand Down Expand Up @@ -209,7 +208,7 @@
<object class="GtkGrid" id="table2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">6</property>
<property name="margin_start">6</property>
<property name="row_spacing">3</property>
<property name="column_spacing">6</property>
<child>
Expand Down Expand Up @@ -287,7 +286,7 @@
<object class="GtkGrid" id="table3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_right">6</property>
<property name="margin_end">6</property>
<property name="margin_top">3</property>
<property name="margin_bottom">3</property>
<property name="hexpand">True</property>
Expand Down Expand Up @@ -342,7 +341,7 @@
<object class="GtkGrid" id="table4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">6</property>
<property name="margin_start">6</property>
<property name="margin_top">3</property>
<property name="margin_bottom">3</property>
<property name="hexpand">True</property>
Expand Down Expand Up @@ -453,5 +452,8 @@
<action-widget response="2">delete_button</action-widget>
<action-widget response="-7">button5</action-widget>
</action-widgets>
<child type="titlebar">
<placeholder/>
</child>
</object>
</interface>
16 changes: 8 additions & 8 deletions gnucash/gtkbuilder/dialog-new-user.glade
@@ -1,17 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<!-- Generated with glade 3.36.0 -->
<interface>
<requires lib="gtk+" version="3.10"/>
<requires lib="gtk+" version="3.22"/>
<object class="GtkDialog" id="new_user_cancel_dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="window_position">center-on-parent</property>
<property name="type_hint">dialog</property>
<child>
<placeholder/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="vbox">
<property name="visible">True</property>
Expand Down Expand Up @@ -127,13 +124,13 @@
<action-widget response="-9">no_but</action-widget>
<action-widget response="-8">yes_but</action-widget>
</action-widgets>
<child type="titlebar">
<placeholder/>
</child>
</object>
<object class="GtkWindow" id="new_user_window">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<placeholder/>
</child>
<child>
<object class="GtkBox" id="vbox2">
<property name="visible">True</property>
Expand Down Expand Up @@ -312,5 +309,8 @@
</child>
</object>
</child>
<child type="titlebar">
<placeholder/>
</child>
</object>
</interface>
10 changes: 5 additions & 5 deletions gnucash/gtkbuilder/dialog-object-references.glade
@@ -1,15 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<!-- Generated with glade 3.36.0 -->
<interface>
<requires lib="gtk+" version="3.10"/>
<requires lib="gtk+" version="3.22"/>
<object class="GtkDialog" id="object_references_dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">Object references</property>
<property name="type_hint">normal</property>
<child>
<placeholder/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
Expand Down Expand Up @@ -86,5 +83,8 @@
<action-widgets>
<action-widget response="0">okbutton</action-widget>
</action-widgets>
<child type="titlebar">
<placeholder/>
</child>
</object>
</interface>
10 changes: 5 additions & 5 deletions gnucash/gtkbuilder/dialog-options.glade
@@ -1,14 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<!-- Generated with glade 3.36.0 -->
<interface>
<requires lib="gtk+" version="3.10"/>
<requires lib="gtk+" version="3.22"/>
<object class="GtkWindow" id="gnucash_options_window">
<property name="can_focus">False</property>
<property name="default_width">640</property>
<property name="default_height">480</property>
<child>
<placeholder/>
</child>
<child>
<object class="GtkBox" id="dialog-vbox">
<property name="visible">True</property>
Expand Down Expand Up @@ -141,5 +138,8 @@
</child>
</object>
</child>
<child type="titlebar">
<placeholder/>
</child>
</object>
</interface>
20 changes: 12 additions & 8 deletions gnucash/gtkbuilder/dialog-order.glade
@@ -1,17 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<!-- Generated with glade 3.36.0 -->
<interface>
<requires lib="gtk+" version="3.10"/>
<requires lib="gtk+" version="3.22"/>
<object class="GtkTextBuffer" id="notes_buffer"/>
<object class="GtkDialog" id="order_entry_dialog">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Order Entry</property>
<property name="default_width">950</property>
<property name="type_hint">dialog</property>
<signal name="destroy" handler="gnc_order_window_destroy_cb" swapped="no"/>
<child>
<placeholder/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox4">
<property name="visible">True</property>
Expand Down Expand Up @@ -338,6 +335,8 @@
<object class="GtkTextView" id="notes_text">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="margin_start">3</property>
<property name="margin_end">3</property>
<property name="wrap_mode">word</property>
<property name="buffer">notes_buffer</property>
<property name="accepts_tab">False</property>
Expand Down Expand Up @@ -416,16 +415,16 @@
<action-widget response="0">new_invoice_button</action-widget>
<action-widget response="0">close_order_button</action-widget>
</action-widgets>
<child type="titlebar">
<placeholder/>
</child>
</object>
<object class="GtkTextBuffer" id="text_buffer"/>
<object class="GtkDialog" id="new_order_dialog">
<property name="can_focus">False</property>
<property name="title" translatable="yes">New Order</property>
<property name="type_hint">dialog</property>
<signal name="destroy" handler="gnc_order_window_destroy_cb" swapped="no"/>
<child>
<placeholder/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox6">
<property name="visible">True</property>
Expand Down Expand Up @@ -688,6 +687,8 @@
<object class="GtkTextView" id="text_notes">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="margin_start">3</property>
<property name="margin_end">3</property>
<property name="editable">False</property>
<property name="wrap_mode">word</property>
<property name="buffer">text_buffer</property>
Expand Down Expand Up @@ -724,5 +725,8 @@
<action-widget response="-6">cancel_button</action-widget>
<action-widget response="-5">ok_button</action-widget>
</action-widgets>
<child type="titlebar">
<placeholder/>
</child>
</object>
</interface>
10 changes: 5 additions & 5 deletions gnucash/gtkbuilder/dialog-payment.glade
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<!-- Generated with glade 3.36.0 -->
<interface>
<requires lib="gtk+" version="3.10"/>
<requires lib="gtk+" version="3.22"/>
<object class="GtkAdjustment" id="docs_list_hor_adj">
<property name="upper">100</property>
<property name="step_increment">1</property>
Expand Down Expand Up @@ -62,9 +62,6 @@
<property name="default_height">560</property>
<property name="type_hint">dialog</property>
<signal name="destroy" handler="gnc_payment_window_destroy_cb" swapped="no"/>
<child>
<placeholder/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
Expand Down Expand Up @@ -747,5 +744,8 @@ In case of an over-payment or if no invoice was selected, GnuCash will automatic
<action-widget response="-6">cancelbutton</action-widget>
<action-widget response="-5">okbutton</action-widget>
</action-widgets>
<child type="titlebar">
<placeholder/>
</child>
</object>
</interface>
14 changes: 7 additions & 7 deletions gnucash/gtkbuilder/dialog-preferences.glade
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.2 -->
<!-- Generated with glade 3.36.0 -->
<interface>
<requires lib="gtk+" version="3.10"/>
<requires lib="gtk+" version="3.22"/>
<object class="GtkAdjustment" id="atm_fee_adj">
<property name="upper">1000</property>
<property name="step_increment">0.01</property>
Expand Down Expand Up @@ -72,7 +72,7 @@
<property name="lower">1</property>
<property name="upper">10</property>
<property name="value">1</property>
<property name="step_increment">0.10000000000000001</property>
<property name="step_increment">0.1</property>
<property name="page_increment">1</property>
</object>
<object class="GtkAdjustment" id="key_length_adj">
Expand Down Expand Up @@ -127,9 +127,6 @@
<property name="default_height">400</property>
<property name="type_hint">normal</property>
<signal name="response" handler="gnc_preferences_response_cb" swapped="no"/>
<child type="titlebar">
<placeholder/>
</child>
<child internal-child="vbox">
<object class="GtkBox">
<property name="visible">True</property>
Expand Down Expand Up @@ -1632,7 +1629,7 @@ many months before the current month</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="margin_left">12</property>
<property name="margin_start">12</property>
<property name="label" translatable="yes">Time to _wait for answer</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">pref/general/autosave-interval-minutes</property>
Expand Down Expand Up @@ -3554,5 +3551,8 @@ many months before the current month</property>
<action-widget response="-11">helpbutton2</action-widget>
<action-widget response="-7">closebutton2</action-widget>
</action-widgets>
<child type="titlebar">
<placeholder/>
</child>
</object>
</interface>
22 changes: 11 additions & 11 deletions gnucash/gtkbuilder/dialog-price.glade
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<!-- Generated with glade 3.36.0 -->
<interface>
<requires lib="gtk+" version="3.10"/>
<requires lib="gtk+" version="3.22"/>
<object class="GtkListStore" id="liststore1">
<columns>
<!-- column-name item -->
Expand Down Expand Up @@ -54,9 +54,6 @@
<property name="modal">True</property>
<property name="type_hint">dialog</property>
<signal name="response" handler="pedit_dialog_response_cb" swapped="no"/>
<child>
<placeholder/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox18">
<property name="visible">True</property>
Expand Down Expand Up @@ -350,6 +347,9 @@
<action-widget response="-10">pd_apply_button</action-widget>
<action-widget response="-5">pd_ok_button</action-widget>
</action-widgets>
<child type="titlebar">
<placeholder/>
</child>
</object>
<object class="GtkListStore" id="liststore4">
<columns>
Expand All @@ -369,9 +369,6 @@
<property name="title" translatable="yes">Remove Old Prices</property>
<property name="default_height">500</property>
<property name="type_hint">dialog</property>
<child>
<placeholder/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox2">
<property name="visible">True</property>
Expand Down Expand Up @@ -789,15 +786,15 @@ These prices were added so that there's always a "nearest in time" price for eve
<action-widget response="-6">cancel_button</action-widget>
<action-widget response="-5">ok_button</action-widget>
</action-widgets>
<child type="titlebar">
<placeholder/>
</child>
</object>
<object class="GtkWindow" id="prices_window">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Price Database</property>
<property name="default_width">800</property>
<property name="default_height">400</property>
<child>
<placeholder/>
</child>
<child>
<object class="GtkBox" id="vbox11">
<property name="visible">True</property>
Expand Down Expand Up @@ -977,5 +974,8 @@ These prices were added so that there's always a "nearest in time" price for eve
</child>
</object>
</child>
<child type="titlebar">
<placeholder/>
</child>
</object>
</interface>

0 comments on commit 9a948eb

Please sign in to comment.