From 87b9725573abc21cee3f0baf82fc1ad5b0a04274 Mon Sep 17 00:00:00 2001 From: Robert Fewell <14uBobIT@gmail.com> Date: Fri, 29 Nov 2019 16:22:15 +0000 Subject: [PATCH] Remove GtkAlignment and use GtkGrids in glade files - Part1 --- gnucash/gtkbuilder/gnc-frequency.glade | 257 ++++++++--------- .../gtkbuilder/gnc-plugin-page-budget.glade | 250 ++++++++--------- .../gtkbuilder/gnc-plugin-page-register.glade | 263 ++++++++---------- .../gnc-plugin-page-register2.glade | 139 +++++---- gnucash/gtkbuilder/gnc-recurrence.glade | 1 + gnucash/gtkbuilder/window-autoclear.glade | 79 +++--- gnucash/gtkbuilder/window-reconcile.glade | 196 +++++++------ 7 files changed, 559 insertions(+), 626 deletions(-) diff --git a/gnucash/gtkbuilder/gnc-frequency.glade b/gnucash/gtkbuilder/gnc-frequency.glade index 7b97fb030c..27600acddf 100644 --- a/gnucash/gtkbuilder/gnc-frequency.glade +++ b/gnucash/gtkbuilder/gnc-frequency.glade @@ -585,12 +585,13 @@ True False + 6 + 6 6 True False - 12 Frequency right @@ -603,12 +604,11 @@ True False - 12 Start Date center - 3 + 2 0 @@ -630,20 +630,7 @@ - - 25 - True - False - 0 - 20 - - - - - - 2 - 0 - + @@ -857,129 +844,124 @@ 0.5 in - + True False - 12 + start + 6 + 6 + 2 + 6 - + + Saturday True - False + True + False start - 12 - 2 - - - Saturday - True - True - False - start - True - True - - - 2 - 0 - - - - - Friday - True - True - False - start - True - True - - - 1 - 2 - - - - - Wednesday - True - True - False - start - True - True - - - 1 - 0 - - - - - Thursday - True - True - False - start - True - True - - - 1 - 1 - - - - - Sunday - True - True - False - start - True - True - - - 0 - 0 - - - - - Monday - True - True - False - start - True - True - - - 0 - 1 - - - - - Tuesday - True - True - False - start - True - True - - - 0 - 2 - - - - - - - - + True + True + + 2 + 0 + + + + + Friday + True + True + False + start + True + True + + + 1 + 2 + + + + + Wednesday + True + True + False + start + True + True + + + 1 + 0 + + + + + Thursday + True + True + False + start + True + True + + + 1 + 1 + + + + + Sunday + True + True + False + start + True + True + + + 0 + 0 + + + + + Monday + True + True + False + start + True + True + + + 0 + 1 + + + + + Tuesday + True + True + False + start + True + True + + + 0 + 2 + + + + + + + @@ -1097,7 +1079,6 @@ True False start - 12 First on the right @@ -1112,7 +1093,6 @@ True False start - 12 liststore1 @@ -1132,7 +1112,6 @@ True False start - 12 except on weekends right @@ -1177,7 +1156,6 @@ True False start - 12 then on the right @@ -1192,7 +1170,6 @@ True False start - 12 liststore6 @@ -1212,7 +1189,6 @@ True False start - 12 except on weekends right @@ -1375,7 +1351,6 @@ False False - 5 1 diff --git a/gnucash/gtkbuilder/gnc-plugin-page-budget.glade b/gnucash/gtkbuilder/gnc-plugin-page-budget.glade index b14c8e7629..274cc08615 100644 --- a/gnucash/gtkbuilder/gnc-plugin-page-budget.glade +++ b/gnucash/gtkbuilder/gnc-plugin-page-budget.glade @@ -66,39 +66,12 @@ 0 - - - True - False - vertical - - - True - False - start - start - Use a fixed value or apply transformation for all periods. - True - 40 - 40 - - - False - False - 0 - - - - - False - False - 2 - - True False + 6 + 3 6 @@ -109,7 +82,7 @@ 0 - 0 + 1 @@ -120,7 +93,7 @@ 1 - 0 + 1 @@ -128,11 +101,12 @@ True False start + start Action 0 - 2 + 3 @@ -196,7 +170,7 @@ 1 - 2 + 3 @@ -215,7 +189,7 @@ 1 - 1 + 2 @@ -227,14 +201,31 @@ 0 - 1 + 2 + + + + + True + False + start + Use a fixed value or apply transformation for all periods. + True + 40 + 0 + 0 + + + 0 + 0 + 2 False False - 3 + 1 @@ -301,62 +292,25 @@ 0 - - - True - False - vertical - - - True - False - start - start - GnuCash will estimate budget values for the selected accounts from past transactions. - True - 40 - 40 - - - False - False - 0 - - - - - False - False - 2 - - True False + 6 + 3 6 - + True - False + True + False + Use the average value over all actual periods for all projected periods start - Start Date + True - 0 - 0 - - - - - True - False - start - Significant Digits - - - 0 - 1 + 1 + 3 @@ -373,6 +327,30 @@ 1 + 2 + + + + + True + False + start + Significant Digits + + + 0 + 2 + + + + + True + False + start + Start Date + + + 0 1 @@ -387,26 +365,37 @@ 1 - 0 + 1 - - Use Average + True - True - False - Use the average value over all actual periods for all projected periods + False start - True + GnuCash will estimate budget values for the selected accounts from past transactions. + True + 40 + 0 + 0 - 1 - 2 + 0 + 0 + 2 - + + True + False + start + Use Average + + + 0 + 3 + @@ -447,12 +436,6 @@ True False end - - - - - - _Cancel @@ -498,6 +481,7 @@ True False + 6 3 6 @@ -544,6 +528,7 @@ True True + 6 True True in @@ -563,19 +548,6 @@ 1 - - - True - False - - - - - - 1 - 3 - - True @@ -610,7 +582,9 @@ True False start + start 5 + 12 Budget Period @@ -630,6 +604,34 @@ 2 + + + True + False + 0 + + + True + False + 6 + 6 + + + + + + + + True + False + + + + + 1 + 3 + + @@ -828,7 +830,7 @@ False vertical - 2 + 3 False @@ -871,30 +873,16 @@ - + True False - vertical - - - True - False - start - start - -Enter Note: - - - - False - False - 0 - - + start + start + Enter Note False - False + True 1 diff --git a/gnucash/gtkbuilder/gnc-plugin-page-register.glade b/gnucash/gtkbuilder/gnc-plugin-page-register.glade index 2f2f36c84d..2663707e50 100644 --- a/gnucash/gtkbuilder/gnc-plugin-page-register.glade +++ b/gnucash/gtkbuilder/gnc-plugin-page-register.glade @@ -380,6 +380,7 @@ If 0, all previous days included True False 12 + 6 _Unreconciled @@ -838,21 +839,11 @@ If 0, all previous days included 11 - - - True - False - - - True - True - 12 - - True False + 6 Sa_ve Sort Order @@ -895,7 +886,7 @@ If 0, all previous days included True False - 14 + 12 @@ -992,150 +983,132 @@ If 0, all previous days included - + True False - 12 + 6 + 6 + 6 + 3 + 6 - + + True + False + start + _Date + True + center + + + 0 + 0 + + + + + True + False + start + _Number + True + center + num_spin + + + 0 + 1 + + + + + True + True + True + False + False + num_adjustment + 1 + + + 1 + 1 + + + + True False - 6 - 12 - - True - False - start - _Date - True - center - - - 0 - 0 - - - - - True - False - start - _Number - True - center - num_spin - - - 0 - 1 - - - - - True - True - True - False - False - num_adjustment - 1 - - - 1 - 1 - - - - - True - False - - - - - - 1 - 0 - - - - - True - False - start - _Transaction Number - True - center - tnum_spin - - - 0 - 2 - - - - - True - True - False - False - tnum_adjustment - 1 - - - 1 - 2 - - - - - True - False - 5 - - - True - False - start - Keep Associated Entry - - - False - True - 0 - - - - - True - True - False - start - top - True - True - - - False - True - 1 - - - - - 0 - 3 - 2 - + + + 1 + 0 + + + + + True + False + start + _Transaction Number + True + center + tnum_spin + + + 0 + 2 + + + + + True + True + False + False + tnum_adjustment + 1 + + + 1 + 2 + + + + + True + True + False + start + top + True + True + + + 1 + 3 + + + + + True + False + start + Keep Associated Entry + + + 0 + 3 + - True + False True - 3 + 2 @@ -1149,7 +1122,6 @@ If 0, all previous days included False 6 Void Transaction - False True center-on-parent dialog @@ -1215,6 +1187,7 @@ If 0, all previous days included True False + start Reason for voiding transaction center diff --git a/gnucash/gtkbuilder/gnc-plugin-page-register2.glade b/gnucash/gtkbuilder/gnc-plugin-page-register2.glade index d501944510..f326cdaa11 100644 --- a/gnucash/gtkbuilder/gnc-plugin-page-register2.glade +++ b/gnucash/gtkbuilder/gnc-plugin-page-register2.glade @@ -72,6 +72,7 @@ True False start + 6 <b>New Transaction Information</b> True @@ -82,80 +83,74 @@ - + True False - 12 + 6 + 3 + 6 - + + True + False + start + _Date + True + center + + + 0 + 0 + + + + + True + False + start + _Number + True + center + num_spin + + + 0 + 1 + + + + + True + True + True + False + False + adjustment1 + 1 + + + 1 + 1 + + + + True False - 6 - 12 - - True - False - start - _Date - True - center - - - 0 - 0 - - - - - True - False - start - _Number - True - center - num_spin - - - 0 - 1 - - - - - True - True - True - False - False - adjustment1 - 1 - - - 1 - 1 - - - - - True - False - - - - - - 1 - 0 - + + + 1 + 0 + - True + False True - 3 + 2 @@ -252,17 +247,6 @@ 0 - - - True - False - - - False - False - 1 - - Select Range: @@ -278,13 +262,14 @@ False False - 2 + 1 True False + 3 6 @@ -480,7 +465,7 @@ True True - 3 + 2 @@ -506,6 +491,7 @@ True False 12 + 6 _Unreconciled @@ -592,6 +578,7 @@ True True True + center True @@ -684,7 +671,6 @@ False 6 Void Transaction - False True center-on-parent dialog @@ -750,6 +736,7 @@ True False + start Reason for voiding transaction center diff --git a/gnucash/gtkbuilder/gnc-recurrence.glade b/gnucash/gtkbuilder/gnc-recurrence.glade index 3616bc7f28..151777d54f 100644 --- a/gnucash/gtkbuilder/gnc-recurrence.glade +++ b/gnucash/gtkbuilder/gnc-recurrence.glade @@ -41,6 +41,7 @@ False True vertical + 3 True diff --git a/gnucash/gtkbuilder/window-autoclear.glade b/gnucash/gtkbuilder/window-autoclear.glade index 46307474f3..fafe92f428 100644 --- a/gnucash/gtkbuilder/window-autoclear.glade +++ b/gnucash/gtkbuilder/window-autoclear.glade @@ -14,7 +14,7 @@ True False vertical - 6 + 3 True @@ -81,56 +81,49 @@ - + True False - 12 + 6 + 6 + 6 - + True False - 10 - 6 - 6 + start + _Ending Balance + True + + + 0 + 0 + + + + + True + False + True - - True - False - start - _Ending Balance - True - - - 0 - 0 - - - - - True - False - True - - - - - - 1 - 0 - - - - - True - False - - - 0 - 1 - 2 - + + + 1 + 0 + + + + + True + False + + + 0 + 1 + 2 + diff --git a/gnucash/gtkbuilder/window-reconcile.glade b/gnucash/gtkbuilder/window-reconcile.glade index ee35d457b2..9ed2afb4fe 100644 --- a/gnucash/gtkbuilder/window-reconcile.glade +++ b/gnucash/gtkbuilder/window-reconcile.glade @@ -14,7 +14,6 @@ True False vertical - 6 True @@ -64,12 +63,14 @@ True False vertical - 6 + 3 True False start + 6 + 6 <b>Reconcile Information</b> True @@ -80,110 +81,125 @@ - + True False - 12 + 6 + 3 + 6 - + True False - 10 - 6 - 6 + start + Statement _Date + True + + + 0 + 0 + + + + + True + False + start + Starting Balance + + + 0 + 1 + + + + + True + False + start + _Ending Balance + True + + + 0 + 2 + + + + + Include _subaccounts + True + True + False + Include all descendant accounts in the reconcile. All of them must use the same commodity as this one. + True + True + + + + 1 + 3 + + + + + True + False + + + + + + 1 + 0 + + + + + True + False + + + + + + 1 + 2 + + + + + True + False + True True False start + 3 + 3 + 3 + 3 $15.00 - 1 - 1 + False + True + 0 - - - True - False - Statement _Date - True - - - 0 - 0 - - - - - True - False - Starting Balance - - - 0 - 1 - - - - - True - False - _Ending Balance - True - - - 0 - 2 - - - - - Include _subaccounts - True - True - False - Include all descendant accounts in the reconcile. All of them must use the same commodity as this one. - True - True - - - - 1 - 3 - - - - - True - False - - - - - - 1 - 0 - - - - - True - False - - - - - - 1 - 2 - - - - - + + + 1 + 1 + + + +