[gnumeric] Conf: handle the new LongFormatToolbar too.
- From: Morten Welinder <mortenw src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnumeric] Conf: handle the new LongFormatToolbar too.
- Date: Mon, 29 Jun 2009 02:37:59 +0000 (UTC)
commit f9a2b4b0407e8fdbf0d2d6ddcf6624f9d104cc89
Author: Morten Welinder <terra gnome org>
Date: Sun Jun 28 21:39:14 2009 -0400
Conf: handle the new LongFormatToolbar too.
src/gnumeric-gconf.c | 54 ++++++++++++++++++++++++++++++++++----------
src/gnumeric-gconf.h | 6 +++++
tools/handle-conf-options | 6 +++++
3 files changed, 53 insertions(+), 13 deletions(-)
---
diff --git a/src/gnumeric-gconf.c b/src/gnumeric-gconf.c
index 92a8f9c..0d44daa 100644
--- a/src/gnumeric-gconf.c
+++ b/src/gnumeric-gconf.c
@@ -179,23 +179,24 @@ gnm_conf_get_printer_decoration_font (void)
return style;
}
-#define TOOLBAR_TANGO(Object,Format,Standard) \
- if (strcmp (name, "ObjectToolbar") == 0) \
- Object \
- else if (strcmp (name, "FormatToolbar") == 0) \
- Format \
- else if (strcmp (name, "StandardToolbar") == 0) \
+#define TOOLBAR_TANGO(Object,Format,LongFormat,Standard) \
+ if (strcmp (name, "ObjectToolbar") == 0) \
+ Object \
+ else if (strcmp (name, "FormatToolbar") == 0) \
+ Format \
+ else if (strcmp (name, "LongFormatToolbar") == 0) \
+ LongFormat \
+ else if (strcmp (name, "StandardToolbar") == 0) \
Standard
gboolean
gnm_conf_get_toolbar_visible (const char *name)
{
- gboolean viz = FALSE;
-
TOOLBAR_TANGO
(return gnm_conf_get_core_gui_toolbars_ObjectToolbar ();,
return gnm_conf_get_core_gui_toolbars_FormatToolbar ();,
+ return gnm_conf_get_core_gui_toolbars_LongFormatToolbar ();,
return gnm_conf_get_core_gui_toolbars_StandardToolbar (););
g_warning ("Unknown toolbar: %s", name);
@@ -208,9 +209,8 @@ gnm_conf_set_toolbar_visible (const char *name, gboolean x)
TOOLBAR_TANGO
(gnm_conf_set_core_gui_toolbars_ObjectToolbar (x);,
gnm_conf_set_core_gui_toolbars_FormatToolbar (x);,
+ gnm_conf_set_core_gui_toolbars_LongFormatToolbar (x);,
gnm_conf_set_core_gui_toolbars_StandardToolbar (x););
-
- g_warning ("Unknown toolbar: %s", name);
}
GtkPositionType
@@ -219,6 +219,7 @@ gnm_conf_get_toolbar_position (const char *name)
TOOLBAR_TANGO
(return gnm_conf_get_core_gui_toolbars_ObjectToolbar_position ();,
return gnm_conf_get_core_gui_toolbars_FormatToolbar_position ();,
+ return gnm_conf_get_core_gui_toolbars_LongFormatToolbar_position ();,
return gnm_conf_get_core_gui_toolbars_StandardToolbar_position (););
g_warning ("Unknown toolbar: %s", name);
@@ -231,9 +232,8 @@ gnm_conf_set_toolbar_position (const char *name, GtkPositionType x)
TOOLBAR_TANGO
(gnm_conf_set_core_gui_toolbars_ObjectToolbar_position (x);,
gnm_conf_set_core_gui_toolbars_FormatToolbar_position (x);,
+ gnm_conf_set_core_gui_toolbars_LongFormatToolbar_position (x);,
gnm_conf_set_core_gui_toolbars_StandardToolbar_position (x););
-
- g_warning ("Unknown toolbar: %s", name);
}
#undef TOOLBAR_TANGO
@@ -292,7 +292,7 @@ gnm_conf_get_detachable_toolbars (void)
* running
*
* cd src
- * perl ../tools/handle-conf-options ../schemas/*.schemas.in >~/xxx
+ * perl ../tools/handle-conf-options ../schemas/gnumeric*.schemas.in >~/xxx
*
* which creates ~/xxx containing both headers and code.
*/
@@ -672,6 +672,34 @@ gnm_conf_set_core_gui_toolbars_FormatToolbar_position (GtkPositionType x)
}
gboolean
+gnm_conf_get_core_gui_toolbars_LongFormatToolbar (void)
+{
+ const char *key = "core/gui/toolbars/LongFormatToolbar";
+ return go_conf_load_bool (root, key, FALSE);
+}
+
+void
+gnm_conf_set_core_gui_toolbars_LongFormatToolbar (gboolean x)
+{
+ const char *key = "core/gui/toolbars/LongFormatToolbar";
+ go_conf_set_bool (root, key, x != FALSE);
+}
+
+GtkPositionType
+gnm_conf_get_core_gui_toolbars_LongFormatToolbar_position (void)
+{
+ const char *key = "core/gui/toolbars/LongFormatToolbar-position";
+ return go_conf_load_int (root, key, 0, 3, 2);
+}
+
+void
+gnm_conf_set_core_gui_toolbars_LongFormatToolbar_position (GtkPositionType x)
+{
+ const char *key = "core/gui/toolbars/LongFormatToolbar-position";
+ go_conf_set_int (root, key, CLAMP (x, 0, 3));
+}
+
+gboolean
gnm_conf_get_core_gui_toolbars_ObjectToolbar (void)
{
const char *key = "core/gui/toolbars/ObjectToolbar";
diff --git a/src/gnumeric-gconf.h b/src/gnumeric-gconf.h
index 3954d04..2fbfec8 100644
--- a/src/gnumeric-gconf.h
+++ b/src/gnumeric-gconf.h
@@ -105,6 +105,12 @@ void gnm_conf_set_core_gui_toolbars_FormatToolbar (gboolean);
GtkPositionType gnm_conf_get_core_gui_toolbars_FormatToolbar_position (void);
void gnm_conf_set_core_gui_toolbars_FormatToolbar_position (GtkPositionType);
+gboolean gnm_conf_get_core_gui_toolbars_LongFormatToolbar (void);
+void gnm_conf_set_core_gui_toolbars_LongFormatToolbar (gboolean);
+
+GtkPositionType gnm_conf_get_core_gui_toolbars_LongFormatToolbar_position (void);
+void gnm_conf_set_core_gui_toolbars_LongFormatToolbar_position (GtkPositionType);
+
gboolean gnm_conf_get_core_gui_toolbars_ObjectToolbar (void);
void gnm_conf_set_core_gui_toolbars_ObjectToolbar (gboolean);
diff --git a/tools/handle-conf-options b/tools/handle-conf-options
index cfdc297..eda72f0 100644
--- a/tools/handle-conf-options
+++ b/tools/handle-conf-options
@@ -70,6 +70,12 @@ my %extra_attributes =
'max' => 3,
},
+ '/apps/gnumeric/core/gui/toolbars/LongFormatToolbar-position' => {
+ 'gtype' => 'GTK_TYPE_POSITION',
+ 'min' => 0,
+ 'max' => 3,
+ },
+
'/apps/gnumeric/core/gui/toolbars/ObjectToolbar-position' => {
'gtype' => 'GTK_TYPE_POSITION',
'min' => 0,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]