gnucash maint: Multiple changes pushed
Frank H.Ellenberger
fell at code.gnucash.org
Tue Nov 10 06:39:58 EST 2020
Updated via https://github.com/Gnucash/gnucash/commit/49b3bdeb (commit)
via https://github.com/Gnucash/gnucash/commit/4718604f (commit)
via https://github.com/Gnucash/gnucash/commit/1aba0621 (commit)
from https://github.com/Gnucash/gnucash/commit/6a6396ed (commit)
commit 49b3bdeb09b5c86751b8dedcec26be9c3487df48
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Thu Oct 29 21:57:26 2020 +0100
I18N: Ammend intro of autoclear window
Split text in titles and section
and use CSS instead of markup.
diff --git a/gnucash/gtkbuilder/window-autoclear.glade b/gnucash/gtkbuilder/window-autoclear.glade
index 4288ac744..335ed8c2a 100644
--- a/gnucash/gtkbuilder/window-autoclear.glade
+++ b/gnucash/gtkbuilder/window-autoclear.glade
@@ -1,14 +1,11 @@
<?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.22"/>
<object class="GtkDialog" id="auto_clear_start_dialog">
<property name="can_focus">False</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
- <child type="titlebar">
- <placeholder/>
- </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox6">
<property name="visible">True</property>
@@ -71,18 +68,59 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Auto-Clear Information</b>
-Use this dialog if you want GnuCash to automatically find which transactions are cleared, given an ending balance. For example, said ending balance can be the current balance given by your online bank.
-
-<b>Note</b>: The complexity of this algorithm is quite high (<a href="https://en.wikipedia.org/wiki/Knapsack_problem#Computational_complexity">O(nW)</a>). Use this only on a dozen of uncleared splits.</property>
- <property name="use_markup">True</property>
+ <property name="label" translatable="yes">About Auto-Clear</property>
+ <style>
+ <class name="gnc-class-title"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Use this dialog if you want GnuCash to automatically find which transactions are cleared, given an ending balance. For example, said ending balance can be the current balance given by your bank online.</property>
<property name="wrap">True</property>
<property name="max_width_chars">80</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="label" translatable="yes">Caution!</property>
+ <style>
+ <class name="gnc-class-emphasis"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">This tool might be slow or abort if the number of uncleared splits is more than approximately 20. In that case please clear at least some of them manually.</property>
+ <property name="wrap">True</property>
+ <property name="max_width_chars">80</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
@@ -110,9 +148,6 @@ Use this dialog if you want GnuCash to automatically find which transactions are
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -134,7 +169,7 @@ Use this dialog if you want GnuCash to automatically find which transactions are
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
@@ -150,7 +185,7 @@ Use this dialog if you want GnuCash to automatically find which transactions are
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">5</property>
</packing>
</child>
</object>
@@ -158,7 +193,7 @@ Use this dialog if you want GnuCash to automatically find which transactions are
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">5</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -167,5 +202,8 @@ Use this dialog if you want GnuCash to automatically find which transactions are
<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>
commit 4718604f3b1e84b4da7d40f2f1bfe7e684d04a90
Author: Cristian Klein <cristian.klein at elastisys.com>
Date: Wed Oct 14 07:48:24 2020 +0200
Document complexity in UI
diff --git a/gnucash/gtkbuilder/window-autoclear.glade b/gnucash/gtkbuilder/window-autoclear.glade
index 25730a6ff..4288ac744 100644
--- a/gnucash/gtkbuilder/window-autoclear.glade
+++ b/gnucash/gtkbuilder/window-autoclear.glade
@@ -72,7 +72,9 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes"><b>Auto-Clear Information</b>
-Use this dialog if you want GnuCash to automatically find which transactions are cleared, given an ending balance. For example, said ending balance can be the current balance given by your online bank.</property>
+Use this dialog if you want GnuCash to automatically find which transactions are cleared, given an ending balance. For example, said ending balance can be the current balance given by your online bank.
+
+<b>Note</b>: The complexity of this algorithm is quite high (<a href="https://en.wikipedia.org/wiki/Knapsack_problem#Computational_complexity">O(nW)</a>). Use this only on a dozen of uncleared splits.</property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
<property name="max_width_chars">80</property>
commit 1aba062109bcf67c56719949e4fc9388ddd8e9ec
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Sat Nov 7 11:41:52 2020 +0100
Add a few more CSS classes for labels
diff --git a/gnucash/gnome-utils/dialog-account.c b/gnucash/gnome-utils/dialog-account.c
index be630f279..f72debba1 100644
--- a/gnucash/gnome-utils/dialog-account.c
+++ b/gnucash/gnome-utils/dialog-account.c
@@ -699,7 +699,7 @@ verify_children_compatible (AccountWindow *aw)
gnc_label_set_alignment (label, 0.0, 0.0);
/* make label large */
- gnc_widget_style_context_add_class (GTK_WIDGET(label), "gnc-class-emphasize-label");
+ gnc_widget_style_context_add_class (GTK_WIDGET(label), "gnc-class-title");
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
diff --git a/gnucash/gnucash-fallback.css b/gnucash/gnucash-fallback.css
index 9528ee9a4..f5f4a34c6 100644
--- a/gnucash/gnucash-fallback.css
+++ b/gnucash/gnucash-fallback.css
@@ -41,10 +41,21 @@
border-color: black;
}
-/* Make label more important */
-.gnc-class-emphasize-label {
- font-size: large;
- font-weight: bold;
+/* Make some labels more important */
+.gnc-class-underline-title {
+font-size: large;
+font-weight: bold;
+text-decoration-line: underline;
+}
+.gnc-class-title {
+font-size: large;
+font-weight: bold;
+}
+.gnc-class-strong {
+font-weight: bold;
+}
+.gnc-class-emphasis {
+font-style: italic;
}
/* The Dense Calendar defaults */
Summary of changes:
gnucash/gnome-utils/dialog-account.c | 2 +-
gnucash/gnucash-fallback.css | 19 +++++++--
gnucash/gtkbuilder/window-autoclear.glade | 68 ++++++++++++++++++++++++-------
3 files changed, 70 insertions(+), 19 deletions(-)
More information about the gnucash-changes
mailing list