IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove the preference for showing an icon and label

Browse Source 
It was decided that this was not the right approach and possibly be
based on OS and desktop. This reverts it back to original behaviour.
This commit is contained in:
Robert Fewell 2017-07-09 14:16:09 +01:00 committed by Geert Janssens
parent c3e865c929
commit 8784a789b9
3 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gnome-utils/dialog-utils.c
View File

@ -570,8 +570,7 @@ gnc_gtk_dialog_add_button (GtkWidget *dialog, const gchar *label, const gchar *i
image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON(button), image);
if (gnc_prefs_get_bool (GNC_PREFS_GROUP_GENERAL, "buttons-with-icons-and-labels"))
g_object_set (button, "always-show-image", TRUE, NULL);
g_object_set (button, "always-show-image", TRUE, NULL);
}
g_object_set (button, "can-default", TRUE, NULL);
gtk_widget_show_all(button);

28
src/gnome-utils/gtkbuilder/dialog-preferences.glade
View File

@ -1726,24 +1726,6 @@ many months before the current month:</property>
<property name="top_attach">26</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="pref/general/buttons-with-icons-and-labels">
<property name="label" translatable="yes">Enable icons on buttons which have been configured</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Some buttons have been defined to show an icon and a label. With this setting the display of the icon can be enabled or disabled.</property>
<property name="halign">start</property>
<property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">5</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="pref/general/grid-lines-horizontal">
<property name="label" translatable="yes">Enable horizontal grid lines on table displays</property>
@ -1758,7 +1740,7 @@ many months before the current month:</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">6</property>
<property name="top_attach">5</property>
<property name="width">2</property>
</packing>
</child>
@ -1776,7 +1758,7 @@ many months before the current month:</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">7</property>
<property name="top_attach">6</property>
<property name="width">2</property>
</packing>
</child>
@ -1843,6 +1825,12 @@ many months before the current month:</property>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="position">3</property>

5
src/gnome/gschemas/org.gnucash.gschema.xml.in.in
View File

@ -125,11 +125,6 @@
<summary>Width of notebook tabs</summary>
<description>This key specifies the maximum width of notebook tabs. If the text in the tab is longer than this value (the test is approximate) then the tab label will have the middle cut and replaced with an ellipsis.</description>
</key>
<key name="buttons-with-icons-and-labels" type="b">
<default>true</default>
<summary>Show Button Icons and Labels</summary>
<description>If active, buttons that have been configured to show icons and labels will show both. Otherwise only labels will be used.</description>
</key>
<key name="currency-choice-locale" type="b">
<default>true</default>
<summary>Use the system locale currency for all newly created accounts.</summary>