From 0f71452a50d7296e054c41601cfcffe2f18a6461 Mon Sep 17 00:00:00 2001
From: Jens Granseuer <jensgr@gmx.net>
Date: Tue, 1 May 2007 16:34:32 +0000
Subject: [PATCH] convert all instances GtkOptionMenu to GtkComboBox

2007-05-01  Jens Granseuer  <jensgr@gmx.net>

	* appearance-ui.c: (ui_init):
	* appearance.glade: convert all instances GtkOptionMenu to
	GtkComboBox

svn path=/trunk/; revision=7533
---
 capplets/appearance/ChangeLog        |  6 +++
 capplets/appearance/appearance-ui.c  |  4 +-
 capplets/appearance/appearance.glade | 58 ++++++----------------------
 3 files changed, 20 insertions(+), 48 deletions(-)

diff --git a/capplets/appearance/ChangeLog b/capplets/appearance/ChangeLog
index 4ebd8c75e..7ccd44eac 100644
--- a/capplets/appearance/ChangeLog
+++ b/capplets/appearance/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-01  Jens Granseuer  <jensgr@gmx.net>
+
+	* appearance-ui.c: (ui_init):
+	* appearance.glade: convert all instances GtkOptionMenu to
+	GtkComboBox
+
 2007-05-01  Jens Granseuer  <jensgr@gmx.net>
 
 	* appearance-main.c: (main):
diff --git a/capplets/appearance/appearance-ui.c b/capplets/appearance/appearance-ui.c
index de3ef23f8..78e45fbcd 100644
--- a/capplets/appearance/appearance-ui.c
+++ b/capplets/appearance/appearance-ui.c
@@ -208,9 +208,9 @@ ui_init (AppearanceData *data)
 			   "/desktop/gnome/interface/menus_have_icons",
 			   NULL));
 
-  peditor = gconf_peditor_new_select_menu
+  peditor = gconf_peditor_new_combo_box
     (NULL, "/desktop/gnome/interface/toolbar_style",
-     WID ("toolbar_style_omenu"),
+     WID ("toolbar_style_select"),
      "conv-to-widget-cb", toolbar_to_widget,
      "conv-from-widget-cb", toolbar_from_widget,
      NULL);
diff --git a/capplets/appearance/appearance.glade b/capplets/appearance/appearance.glade
index a00bdebcc..85f3a6189 100644
--- a/capplets/appearance/appearance.glade
+++ b/capplets/appearance/appearance.glade
@@ -986,10 +986,10 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkOptionMenu" id="style_menu2">
+                          <widget class="GtkComboBox" id="style_menu2">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Zoom        </property>
+                            <property name="focus_on_click">True</property>
+                            <property name="items" translatable="yes">Zoom</property>
                           </widget>
                           <packing>
                             <property name="expand">False</property>
@@ -1090,10 +1090,10 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkOptionMenu" id="color_menu2">
+                  <widget class="GtkComboBox" id="color_menu2">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Solid Color  </property>
+                    <property name="focus_on_click">True</property>
+                    <property name="label" translatable="yes">Solid Color</property>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
@@ -1238,47 +1238,13 @@
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkOptionMenu" id="toolbar_style_omenu">
+                              <widget class="GtkComboBox" id="toolbar_style_select">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-
-				<child internal-child="menu">
-				  <widget class="GtkMenu" id="toolbar_style_menu">
-				    <property name="visible">True</property>
-
-				    <child>
-				      <widget class="GtkMenuItem" id="tb_style_text_below_icons">
-					<property name="visible">True</property>
-					<property name="label" translatable="yes">Text below icons</property>
-					<property name="use_underline">True</property>
-				      </widget>
-				    </child>
-
-				    <child>
-				      <widget class="GtkMenuItem" id="tb_style_text_beside_icons">
-					<property name="visible">True</property>
-					<property name="label" translatable="yes">Text beside icons</property>
-					<property name="use_underline">True</property>
-				      </widget>
-				    </child>
-
-				    <child>
-				      <widget class="GtkMenuItem" id="tb_style_icons_only">
-					<property name="visible">True</property>
-					<property name="label" translatable="yes">Icons only</property>
-					<property name="use_underline">True</property>
-				      </widget>
-				    </child>
-
-				    <child>
-				      <widget class="GtkMenuItem" id="tb_style_text_only">
-					<property name="visible">True</property>
-					<property name="label" translatable="yes">Text only</property>
-					<property name="use_underline">True</property>
-				      </widget>
-				    </child>
-				  </widget>
-			        </child>
+                                <property name="focus_on_click">True</property>
+				<property name="items" translatable="yes">Text below items
+Text beside items
+Icons only
+Text only</property>
                               </widget>
                               <packing>
                                 <property name="expand">False</property>