r23246 - gnucash/trunk/src - Gnc-Prefs: remove toolbar_style preference
Geert Janssens
gjanssens at code.gnucash.org
Mon Oct 7 10:16:12 EDT 2013
Author: gjanssens
Date: 2013-10-07 10:16:11 -0400 (Mon, 07 Oct 2013)
New Revision: 23246
Trac: http://svn.gnucash.org/trac/changeset/23246
Modified:
gnucash/trunk/src/core-utils/gnc-prefs.h
gnucash/trunk/src/gnome-utils/dialog-utils.c
gnucash/trunk/src/gnome-utils/dialog-utils.h
gnucash/trunk/src/gnome-utils/gnc-main-window.c
gnucash/trunk/src/gnome-utils/gtkbuilder/dialog-preferences.glade
gnucash/trunk/src/gnome/gnc-split-reg.c
gnucash/trunk/src/gnome/gnc-split-reg2.c
gnucash/trunk/src/gnome/gschemas/org.gnucash.gschema.xml.in
gnucash/trunk/src/gnome/window-reconcile.c
gnucash/trunk/src/gnome/window-reconcile2.c
Log:
Gnc-Prefs: remove toolbar_style preference
This option should be handled by the environment, not by GnuCash
Modified: gnucash/trunk/src/core-utils/gnc-prefs.h
===================================================================
--- gnucash/trunk/src/core-utils/gnc-prefs.h 2013-10-07 14:15:55 UTC (rev 23245)
+++ gnucash/trunk/src/core-utils/gnc-prefs.h 2013-10-07 14:16:11 UTC (rev 23246)
@@ -58,13 +58,6 @@
#define GNC_PREFS_GROUP_WARNINGS_PERM "general.warnings.permanent"
/* Preference names used across multiple modules */
-/* Currently the first one conflicts with same definition in gnc-gconf-utils.h
- * Only load it if gnc-gconf-utils.h isn't loaded yet.
- */
-#ifndef GNC_GCONF_UTILS_H
-#define DESKTOP_GNOME_INTERFACE "/desktop/gnome/interface"
-#endif /* GNC_GCONF_UTILS_H */
-#define GNC_PREF_TOOLBAR_STYLE "toolbar_style"
#define GNC_PREF_SAVE_GEOMETRY "save_window_geometry"
#define GNC_PREF_LAST_PATH "last_path"
#define GNC_PREF_USE_NEW "use_new_window"
Modified: gnucash/trunk/src/gnome/gnc-split-reg.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-split-reg.c 2013-10-07 14:15:55 UTC (rev 23245)
+++ gnucash/trunk/src/gnome/gnc-split-reg.c 2013-10-07 14:16:11 UTC (rev 23246)
@@ -82,8 +82,6 @@
static void gsr_redraw_all_cb (GnucashRegister *g_reg, gpointer data);
-static void gnc_split_reg_refresh_toolbar( GNCSplitReg *gsr );
-
static void gnc_split_reg_ld_destroy( GNCLedgerDisplay *ledger );
static Transaction* create_balancing_transaction(QofBook *book, Account *account,
@@ -372,7 +370,6 @@
gnc_split_register_show_present_divider( sr, TRUE );
/* events should be sufficient to redraw this */
/* gnc_ledger_display_refresh( gsr->ledger ); */
- gnc_split_reg_refresh_toolbar( gsr );
LEAVE(" ");
}
@@ -684,18 +681,6 @@
}
static void
-gnc_split_reg_refresh_toolbar( GNCSplitReg *gsr )
-{
- GtkToolbarStyle tbstyle;
-
- if ((gsr == NULL) || (gsr->toolbar == NULL))
- return;
-
- tbstyle = gnc_get_toolbar_style ();
- gtk_toolbar_set_style( GTK_TOOLBAR(gsr->toolbar), tbstyle );
-}
-
-static void
gnc_split_reg_ld_destroy( GNCLedgerDisplay *ledger )
{
GNCSplitReg *gsr = gnc_ledger_display_get_user_data( ledger );
Modified: gnucash/trunk/src/gnome/gnc-split-reg2.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-split-reg2.c 2013-10-07 14:15:55 UTC (rev 23245)
+++ gnucash/trunk/src/gnome/gnc-split-reg2.c 2013-10-07 14:16:11 UTC (rev 23246)
@@ -72,8 +72,6 @@
static void gsr2_redraw_all_cb (GncTreeViewSplitReg *view, gpointer data);
-static void gnc_split_reg2_refresh_toolbar (GNCSplitReg2 *gsr);
-
static void gnc_split_reg2_ld_destroy (GNCLedgerDisplay2 *ledger);
static Transaction* gsr2_create_balancing_transaction (QofBook *book, Account *account,
@@ -219,8 +217,6 @@
model = gnc_ledger_display2_get_split_model_register (gsr->ledger);
- gnc_split_reg2_refresh_toolbar (gsr);
-
LEAVE(" ");
}
@@ -683,18 +679,6 @@
}
static void
-gnc_split_reg2_refresh_toolbar (GNCSplitReg2 *gsr)
-{
- GtkToolbarStyle tbstyle;
-
- if ((gsr == NULL) || (gsr->toolbar == NULL))
- return;
-
- tbstyle = gnc_get_toolbar_style ();
- gtk_toolbar_set_style (GTK_TOOLBAR (gsr->toolbar), tbstyle );
-}
-
-static void
gnc_split_reg2_ld_destroy (GNCLedgerDisplay2 *ledger)
{
GNCSplitReg2 *gsr = gnc_ledger_display2_get_user_data (ledger);
Modified: gnucash/trunk/src/gnome/gschemas/org.gnucash.gschema.xml.in
===================================================================
--- gnucash/trunk/src/gnome/gschemas/org.gnucash.gschema.xml.in 2013-10-07 14:15:55 UTC (rev 23245)
+++ gnucash/trunk/src/gnome/gschemas/org.gnucash.gschema.xml.in 2013-10-07 14:16:11 UTC (rev 23246)
@@ -69,11 +69,6 @@
<summary>Use account colors in the tabs of open account registers</summary>
<description>If active the account register tabs will be colored using the account's custom color if set. This can serve as a visual aid to quickly identify accounts.</description>
</key>
- <key name="toolbar_style" type="s">
- <default>'system'</default>
- <summary>Labels on toolbar buttons</summary>
- <description>This setting controls how the labels on toolbar buttons are shown. If set to "system" then GnuCash will use the desktop setting for how to draw toolbar buttons. If set to "icon" then only icons will be show on toolbar buttons.. If set to "text" only the labels will be shown. If set to "both" then both icons and labels will be shown. If set to "both-horiz" then icons will be shown for all buttons with labels added on important buttons.</description>
- </key>
<key name="use_accounting_labels" type="b">
<default>false</default>
<summary>Use formal account labels</summary>
Modified: gnucash/trunk/src/gnome/window-reconcile.c
===================================================================
--- gnucash/trunk/src/gnome/window-reconcile.c 2013-10-07 14:15:55 UTC (rev 23245)
+++ gnucash/trunk/src/gnome/window-reconcile.c 2013-10-07 14:16:11 UTC (rev 23246)
@@ -47,7 +47,6 @@
#include "gnc-date-edit.h"
#include "gnc-event.h"
#include "gnc-filepath-utils.h"
-#include "gnc-gconf-utils.h"
#include <gnc-gdate-utils.h>
#include "gnc-gnome-utils.h"
#include "gnc-main-window.h"
@@ -78,9 +77,6 @@
GtkUIManager *ui_merge;
GtkActionGroup *action_group;
- GtkWidget *toolbar; /* Toolbar widget */
- gint toolbar_change_cb_id; /* id for toolbar preference change cb */
- gint toolbar_change_cb_id2; /* id for toolbar preference change cb */
GtkWidget *starting; /* The starting balance */
GtkWidget *ending; /* The ending balance */
@@ -1395,47 +1391,6 @@
static void
-gnc_recn_refresh_toolbar(RecnWindow *recnData)
-{
- GtkToolbarStyle style;
- GSList *list;
-
- if ((recnData == NULL) || (recnData->toolbar == NULL))
- return;
-
- style = gnc_get_toolbar_style();
- list = gtk_ui_manager_get_toplevels(recnData->ui_merge, GTK_UI_MANAGER_TOOLBAR);
- g_slist_foreach(list, (GFunc)gtk_toolbar_set_style, GINT_TO_POINTER(style));
- g_slist_free(list);
-}
-
-
-static void
-gnc_toolbar_change_cb (GConfClient *client,
- guint cnxn_id,
- GConfEntry *entry,
- gpointer data)
-{
- RecnWindow *recnData = data;
- GConfValue *value;
- const gchar *key, *key_tail;
-
- key = gconf_entry_get_key(entry);
- value = gconf_entry_get_value(entry);
- if (!key || !value)
- return;
-
- key_tail = strrchr(key, '/');
- if (key_tail != NULL)
- key_tail++;
- if (strcmp(key_tail, KEY_TOOLBAR_STYLE) == 0)
- {
- gnc_recn_refresh_toolbar(recnData);
- }
-}
-
-
-static void
gnc_get_reconcile_info (Account *account,
gnc_numeric *new_ending,
time64 *statement_date)
@@ -1767,13 +1722,6 @@
g_assert(merge_id != 0);
}
g_free(filename);
-
- recnData->toolbar_change_cb_id =
- gnc_gconf_add_anon_notification(GCONF_GENERAL,
- gnc_toolbar_change_cb, recnData);
- recnData->toolbar_change_cb_id2 =
- gnc_gconf_add_anon_notification(DESKTOP_GNOME_INTERFACE,
- gnc_toolbar_change_cb, recnData);
}
g_signal_connect(recnData->window, "popup-menu",
@@ -1912,8 +1860,6 @@
recnRecalculateBalance(recnData);
- gnc_recn_refresh_toolbar(recnData);
-
gnc_window_adjust_for_screen(GTK_WINDOW(recnData->window));
/* Set the sort orders of the debit and credit tree views */
@@ -1961,11 +1907,6 @@
gnc_unregister_gui_component_by_data (WINDOW_RECONCILE_CM_CLASS, recnData);
- gnc_gconf_remove_anon_notification(GCONF_GENERAL,
- recnData->toolbar_change_cb_id);
- gnc_gconf_remove_anon_notification(DESKTOP_GNOME_INTERFACE,
- recnData->toolbar_change_cb_id2);
-
if (recnData->delete_refresh)
gnc_resume_gui_refresh ();
Modified: gnucash/trunk/src/gnome/window-reconcile2.c
===================================================================
--- gnucash/trunk/src/gnome/window-reconcile2.c 2013-10-07 14:15:55 UTC (rev 23245)
+++ gnucash/trunk/src/gnome/window-reconcile2.c 2013-10-07 14:16:11 UTC (rev 23246)
@@ -47,7 +47,6 @@
#include "gnc-date-edit.h"
#include "gnc-event.h"
#include "gnc-filepath-utils.h"
-#include "gnc-gconf-utils.h"
#include <gnc-gdate-utils.h>
#include "gnc-gnome-utils.h"
#include "gnc-main-window.h"
@@ -78,9 +77,6 @@
GtkUIManager *ui_merge;
GtkActionGroup *action_group;
- GtkWidget *toolbar; /* Toolbar widget */
- gint toolbar_change_cb_id; /* id for toolbar preference change cb */
- gint toolbar_change_cb_id2; /* id for toolbar preference change cb */
GtkWidget *starting; /* The starting balance */
GtkWidget *ending; /* The ending balance */
@@ -1395,47 +1391,6 @@
static void
-gnc_recn_refresh_toolbar (RecnWindow2 *recnData)
-{
- GtkToolbarStyle style;
- GSList *list;
-
- if ((recnData == NULL) || (recnData->toolbar == NULL))
- return;
-
- style = gnc_get_toolbar_style();
- list = gtk_ui_manager_get_toplevels (recnData->ui_merge, GTK_UI_MANAGER_TOOLBAR);
- g_slist_foreach (list, (GFunc) gtk_toolbar_set_style, GINT_TO_POINTER(style));
- g_slist_free (list);
-}
-
-
-static void
-gnc_toolbar_change_cb (GConfClient *client,
- guint cnxn_id,
- GConfEntry *entry,
- gpointer data)
-{
- RecnWindow2 *recnData = data;
- GConfValue *value;
- const gchar *key, *key_tail;
-
- key = gconf_entry_get_key (entry);
- value = gconf_entry_get_value (entry);
- if (!key || !value)
- return;
-
- key_tail = strrchr(key, '/');
- if (key_tail != NULL)
- key_tail++;
- if (strcmp(key_tail, KEY_TOOLBAR_STYLE) == 0)
- {
- gnc_recn_refresh_toolbar (recnData);
- }
-}
-
-
-static void
gnc_get_reconcile_info (Account *account,
gnc_numeric *new_ending,
time64 *statement_date)
@@ -1767,13 +1722,6 @@
g_assert (merge_id != 0);
}
g_free (filename);
-
- recnData->toolbar_change_cb_id =
- gnc_gconf_add_anon_notification (GCONF_GENERAL,
- gnc_toolbar_change_cb, recnData);
- recnData->toolbar_change_cb_id2 =
- gnc_gconf_add_anon_notification (DESKTOP_GNOME_INTERFACE,
- gnc_toolbar_change_cb, recnData);
}
g_signal_connect (recnData->window, "popup-menu",
@@ -1912,8 +1860,6 @@
recnRecalculateBalance (recnData);
- gnc_recn_refresh_toolbar (recnData);
-
gnc_window_adjust_for_screen (GTK_WINDOW (recnData->window));
/* Set the sort orders of the debit and credit tree views */
@@ -1961,11 +1907,6 @@
gnc_unregister_gui_component_by_data (WINDOW_RECONCILE_CM_CLASS, recnData);
- gnc_gconf_remove_anon_notification (GCONF_GENERAL,
- recnData->toolbar_change_cb_id);
- gnc_gconf_remove_anon_notification (DESKTOP_GNOME_INTERFACE,
- recnData->toolbar_change_cb_id2);
-
if (recnData->delete_refresh)
gnc_resume_gui_refresh ();
Modified: gnucash/trunk/src/gnome-utils/dialog-utils.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-utils.c 2013-10-07 14:15:55 UTC (rev 23245)
+++ gnucash/trunk/src/gnome-utils/dialog-utils.c 2013-10-07 14:16:11 UTC (rev 23246)
@@ -50,39 +50,7 @@
#define GNC_PREF_LAST_GEOMETRY "last-geometry"
-/********************************************************************\
- * gnc_get_toolbar_style *
- * returns the current toolbar style for gnucash toolbars *
- * *
- * Args: none *
- * Returns: toolbar style *
- \*******************************************************************/
-GtkToolbarStyle
-gnc_get_toolbar_style(void)
-{
- GtkToolbarStyle tbstyle = GTK_TOOLBAR_BOTH;
- char *style_string;
- style_string = gnc_gconf_get_string(GCONF_GENERAL,
- KEY_TOOLBAR_STYLE, NULL);
- if (!style_string || strcmp(style_string, "system") == 0)
- {
- if (style_string)
- g_free(style_string);
- style_string = gnc_gconf_get_string(DESKTOP_GNOME_INTERFACE,
- KEY_TOOLBAR_STYLE, NULL);
- }
-
- if (style_string == NULL)
- return GTK_TOOLBAR_BOTH;
- tbstyle = gnc_enum_from_nick(GTK_TYPE_TOOLBAR_STYLE, style_string,
- GTK_TOOLBAR_BOTH);
- g_free(style_string);
-
- return tbstyle;
-}
-
-
/********************************************************************\
* gnc_get_deficit_color *
* fill in the 3 color values for the color of deficit values *
Modified: gnucash/trunk/src/gnome-utils/dialog-utils.h
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-utils.h 2013-10-07 14:15:55 UTC (rev 23245)
+++ gnucash/trunk/src/gnome-utils/dialog-utils.h 2013-10-07 14:16:11 UTC (rev 23246)
@@ -29,7 +29,6 @@
#include <gtk/gtk.h>
#include "qof.h"
-GtkToolbarStyle gnc_get_toolbar_style (void);
void gnc_get_deficit_color (GdkColor *color);
void gnc_set_label_color (GtkWidget *label, gnc_numeric value);
Modified: gnucash/trunk/src/gnome-utils/gnc-main-window.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-main-window.c 2013-10-07 14:15:55 UTC (rev 23245)
+++ gnucash/trunk/src/gnome-utils/gnc-main-window.c 2013-10-07 14:16:11 UTC (rev 23246)
@@ -63,7 +63,6 @@
#include "core-utils/gnc-version.h"
#include "gnc-window.h"
#include "gnc-prefs.h"
-#include "gnc-gconf-utils.h"
#include "gnc-prefs.h"
#include "option-util.h"
// +JSLED
@@ -2543,10 +2542,6 @@
/* Update the "Windows" menu in all other windows */
gnc_main_window_update_all_menu_items();
#endif
- gnc_gconf_remove_notification(G_OBJECT(window), DESKTOP_GNOME_INTERFACE,
- GNC_MAIN_WINDOW_NAME);
- gnc_gconf_remove_notification(G_OBJECT(window), GCONF_GENERAL,
- GNC_MAIN_WINDOW_NAME);
gnc_prefs_remove_cb_by_func (GNC_PREFS_GROUP_GENERAL,
GNC_PREF_TAB_COLOR,
gnc_main_window_update_tab_color,
@@ -3186,23 +3181,7 @@
return entry->action_group;
}
-
static void
-gnc_main_window_update_toolbar (GncMainWindow *window)
-{
- GtkToolbarStyle style;
- GSList *list;
-
- ENTER("window %p", window);
-
- style = gnc_get_toolbar_style();
- list = gtk_ui_manager_get_toplevels(window->ui_merge, GTK_UI_MANAGER_TOOLBAR);
- g_slist_foreach(list, (GFunc)gtk_toolbar_set_style, GINT_TO_POINTER(style));
- g_slist_free(list);
- LEAVE("");
-}
-
-static void
gnc_main_window_update_tab_position (GncMainWindow *window)
{
GtkPositionType position = GTK_POS_TOP;
@@ -3357,12 +3336,8 @@
key_tail = strrchr(key, '/');
if (key_tail != NULL)
key_tail++;
- if (strcmp(key_tail, KEY_TOOLBAR_STYLE) == 0)
+ if (strcmp(key_tail, KEY_TAB_POSITION) == 0)
{
- gnc_main_window_update_toolbar(window);
- }
- else if (strcmp(key_tail, KEY_TAB_POSITION) == 0)
- {
gnc_main_window_update_tab_position(window);
}
}
@@ -3593,10 +3568,6 @@
gnc_gconf_add_notification(G_OBJECT(window), GCONF_GENERAL,
gnc_main_window_gconf_changed,
GNC_MAIN_WINDOW_NAME);
- gnc_gconf_add_notification(G_OBJECT(window), DESKTOP_GNOME_INTERFACE,
- gnc_main_window_gconf_changed,
- GNC_MAIN_WINDOW_NAME);
- gnc_main_window_update_toolbar(window);
gnc_main_window_update_tab_position(window);
gnc_main_window_init_menu_updaters(window);
Modified: gnucash/trunk/src/gnome-utils/gtkbuilder/dialog-preferences.glade
===================================================================
--- gnucash/trunk/src/gnome-utils/gtkbuilder/dialog-preferences.glade 2013-10-07 14:15:55 UTC (rev 23245)
+++ gnucash/trunk/src/gnome-utils/gtkbuilder/dialog-preferences.glade 2013-10-07 14:16:11 UTC (rev 23246)
@@ -1978,129 +1978,6 @@
<placeholder/>
</child>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
<object class="GtkLabel" id="label115">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -3234,7 +3111,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="n_rows">20</property>
+ <property name="n_rows">13</property>
<property name="n_columns">4</property>
<property name="column_spacing">12</property>
<child>
@@ -3247,165 +3124,6 @@
<placeholder/>
</child>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <object class="GtkRadioButton" id="gconf/general/toolbar_style/text">
- <property name="label" translatable="yes">_Text only</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup">Display toolbar items as text only.</property>
- <property name="tooltip_text" translatable="yes">Display toolbar items as text only.</property>
- <property name="use_underline">True</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="right_attach">4</property>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- <property name="x_padding">12</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="gconf/general/toolbar_style/icons">
- <property name="label" translatable="yes">_Icons only</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup">Display toolbar items as icons only.</property>
- <property name="tooltip_text" translatable="yes">Display toolbar items as icons only.</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">gconf/general/toolbar_style/text</property>
- </object>
- <packing>
- <property name="right_attach">4</property>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- <property name="x_padding">12</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="gconf/general/toolbar_style/both_horiz">
- <property name="label" translatable="yes">Priority text besi_de icons</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup">Display toolbar items with the text label beside the icon. Labels are only shown for the most important items.</property>
- <property name="tooltip_text" translatable="yes">Display toolbar items with the text label beside the icon. Labels are only shown for the most important items.</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">gconf/general/toolbar_style/text</property>
- </object>
- <packing>
- <property name="right_attach">4</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- <property name="x_padding">12</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="gconf/general/toolbar_style/both">
- <property name="label" translatable="yes">Text _below icons</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup">Display toolbar items with the text label below the icon. Labels are show for all items.</property>
- <property name="tooltip_text" translatable="yes">Display toolbar items with the text label below the icon. Labels are show for all items.</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">gconf/general/toolbar_style/text</property>
- </object>
- <packing>
- <property name="right_attach">4</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- <property name="x_padding">12</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="gconf/general/toolbar_style/system">
- <property name="label" translatable="yes">Use s_ystem default</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup">Use the system setting for displaying toolbar items.</property>
- <property name="tooltip_text" translatable="yes">Use the system setting for displaying toolbar items.</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">gconf/general/toolbar_style/text</property>
- </object>
- <packing>
- <property name="right_attach">4</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- <property name="x_padding">12</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label69">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Toolbar Style</b></property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="right_attach">4</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
<object class="GtkLabel" id="label72">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -3467,8 +3185,8 @@
</object>
<packing>
<property name="right_attach">4</property>
- <property name="top_attach">12</property>
- <property name="bottom_attach">13</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="x_padding">12</property>
@@ -3481,8 +3199,8 @@
<property name="xalign">0</property>
</object>
<packing>
- <property name="top_attach">14</property>
- <property name="bottom_attach">15</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
</packing>
@@ -3497,8 +3215,8 @@
</object>
<packing>
<property name="right_attach">2</property>
- <property name="top_attach">15</property>
- <property name="bottom_attach">16</property>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
</packing>
@@ -3518,8 +3236,8 @@
</object>
<packing>
<property name="right_attach">2</property>
- <property name="top_attach">16</property>
- <property name="bottom_attach">17</property>
+ <property name="top_attach">9</property>
+ <property name="bottom_attach">10</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="x_padding">12</property>
@@ -3540,8 +3258,8 @@
</object>
<packing>
<property name="right_attach">2</property>
- <property name="top_attach">17</property>
- <property name="bottom_attach">18</property>
+ <property name="top_attach">10</property>
+ <property name="bottom_attach">11</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="x_padding">12</property>
@@ -3562,8 +3280,8 @@
</object>
<packing>
<property name="right_attach">2</property>
- <property name="top_attach">18</property>
- <property name="bottom_attach">19</property>
+ <property name="top_attach">11</property>
+ <property name="bottom_attach">12</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="x_padding">12</property>
@@ -3584,8 +3302,8 @@
</object>
<packing>
<property name="right_attach">2</property>
- <property name="top_attach">19</property>
- <property name="bottom_attach">20</property>
+ <property name="top_attach">12</property>
+ <property name="bottom_attach">13</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="x_padding">12</property>
@@ -3602,8 +3320,8 @@
<packing>
<property name="left_attach">2</property>
<property name="right_attach">4</property>
- <property name="top_attach">15</property>
- <property name="bottom_attach">16</property>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
</packing>
@@ -3624,8 +3342,8 @@
<packing>
<property name="left_attach">2</property>
<property name="right_attach">4</property>
- <property name="top_attach">16</property>
- <property name="bottom_attach">17</property>
+ <property name="top_attach">9</property>
+ <property name="bottom_attach">10</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="x_padding">12</property>
@@ -3647,8 +3365,8 @@
<packing>
<property name="left_attach">2</property>
<property name="right_attach">4</property>
- <property name="top_attach">17</property>
- <property name="bottom_attach">18</property>
+ <property name="top_attach">10</property>
+ <property name="bottom_attach">11</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="x_padding">12</property>
@@ -3661,8 +3379,8 @@
<property name="xalign">0</property>
</object>
<packing>
- <property name="top_attach">9</property>
- <property name="bottom_attach">10</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
</packing>
@@ -3677,8 +3395,8 @@
</object>
<packing>
<property name="right_attach">4</property>
- <property name="top_attach">10</property>
- <property name="bottom_attach">11</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
</packing>
@@ -3697,8 +3415,8 @@
</object>
<packing>
<property name="right_attach">4</property>
- <property name="top_attach">11</property>
- <property name="bottom_attach">12</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="x_padding">12</property>
@@ -3719,8 +3437,8 @@
</child>
</object>
<packing>
- <property name="top_attach">13</property>
- <property name="bottom_attach">14</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
@@ -3769,12 +3487,36 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">3</property>
- <property name="top_attach">13</property>
- <property name="bottom_attach">14</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">8</property>
More information about the gnucash-changes
mailing list