gnucash unstable: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Fri Nov 24 11:28:36 EST 2017
Updated via https://github.com/Gnucash/gnucash/commit/037c93fa (commit)
via https://github.com/Gnucash/gnucash/commit/1e81d3ac (commit)
via https://github.com/Gnucash/gnucash/commit/22e7e1b4 (commit)
via https://github.com/Gnucash/gnucash/commit/761d4091 (commit)
via https://github.com/Gnucash/gnucash/commit/baf7575f (commit)
via https://github.com/Gnucash/gnucash/commit/a5d15de4 (commit)
via https://github.com/Gnucash/gnucash/commit/99f2283d (commit)
via https://github.com/Gnucash/gnucash/commit/c5f483d1 (commit)
via https://github.com/Gnucash/gnucash/commit/78ec2e33 (commit)
via https://github.com/Gnucash/gnucash/commit/67e4b352 (commit)
via https://github.com/Gnucash/gnucash/commit/8a6ce10a (commit)
via https://github.com/Gnucash/gnucash/commit/1b52053d (commit)
via https://github.com/Gnucash/gnucash/commit/ed4bad34 (commit)
via https://github.com/Gnucash/gnucash/commit/2a476cb6 (commit)
via https://github.com/Gnucash/gnucash/commit/bbafb818 (commit)
via https://github.com/Gnucash/gnucash/commit/9cd2c6d1 (commit)
from https://github.com/Gnucash/gnucash/commit/9c4635e3 (commit)
commit 037c93faea77f51a36d7391d0f3ef403b5036843
Merge: 1e81d3a 22e7e1b
Author: Geert Janssens <geert at kobaltwit.be>
Date: Fri Nov 24 17:24:52 2017 +0100
Merge branch 'gtk3-update8' of https://github.com/Bob-IT/gnucash into unstable
commit 1e81d3ace27fd32f7a4b61ae2aaa45c7dfffa92e
Author: Jose Marino <jmarino at users.noreply.github.com>
Date: Tue Nov 21 16:53:10 2017 -0700
report: fix default colors incorrectly set to transparent
The default color of a color option is set during a call to "gnc:make-color-option"
as a list of rgba values. In all color option instances in the scheme code this
default color is incorrectly set to transparent.
For example, white color was being set with:
(list #xff #xff #xff 0)
The last value in the list is the value of the alpha channel, with 0 meaning
transparent. When the color button is displayed in the gui it shows a checkerboard
pattern instead of the intended color.
This commit changes all default colors of color options to have alpha=#xff, i.e.,
fully opaque.
diff --git a/gnucash/report/report-system/doc/report-html.txt b/gnucash/report/report-system/doc/report-html.txt
index 99899fa..35f4341 100644
--- a/gnucash/report/report-system/doc/report-html.txt
+++ b/gnucash/report/report-system/doc/report-html.txt
@@ -363,7 +363,7 @@ We have three different kinds of style control information available:
(gnc:make-color-option
(_ "Style Sheet Options")
(_ "Background Color") "a" (_ "Background color for reports.")
- (list #xff #xff #xff 0)
+ (list #xff #xff #xff #xff)
255 #f))
options))
diff --git a/gnucash/report/standard-reports/price-scatter.scm b/gnucash/report/standard-reports/price-scatter.scm
index 551a6fb..5df439d 100644
--- a/gnucash/report/standard-reports/price-scatter.scm
+++ b/gnucash/report/standard-reports/price-scatter.scm
@@ -118,7 +118,7 @@
gnc:pagename-display optname-markercolor
"b"
(N_ "Color of the marker.")
- (list #xb2 #x22 #x22 0)
+ (list #xb2 #x22 #x22 #xff)
255 #f))
(gnc:options-set-default-section options gnc:pagename-general)
diff --git a/gnucash/report/stylesheets/stylesheet-easy.scm b/gnucash/report/stylesheets/stylesheet-easy.scm
index 25be3d9..38e7fb6 100644
--- a/gnucash/report/stylesheets/stylesheet-easy.scm
+++ b/gnucash/report/stylesheets/stylesheet-easy.scm
@@ -101,28 +101,28 @@
(gnc:make-color-option
(N_ "Colors")
(N_ "Background Color") "a" (N_ "General background color for report.")
- (list #xff #xff #xff 0)
+ (list #xff #xff #xff #xff)
255 #f))
(opt-register
(gnc:make-color-option
(N_ "Colors")
(N_ "Text Color") "b" (N_ "Normal body text color.")
- (list #x00 #x00 #x00 0)
+ (list #x00 #x00 #x00 #xff)
255 #f))
(opt-register
(gnc:make-color-option
(N_ "Colors")
(N_ "Link Color") "c" (N_ "Link text color.")
- (list #xb2 #x22 #x22 0)
+ (list #xb2 #x22 #x22 #xff)
255 #f))
(opt-register
(gnc:make-color-option
(N_ "Colors")
(N_ "Table Cell Color") "c" (N_ "Default background for table cells.")
- (list #xff #xff #xff 0)
+ (list #xff #xff #xff #xff)
255 #f))
(opt-register
@@ -130,7 +130,7 @@
(N_ "Colors")
(N_ "Alternate Table Cell Color") "d"
(N_ "Default alternate background for table cells.")
- (list #xff #xff #xff 0)
+ (list #xff #xff #xff #xff)
255 #f))
(opt-register
@@ -138,7 +138,7 @@
(N_ "Colors")
(N_ "Subheading/Subtotal Cell Color") "e"
(N_ "Default color for subtotal rows.")
- (list #xee #xe8 #xaa 0)
+ (list #xee #xe8 #xaa #xff)
255 #f))
(opt-register
@@ -146,7 +146,7 @@
(N_ "Colors")
(N_ "Sub-subheading/total Cell Color") "f"
(N_ "Color for subsubtotals.")
- (list #xfa #xfa #xd2 0)
+ (list #xfa #xfa #xd2 #xff)
255 #f))
(opt-register
@@ -154,7 +154,7 @@
(N_ "Colors")
(N_ "Grand Total Cell Color") "g"
(N_ "Color for grand totals.")
- (list #xff #xff #x00 0)
+ (list #xff #xff #x00 #xff)
255 #f))
(opt-register
diff --git a/gnucash/report/stylesheets/stylesheet-fancy.scm b/gnucash/report/stylesheets/stylesheet-fancy.scm
index a4b4bc8..eebdc3a 100644
--- a/gnucash/report/stylesheets/stylesheet-fancy.scm
+++ b/gnucash/report/stylesheets/stylesheet-fancy.scm
@@ -95,28 +95,28 @@
(gnc:make-color-option
(N_ "Colors")
(N_ "Background Color") "a" (N_ "General background color for report.")
- (list #xff #xff #xff 0)
+ (list #xff #xff #xff #xff)
255 #f))
(opt-register
(gnc:make-color-option
(N_ "Colors")
(N_ "Text Color") "b" (N_ "Normal body text color.")
- (list #x00 #x00 #x00 0)
+ (list #x00 #x00 #x00 #xff)
255 #f))
(opt-register
(gnc:make-color-option
(N_ "Colors")
(N_ "Link Color") "c" (N_ "Link text color.")
- (list #xb2 #x22 #x22 0)
+ (list #xb2 #x22 #x22 #xff)
255 #f))
(opt-register
(gnc:make-color-option
(N_ "Colors")
(N_ "Table Cell Color") "c" (N_ "Default background for table cells.")
- (list #xff #xff #xff 0)
+ (list #xff #xff #xff #xff)
255 #f))
(opt-register
@@ -124,7 +124,7 @@
(N_ "Colors")
(N_ "Alternate Table Cell Color") "d"
(N_ "Default alternate background for table cells.")
- (list #xff #xff #xff 0)
+ (list #xff #xff #xff #xff)
255 #f))
(opt-register
@@ -132,7 +132,7 @@
(N_ "Colors")
(N_ "Subheading/Subtotal Cell Color") "e"
(N_ "Default color for subtotal rows.")
- (list #xee #xe8 #xaa 0)
+ (list #xee #xe8 #xaa #xff)
255 #f))
(opt-register
@@ -140,7 +140,7 @@
(N_ "Colors")
(N_ "Sub-subheading/total Cell Color") "f"
(N_ "Color for subsubtotals.")
- (list #xfa #xfa #xd2 0)
+ (list #xfa #xfa #xd2 #xff)
255 #f))
(opt-register
@@ -148,7 +148,7 @@
(N_ "Colors")
(N_ "Grand Total Cell Color") "g"
(N_ "Color for grand totals.")
- (list #xff #xff #x00 0)
+ (list #xff #xff #x00 #xff)
255 #f))
(opt-register
diff --git a/gnucash/report/stylesheets/stylesheet-footer.scm b/gnucash/report/stylesheets/stylesheet-footer.scm
index 5192bab..59c3fb6 100644
--- a/gnucash/report/stylesheets/stylesheet-footer.scm
+++ b/gnucash/report/stylesheets/stylesheet-footer.scm
@@ -114,28 +114,28 @@
(gnc:make-color-option
(N_ "Colors")
(N_ "Background Color") "a" (N_ "General background color for report.")
- (list #xff #xff #xff 0)
+ (list #xff #xff #xff #xff)
255 #f))
(opt-register
(gnc:make-color-option
(N_ "Colors")
(N_ "Text Color") "b" (N_ "Normal body text color.")
- (list #x00 #x00 #x00 0)
+ (list #x00 #x00 #x00 #xff)
255 #f))
(opt-register
(gnc:make-color-option
(N_ "Colors")
(N_ "Link Color") "c" (N_ "Link text color.")
- (list #xb2 #x22 #x22 0)
+ (list #xb2 #x22 #x22 #xff)
255 #f))
(opt-register
(gnc:make-color-option
(N_ "Colors")
(N_ "Table Cell Color") "c" (N_ "Default background for table cells.")
- (list #xff #xff #xff 0)
+ (list #xff #xff #xff #xff)
255 #f))
(opt-register
@@ -143,7 +143,7 @@
(N_ "Colors")
(N_ "Alternate Table Cell Color") "d"
(N_ "Default alternate background for table cells.")
- (list #xff #xff #xff 0)
+ (list #xff #xff #xff #xff)
255 #f))
(opt-register
@@ -151,7 +151,7 @@
(N_ "Colors")
(N_ "Subheading/Subtotal Cell Color") "e"
(N_ "Default color for subtotal rows.")
- (list #xee #xe8 #xaa 0)
+ (list #xee #xe8 #xaa #xff)
255 #f))
(opt-register
@@ -159,7 +159,7 @@
(N_ "Colors")
(N_ "Sub-subheading/total Cell Color") "f"
(N_ "Color for subsubtotals.")
- (list #xfa #xfa #xd2 0)
+ (list #xfa #xfa #xd2 #xff)
255 #f))
(opt-register
@@ -167,7 +167,7 @@
(N_ "Colors")
(N_ "Grand Total Cell Color") "g"
(N_ "Color for grand totals.")
- (list #xff #xff #x00 0)
+ (list #xff #xff #x00 #xff)
255 #f))
(opt-register
diff --git a/gnucash/report/stylesheets/stylesheet-head-or-tail.scm b/gnucash/report/stylesheets/stylesheet-head-or-tail.scm
index b264982..e31cb46 100644
--- a/gnucash/report/stylesheets/stylesheet-head-or-tail.scm
+++ b/gnucash/report/stylesheets/stylesheet-head-or-tail.scm
@@ -170,28 +170,28 @@
(gnc:make-color-option
(N_ "Colors")
(N_ "Background Color") "a" (N_ "General background color for report.")
- (list #xff #xff #xff 0)
+ (list #xff #xff #xff #xff)
255 #f))
(opt-register
(gnc:make-color-option
(N_ "Colors")
(N_ "Text Color") "b" (N_ "Normal body text color.")
- (list #x00 #x00 #x00 0)
+ (list #x00 #x00 #x00 #xff)
255 #f))
(opt-register
(gnc:make-color-option
(N_ "Colors")
(N_ "Link Color") "c" (N_ "Link text color.")
- (list #xb2 #x22 #x22 0)
+ (list #xb2 #x22 #x22 #xff)
255 #f))
(opt-register
(gnc:make-color-option
(N_ "Colors")
(N_ "Table Cell Color") "c" (N_ "Default background for table cells.")
- (list #xff #xff #xff 0)
+ (list #xff #xff #xff #xff)
255 #f))
(opt-register
@@ -199,7 +199,7 @@
(N_ "Colors")
(N_ "Alternate Table Cell Color") "d"
(N_ "Default alternate background for table cells.")
- (list #xff #xff #xff 0)
+ (list #xff #xff #xff #xff)
255 #f))
(opt-register
@@ -207,7 +207,7 @@
(N_ "Colors")
(N_ "Subheading/Subtotal Cell Color") "e"
(N_ "Default color for subtotal rows.")
- (list #xee #xe8 #xaa 0)
+ (list #xee #xe8 #xaa #xff)
255 #f))
(opt-register
@@ -215,7 +215,7 @@
(N_ "Colors")
(N_ "Sub-subheading/total Cell Color") "f"
(N_ "Color for subsubtotals.")
- (list #xfa #xfa #xd2 0)
+ (list #xfa #xfa #xd2 #xff)
255 #f))
(opt-register
@@ -223,7 +223,7 @@
(N_ "Colors")
(N_ "Grand Total Cell Color") "g"
(N_ "Color for grand totals.")
- (list #xff #xff #x00 0)
+ (list #xff #xff #x00 #xff)
255 #f))
(opt-register
diff --git a/gnucash/report/stylesheets/stylesheet-plain.scm b/gnucash/report/stylesheets/stylesheet-plain.scm
index d5d6f6e..12cc747 100644
--- a/gnucash/report/stylesheets/stylesheet-plain.scm
+++ b/gnucash/report/stylesheets/stylesheet-plain.scm
@@ -46,7 +46,7 @@
(gnc:make-color-option
(N_ "General")
(N_ "Background Color") "a" (N_ "Background color for reports.")
- (list #xff #xff #xff 0)
+ (list #xff #xff #xff #xff)
255 #f))
(opt-register
(gnc:make-pixmap-option
@@ -62,7 +62,7 @@
(gnc:make-color-option
(N_ "Colors")
(N_ "Alternate Table Cell Color") "a" (N_ "Background color for alternate lines.")
- (list #xff #xff #xff 0)
+ (list #xff #xff #xff #xff)
255 #f))
(opt-register
(gnc:make-number-range-option
diff --git a/gnucash/report/utility-reports/hello-world.scm b/gnucash/report/utility-reports/hello-world.scm
index ad8c5a1..bbabfdd 100644
--- a/gnucash/report/utility-reports/hello-world.scm
+++ b/gnucash/report/utility-reports/hello-world.scm
@@ -159,14 +159,14 @@
(gnc:make-color-option
(N_ "Hello, World!") (N_ "Background Color")
"f" (N_ "This is a color option.")
- (list #xf6 #xff #xdb 0)
+ (list #xf6 #xff #xdb #xff)
255
#f))
(add-option
(gnc:make-color-option
(N_ "Hello, World!") (N_ "Text Color")
"f" (N_ "This is a color option.")
- (list #x00 #x00 #x00 0)
+ (list #x00 #x00 #x00 #xff)
255
#f))
commit 22e7e1b440bd9d6925ab545a6ad1128c25b13ffa
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Thu Nov 23 13:57:10 2017 +0000
Fix some corrupted glade files
diff --git a/gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade b/gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade
index ce06a8f..3b44403 100644
--- a/gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade
+++ b/gnucash/gnome-utils/gtkbuilder/dialog-preferences.glade
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
@@ -1128,8 +1126,7 @@ many months before the current month:</property>
<object class="GtkLabel" id="label50">
<property name="visible">True</property>
<property name="halign">start</property>
- <property name="label" translatable="yes"><b>General</b></property>
- <property name="label" translatable="yes"><b>General</b></property>
+ <property name="label" translatable="yes" comments="Preferences Dialog, General Tab"><b>General</b></property>
<property name="use_markup">True</property>
</object>
<packing>
@@ -1618,8 +1615,7 @@ many months before the current month:</property>
<property name="visible">True</property>
<property name="halign">start</property>
<property name="margin_left">12</property>
- <property name="label" translatable="yes">Time to wait for answer:</property>
- <property name="label" translatable="yes">Time to wait for answer:</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>
</object>
@@ -2526,8 +2522,7 @@ many months before the current month:</property>
<property name="visible">True</property>
<property name="halign">start</property>
<property name="margin_left">12</property>
- <property name="label" translatable="yes">Number of _characters for auto complete:</property>
- <property name="label" translatable="yes">Number of _characters for auto complete:</property>
+ <property name="label" translatable="yes" comments="Register2 feature">Number of _characters for auto complete:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">pref/general.register/key-length</property>
</object>
@@ -2566,7 +2561,6 @@ many months before the current month:</property>
<property name="tooltip_text" translatable="yes">Show the date when the transaction was entered below the posted date and reconciled date on split row.</property>
<property name="halign">start</property>
<property name="margin_left">12</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -2584,7 +2578,6 @@ many months before the current month:</property>
<property name="tooltip_text" translatable="yes">Show the calendar buttons Cancel, Today and Select.</property>
<property name="halign">start</property>
<property name="margin_left">12</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -2602,7 +2595,6 @@ many months before the current month:</property>
<property name="tooltip_text" translatable="yes">This will move the selection to the blank split when the transaction is expanded.</property>
<property name="halign">start</property>
<property name="margin_left">12</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -2620,7 +2612,6 @@ many months before the current month:</property>
<property name="tooltip_text" translatable="yes">Show the entered date and reconciled date on transaction selection.</property>
<property name="halign">start</property>
<property name="margin_left">12</property>
- <property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
diff --git a/gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade b/gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade
index ce244d0..d690887 100644
--- a/gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade
+++ b/gnucash/gnome/gtkbuilder/gnc-plugin-page-register.glade
@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
+<interface>
<requires lib="gtk+" version="3.10"/>
<object class="GtkDialog" id="filter_by_dialog">
- <object class="GtkDialog" id="filter_by_dialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
@@ -126,8 +124,7 @@
<child>
<object class="GtkLabel" id="label847682">
<property name="visible">True</property>
- <property name="label" translatable="yes">Start:</property>
- <property name="label" translatable="yes">Start:</property>
+ <property name="label" translatable="yes" comments="Filter By Dialog, Date Tab, Start section">Start:</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -213,8 +210,7 @@
<child>
<object class="GtkLabel" id="label847684">
<property name="visible">True</property>
- <property name="label" translatable="yes">End:</property>
- <property name="label" translatable="yes">End:</property>
+ <property name="label" translatable="yes" comments="Filter By Dialog, Date Tab, End section">End:</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -838,8 +834,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Sort in descending order.</property>
<property name="halign">start</property>
- <property name="halign">start</property>
+ <property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="gnc_plugin_page_register_sort_order_reverse_cb" swapped="no"/>
</object>
@@ -879,7 +876,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Duplicate Transaction</property>
+ <property name="title" translatable="yes" comments="Duplicate Transaction Dialog">Duplicate Transaction</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="type_hint">dialog</property>
diff --git a/gnucash/import-export/dialog-import.glade b/gnucash/import-export/dialog-import.glade
index 96c39c0..8f329fb 100644
--- a/gnucash/import-export/dialog-import.glade
+++ b/gnucash/import-export/dialog-import.glade
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
@@ -441,8 +439,7 @@
<property name="visible">True</property>
<property name="halign">start</property>
<property name="margin_left">12</property>
- <property name="label" translatable="yes">Commercial ATM _fees threshold</property>
- <property name="label" translatable="yes">Commercial ATM _fees threshold</property>
+ <property name="label" translatable="yes" comments="Preferences->Online Banking:Generic">Commercial ATM _fees threshold</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">pref/dialogs.import.generic/atm-fee-threshold</property>
</object>
@@ -456,8 +453,7 @@
<property name="visible">True</property>
<property name="halign">start</property>
<property name="margin_left">12</property>
- <property name="label" translatable="yes">Auto-c_lear threshold</property>
- <property name="label" translatable="yes">Auto-c_lear threshold</property>
+ <property name="label" translatable="yes" comments="Preferences->Online Banking:Generic">Auto-c_lear threshold</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">pref/dialogs.import.generic/auto-clear-threshold</property>
</object>
@@ -471,8 +467,7 @@
<property name="visible">True</property>
<property name="halign">start</property>
<property name="margin_left">12</property>
- <property name="label" translatable="yes">Auto-_add threshold</property>
- <property name="label" translatable="yes">Auto-_add threshold</property>
+ <property name="label" translatable="yes" comments="Preferences->Online Banking:Generic">Auto-_add threshold</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">pref/dialogs.import.generic/auto-add-threshold</property>
</object>
@@ -486,8 +481,7 @@
<property name="visible">True</property>
<property name="halign">start</property>
<property name="margin_left">12</property>
- <property name="label" translatable="yes">Match _display threshold</property>
- <property name="label" translatable="yes">Match _display threshold</property>
+ <property name="label" translatable="yes" comments="Preferences->Online Banking:Generic">Match _display threshold</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">pref/dialogs.import.generic/match-threshold</property>
</object>
@@ -622,8 +616,7 @@
<child>
<object class="GtkLabel" id="label847772">
<property name="visible">True</property>
- <property name="label" translatable="yes">Imported transaction's first split:</property>
- <property name="label" translatable="yes">Imported transaction's first split:</property>
+ <property name="label" translatable="yes" comments="Dialog Select matching transactions">Imported transaction's first split:</property>
<property name="justify">center</property>
</object>
<packing>
@@ -657,8 +650,7 @@
<child>
<object class="GtkLabel" id="label847766">
<property name="visible">True</property>
- <property name="label" translatable="yes">Potential splits matching the selected transaction: </property>
- <property name="label" translatable="yes">Potential splits matching the selected transaction: </property>
+ <property name="label" translatable="yes" comments="Dialog Select matching transactions">Potential splits matching the selected transaction: </property>
<property name="justify">center</property>
</object>
<packing>
commit 761d40918df88556598f98c8f8c72984a533ddc5
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Thu Nov 23 13:56:36 2017 +0000
Change assistant-ab-initial.glade to gtk3.10 version
diff --git a/gnucash/import-export/aqb/assistant-ab-initial.glade b/gnucash/import-export/aqb/assistant-ab-initial.glade
index 2658fe9..45cfca0 100644
--- a/gnucash/import-export/aqb/assistant-ab-initial.glade
+++ b/gnucash/import-export/aqb/assistant-ab-initial.glade
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
<interface>
- <requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.10"/>
<object class="GtkAssistant" id="aqbanking_init_assistant">
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="title" translatable="yes">AqBanking Initial Assistant</property>
+ <property name="default_width">400</property>
+ <signal name="cancel" handler="aai_on_cancel" swapped="no"/>
<signal name="close" handler="aai_on_finish" swapped="no"/>
<signal name="prepare" handler="aai_on_prepare" swapped="no"/>
- <signal name="cancel" handler="aai_on_cancel" swapped="no"/>
<child>
<placeholder/>
</child>
@@ -41,10 +42,11 @@ Press "Cancel" if you do not wish to setup any Online Banking connection now.
</packing>
</child>
<child>
- <object class="GtkVBox" id="wizard_page">
+ <object class="GtkBox" id="wizard_page">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label8877441">
@@ -88,27 +90,30 @@ Press "Cancel" if you do not wish to setup any Online Banking connection now.
</packing>
</child>
<child>
- <object class="GtkVBox" id="account_match_page">
+ <object class="GtkBox" id="account_match_page">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkVBox" id="vbox157">
+ <object class="GtkBox" id="vbox157">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow25">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="account_page_view">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="rules_hint">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"/>
+ </child>
</object>
</child>
</object>
@@ -122,7 +127,7 @@ Press "Cancel" if you do not wish to setup any Online Banking connection now.
<object class="GtkLabel" id="label828">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Double Click on the line of an Online Banking account name if you want to match it to a GnuCash account. Click "Forward" when all desired accounts are matching.</property>
+ <property name="label" translatable="yes">Double Click on the line of an Online Banking account name if you want to match it to a GnuCash account. Click "Next" when all desired accounts are matching.</property>
<property name="wrap">True</property>
</object>
<packing>
@@ -160,5 +165,10 @@ Press "Apply" now.</property>
<property name="complete">True</property>
</packing>
</child>
+ <child internal-child="action_area">
+ <object class="GtkBox">
+ <property name="can_focus">False</property>
+ </object>
+ </child>
</object>
</interface>
commit baf7575f1d77198219bc6fc2bc0bcf1e18625f07
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Thu Nov 23 13:55:58 2017 +0000
Replace deprecated GTK_STOCK_ macro identifiers
diff --git a/gnucash/import-export/aqb/dialog-ab-trans.c b/gnucash/import-export/aqb/dialog-ab-trans.c
index 5f59e85..dc4480a 100644
--- a/gnucash/import-export/aqb/dialog-ab-trans.c
+++ b/gnucash/import-export/aqb/dialog-ab-trans.c
@@ -478,10 +478,10 @@ gnc_ab_trans_dialog_new(GtkWidget *parent, AB_ACCOUNT *ab_acc,
static void
gnc_ab_trans_dialog_entry_set (GtkWidget* entry,
const gchar* message,
- const gchar* stock_icon)
+ const gchar* icon_name)
{
g_object_set (entry,
- "secondary-icon-stock", stock_icon,
+ "secondary-icon-name", icon_name,
"secondary-icon-tooltip-text", message,
NULL);
}
@@ -499,7 +499,7 @@ gnc_ab_trans_dialog_check_ktoblzcheck(const GncABTransDialog *td,
"the account number might contain an error."),
AB_Transaction_GetRemoteIban(trans));
gnc_ab_trans_dialog_entry_set (td->recp_account_entry, message,
- GTK_STOCK_DIALOG_WARNING);
+ "dialog-warning");
}
else
{
@@ -540,9 +540,9 @@ gnc_ab_trans_dialog_check_ktoblzcheck(const GncABTransDialog *td,
AB_Transaction_GetRemoteAccountNumber(trans),
AB_Transaction_GetRemoteBankCode(trans));
gnc_ab_trans_dialog_entry_set (td->recp_bankcode_entry, message,
- GTK_STOCK_DIALOG_WARNING);
+ "dialog-warning");
gnc_ab_trans_dialog_entry_set (td->recp_account_entry, message,
- GTK_STOCK_DIALOG_WARNING);
+ "dialog-warning");
blztext = "Kontonummer wahrscheinlich falsch";
break;
@@ -624,7 +624,7 @@ gnc_ab_trans_dialog_verify_values(GncABTransDialog *td)
gnc_ab_trans_dialog_entry_set (td->recp_name_entry,
_("You did not enter a recipient name. A recipient name is "
"required for an online transfer.\n"),
- GTK_STOCK_CANCEL);
+ "process-stop");
g_free (othername);
values_ok = FALSE;
@@ -644,7 +644,7 @@ gnc_ab_trans_dialog_verify_values(GncABTransDialog *td)
gnc_ab_trans_dialog_entry_set (td->recp_account_entry,
_("You did not enter a recipient account. A recipient account is "
"required for an online transfer.\n"),
- GTK_STOCK_CANCEL);
+ "process-stop");
values_ok = FALSE;
}
else
@@ -660,7 +660,7 @@ gnc_ab_trans_dialog_verify_values(GncABTransDialog *td)
gnc_ab_trans_dialog_entry_set (td->recp_bankcode_entry,
_("You did not enter a recipient bank. A recipient bank is "
"required for an online transfer.\n"),
- GTK_STOCK_CANCEL);
+ "process-stop");
values_ok = FALSE;
}
else
@@ -680,7 +680,7 @@ gnc_ab_trans_dialog_verify_values(GncABTransDialog *td)
"interpreted correctly. You might have mixed up decimal "
"point and comma, compared to your locale settings. "
"This does not result in a valid online transfer job."),
- GTK_STOCK_CANCEL);
+ "process-stop");
values_ok = FALSE;
}
else
@@ -695,7 +695,7 @@ gnc_ab_trans_dialog_verify_values(GncABTransDialog *td)
gnc_ab_trans_dialog_entry_set (td->purpose_entry,
_("You did not enter any transaction purpose. A purpose is "
"required for an online transfer.\n"),
- GTK_STOCK_CANCEL);
+ "process-stop");
g_free (purpose);
values_ok = FALSE;
}
@@ -721,7 +721,7 @@ gnc_ab_trans_dialog_verify_values(GncABTransDialog *td)
"\n\n"
"In particular, neither Umlauts nor an ampersand (&) is allowed, "
"neither in the recipient or sender name nor in any purpose line."),
- GTK_STOCK_CANCEL);
+ "process-stop");
values_ok = FALSE;
}
#endif
commit a5d15de4263e486031a1fa66efb6b3a1483d2fb4
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Thu Nov 23 13:55:19 2017 +0000
Change a couple of deprecated functions in gnc-html-webkit1.c
diff --git a/gnucash/html/gnc-html-webkit1.c b/gnucash/html/gnc-html-webkit1.c
index c37881f..0b0fadd 100644
--- a/gnucash/html/gnc-html-webkit1.c
+++ b/gnucash/html/gnc-html-webkit1.c
@@ -125,9 +125,10 @@ gnc_html_webkit_init( GncHtmlWebkit* self )
{
GncHtmlWebkitPrivate* priv;
GncHtmlWebkitPrivate* new_priv;
-
+ GtkStyleContext *stylecontext;
WebKitWebSettings* webkit_settings = NULL;
const char* default_font_family = NULL;
+ PangoFontDescription *font_desc;
gdouble zoom = 1.0;
new_priv = g_realloc( GNC_HTML(self)->priv, sizeof(GncHtmlWebkitPrivate) );
@@ -137,9 +138,13 @@ gnc_html_webkit_init( GncHtmlWebkit* self )
priv->html_string = NULL;
priv->web_view = WEBKIT_WEB_VIEW(webkit_web_view_new());
+ /* Get the default font family from GtkStyleContext of a GtkWidget(priv->web_view). */
+ stylecontext = gtk_widget_get_style_context (GTK_WIDGET(priv->web_view));
+ gtk_style_context_get (stylecontext, gtk_widget_get_state_flags (GTK_WIDGET(priv->web_view)),
+ "font", &font_desc, NULL);
- /* Get the default font family from GtkStyle of a GtkWidget(priv-web_view). */
- default_font_family = pango_font_description_get_family( gtk_rc_get_style(GTK_WIDGET(priv->web_view))->font_desc );
+ default_font_family = pango_font_description_get_family (font_desc);
+ pango_font_description_free (font_desc);
/* Set default webkit settings */
webkit_settings = webkit_web_view_get_settings (priv->web_view);
@@ -1188,8 +1193,8 @@ impl_webkit_print( GncHtml* self, const gchar* jobname, gboolean export_pdf )
dialog = gtk_file_chooser_dialog_new (_("Export to PDF File"),
NULL,
GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Save"), GTK_RESPONSE_ACCEPT,
NULL);
gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
commit 99f2283d83ffc7517b01f6c8d188fbbf2addc94c
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Thu Nov 23 13:54:40 2017 +0000
Control the toggle button width
There did not seem to be an easier way to control the toggle button
width so created a custom one based on the GtkToggleButton. This
allowed the use of the class function get_preferred_width which is set
at two thirds the height.
diff --git a/gnucash/register/register-gnome/gnucash-item-edit.c b/gnucash/register/register-gnome/gnucash-item-edit.c
index 07c07d7..56bad13 100644
--- a/gnucash/register/register-gnome/gnucash-item-edit.c
+++ b/gnucash/register/register-gnome/gnucash-item-edit.c
@@ -58,6 +58,155 @@ enum
static GtkBoxClass *gnc_item_edit_parent_class;
+static GtkToggleButtonClass *gnc_item_edit_tb_parent_class;
+
+static void
+gnc_item_edit_tb_init (GncItemEditTb *item_edit_tb)
+{
+ item_edit_tb->sheet = NULL;
+}
+
+static void
+gnc_item_edit_tb_get_property (GObject *object,
+ guint param_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GncItemEditTb *item_edit_tb = GNC_ITEM_EDIT_TB (object);
+
+ switch (param_id)
+ {
+ case PROP_SHEET:
+ g_value_take_object (value, item_edit_tb->sheet);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+ break;
+ }
+}
+
+static void
+gnc_item_edit_tb_set_property (GObject *object,
+ guint param_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ GncItemEditTb *item_edit_tb = GNC_ITEM_EDIT_TB (object);
+
+ switch (param_id)
+ {
+ case PROP_SHEET:
+ item_edit_tb->sheet = GNUCASH_SHEET (g_value_get_object (value));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+ break;
+ }
+}
+
+static void
+gnc_item_edit_tb_get_preferred_width (GtkWidget *widget,
+ gint *minimal_width,
+ gint *natural_width)
+{
+ GncItemEditTb *tb = GNC_ITEM_EDIT_TB (widget);
+ GncItemEdit *item_edit = GNC_ITEM_EDIT(tb->sheet->item_editor);
+ gint x, y, w, h, width = 0;
+ gnc_item_edit_get_pixel_coords (GNC_ITEM_EDIT (item_edit), &x, &y, &w, &h);
+ width = ((h - 2)*2)/3;
+ if (width < 20) // minimum size for a button
+ width = 20;
+ *minimal_width = *natural_width = width;
+}
+
+static void
+gnc_item_edit_tb_get_preferred_height (GtkWidget *widget,
+ gint *minimal_width,
+ gint *natural_width)
+{
+ GncItemEditTb *tb = GNC_ITEM_EDIT_TB (widget);
+ GncItemEdit *item_edit = GNC_ITEM_EDIT(tb->sheet->item_editor);
+ gint x, y, w, h;
+ gnc_item_edit_get_pixel_coords (GNC_ITEM_EDIT (item_edit), &x, &y, &w, &h);
+ *minimal_width = *natural_width = (h - 2);
+}
+
+static void
+gnc_item_edit_tb_class_init (GncItemEditTbClass *gnc_item_edit_tb_class)
+{
+ GObjectClass *object_class;
+ GtkWidgetClass *widget_class;
+
+#if GTK_CHECK_VERSION(3,20,0)
+ gtk_widget_class_set_css_name (GTK_WIDGET_CLASS(gnc_item_edit_tb_class), "button");
+#endif
+
+ gnc_item_edit_tb_parent_class = g_type_class_peek_parent (gnc_item_edit_tb_class);
+
+ object_class = G_OBJECT_CLASS (gnc_item_edit_tb_class);
+ widget_class = GTK_WIDGET_CLASS (gnc_item_edit_tb_class);
+
+ object_class->get_property = gnc_item_edit_tb_get_property;
+ object_class->set_property = gnc_item_edit_tb_set_property;
+
+ g_object_class_install_property (object_class,
+ PROP_SHEET,
+ g_param_spec_object ("sheet",
+ "Sheet Value",
+ "Sheet Value",
+ GNUCASH_TYPE_SHEET,
+ G_PARAM_READWRITE));
+
+ /* GtkWidget method overrides */
+ widget_class->get_preferred_width = gnc_item_edit_tb_get_preferred_width;
+ widget_class->get_preferred_height = gnc_item_edit_tb_get_preferred_height;
+}
+
+GType
+gnc_item_edit_tb_get_type (void)
+{
+ static GType gnc_item_edit_tb_type = 0;
+
+ if (!gnc_item_edit_tb_type)
+ {
+ static const GTypeInfo gnc_item_edit_tb_info =
+ {
+ sizeof (GncItemEditTbClass),
+ NULL,
+ NULL,
+ (GClassInitFunc) gnc_item_edit_tb_class_init,
+ NULL,
+ NULL,
+ sizeof (GncItemEditTb),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gnc_item_edit_tb_init,
+ NULL,
+ };
+ gnc_item_edit_tb_type =
+ g_type_register_static(GTK_TYPE_TOGGLE_BUTTON,
+ "GncItemEditTb",
+ &gnc_item_edit_tb_info, 0);
+ }
+ return gnc_item_edit_tb_type;
+}
+
+GtkWidget *
+gnc_item_edit_tb_new (GnucashSheet *sheet)
+{
+ GtkStyleContext *context;
+ GncItemEditTb *item_edit_tb =
+ g_object_new (GNC_TYPE_ITEM_EDIT_TB,
+ "sheet", sheet,
+ NULL);
+
+ // This sets a style class for when Gtk+ version is less than 3.20
+ gnc_widget_set_css_name (GTK_WIDGET(item_edit_tb), "button");
+
+ context = gtk_widget_get_style_context (GTK_WIDGET(item_edit_tb));
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_BUTTON);
+
+ return GTK_WIDGET(item_edit_tb);
+}
/*
* Returns the coordinates for the editor bounding box
@@ -719,7 +868,7 @@ gnc_item_edit_new (GnucashSheet *sheet)
/* Create the popup button
It will only be displayed when the cell being edited provides
a popup item (like a calendar or account list) */
- item_edit->popup_toggle.tbutton = gtk_toggle_button_new();
+ item_edit->popup_toggle.tbutton = gnc_item_edit_tb_new (sheet);
gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (item_edit->popup_toggle.tbutton), FALSE);
/* Wrap the popup button in an event box to give it its own gdkwindow.
diff --git a/gnucash/register/register-gnome/gnucash-item-edit.h b/gnucash/register/register-gnome/gnucash-item-edit.h
index 45d1502..2be4d24 100644
--- a/gnucash/register/register-gnome/gnucash-item-edit.h
+++ b/gnucash/register/register-gnome/gnucash-item-edit.h
@@ -37,6 +37,10 @@
#define GNC_ITEM_EDIT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GNC_TYPE_ITEM_EDIT, GncItemEditClass))
#define GNC_IS_ITEM_EDIT(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GNC_TYPE_ITEM_EDIT))
+#define GNC_TYPE_ITEM_EDIT_TB (gnc_item_edit_tb_get_type ())
+#define GNC_ITEM_EDIT_TB(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GNC_TYPE_ITEM_EDIT_TB, GncItemEditTb))
+#define GNC_ITEM_EDIT_TB_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GNC_TYPE_ITEM_EDIT_TB, GncItemEditTbClass))
+#define GNC_IS_ITEM_EDIT_TB(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GNC_TYPE_ITEM_EDIT_TB))
typedef int (*PopupGetHeight) (GtkWidget *item,
int space_available,
@@ -102,6 +106,19 @@ typedef struct
GtkBoxClass parent_class;
} GncItemEditClass;
+typedef struct
+{
+ GtkToggleButton tb;
+ GnucashSheet *sheet;
+} GncItemEditTb;
+
+typedef struct
+{
+ GtkToggleButtonClass parent_class;
+
+ void (* toggled) (GncItemEditTb *item_edit_tb);
+} GncItemEditTbClass;
+
typedef enum
{
left,
@@ -145,5 +162,8 @@ void gnc_item_edit_focus_out (GncItemEdit *item_edit);
gint gnc_item_edit_get_margin (GncItemEdit *item_edit, Sides side);
gint gnc_item_edit_get_padding_border (GncItemEdit *item_edit, Sides side);
+GType gnc_item_edit_tb_get_type (void);
+GtkWidget *gnc_item_edit_tb_new (GnucashSheet *sheet);
+
/** @} */
#endif /* GNUCASH_ITEM_EDIT_H */
commit c5f483d115c5ad81ce722eb300f669309037750b
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Thu Nov 23 13:54:03 2017 +0000
Move the double line to be inside the cursor cell
diff --git a/gnucash/register/register-gnome/gnucash-sheet-private.c b/gnucash/register/register-gnome/gnucash-sheet-private.c
index a951415..aa13c55 100644
--- a/gnucash/register/register-gnome/gnucash-sheet-private.c
+++ b/gnucash/register/register-gnome/gnucash-sheet-private.c
@@ -680,7 +680,7 @@ gnucash_sheet_draw_cursor (GnucashCursor *cursor, cairo_t *cr)
cairo_stroke (cr);
// make the bottom line thicker
- cairo_move_to (cr, cursor->x - x + 0.5, cursor->y - y + cursor->h - 1.5);
+ cairo_move_to (cr, cursor->x - x + 0.5, cursor->y - y + cursor->h - 3.5);
cairo_rel_line_to (cr, cursor->w, 0);
cairo_set_line_width (cr, 1.0);
cairo_stroke (cr);
commit 78ec2e339ebb6ec90de2ce7660b04ba4a9180df1
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Thu Nov 23 13:53:25 2017 +0000
If a font size is specified for the sheet, popup size may be wrong
When you specify a font size for the sheet, the popup will inherit this
but when first popped it will use the minimum height value and so may
be different resulting in not being in the right position. So check on
allocation and if different remove and pop again.
diff --git a/gnucash/register/register-gnome/gnucash-item-edit.c b/gnucash/register/register-gnome/gnucash-item-edit.c
index 7af904d..07c07d7 100644
--- a/gnucash/register/register-gnome/gnucash-item-edit.c
+++ b/gnucash/register/register-gnome/gnucash-item-edit.c
@@ -739,6 +739,25 @@ gnc_item_edit_new (GnucashSheet *sheet)
return GTK_WIDGET(item_edit);
}
+static void
+check_popup_height_is_true (GtkWidget *widget,
+ GdkRectangle *allocation,
+ gpointer user_data)
+{
+ GncItemEdit *item_edit = GNC_ITEM_EDIT(user_data);
+ GnucashSheet *sheet = item_edit->sheet;
+
+ // if a larger font is specified in css for the sheet, the popup returned height value
+ // on first pop does not reflect the true height but the minimum height so just to be
+ // sure check this value against the allocated one.
+ if (allocation->height != item_edit->popup_returned_height)
+ {
+ gtk_container_remove (GTK_CONTAINER(item_edit->sheet), item_edit->popup_item);
+
+ g_idle_add_full (G_PRIORITY_HIGH_IDLE,
+ (GSourceFunc) gnc_item_edit_update, item_edit, NULL);
+ }
+}
void
gnc_item_edit_show_popup (GncItemEdit *item_edit)
@@ -807,6 +826,11 @@ gnc_item_edit_show_popup (GncItemEdit *item_edit)
if (!gtk_widget_get_parent (item_edit->popup_item))
gtk_layout_put (GTK_LAYOUT(sheet), item_edit->popup_item, popup_x, popup_y);
+ // Lets check popup height is the true height
+ item_edit->popup_returned_height = popup_h;
+ g_signal_connect_after (item_edit->popup_item, "size-allocate",
+ G_CALLBACK(check_popup_height_is_true), item_edit);
+
gtk_widget_set_size_request (item_edit->popup_item, popup_w - 1, popup_h);
toggle = GTK_TOGGLE_BUTTON(item_edit->popup_toggle.tbutton);
diff --git a/gnucash/register/register-gnome/gnucash-item-edit.h b/gnucash/register/register-gnome/gnucash-item-edit.h
index 7d37378..45d1502 100644
--- a/gnucash/register/register-gnome/gnucash-item-edit.h
+++ b/gnucash/register/register-gnome/gnucash-item-edit.h
@@ -85,6 +85,7 @@ typedef struct
PopupPostShow popup_post_show;
PopupGetWidth popup_get_width;
gpointer popup_user_data;
+ gint popup_returned_height;
GtkBorder padding;
GtkBorder margin;
commit 67e4b3529466b1dc1b90715853815889a1f19b42
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Thu Nov 23 13:52:43 2017 +0000
Use previously created functions
Use the previously created functions to reduce code and for conformity.
As part of this some variables were renamed to be common.
diff --git a/gnucash/register/register-gnome/gnucash-header.c b/gnucash/register/register-gnome/gnucash-header.c
index 2f6d4d2..156ae68 100644
--- a/gnucash/register/register-gnome/gnucash-header.c
+++ b/gnucash/register/register-gnome/gnucash-header.c
@@ -69,6 +69,7 @@ static void
gnc_header_draw_offscreen (GncHeader *header)
{
SheetBlockStyle *style = header->style;
+ GncItemEdit *item_edit = GNC_ITEM_EDIT(header->sheet->item_editor);
Table *table = header->sheet->table;
VirtualLocation virt_loc;
VirtualCell *vcell;
@@ -125,7 +126,7 @@ gnc_header_draw_offscreen (GncHeader *header)
for (i = 0; i < style->nrows; i++)
{
int col_offset = 0;
- int h = 0, j;
+ int height = 0, j;
virt_loc.phys_row_offset = i;
/* TODO: This routine is duplicated in several places.
@@ -139,26 +140,29 @@ gnc_header_draw_offscreen (GncHeader *header)
double text_x, text_y, text_w, text_h;
BasicCell *cell;
const char *text;
- int w;
+ int width;
PangoLayout *layout;
+ PangoRectangle logical_rect;
+ GdkRectangle rect;
+ int x_offset;
virt_loc.phys_col_offset = j;
cd = gnucash_style_get_cell_dimensions (style, i, j);
- h = cd->pixel_height;
+ height = cd->pixel_height;
if (header->in_resize && (j == header->resize_col))
- w = header->resize_col_width;
+ width = header->resize_col_width;
else
- w = cd->pixel_width;
+ width = cd->pixel_width;
cell = gnc_cellblock_get_cell (cb, i, j);
if (!cell || !cell->cell_name)
{
- col_offset += w;
+ col_offset += width;
continue;
}
- cairo_rectangle (cr, col_offset - 0.5, row_offset + 0.5, w, h);
+ cairo_rectangle (cr, col_offset - 0.5, row_offset + 0.5, width, height);
cairo_set_line_width (cr, 1.0);
cairo_stroke (cr);
@@ -169,38 +173,28 @@ gnc_header_draw_offscreen (GncHeader *header)
text = "";
layout = gtk_widget_create_pango_layout (GTK_WIDGET (header->sheet), text);
- switch (gnc_table_get_align (table, virt_loc))
- {
- default:
- case CELL_ALIGN_LEFT:
- pango_layout_set_alignment (layout, PANGO_ALIGN_LEFT);
- break;
-
- case CELL_ALIGN_RIGHT:
- pango_layout_set_alignment (layout, PANGO_ALIGN_RIGHT);
- break;
-
- case CELL_ALIGN_CENTER:
- pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
- break;
- }
- text_x = col_offset + CELL_HPADDING;
- text_y = row_offset + 1;
- text_w = MAX (0, w - (2 * CELL_HPADDING));
- text_h = h - 2;
+ pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
+
+ gnucash_sheet_set_text_bounds (header->sheet, &rect,
+ col_offset, row_offset, width, height);
+
cairo_save (cr);
- cairo_rectangle (cr, text_x, text_y, text_w, text_h);
+ cairo_rectangle (cr, rect.x, rect.y, rect.width, rect.height);
cairo_clip (cr);
- gtk_render_layout (stylectxt, cr, text_x, text_y, layout);
+ x_offset = gnucash_sheet_get_text_offset (header->sheet, virt_loc,
+ rect.width, logical_rect.width);
+
+ gtk_render_layout (stylectxt, cr, rect.x + x_offset,
+ rect.y + gnc_item_edit_get_padding_border (item_edit, top), layout);
cairo_restore (cr);
g_object_unref (layout);
- col_offset += w;
+ col_offset += width;
}
- row_offset += h;
+ row_offset += height;
}
gtk_style_context_restore (stylectxt);
diff --git a/gnucash/register/register-gnome/gnucash-sheet-private.c b/gnucash/register/register-gnome/gnucash-sheet-private.c
index 8b0d067..a951415 100644
--- a/gnucash/register/register-gnome/gnucash-sheet-private.c
+++ b/gnucash/register/register-gnome/gnucash-sheet-private.c
@@ -381,6 +381,7 @@ draw_cell (GnucashSheet *sheet,
cairo_t *cr,
int x, int y, int width, int height)
{
+ GncItemEdit *item_edit = GNC_ITEM_EDIT(sheet->item_editor);
Table *table = sheet->table;
PhysicalCellBorders borders;
const char *text;
@@ -522,39 +523,19 @@ draw_cell (GnucashSheet *sheet,
goto exit;
}
- pango_layout_get_pixel_extents(layout,
- NULL,
- &logical_rect);
+ pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
- rect.x = x + CELL_HPADDING;
- rect.y = y + CELL_VPADDING;
- rect.width = MAX (0, width - (2 * CELL_HPADDING));
- rect.height = height - 2;
+ gnucash_sheet_set_text_bounds (sheet, &rect, x, y, width, height);
cairo_save (cr);
cairo_rectangle (cr, rect.x, rect.y, rect.width, rect.height);
cairo_clip (cr);
- switch (gnc_table_get_align (table, virt_loc))
- {
- default:
- case CELL_ALIGN_LEFT:
- x_offset = 0;
- break;
-
- case CELL_ALIGN_RIGHT:
- x_offset = width - 2 * CELL_HPADDING - logical_rect.width - 3;
- break;
-
- case CELL_ALIGN_CENTER:
- if (logical_rect.width > width - 2 * CELL_HPADDING)
- x_offset = 0;
- else
- x_offset = (width - 2 * CELL_HPADDING -
- logical_rect.width) / 2;
- break;
- }
- gtk_render_layout (stylectxt, cr, rect.x + x_offset + 1, rect.y, layout);
+ x_offset = gnucash_sheet_get_text_offset (sheet, virt_loc,
+ rect.width, logical_rect.width);
+
+ gtk_render_layout (stylectxt, cr, rect.x + x_offset,
+ rect.y + gnc_item_edit_get_padding_border (item_edit, top), layout);
cairo_restore (cr);
diff --git a/gnucash/register/register-gnome/gnucash-sheet.c b/gnucash/register/register-gnome/gnucash-sheet.c
index d8426cb..311ab1b 100644
--- a/gnucash/register/register-gnome/gnucash-sheet.c
+++ b/gnucash/register/register-gnome/gnucash-sheet.c
@@ -312,7 +312,7 @@ gnucash_sheet_get_text_cursor_position (GnucashSheet *sheet, const VirtualLocati
PangoLayout *layout;
PangoRectangle logical_rect;
GdkRectangle rect;
- gint x, y, w, h;
+ gint x, y, width, height;
gint index, trailing;
gboolean result;
gint x_offset = 0;
@@ -321,7 +321,7 @@ gnucash_sheet_get_text_cursor_position (GnucashSheet *sheet, const VirtualLocati
return 0;
// Get the item_edit position
- gnc_item_edit_get_pixel_coords (item_edit, &x, &y, &w, &h);
+ gnc_item_edit_get_pixel_coords (item_edit, &x, &y, &width, &height);
layout = gtk_widget_create_pango_layout (GTK_WIDGET (sheet), text);
@@ -330,35 +330,14 @@ gnucash_sheet_get_text_cursor_position (GnucashSheet *sheet, const VirtualLocati
pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
- rect.x = x + CELL_HPADDING;
- rect.y = y + CELL_VPADDING;
- rect.width = MAX (0, w - (2 * CELL_HPADDING));
- rect.height = h - 2;
+ gnucash_sheet_set_text_bounds (sheet, &rect, x, y, width, height);
- // Get the alignment of the cell
- switch (gnc_table_get_align (table, virt_loc))
- {
- default:
- case CELL_ALIGN_LEFT:
- x_offset = 0;
- break;
-
- case CELL_ALIGN_RIGHT:
- x_offset = w - 2 * CELL_HPADDING - logical_rect.width - 3;
- break;
-
- case CELL_ALIGN_CENTER:
- if (logical_rect.width > w - 2 * CELL_HPADDING)
- x_offset = 0;
- else
- x_offset = (w - 2 * CELL_HPADDING -
- logical_rect.width) / 2;
- break;
- }
+ x_offset = gnucash_sheet_get_text_offset (sheet, virt_loc,
+ rect.width, logical_rect.width);
result = pango_layout_xy_to_index (layout,
PANGO_SCALE * (sheet->button_x - rect.x - x_offset),
- PANGO_SCALE * (h/2), &index, &trailing);
+ PANGO_SCALE * (height/2), &index, &trailing);
g_object_unref (layout);
@@ -2231,6 +2210,7 @@ gnucash_sheet_col_max_width (GnucashSheet *sheet, gint virt_col, gint cell_col)
SheetBlock *block;
SheetBlockStyle *style;
PangoLayout *layout = gtk_widget_create_pango_layout (GTK_WIDGET (sheet), "");
+ GncItemEdit *item_edit = GNC_ITEM_EDIT(sheet->item_editor);
g_return_val_if_fail (virt_col >= 0, 0);
g_return_val_if_fail (virt_col < sheet->num_virt_cols, 0);
diff --git a/gnucash/register/register-gnome/gnucash-sheet.h b/gnucash/register/register-gnome/gnucash-sheet.h
index 68b3c70..f729e8f 100644
--- a/gnucash/register/register-gnome/gnucash-sheet.h
+++ b/gnucash/register/register-gnome/gnucash-sheet.h
@@ -33,10 +33,6 @@
* @brief Public declarations of GnucashSheet class.
*/
-#define CELL_VPADDING 2
-#define CELL_HPADDING 5
-
-
#define GNUCASH_TYPE_SHEET (gnucash_sheet_get_type ())
#define GNUCASH_SHEET(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNUCASH_TYPE_SHEET, GnucashSheet))
#define GNUCASH_SHEET_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GNUCASH_TYPE_SHEET))
commit 8a6ce10aa872533739264a0a2a386067e5f2def5
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Thu Nov 23 13:52:02 2017 +0000
Provide two functions for common code
These two sections of code appear in three separate files in slightly
different versions so define them hear for conformity
diff --git a/gnucash/register/register-gnome/gnucash-sheet.c b/gnucash/register/register-gnome/gnucash-sheet.c
index e2a759a..d8426cb 100644
--- a/gnucash/register/register-gnome/gnucash-sheet.c
+++ b/gnucash/register/register-gnome/gnucash-sheet.c
@@ -261,6 +261,47 @@ gnucash_sheet_deactivate_cursor_cell (GnucashSheet *sheet)
gnucash_sheet_redraw_block (sheet, virt_loc.vcell_loc);
}
+void
+gnucash_sheet_set_text_bounds (GnucashSheet *sheet, GdkRectangle *rect,
+ gint x, gint y, gint width, gint height)
+{
+ GncItemEdit *item_edit = GNC_ITEM_EDIT(sheet->item_editor);
+
+ rect->x = x + gnc_item_edit_get_margin (item_edit, left);
+ rect->y = y + gnc_item_edit_get_margin (item_edit, top);
+ rect->width = MAX (0, width - gnc_item_edit_get_margin (item_edit, left_right));
+ rect->height = height - gnc_item_edit_get_margin (item_edit, top_bottom);
+}
+
+gint
+gnucash_sheet_get_text_offset (GnucashSheet *sheet, const VirtualLocation virt_loc,
+ gint rect_width, gint logical_width)
+{
+ GncItemEdit *item_edit = GNC_ITEM_EDIT(sheet->item_editor);
+ Table *table = sheet->table;
+ gint x_offset = 0;
+
+ // Get the alignment of the cell
+ switch (gnc_table_get_align (table, virt_loc))
+ {
+ default:
+ case CELL_ALIGN_LEFT:
+ x_offset = gnc_item_edit_get_padding_border (item_edit, left);
+ break;
+
+ case CELL_ALIGN_RIGHT:
+ x_offset = rect_width - gnc_item_edit_get_padding_border (item_edit, right) - logical_width - 1;
+ break;
+
+ case CELL_ALIGN_CENTER:
+ if (logical_width > rect_width)
+ x_offset = 0;
+ else
+ x_offset = (rect_width - logical_width) / 2;
+ break;
+ }
+ return x_offset;
+}
static gint
gnucash_sheet_get_text_cursor_position (GnucashSheet *sheet, const VirtualLocation virt_loc)
@@ -2229,7 +2270,7 @@ gnucash_sheet_col_max_width (GnucashSheet *sheet, gint virt_col, gint cell_col)
pango_layout_set_text (layout, text, strlen (text));
pango_layout_get_pixel_size (layout, &width, NULL);
- width += 2 * CELL_HPADDING;
+ width += gnc_item_edit_get_margin (item_edit, left_right);
max = MAX (max, width);
}
diff --git a/gnucash/register/register-gnome/gnucash-sheet.h b/gnucash/register/register-gnome/gnucash-sheet.h
index b571d03..68b3c70 100644
--- a/gnucash/register/register-gnome/gnucash-sheet.h
+++ b/gnucash/register/register-gnome/gnucash-sheet.h
@@ -108,5 +108,11 @@ void gnucash_sheet_set_window (GnucashSheet *sheet, GtkWidget *window);
void gnucash_get_style_classes (GnucashSheet *sheet, GtkStyleContext *stylectxt,
RegisterColor field_type);
+void gnucash_sheet_set_text_bounds (GnucashSheet *sheet, GdkRectangle *rect,
+ gint x, gint y, gint width, gint height);
+
+gint gnucash_sheet_get_text_offset (GnucashSheet *sheet, const VirtualLocation virt_loc,
+ gint rect_width, gint logical_width);
+
/** @} */
#endif
commit 1b52053d2e253e0b2fb8e453a494e6e5d4aba5d1
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Thu Nov 23 13:51:25 2017 +0000
This function doesn't do much and is only used for new account registers
This function is used to get the width of the toggle button and add it
to the sample text length to set the default column width. As the it is
square, just use the row height instead and the user will no doubt set
there own widths any way.
diff --git a/gnucash/register/register-gnome/gnucash-item-edit.c b/gnucash/register/register-gnome/gnucash-item-edit.c
index 047757e..7af904d 100644
--- a/gnucash/register/register-gnome/gnucash-item-edit.c
+++ b/gnucash/register/register-gnome/gnucash-item-edit.c
@@ -94,14 +94,6 @@ gnc_item_edit_get_pixel_coords (GncItemEdit *item_edit,
*y += yd;
}
-
-int
-gnc_item_edit_get_toggle_offset (int row_height)
-{
- /* sync with gnc_item_edit_update */
- return row_height - (2 * (CELL_VPADDING + 1)) + 3;
-}
-
static gboolean
gnc_item_edit_update (GncItemEdit *item_edit)
{
diff --git a/gnucash/register/register-gnome/gnucash-item-edit.h b/gnucash/register/register-gnome/gnucash-item-edit.h
index a2eae31..7d37378 100644
--- a/gnucash/register/register-gnome/gnucash-item-edit.h
+++ b/gnucash/register/register-gnome/gnucash-item-edit.h
@@ -133,8 +133,6 @@ void gnc_item_edit_set_popup (GncItemEdit *item_edit,
void gnc_item_edit_show_popup (GncItemEdit *item_edit);
void gnc_item_edit_hide_popup (GncItemEdit *item_edit);
-int gnc_item_edit_get_toggle_offset (int row_height);
-
void gnc_item_edit_cut_clipboard (GncItemEdit *item_edit);
void gnc_item_edit_copy_clipboard (GncItemEdit *item_edit);
void gnc_item_edit_paste_clipboard (GncItemEdit *item_edit);
diff --git a/gnucash/register/register-gnome/gnucash-style.c b/gnucash/register/register-gnome/gnucash-style.c
index 2ef3c8f..e999620 100644
--- a/gnucash/register/register-gnome/gnucash-style.c
+++ b/gnucash/register/register-gnome/gnucash-style.c
@@ -215,9 +215,10 @@ set_dimensions_pass_one (GnucashSheet *sheet, CellBlock *cursor,
if (cd->pixel_width > 0)
continue;
+ // This is used on new account popup cells to get the default
+ // width of text plus toggle button.
if (cell && cell->is_popup)
- width += gnc_item_edit_get_toggle_offset
- (cd->pixel_height);
+ width += cd->pixel_height; // toggle button is square, use cell height
cd->pixel_width = MAX (cd->pixel_width, width);
}
commit ed4bad34a7771ce7f287eb64f7001c307a3fe4ea
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Thu Nov 23 13:50:42 2017 +0000
Adjust the sheet to get its spacings from the item_edit CSS
diff --git a/gnucash/register/register-gnome/gnucash-style.c b/gnucash/register/register-gnome/gnucash-style.c
index dcadb7c..2ef3c8f 100644
--- a/gnucash/register/register-gnome/gnucash-style.c
+++ b/gnucash/register/register-gnome/gnucash-style.c
@@ -169,6 +169,7 @@ set_dimensions_pass_one (GnucashSheet *sheet, CellBlock *cursor,
int row, col;
gint max_height = -1;
PangoLayout *layout;
+ GncItemEdit *item_edit = GNC_ITEM_EDIT(sheet->item_editor);
/* g_return_if_fail (font != NULL); */
@@ -196,13 +197,17 @@ set_dimensions_pass_one (GnucashSheet *sheet, CellBlock *cursor,
layout = gtk_widget_create_pango_layout (GTK_WIDGET (sheet), text);
pango_layout_get_pixel_size (layout, &width, &cd->pixel_height);
g_object_unref (layout);
- width += 2 * CELL_HPADDING;
- cd->pixel_height += 2 * CELL_VPADDING;
+ width += gnc_item_edit_get_margin (item_edit, left_right) +
+ gnc_item_edit_get_padding_border (item_edit, left_right);
+
+ cd->pixel_height += gnc_item_edit_get_margin (item_edit, top_bottom) +
+ gnc_item_edit_get_padding_border (item_edit, top_bottom);
}
else
{
width = 0;
- cd->pixel_height = (2 * CELL_VPADDING);
+ cd->pixel_height = gnc_item_edit_get_margin (item_edit, top_bottom) +
+ gnc_item_edit_get_padding_border (item_edit, top_bottom);
}
max_height = MAX(max_height, cd->pixel_height);
@@ -239,6 +244,7 @@ static void
set_dimensions_pass_two (GnucashSheet *sheet, int default_width)
{
SheetBlockStyle *style;
+ GncItemEdit *item_edit = GNC_ITEM_EDIT(sheet->item_editor);
BlockDimensions *dimensions;
CellDimensions *cd;
GTable *cd_table;
@@ -315,7 +321,8 @@ set_dimensions_pass_two (GnucashSheet *sheet, int default_width)
pango_layout_get_pixel_size (layout, &sample_width, NULL);
g_object_unref (layout);
/*sample_width = gdk_string_width (font, text);*/
- sample_width += 2 * CELL_HPADDING;
+ sample_width += gnc_item_edit_get_margin (item_edit, left_right) +
+ gnc_item_edit_get_padding_border (item_edit, left_right);
}
else
sample_width = 0;
commit 2a476cb68a9b7a2edd4b2e399d38a61b6464b652
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Thu Nov 23 13:50:01 2017 +0000
Get the item_edit cell padding from CSS instead of defines
This commit sets up getting the vertical and horizontal item_edit cell
margins, borders and padding from CSS. This increases the option to
specify individual values for top, right, bottom and left instead of
just specifying just two values.
diff --git a/gnucash/gnucash-310.css b/gnucash/gnucash-310.css
index e4a37a3..e6b218d 100644
--- a/gnucash/gnucash-310.css
+++ b/gnucash/gnucash-310.css
@@ -21,13 +21,14 @@
color: mix (currentColor, grey, 0.2);
}
-/* Register Cursor padding settings, make sure entry matches sheet.h */
-cursor entry {
- padding: 2px 5px 2px 5px;
+/* Register Cursor settings, top, right, bottom, left */
+.cursor .entry {
+ margin: 2px 5px 2px 5px; /* this only works by doing it in code, yellow area */
+ padding: 2px 2px 2px 2px; /* all work with different values, around the text blue area */
}
-cursor button {
- padding: 1px 1px 1px 1px;
+.cursor .button {
+ margin: 1px 1px 1px 1px; /* does not work, not used, here for completeness */
}
/* Register defaults */
@@ -37,7 +38,7 @@ cursor button {
@define-color register_split_bg_color #EDE7D3;
@define-color register_cursor_bg_color #FFEF98;
-.register-header {
+*.register-header {
background-color: @register_header_bg_color;
}
diff --git a/gnucash/gnucash-320.css b/gnucash/gnucash-320.css
index d7e0495..4f4ea09 100644
--- a/gnucash/gnucash-320.css
+++ b/gnucash/gnucash-320.css
@@ -12,13 +12,14 @@
color: @negative-numbers;
}
-/* Register Cursor padding settings, make sure entry matches sheet.h */
+/* Register Cursor settings, top, right, bottom, left */
cursor entry {
- padding: 2px 5px 2px 5px;
+ margin: 2px 5px 2px 5px;
+ padding: 0px 2px 0px 2px;
}
cursor button {
- padding: 1px 1px 1px 1px;
+ margin: 1px 1px 1px 1px;
}
/* Register defaults */
@@ -28,7 +29,7 @@ cursor button {
@define-color register_split_bg_color #EDE7D3;
@define-color register_cursor_bg_color #FFEF98;
-.register-header {
+*.register-header {
background-color: @register_header_bg_color;
}
diff --git a/gnucash/register/register-gnome/gnucash-item-edit.c b/gnucash/register/register-gnome/gnucash-item-edit.c
index 3770dc5..047757e 100644
--- a/gnucash/register/register-gnome/gnucash-item-edit.c
+++ b/gnucash/register/register-gnome/gnucash-item-edit.c
@@ -358,6 +358,7 @@ draw_background_cb (GtkWidget *widget, cairo_t *cr, gpointer user_data)
static gboolean
draw_text_cursor_cb (GtkWidget *widget, cairo_t *cr, gpointer user_data)
{
+ GncItemEdit *item_edit = GNC_ITEM_EDIT(user_data);
GtkEditable *editable = GTK_EDITABLE(widget);
GtkStyleContext *stylectxt = gtk_widget_get_style_context (GTK_WIDGET(widget));
gint height = gtk_widget_get_allocated_height (widget);
@@ -398,8 +399,15 @@ draw_text_cursor_cb (GtkWidget *widget, cairo_t *cr, gpointer user_data)
// Now draw a vertical line
cairo_set_source_rgb (cr, fg_color->red, fg_color->green, fg_color->blue);
cairo_set_line_width (cr, 1.0);
- cairo_move_to (cr, cursor_x + 0.5, 2);
- cairo_rel_line_to (cr, 0, height - 4);
+#if GTK_CHECK_VERSION(3,20,0)
+ cairo_move_to (cr, cursor_x + 0.5, gnc_item_edit_get_margin (item_edit, top) +
+ gnc_item_edit_get_padding_border (item_edit, top));
+ cairo_rel_line_to (cr, 0, height - gnc_item_edit_get_margin (item_edit, top_bottom) -
+ gnc_item_edit_get_padding_border (item_edit, top_bottom));
+#else
+ cairo_move_to (cr, cursor_x + 0.5, gnc_item_edit_get_padding_border (item_edit, top));
+ cairo_rel_line_to (cr, 0, height - gnc_item_edit_get_padding_border (item_edit, top_bottom));
+#endif
cairo_stroke (cr);
return FALSE;
@@ -605,13 +613,60 @@ gnc_item_edit_get_type (void)
return gnc_item_edit_type;
}
+gint
+gnc_item_edit_get_margin (GncItemEdit *item_edit, Sides side)
+{
+ switch (side)
+ {
+ case left:
+ return item_edit->margin.left;
+ case right:
+ return item_edit->margin.right;
+ case top:
+ return item_edit->margin.top;
+ case bottom:
+ return item_edit->margin.bottom;
+ case left_right:
+ return item_edit->margin.left + item_edit->margin.right;
+ case top_bottom:
+ return item_edit->margin.top + item_edit->margin.bottom;
+ default:
+ return 2;
+ }
+}
+
+gint
+gnc_item_edit_get_padding_border (GncItemEdit *item_edit, Sides side)
+{
+ switch (side)
+ {
+ case left:
+ return item_edit->padding.left + item_edit->border.left;
+ case right:
+ return item_edit->padding.right + item_edit->border.right;
+ case top:
+ return item_edit->padding.top + item_edit->border.top;
+ case bottom:
+ return item_edit->padding.bottom + item_edit->border.bottom;
+ case left_right:
+ return item_edit->padding.left + item_edit->border.left +
+ item_edit->padding.right + item_edit->border.right;
+ case top_bottom:
+ return item_edit->padding.top + item_edit->border.top +
+ item_edit->padding.bottom + item_edit->border.bottom;
+ default:
+ return 2;
+ }
+}
GtkWidget *
gnc_item_edit_new (GnucashSheet *sheet)
{
- char *hpad_str, *vpad_str, *entry_css;
- GtkStyleContext *stylecontext;
- GtkCssProvider *provider;
+ GtkStyleContext *stylectxt;
+ GtkBorder padding;
+ GtkBorder margin;
+ GtkBorder border;
+ GtkWidget *vb = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
GncItemEdit *item_edit =
g_object_new (GNC_TYPE_ITEM_EDIT,
"sheet", sheet,
@@ -627,32 +682,54 @@ gnc_item_edit_new (GnucashSheet *sheet)
item_edit->editor = gtk_entry_new();
sheet->entry = item_edit->editor;
gtk_entry_set_width_chars (GTK_ENTRY(item_edit->editor), 1);
- gtk_box_pack_start (GTK_BOX(item_edit), item_edit->editor, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX(item_edit), item_edit->editor, TRUE, TRUE, 0);
+
+ // Get the CSS space settings for the entry
+ stylectxt = gtk_widget_get_style_context (GTK_WIDGET(item_edit->editor));
+ gtk_style_context_get_padding (stylectxt, GTK_STATE_FLAG_NORMAL, &padding);
+ gtk_style_context_get_margin (stylectxt, GTK_STATE_FLAG_NORMAL, &margin);
+ gtk_style_context_get_border (stylectxt, GTK_STATE_FLAG_NORMAL, &border);
+
+ item_edit->padding = padding;
+ item_edit->margin = margin;
+ item_edit->border = border;
// Make sure the Entry can not have focus and no frame
gtk_widget_set_can_focus (GTK_WIDGET(item_edit->editor), FALSE);
gtk_entry_set_has_frame (GTK_ENTRY(item_edit->editor), FALSE);
+#if !GTK_CHECK_VERSION(3,20,0)
+#if GTK_CHECK_VERSION(3,12,0)
+ gtk_widget_set_margin_start (GTK_WIDGET(item_edit->editor),
+ gnc_item_edit_get_margin (item_edit, left));
+ gtk_widget_set_margin_end (GTK_WIDGET(item_edit->editor),
+ gnc_item_edit_get_margin (item_edit, right));
+#else
+ gtk_widget_set_margin_left (GTK_WIDGET(item_edit->editor),
+ gnc_item_edit_get_margin (item_edit, left));
+ gtk_widget_set_margin_right (GTK_WIDGET(item_edit->editor),
+ gnc_item_edit_get_margin (item_edit, right));
+#endif
+ gtk_widget_set_margin_top (GTK_WIDGET(item_edit->editor),
+ gnc_item_edit_get_margin (item_edit, top));
+ gtk_widget_set_margin_bottom (GTK_WIDGET(item_edit->editor),
+ gnc_item_edit_get_margin (item_edit, bottom));
+#endif
+
// Connect to the draw signal so we can draw a cursor
g_signal_connect_after (item_edit->editor, "draw",
- G_CALLBACK (draw_text_cursor_cb), NULL);
+ G_CALLBACK (draw_text_cursor_cb), item_edit);
// Fill in the background so the underlying sheet cell can not be seen
g_signal_connect (item_edit, "draw",
G_CALLBACK (draw_background_cb), item_edit);
- /* Force padding on the entry to align with the rest of the register this
- is done in the gnucash.css file which should be in line with sheet.h */
-
/* Create the popup button
It will only be displayed when the cell being edited provides
a popup item (like a calendar or account list) */
item_edit->popup_toggle.tbutton = gtk_toggle_button_new();
gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (item_edit->popup_toggle.tbutton), FALSE);
- /* Force padding on the button to keep it small and display as much as
- possible of the arrow which is done in the gnucash.css file */
-
/* Wrap the popup button in an event box to give it its own gdkwindow.
* Without one the button would disappear behind the grid object. */
item_edit->popup_toggle.ebox = gtk_event_box_new();
@@ -660,11 +737,13 @@ gnc_item_edit_new (GnucashSheet *sheet)
gtk_container_add(GTK_CONTAINER(item_edit->popup_toggle.ebox),
item_edit->popup_toggle.tbutton);
- gtk_box_pack_start (GTK_BOX(item_edit),
- item_edit->popup_toggle.ebox,
- FALSE, TRUE, 0);
- gtk_widget_show_all(GTK_WIDGET(item_edit));
+ /* The button needs to be packed into a vertical box so that the height and position
+ * can be controlled in ealier than Gtk3.20 versions */
+ gtk_box_pack_start (GTK_BOX(vb), item_edit->popup_toggle.ebox,
+ FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(item_edit), vb, FALSE, FALSE, 0);
+ gtk_widget_show_all(GTK_WIDGET(item_edit));
return GTK_WIDGET(item_edit);
}
diff --git a/gnucash/register/register-gnome/gnucash-item-edit.h b/gnucash/register/register-gnome/gnucash-item-edit.h
index 7b8969a..a2eae31 100644
--- a/gnucash/register/register-gnome/gnucash-item-edit.h
+++ b/gnucash/register/register-gnome/gnucash-item-edit.h
@@ -86,6 +86,10 @@ typedef struct
PopupGetWidth popup_get_width;
gpointer popup_user_data;
+ GtkBorder padding;
+ GtkBorder margin;
+ GtkBorder border;
+
/* Where are we */
VirtualLocation virt_loc;
@@ -97,6 +101,15 @@ typedef struct
GtkBoxClass parent_class;
} GncItemEditClass;
+typedef enum
+{
+ left,
+ right,
+ top,
+ bottom,
+ left_right,
+ top_bottom,
+} Sides;
GType gnc_item_edit_get_type (void);
@@ -130,5 +143,8 @@ gboolean gnc_item_edit_get_has_selection (GncItemEdit *item_edit);
void gnc_item_edit_focus_in (GncItemEdit *item_edit);
void gnc_item_edit_focus_out (GncItemEdit *item_edit);
+gint gnc_item_edit_get_margin (GncItemEdit *item_edit, Sides side);
+gint gnc_item_edit_get_padding_border (GncItemEdit *item_edit, Sides side);
+
/** @} */
#endif /* GNUCASH_ITEM_EDIT_H */
commit bbafb8184e76609dad4f78a36601fcbe4c68359e
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Thu Nov 23 13:49:00 2017 +0000
Replace the cell foreground and background colour handlers
By using CSS classes, there is no need to have separate handlers for
the foreground and background colours so replace them with one being of
a similar format to that of cell_border_handlers. This also involves
changing the map of RegisterColors to CSS style classes to reflect the
changes and reduce the get colour type to one call per class
diff --git a/gnucash/register/ledger-core/gncEntryLedgerModel.c b/gnucash/register/ledger-core/gncEntryLedgerModel.c
index 8c5207d..a638d06 100644
--- a/gnucash/register/ledger-core/gncEntryLedgerModel.c
+++ b/gnucash/register/ledger-core/gncEntryLedgerModel.c
@@ -915,65 +915,57 @@ static CellIOFlags get_qty_io_flags (VirtualLocation virt_loc, gpointer user_dat
return flags;
}
-/* GET BG_COLORS */
+/* GET COLORS */
static guint32
-gnc_entry_ledger_get_color_internal (VirtualLocation virt_loc,
- GncEntryLedger *ledger,
- gboolean foreground)
+gnc_entry_ledger_get_cell_color_internal (VirtualLocation virt_loc,
+ GncEntryLedger *ledger)
{
VirtualCell *vcell;
gboolean is_current;
- guint32 colorbase = 0; /* By default return background colors */
+ guint32 colorbase = 0;
- if (foreground)
- colorbase = COLOR_UNKNOWN_FG; /* a bit of enum arithmetic */
+ /* a bit of enum arithmetic */
+
+ // There are negative numbers
if (!ledger)
- return (colorbase + COLOR_UNKNOWN_BG);
+ return (colorbase + COLOR_UNDEFINED);
if (gnc_table_virtual_location_in_header (ledger->table, virt_loc))
- return (colorbase + COLOR_HEADER_BG);
+ return (colorbase + COLOR_HEADER);
vcell = gnc_table_get_virtual_cell (ledger->table, virt_loc.vcell_loc);
if (!vcell || !vcell->cellblock)
- return (colorbase + COLOR_UNKNOWN_BG);
+ return (colorbase + COLOR_UNDEFINED);
if ((virt_loc.phys_col_offset < vcell->cellblock->start_col) ||
(virt_loc.phys_col_offset > vcell->cellblock->stop_col))
- return (colorbase + COLOR_UNKNOWN_BG);
+ return (colorbase + COLOR_UNDEFINED);
is_current = virt_cell_loc_equal (ledger->table->current_cursor_loc.vcell_loc,
virt_loc.vcell_loc);
if (is_current)
return vcell->start_primary_color ?
- (colorbase + COLOR_PRIMARY_BG_ACTIVE) :
- (colorbase + COLOR_SECONDARY_BG_ACTIVE);
+ (colorbase + COLOR_PRIMARY_ACTIVE) :
+ (colorbase + COLOR_SECONDARY_ACTIVE);
return vcell->start_primary_color ?
- (colorbase + COLOR_PRIMARY_BG) : (colorbase + COLOR_SECONDARY_BG);
+ (colorbase + COLOR_PRIMARY) : (colorbase + COLOR_SECONDARY);
}
static guint32
-gnc_entry_ledger_get_fg_color (VirtualLocation virt_loc,
- gpointer user_data)
-{
- GncEntryLedger *ledger = user_data;
- return gnc_entry_ledger_get_color_internal (virt_loc, ledger, TRUE);
-}
-
-static guint32
-gnc_entry_ledger_get_bg_color (VirtualLocation virt_loc,
- gboolean *hatching, gpointer user_data)
+gnc_entry_ledger_get_cell_color (VirtualLocation virt_loc,
+ gboolean *hatching, gpointer user_data)
{
GncEntryLedger *ledger = user_data;
if (hatching)
*hatching = FALSE;
- return gnc_entry_ledger_get_color_internal (virt_loc, ledger, FALSE);
+ return gnc_entry_ledger_get_cell_color_internal (virt_loc, ledger);
}
/* SAVE CELLS */
@@ -1225,11 +1217,8 @@ static void gnc_entry_ledger_model_new_handlers (TableModel *model,
};
unsigned int i;
- gnc_table_model_set_default_fg_color_handler
- (model, gnc_entry_ledger_get_fg_color);
-
- gnc_table_model_set_default_bg_color_handler
- (model, gnc_entry_ledger_get_bg_color);
+ // Set the cell color handler
+ gnc_table_model_set_default_cell_color_handler (model, gnc_entry_ledger_get_cell_color);
for (i = 0; i < (sizeof(models) / sizeof(*models)); i++)
{
diff --git a/gnucash/register/ledger-core/split-register-model.c b/gnucash/register/ledger-core/split-register-model.c
index 3a2fac4..f8b6614 100644
--- a/gnucash/register/ledger-core/split-register-model.c
+++ b/gnucash/register/ledger-core/split-register-model.c
@@ -514,33 +514,85 @@ get_trans_total_balance (SplitRegister *reg, Transaction *trans)
return xaccTransGetAccountBalance(trans, account);
}
+static gboolean
+gnc_split_register_use_negative_color (VirtualLocation virt_loc,
+ SplitRegister *reg)
+{
+ const char * cell_name;
+ gnc_numeric value;
+ Split *split;
+
+ if (!use_red_for_negative)
+ return FALSE;
+
+ split = gnc_split_register_get_split (reg, virt_loc.vcell_loc);
+ if (!split)
+ return FALSE;
+
+ cell_name = gnc_table_get_cell_name (reg->table, virt_loc);
+
+ if (gnc_cell_name_equal (cell_name, TSHRS_CELL))
+ value = get_trans_total_amount (reg, xaccSplitGetParent (split));
+ else if (gnc_cell_name_equal (cell_name, SHRS_CELL))
+ {
+ if (virt_cell_loc_equal (reg->table->current_cursor_loc.vcell_loc,
+ virt_loc.vcell_loc))
+ value = gnc_price_cell_get_value
+ ((PriceCell *) gnc_table_layout_get_cell (reg->table->layout,
+ SHRS_CELL));
+ else
+ value = xaccSplitGetAmount (split);
+ }
+ else if (gnc_cell_name_equal (cell_name, BALN_CELL))
+ value = xaccSplitGetBalance (split);
+ else if (gnc_cell_name_equal (cell_name, RBALN_CELL))
+ value = gnc_split_register_get_rbaln (virt_loc, reg, TRUE);
+ else if (gnc_cell_name_equal (cell_name, TBALN_CELL))
+ value = get_trans_total_balance (reg, xaccSplitGetParent (split));
+
+ if ((gnc_cell_name_equal (cell_name, BALN_CELL)) ||
+ (gnc_cell_name_equal (cell_name, RBALN_CELL)) ||
+ (gnc_cell_name_equal (cell_name, TBALN_CELL)))
+ {
+ Account *account = xaccSplitGetAccount (split);
+ if (gnc_reverse_balance (account))
+ value = gnc_numeric_neg (value);
+ }
+
+ if (gnc_numeric_negative_p (value))
+ return TRUE;
+
+ return FALSE;
+}
+
static guint32
-gnc_split_register_get_color_internal (VirtualLocation virt_loc,
- SplitRegister *reg,
- gboolean foreground)
+gnc_split_register_get_cell_color_internal (VirtualLocation virt_loc,
+ SplitRegister *reg)
{
const char *cursor_name;
VirtualCell *vcell;
gboolean is_current;
gboolean double_alternate_virt;
- guint32 colorbase = 0; /* By default return background colors */
+ guint32 colorbase = 0;
- if (foreground)
- colorbase = COLOR_UNKNOWN_FG; /* a bit of enum arithmetic */
+ /* a bit of enum arithmetic */
+
+ if (gnc_split_register_use_negative_color (virt_loc, reg))
+ colorbase = COLOR_NEGATIVE; // Requires Negative fg color
if (!reg)
- return (colorbase + COLOR_UNKNOWN_BG);
+ return (colorbase + COLOR_UNDEFINED);
if (gnc_table_virtual_location_in_header (reg->table, virt_loc))
- return (colorbase + COLOR_HEADER_BG);
+ return (colorbase + COLOR_HEADER);
vcell = gnc_table_get_virtual_cell (reg->table, virt_loc.vcell_loc);
if (!vcell || !vcell->cellblock)
- return (colorbase + COLOR_UNKNOWN_BG);
+ return (colorbase + COLOR_UNDEFINED);
if ((virt_loc.phys_col_offset < vcell->cellblock->start_col) ||
(virt_loc.phys_col_offset > vcell->cellblock->stop_col))
- return (colorbase + COLOR_UNKNOWN_BG);
+ return (colorbase + COLOR_UNDEFINED);
is_current = virt_cell_loc_equal (reg->table->current_cursor_loc.vcell_loc,
virt_loc.vcell_loc);
@@ -552,11 +604,11 @@ gnc_split_register_get_color_internal (VirtualLocation virt_loc,
{
if (is_current)
return vcell->start_primary_color ?
- (colorbase + COLOR_PRIMARY_BG_ACTIVE) :
- (colorbase + COLOR_SECONDARY_BG_ACTIVE);
+ (colorbase + COLOR_PRIMARY_ACTIVE) :
+ (colorbase + COLOR_SECONDARY_ACTIVE);
return vcell->start_primary_color ?
- (colorbase + COLOR_PRIMARY_BG) : (colorbase + COLOR_SECONDARY_BG);
+ (colorbase + COLOR_PRIMARY) : (colorbase + COLOR_SECONDARY);
}
if (g_strcmp0 (cursor_name, CURSOR_DOUBLE_JOURNAL) == 0 ||
@@ -570,101 +622,40 @@ gnc_split_register_get_color_internal (VirtualLocation virt_loc,
{
if (double_alternate_virt)
return vcell->start_primary_color ?
- (colorbase + COLOR_PRIMARY_BG_ACTIVE) :
- (colorbase + COLOR_SECONDARY_BG_ACTIVE);
+ (colorbase + COLOR_PRIMARY_ACTIVE) :
+ (colorbase + COLOR_SECONDARY_ACTIVE);
return (virt_loc.phys_row_offset % 2 == 0) ?
- (colorbase + COLOR_PRIMARY_BG_ACTIVE) :
- (colorbase + COLOR_SECONDARY_BG_ACTIVE);
+ (colorbase + COLOR_PRIMARY_ACTIVE) :
+ (colorbase + COLOR_SECONDARY_ACTIVE);
}
if (double_alternate_virt)
return vcell->start_primary_color ?
- (colorbase + COLOR_PRIMARY_BG) :
- (colorbase + COLOR_SECONDARY_BG);
+ (colorbase + COLOR_PRIMARY) :
+ (colorbase + COLOR_SECONDARY);
return (virt_loc.phys_row_offset % 2 == 0) ?
- (colorbase + COLOR_PRIMARY_BG) :
- (colorbase + COLOR_SECONDARY_BG);
+ (colorbase + COLOR_PRIMARY) :
+ (colorbase + COLOR_SECONDARY);
}
if (g_strcmp0 (cursor_name, CURSOR_SPLIT) == 0)
{
if (is_current)
- return (colorbase + COLOR_SPLIT_BG_ACTIVE);
+ return (colorbase + COLOR_SPLIT_ACTIVE);
- return (colorbase + COLOR_SPLIT_BG);
+ return (colorbase + COLOR_SPLIT);
}
PWARN ("Unexpected cursor: %s\n", cursor_name);
- return (colorbase + COLOR_UNKNOWN_BG);
+ return (colorbase + COLOR_UNDEFINED);
}
+// Get Color for non numeric cells, no hatching required
static guint32
-gnc_split_register_get_fg_color_internal (VirtualLocation virt_loc,
- SplitRegister *reg)
-{
- guint32 fg_color;
- const char * cell_name;
- gnc_numeric value;
- Split *split;
-
- fg_color = gnc_split_register_get_color_internal (virt_loc, reg, TRUE);
-
- if (!use_red_for_negative)
- return fg_color;
-
- split = gnc_split_register_get_split (reg, virt_loc.vcell_loc);
- if (!split)
- return fg_color;
-
- cell_name = gnc_table_get_cell_name (reg->table, virt_loc);
-
- if (gnc_cell_name_equal (cell_name, TSHRS_CELL))
- value = get_trans_total_amount (reg, xaccSplitGetParent (split));
- else if (gnc_cell_name_equal (cell_name, SHRS_CELL))
- {
- if (virt_cell_loc_equal (reg->table->current_cursor_loc.vcell_loc,
- virt_loc.vcell_loc))
- value = gnc_price_cell_get_value
- ((PriceCell *) gnc_table_layout_get_cell (reg->table->layout,
- SHRS_CELL));
- else
- value = xaccSplitGetAmount (split);
- }
- else if (gnc_cell_name_equal (cell_name, BALN_CELL))
- value = xaccSplitGetBalance (split);
- else if (gnc_cell_name_equal (cell_name, RBALN_CELL))
- value = gnc_split_register_get_rbaln (virt_loc, reg, TRUE);
- else if (gnc_cell_name_equal (cell_name, TBALN_CELL))
- value = get_trans_total_balance (reg, xaccSplitGetParent (split));
-
- if ((gnc_cell_name_equal (cell_name, BALN_CELL)) ||
- (gnc_cell_name_equal (cell_name, RBALN_CELL)) ||
- (gnc_cell_name_equal (cell_name, TBALN_CELL)))
- {
- Account *account = xaccSplitGetAccount (split);
- if (gnc_reverse_balance (account))
- value = gnc_numeric_neg (value);
- }
-
- if (gnc_numeric_negative_p (value))
- return COLOR_NEGATIVE;
-
- return fg_color;
-}
-
-static guint32
-gnc_split_register_get_fg_color (VirtualLocation virt_loc,
- gpointer user_data)
-{
- SplitRegister *reg = user_data;
- return gnc_split_register_get_fg_color_internal (virt_loc, reg);
-}
-
-static guint32
-gnc_split_register_get_bg_color (VirtualLocation virt_loc,
+gnc_split_register_get_cell_color (VirtualLocation virt_loc,
gboolean *hatching,
gpointer user_data)
{
@@ -673,11 +664,12 @@ gnc_split_register_get_bg_color (VirtualLocation virt_loc,
if (hatching)
*hatching = FALSE;
- return gnc_split_register_get_color_internal (virt_loc, reg, FALSE);
+ return gnc_split_register_get_cell_color_internal (virt_loc, reg);
}
+// Get Color for numeric cells, update hatching
static guint32
-gnc_split_register_get_debcred_bg_color (VirtualLocation virt_loc,
+gnc_split_register_get_debcred_color (VirtualLocation virt_loc,
gboolean *hatching,
gpointer user_data)
{
@@ -694,8 +686,7 @@ gnc_split_register_get_debcred_bg_color (VirtualLocation virt_loc,
else
*hatching = FALSE;
}
-
- return gnc_split_register_get_bg_color (virt_loc, NULL, user_data);
+ return gnc_split_register_get_cell_color_internal (virt_loc, reg);
}
static void
@@ -2623,42 +2614,26 @@ gnc_split_register_model_new (void)
model, gnc_split_register_get_security_io_flags, SHRS_CELL);
- gnc_table_model_set_fg_color_handler(
- model, gnc_split_register_get_fg_color, SHRS_CELL);
-
- gnc_table_model_set_fg_color_handler(
- model, gnc_split_register_get_fg_color, TSHRS_CELL);
-
- gnc_table_model_set_fg_color_handler(
- model, gnc_split_register_get_fg_color, BALN_CELL);
-
- gnc_table_model_set_fg_color_handler(
- model, gnc_split_register_get_fg_color, TBALN_CELL);
-
- gnc_table_model_set_fg_color_handler(
- model, gnc_split_register_get_fg_color, RBALN_CELL);
-
-
- gnc_table_model_set_default_bg_color_handler(
- model, gnc_split_register_get_bg_color);
+ gnc_table_model_set_default_cell_color_handler(
+ model, gnc_split_register_get_cell_color);
- gnc_table_model_set_bg_color_handler(
- model, gnc_split_register_get_debcred_bg_color, DEBT_CELL);
+ gnc_table_model_set_cell_color_handler(
+ model, gnc_split_register_get_debcred_color, DEBT_CELL);
- gnc_table_model_set_bg_color_handler(
- model, gnc_split_register_get_debcred_bg_color, CRED_CELL);
+ gnc_table_model_set_cell_color_handler(
+ model, gnc_split_register_get_debcred_color, CRED_CELL);
- gnc_table_model_set_bg_color_handler(
- model, gnc_split_register_get_debcred_bg_color, TDEBT_CELL);
+ gnc_table_model_set_cell_color_handler(
+ model, gnc_split_register_get_debcred_color, TDEBT_CELL);
- gnc_table_model_set_bg_color_handler(
- model, gnc_split_register_get_debcred_bg_color, TCRED_CELL);
+ gnc_table_model_set_cell_color_handler(
+ model, gnc_split_register_get_debcred_color, TCRED_CELL);
- gnc_table_model_set_bg_color_handler(
- model, gnc_split_register_get_debcred_bg_color, FCRED_CELL);
+ gnc_table_model_set_cell_color_handler(
+ model, gnc_split_register_get_debcred_color, FCRED_CELL);
- gnc_table_model_set_bg_color_handler(
- model, gnc_split_register_get_debcred_bg_color, FDEBT_CELL);
+ gnc_table_model_set_cell_color_handler(
+ model, gnc_split_register_get_debcred_color, FDEBT_CELL);
gnc_table_model_set_default_cell_border_handler(
diff --git a/gnucash/register/register-core/table-allgui.c b/gnucash/register/register-core/table-allgui.c
index 7e407db..038d3b0 100644
--- a/gnucash/register/register-core/table-allgui.c
+++ b/gnucash/register/register-core/table-allgui.c
@@ -345,68 +345,29 @@ gnc_table_get_label (Table *table, VirtualLocation virt_loc)
return label;
}
-static guint32
-gnc_table_get_fg_color_internal (Table *table, VirtualLocation virt_loc)
-{
- TableGetFGColorHandler fg_color_handler;
- const char *handler_name;
-
- if (!table || !table->model)
- return COLOR_UNKNOWN_FG;
-
- handler_name = gnc_table_get_cell_name (table, virt_loc);
-
- fg_color_handler = gnc_table_model_get_fg_color_handler (table->model,
- handler_name);
- if (!fg_color_handler)
- {
- TableGetBGColorHandler bg_color_handler =
- gnc_table_model_get_bg_color_handler (table->model, handler_name);
-
- guint32 bg_color =
- bg_color_handler (virt_loc, NULL, table->model->handler_user_data);
- return bg_color + COLOR_UNKNOWN_FG;
- }
-
- return fg_color_handler (virt_loc, table->model->handler_user_data);
-}
-
guint32
-gnc_table_get_fg_color (Table *table, VirtualLocation virt_loc)
-{
- return gnc_table_get_fg_color_internal (table, virt_loc);
-}
-
-static guint32
-gnc_table_get_bg_color_internal (Table *table, VirtualLocation virt_loc,
+gnc_table_get_color (Table *table, VirtualLocation virt_loc,
gboolean *hatching)
{
- TableGetBGColorHandler bg_color_handler;
+ TableGetCellColorHandler color_handler;
const char *handler_name;
if (hatching)
*hatching = FALSE;
if (!table || !table->model)
- return COLOR_UNKNOWN_BG;
+ return COLOR_UNDEFINED;
handler_name = gnc_table_get_cell_name (table, virt_loc);
- bg_color_handler = gnc_table_model_get_bg_color_handler (table->model,
- handler_name);
-
- if (!bg_color_handler)
- return COLOR_UNKNOWN_BG;
+ color_handler = gnc_table_model_get_cell_color_handler (table->model,
+ handler_name);
- return bg_color_handler (virt_loc, hatching,
- table->model->handler_user_data);
-}
+ if (!color_handler)
+ return COLOR_UNDEFINED;
-guint32
-gnc_table_get_bg_color (Table *table, VirtualLocation virt_loc,
- gboolean *hatching)
-{
- return gnc_table_get_bg_color_internal (table, virt_loc, hatching);
+ return color_handler (virt_loc, hatching,
+ table->model->handler_user_data);
}
void
diff --git a/gnucash/register/register-core/table-allgui.h b/gnucash/register/register-core/table-allgui.h
index d827fd5..3b4fa26 100644
--- a/gnucash/register/register-core/table-allgui.h
+++ b/gnucash/register/register-core/table-allgui.h
@@ -179,35 +179,19 @@ struct table
};
/** Color definitions used for table elements */
-typedef enum
-{
- /* Colors used for background drawing */
- COLOR_UNKNOWN_BG, // 0
- COLOR_HEADER_BG, // 1
- COLOR_PRIMARY_BG, // 2
- COLOR_PRIMARY_BG_ACTIVE, // 3
- COLOR_SECONDARY_BG, // 4
- COLOR_SECONDARY_BG_ACTIVE, // 5
- COLOR_SPLIT_BG, // 6
- COLOR_SPLIT_BG_ACTIVE, // 7
-
- /* Colors used for foreground drawing (text etc)
- * ATTENTION: the background and foreground lists should have
- * the same types (the same amount of entries) !
- * The code relies on this ! */
- COLOR_UNKNOWN_FG, // 8
- COLOR_HEADER_FG, // 9
- COLOR_PRIMARY_FG, // 10
- COLOR_PRIMARY_FG_ACTIVE, // 11
- COLOR_SECONDARY_FG, // 12
- COLOR_SECONDARY_FG_ACTIVE, // 13
- COLOR_SPLIT_FG, // 14
- COLOR_SPLIT_FG_ACTIVE, // 15
-
- /* Other colors */
- COLOR_NEGATIVE, // 16 Color to use for negative numbers
+typedef enum {
+ COLOR_UNDEFINED = 0, // 0
+ COLOR_HEADER, // 1
+ COLOR_PRIMARY, // 2
+ COLOR_PRIMARY_ACTIVE, // 3
+ COLOR_SECONDARY, // 4
+ COLOR_SECONDARY_ACTIVE, // 5
+ COLOR_SPLIT, // 6
+ COLOR_SPLIT_ACTIVE, // 7
+ COLOR_NEGATIVE = 16, // 16
} RegisterColor;
+
/** Set the default gui handlers used by new tables. */
void gnc_table_set_default_gui_handlers (TableGUIHandlers *gui_handlers);
@@ -258,9 +242,7 @@ const char * gnc_table_get_label (Table *table, VirtualLocation virt_loc);
CellIOFlags gnc_table_get_io_flags (Table *table, VirtualLocation virt_loc);
-guint32 gnc_table_get_fg_color (Table *table, VirtualLocation virt_loc);
-
-guint32 gnc_table_get_bg_color (Table *table, VirtualLocation virt_loc,
+guint32 gnc_table_get_color (Table *table, VirtualLocation virt_loc,
gboolean *hatching);
void gnc_table_get_borders (Table *table, VirtualLocation virt_loc,
diff --git a/gnucash/register/register-core/table-model.c b/gnucash/register/register-core/table-model.c
index c76310e..a5baee2 100644
--- a/gnucash/register/register-core/table-model.c
+++ b/gnucash/register/register-core/table-model.c
@@ -134,8 +134,7 @@ gnc_table_model_new (void)
model->label_handlers = gnc_table_model_handler_hash_new ();
model->help_handlers = gnc_table_model_handler_hash_new ();
model->io_flags_handlers = gnc_table_model_handler_hash_new ();
- model->fg_color_handlers = gnc_table_model_handler_hash_new ();
- model->bg_color_handlers = gnc_table_model_handler_hash_new ();
+ model->cell_color_handlers = gnc_table_model_handler_hash_new ();
model->cell_border_handlers = gnc_table_model_handler_hash_new ();
model->confirm_handlers = gnc_table_model_handler_hash_new ();
model->save_handlers = gnc_table_model_handler_hash_new ();
@@ -165,11 +164,8 @@ gnc_table_model_destroy (TableModel *model)
gnc_table_model_handler_hash_destroy (model->io_flags_handlers);
model->io_flags_handlers = NULL;
- gnc_table_model_handler_hash_destroy (model->fg_color_handlers);
- model->fg_color_handlers = NULL;
-
- gnc_table_model_handler_hash_destroy (model->bg_color_handlers);
- model->bg_color_handlers = NULL;
+ gnc_table_model_handler_hash_destroy (model->cell_color_handlers);
+ model->cell_color_handlers = NULL;
gnc_table_model_handler_hash_destroy (model->cell_border_handlers);
model->cell_border_handlers = NULL;
@@ -334,75 +330,39 @@ gnc_table_model_get_io_flags_handler (TableModel *model,
}
void
-gnc_table_model_set_fg_color_handler
+gnc_table_model_set_cell_color_handler
(TableModel *model,
- TableGetFGColorHandler fg_color_handler,
+ TableGetCellColorHandler color_handler,
const char * cell_name)
{
g_return_if_fail (model != NULL);
g_return_if_fail (cell_name != NULL);
- gnc_table_model_handler_hash_insert (model->fg_color_handlers,
+ gnc_table_model_handler_hash_insert (model->cell_color_handlers,
cell_name,
- fg_color_handler);
+ color_handler);
}
void
-gnc_table_model_set_default_fg_color_handler
+gnc_table_model_set_default_cell_color_handler
(TableModel *model,
- TableGetFGColorHandler fg_color_handler)
+ TableGetCellColorHandler color_handler)
{
g_return_if_fail (model != NULL);
- gnc_table_model_handler_hash_insert (model->fg_color_handlers,
+ gnc_table_model_handler_hash_insert (model->cell_color_handlers,
DEFAULT_HANDLER,
- fg_color_handler);
-}
-
-TableGetFGColorHandler
-gnc_table_model_get_fg_color_handler (TableModel *model,
- const char * cell_name)
-{
- g_return_val_if_fail (model != NULL, NULL);
-
- return gnc_table_model_handler_hash_lookup (model->fg_color_handlers,
- cell_name);
+ color_handler);
}
-void
-gnc_table_model_set_bg_color_handler
-(TableModel *model,
- TableGetBGColorHandler bg_color_handler,
- const char * cell_name)
-{
- g_return_if_fail (model != NULL);
- g_return_if_fail (cell_name != NULL);
-
- gnc_table_model_handler_hash_insert (model->bg_color_handlers,
- cell_name,
- bg_color_handler);
-}
-
-void
-gnc_table_model_set_default_bg_color_handler
-(TableModel *model,
- TableGetBGColorHandler bg_color_handler)
-{
- g_return_if_fail (model != NULL);
-
- gnc_table_model_handler_hash_insert (model->bg_color_handlers,
- DEFAULT_HANDLER,
- bg_color_handler);
-}
-
-TableGetBGColorHandler
-gnc_table_model_get_bg_color_handler (TableModel *model,
- const char * cell_name)
+TableGetCellColorHandler
+gnc_table_model_get_cell_color_handler (TableModel *model,
+ const char * cell_name)
{
g_return_val_if_fail (model != NULL, NULL);
- return gnc_table_model_handler_hash_lookup (model->bg_color_handlers,
- cell_name);
+ return gnc_table_model_handler_hash_lookup (model->cell_color_handlers,
+ cell_name);
}
void
diff --git a/gnucash/register/register-core/table-model.h b/gnucash/register/register-core/table-model.h
index 268757e..2d489a6 100644
--- a/gnucash/register/register-core/table-model.h
+++ b/gnucash/register/register-core/table-model.h
@@ -76,10 +76,7 @@ typedef char * (*TableGetHelpHandler) (VirtualLocation virt_loc,
typedef CellIOFlags (*TableGetCellIOFlagsHandler) (VirtualLocation virt_loc,
gpointer user_data);
-typedef guint32 (*TableGetFGColorHandler) (VirtualLocation virt_loc,
- gpointer user_data);
-
-typedef guint32 (*TableGetBGColorHandler) (VirtualLocation virt_loc,
+typedef guint32 (*TableGetCellColorHandler) (VirtualLocation virt_loc,
gboolean *hatching,
gpointer user_data);
@@ -107,8 +104,7 @@ typedef struct
GHashTable *label_handlers;
GHashTable *help_handlers;
GHashTable *io_flags_handlers;
- GHashTable *fg_color_handlers;
- GHashTable *bg_color_handlers;
+ GHashTable *cell_color_handlers;
GHashTable *cell_border_handlers;
GHashTable *confirm_handlers;
@@ -189,25 +185,14 @@ TableGetCellIOFlagsHandler gnc_table_model_get_io_flags_handler
(TableModel *model,
const char * cell_name);
-void gnc_table_model_set_fg_color_handler
-(TableModel *model,
- TableGetFGColorHandler io_flags_handler,
- const char * cell_name);
-void gnc_table_model_set_default_fg_color_handler
-(TableModel *model,
- TableGetFGColorHandler io_flags_handler);
-TableGetFGColorHandler gnc_table_model_get_fg_color_handler
-(TableModel *model,
- const char * cell_name);
-
-void gnc_table_model_set_bg_color_handler
+void gnc_table_model_set_cell_color_handler
(TableModel *model,
- TableGetBGColorHandler io_flags_handler,
+ TableGetCellColorHandler io_flags_handler,
const char * cell_name);
-void gnc_table_model_set_default_bg_color_handler
+ void gnc_table_model_set_default_cell_color_handler
(TableModel *model,
- TableGetBGColorHandler io_flags_handler);
-TableGetBGColorHandler gnc_table_model_get_bg_color_handler
+ TableGetCellColorHandler io_flags_handler);
+TableGetCellColorHandler gnc_table_model_get_cell_color_handler
(TableModel *model,
const char * cell_name);
diff --git a/gnucash/register/register-gnome/gnucash-header.c b/gnucash/register/register-gnome/gnucash-header.c
index 247d08f..2f6d4d2 100644
--- a/gnucash/register/register-gnome/gnucash-header.c
+++ b/gnucash/register/register-gnome/gnucash-header.c
@@ -87,8 +87,8 @@ gnc_header_draw_offscreen (GncHeader *header)
gtk_style_context_save (stylectxt);
- // Get the background color type and apply the css class
- color_type = gnc_table_get_bg_color (table, virt_loc, NULL);
+ // Get the color type and apply the css class
+ color_type = gnc_table_get_color (table, virt_loc, NULL);
gnucash_get_style_classes (header->sheet, stylectxt, color_type);
if (header->surface)
diff --git a/gnucash/register/register-gnome/gnucash-item-edit.c b/gnucash/register/register-gnome/gnucash-item-edit.c
index 91aa497..3770dc5 100644
--- a/gnucash/register/register-gnome/gnucash-item-edit.c
+++ b/gnucash/register/register-gnome/gnucash-item-edit.c
@@ -344,11 +344,8 @@ draw_background_cb (GtkWidget *widget, cairo_t *cr, gpointer user_data)
gtk_style_context_save (stylectxt);
- // Get the background and foreground color types and apply the css class
- color_type = gnc_table_get_bg_color (item_edit->sheet->table, item_edit->virt_loc, NULL);
- gnucash_get_style_classes (item_edit->sheet, stylectxt, color_type);
-
- color_type = gnc_table_get_fg_color (item_edit->sheet->table, item_edit->virt_loc);
+ // Get the color type and apply the css class
+ color_type = gnc_table_get_color (item_edit->sheet->table, item_edit->virt_loc, NULL);
gnucash_get_style_classes (item_edit->sheet, stylectxt, color_type);
gtk_render_background (stylectxt, cr, 0, 1, width, height - 2);
diff --git a/gnucash/register/register-gnome/gnucash-sheet-private.c b/gnucash/register/register-gnome/gnucash-sheet-private.c
index a286abe..8b0d067 100644
--- a/gnucash/register/register-gnome/gnucash-sheet-private.c
+++ b/gnucash/register/register-gnome/gnucash-sheet-private.c
@@ -398,11 +398,8 @@ draw_cell (GnucashSheet *sheet,
gtk_style_context_save (stylectxt);
- // Get the background and foreground color types and apply the css class
- color_type = gnc_table_get_bg_color (table, virt_loc, &hatching);
- gnucash_get_style_classes (sheet, stylectxt, color_type);
-
- color_type = gnc_table_get_fg_color (table, virt_loc);
+ // Get the color type and apply the css class
+ color_type = gnc_table_get_color (table, virt_loc, &hatching);
gnucash_get_style_classes (sheet, stylectxt, color_type);
// Are we in a read-only row? Then make the background color somewhat more grey.
diff --git a/gnucash/register/register-gnome/gnucash-sheet.c b/gnucash/register/register-gnome/gnucash-sheet.c
index d8a6cea..e2a759a 100644
--- a/gnucash/register/register-gnome/gnucash-sheet.c
+++ b/gnucash/register/register-gnome/gnucash-sheet.c
@@ -2407,52 +2407,46 @@ gnucash_sheet_table_load (GnucashSheet *sheet, gboolean do_scroll)
/*************************************************************/
-/** Map a cell type to a css style class. */
+/** Map a cell color type to a css style class. */
void
gnucash_get_style_classes (GnucashSheet *sheet, GtkStyleContext *stylectxt,
RegisterColor field_type)
{
gchar *full_class, *style_class = NULL;
+ if (field_type >= COLOR_NEGATIVE) // Require a Negative fg color
+ {
+ gtk_style_context_add_class (stylectxt, "negative-numbers");
+ field_type -= COLOR_NEGATIVE;
+ }
+
switch (field_type)
{
default:
- case COLOR_UNKNOWN_BG:
- case COLOR_UNKNOWN_FG:
+ case COLOR_UNDEFINED:
gtk_style_context_add_class (stylectxt, GTK_STYLE_CLASS_BACKGROUND);
return;
- case COLOR_NEGATIVE:
- gtk_style_context_add_class (stylectxt, "negative-numbers");
- return;
-
- case COLOR_HEADER_BG:
- case COLOR_HEADER_FG:
+ case COLOR_HEADER:
style_class = "header";
break;
- case COLOR_PRIMARY_BG:
- case COLOR_PRIMARY_FG:
+ case COLOR_PRIMARY:
style_class = "primary";
break;
- case COLOR_PRIMARY_BG_ACTIVE:
- case COLOR_PRIMARY_FG_ACTIVE:
- case COLOR_SECONDARY_BG_ACTIVE:
- case COLOR_SECONDARY_FG_ACTIVE:
- case COLOR_SPLIT_BG_ACTIVE:
- case COLOR_SPLIT_FG_ACTIVE:
+ case COLOR_PRIMARY_ACTIVE:
+ case COLOR_SECONDARY_ACTIVE:
+ case COLOR_SPLIT_ACTIVE:
gtk_style_context_set_state (stylectxt, GTK_STATE_FLAG_SELECTED);
style_class = "cursor";
break;
- case COLOR_SECONDARY_BG:
- case COLOR_SECONDARY_FG:
+ case COLOR_SECONDARY:
style_class = "secondary";
break;
- case COLOR_SPLIT_BG:
- case COLOR_SPLIT_FG:
+ case COLOR_SPLIT:
style_class = "split";
break;
}
commit 9cd2c6d17fcac36941e189560d1a7c7de036cb1f
Author: Robert Fewell <14uBobIT at gmail.com>
Date: Wed Nov 1 12:17:19 2017 +0000
Test the widget state to get the correct background colour.
When the cell borders are not displayed, the border colour is set to
the background colour so test for the widget being in an insensitive
state to get the correct background colour.
diff --git a/gnucash/register/register-gnome/gnucash-sheet-private.c b/gnucash/register/register-gnome/gnucash-sheet-private.c
index 955f607..a286abe 100644
--- a/gnucash/register/register-gnome/gnucash-sheet-private.c
+++ b/gnucash/register/register-gnome/gnucash-sheet-private.c
@@ -417,7 +417,8 @@ draw_cell (GnucashSheet *sheet,
gtk_render_background (stylectxt, cr, x, y, width, height);
gdk_rgba_parse (&color, "black");
- gnc_style_context_get_background_color (stylectxt, GTK_STATE_FLAG_NORMAL, &color);
+ gnc_style_context_get_background_color (stylectxt, gtk_style_context_get_state (stylectxt),
+ &color);
bg_color = &color;
get_cell_borders (sheet, virt_loc, &borders);
Summary of changes:
.../gtkbuilder/dialog-preferences.glade | 15 +-
.../gtkbuilder/gnc-plugin-page-register.glade | 15 +-
gnucash/gnucash-310.css | 13 +-
gnucash/gnucash-320.css | 9 +-
gnucash/html/gnc-html-webkit1.c | 15 +-
.../import-export/aqb/assistant-ab-initial.glade | 28 +-
gnucash/import-export/aqb/dialog-ab-trans.c | 22 +-
gnucash/import-export/dialog-import.glade | 20 +-
gnucash/register/ledger-core/gncEntryLedgerModel.c | 49 ++--
.../register/ledger-core/split-register-model.c | 217 +++++++--------
gnucash/register/register-core/table-allgui.c | 57 +---
gnucash/register/register-core/table-allgui.h | 42 +--
gnucash/register/register-core/table-model.c | 72 ++---
gnucash/register/register-core/table-model.h | 29 +-
gnucash/register/register-gnome/gnucash-header.c | 58 ++--
.../register/register-gnome/gnucash-item-edit.c | 303 ++++++++++++++++++---
.../register/register-gnome/gnucash-item-edit.h | 39 ++-
.../register-gnome/gnucash-sheet-private.c | 47 +---
gnucash/register/register-gnome/gnucash-sheet.c | 113 ++++----
gnucash/register/register-gnome/gnucash-sheet.h | 10 +-
gnucash/register/register-gnome/gnucash-style.c | 20 +-
gnucash/report/report-system/doc/report-html.txt | 2 +-
gnucash/report/standard-reports/price-scatter.scm | 2 +-
gnucash/report/stylesheets/stylesheet-easy.scm | 16 +-
gnucash/report/stylesheets/stylesheet-fancy.scm | 16 +-
gnucash/report/stylesheets/stylesheet-footer.scm | 16 +-
.../report/stylesheets/stylesheet-head-or-tail.scm | 16 +-
gnucash/report/stylesheets/stylesheet-plain.scm | 4 +-
gnucash/report/utility-reports/hello-world.scm | 4 +-
29 files changed, 696 insertions(+), 573 deletions(-)
More information about the gnucash-changes
mailing list