Index: nautilus-file-management-properties.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-file-management-properties.c,v
retrieving revision 1.18
diff -u -r1.18 nautilus-file-management-properties.c
--- nautilus-file-management-properties.c	17 Nov 2005 23:12:28 -0000	1.18
+++ nautilus-file-management-properties.c	26 Nov 2005 11:53:55 -0000
@@ -33,8 +33,7 @@
 #include <gtk/gtkmenuitem.h>
 #include <gtk/gtkmessagedialog.h>
 #include <gtk/gtknotebook.h>
-#include <gtk/gtkicontheme.h>
-#include <gtk/gtkoptionmenu.h>
+#include <gtk/gtkcombobox.h>
 #include <gtk/gtksizegroup.h>
 
 #include <libgnome/gnome-help.h>
@@ -45,6 +44,7 @@
 #include <eel/eel-gconf-extensions.h>
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-preferences-glade.h>
+#include <eel/eel-string-list.h>
 
 #include <libnautilus-private/nautilus-column-chooser.h>
 #include <libnautilus-private/nautilus-column-utilities.h>
@@ -52,15 +52,15 @@
 #include <libnautilus-private/nautilus-module.h>
 
 /* string enum preferences */
-#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_DEFAULT_VIEW_WIDGET "default_view_optionmenu"
-#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ICON_VIEW_ZOOM_WIDGET "iconview_zoom_optionmenu"
-#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_LIST_VIEW_ZOOM_WIDGET "listview_zoom_optionmenu"
-#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SORT_ORDER_WIDGET "sort_order_optionmenu"
-#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_DATE_FORMAT_WIDGET "date_format_optionmenu"
-#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_TEXT_WIDGET "preview_text_optionmenu"
-#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_IMAGE_WIDGET "preview_image_optionmenu"
-#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_SOUND_WIDGET "preview_sound_optionmenu"
-#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_FOLDER_WIDGET "preview_folder_optionmenu"
+#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_DEFAULT_VIEW_WIDGET "default_view_combobox"
+#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ICON_VIEW_ZOOM_WIDGET "icon_view_zoom_combobox"
+#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_LIST_VIEW_ZOOM_WIDGET "list_view_zoom_combobox"
+#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SORT_ORDER_WIDGET "sort_order_combobox"
+#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_DATE_FORMAT_WIDGET "date_format_combobox"
+#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_TEXT_WIDGET "preview_text_combobox"
+#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_IMAGE_WIDGET "preview_image_combobox"
+#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_SOUND_WIDGET "preview_sound_combobox"
+#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_FOLDER_WIDGET "preview_folder_combobox"
 
 /* bool preferences */
 #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_FOLDERS_FIRST_WIDGET "sort_folders_first_checkbutton"
@@ -74,7 +74,7 @@
 #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_TREE_VIEW_FOLDERS_WIDGET "treeview_folders_checkbutton"
 
 /* int enums */
-#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_THUMBNAIL_LIMIT_WIDGET "preview_image_size_optionmenu"
+#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_THUMBNAIL_LIMIT_WIDGET "preview_image_size_combobox"
 
 static const char * const default_view_values[] = {
 	"icon_view",
@@ -155,9 +155,9 @@
 };
 
 static const char * const icon_captions_components[] = {
-	"captions_0_optionmenu",
-	"captions_1_optionmenu",
-	"captions_2_optionmenu",
+	"captions_0_combobox",
+	"captions_1_combobox",
+	"captions_2_combobox",
 	NULL
 };
 
@@ -193,21 +193,6 @@
 }
 
 static void
-nautilus_file_management_properties_dialog_set_icons (GtkWindow *window)
-{
-	GtkIconTheme *icon_theme;
-	GdkPixbuf *icon;
-	
-	icon_theme =  gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (window)));
-	icon = gtk_icon_theme_load_icon (icon_theme, "file-manager", 48, 0, NULL);
-	
-	if (icon != NULL) {
-		gtk_window_set_icon (window, icon);
-		g_object_unref (icon);
-	}
-}
-
-static void
 preferences_show_help (GtkWindow *parent,
 		       char const *helpfile,
 		       char const *sect_id)
@@ -295,20 +280,17 @@
 	eel_g_list_free_deep (column_order);
 }
 
-static GtkWidget *
-create_icon_caption_menu (GladeXML *xml_dialog,
-			  GList *columns)
+static void
+create_icon_caption_combo_box_items (GtkComboBox *combo_box,
+			             GList *columns)
 {
-	GtkWidget *menu;
 	GList *l;
-	GtkWidget *menu_item;
-	
-	menu = gtk_menu_new ();
+	EelStringList *column_names;
 
-	menu_item = gtk_menu_item_new_with_label (_("None"));
-	gtk_widget_show (menu_item);
-	g_object_set_data (G_OBJECT (menu_item), "column_name", "none");
-	gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+	column_names = eel_string_list_new (FALSE);
+	
+	gtk_combo_box_append_text (combo_box, _("None"));
+	eel_string_list_insert (column_names, "none");
 
 	for (l = columns; l != NULL; l = l->next) {
 		NautilusColumn *column;
@@ -328,24 +310,19 @@
 			continue;
 		}
 		
-		menu_item = gtk_menu_item_new_with_label (label);
-		gtk_widget_show (menu_item);
-		g_object_set_data_full 
-			(G_OBJECT (menu_item), "column_name",
-			 g_strdup (name),
-			 (GDestroyNotify)g_free);
+		gtk_combo_box_append_text (combo_box, label);
+		eel_string_list_insert (column_names, name);
+
 		g_free (name);
 		g_free (label);
-		gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
 	}
-	
-	gtk_widget_show (menu);
-	
-	return menu;
+	g_object_set_data_full (G_OBJECT (combo_box), "column_names",
+			        column_names,
+			        (GDestroyNotify) eel_string_list_free);
 }
 
 static void
-icon_captions_changed_callback (GtkOptionMenu *option_menu,
+icon_captions_changed_callback (GtkComboBox *combo_box,
 				gpointer user_data)
 {
 	GList *captions;
@@ -357,18 +334,19 @@
 	captions = NULL;
 
 	for (i = 0; icon_captions_components[i] != NULL; i++) {
-		GtkWidget *option_menu;
-		GtkWidget *menu;
-		GtkWidget *item;
+		GtkWidget *combo_box;
+		int active;
+		EelStringList *column_names;
 		char *name;
 		
-		option_menu = glade_xml_get_widget
-			(GLADE_XML (xml), icon_captions_components[i]);
-		menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (option_menu));
-		item = gtk_menu_get_active (GTK_MENU (menu));
+		combo_box = glade_xml_get_widget
+			    (GLADE_XML (xml), icon_captions_components[i]);
+		active = gtk_combo_box_get_active (GTK_COMBO_BOX (combo_box));
 
-		name = g_object_get_data (G_OBJECT (item), "column_name");
-		captions = g_list_prepend (captions, g_strdup (name));
+		column_names = g_object_get_data (G_OBJECT (combo_box), "column_names");
+		
+		name = eel_string_list_nth (column_names, active);
+		captions = g_list_prepend (captions, name);
 	}
 	captions = g_list_reverse (captions);
 	eel_preferences_set_string_glist (NAUTILUS_PREFERENCES_ICON_VIEW_CAPTIONS, captions);
@@ -376,36 +354,33 @@
 }
 
 static void
-update_caption_option_menu (GladeXML *xml,
-			    const char *option_menu_name,
-			    const char *name)
+update_caption_combo_box (GladeXML *xml,
+			  const char *combo_box_name,
+			  const char *name)
 {
-	GtkWidget *option_menu;
-	GtkWidget *menu;
-	GList *l;
+	GtkWidget *combo_box;
 	int i;
+	EelStringList *column_names;
 	
-	option_menu = glade_xml_get_widget (xml, option_menu_name);
+	combo_box = glade_xml_get_widget (xml, combo_box_name);
 
 	g_signal_handlers_block_by_func
-		(option_menu,
+		(combo_box,
 		 G_CALLBACK (icon_captions_changed_callback),
 		 xml);
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (option_menu));
-	for (l = GTK_MENU_SHELL (menu)->children, i = 0; 
-	     l != NULL;
-	     l = l->next, i++) {
-		char *item_name;
-		item_name = g_object_get_data (G_OBJECT (l->data), 
-					       "column_name");
-		if (!strcmp (name, item_name)) {
-			gtk_option_menu_set_history (GTK_OPTION_MENU (option_menu), i);
+
+	column_names = g_object_get_data (G_OBJECT (combo_box), 
+					  "column_names");
+
+	for (i = 0; i < eel_string_list_get_length (column_names); i++) {
+		if (!strcmp (name, eel_string_list_peek_nth (column_names, i))) {
+			gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), i);
 			break;
 		}
 	}
 
 	g_signal_handlers_unblock_by_func
-		(option_menu,
+		(combo_box,
 		 G_CALLBACK (icon_captions_changed_callback),
 		 xml);
 }
@@ -423,9 +398,9 @@
 	for (l = captions, i = 0; 
 	     captions != NULL && icon_captions_components[i] != NULL;
 	      l = l->next, i++) {
-		update_caption_option_menu (xml, 
-					    icon_captions_components[i],
-					    (char *)l->data);
+		update_caption_combo_box (xml, 
+					  icon_captions_components[i],
+					  (char *)l->data);
 	}
 	eel_g_list_free_deep (captions);
 }
@@ -442,18 +417,15 @@
 	columns = nautilus_get_all_columns ();
 	
 	for (i = 0; icon_captions_components[i] != NULL; i++) {
-		GtkWidget *menu;
-		GtkWidget *option_menu;
+		GtkWidget *combo_box;
 		
-		option_menu = glade_xml_get_widget (xml_dialog, 
+		combo_box = glade_xml_get_widget (xml_dialog, 
 						    icon_captions_components[i]);
 
-		menu = create_icon_caption_menu (xml_dialog, columns);
-		gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), menu);
+		create_icon_caption_combo_box_items (GTK_COMBO_BOX (combo_box), columns);
+		gtk_widget_set_sensitive (combo_box, writable);
 
-		gtk_widget_set_sensitive (GTK_WIDGET (option_menu), writable);
-
-		g_signal_connect (option_menu, "changed", 
+		g_signal_connect (combo_box, "changed", 
 				  G_CALLBACK (icon_captions_changed_callback),
 				  xml_dialog);
 	}
@@ -466,38 +438,27 @@
 static void
 create_date_format_menu (GladeXML *xml_dialog)
 {
-	GtkWidget *option_menu;
-	GtkWidget *menu;
-	GtkWidget *menu_item;
+	GtkWidget *combo_box;
 	gchar *date_string;
 	time_t now_raw;
 	struct tm* now;
-	option_menu = glade_xml_get_widget (xml_dialog,
-					    NAUTILUS_FILE_MANAGEMENT_PROPERTIES_DATE_FORMAT_WIDGET);
-	menu = gtk_menu_new ();
+	combo_box = glade_xml_get_widget (xml_dialog,
+					  NAUTILUS_FILE_MANAGEMENT_PROPERTIES_DATE_FORMAT_WIDGET);
 
 	now_raw = time (NULL);
 	now = localtime (&now_raw);
 
 	date_string = eel_strdup_strftime ("%c", now);
-	menu_item = gtk_menu_item_new_with_label (date_string);
+	gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), date_string);
 	g_free (date_string);
-	gtk_widget_show (menu_item);
-	gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
 
 	date_string = eel_strdup_strftime ("%Y-%m-%d %H:%M:%S", now);
-	menu_item = gtk_menu_item_new_with_label (date_string);
+	gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), date_string);
 	g_free (date_string);
-	gtk_widget_show (menu_item);
-	gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
 
 	date_string = eel_strdup_strftime (_("today at %-I:%M:%S %p"), now);
-	menu_item = gtk_menu_item_new_with_label (date_string);
+	gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), date_string);
 	g_free (date_string);
-	gtk_widget_show (menu_item);
-	gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-
-	gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu), menu);
 }
 
 static void
@@ -603,45 +564,45 @@
 					    NAUTILUS_FILE_MANAGEMENT_PROPERTIES_TREE_VIEW_FOLDERS_WIDGET,
 					    NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES);
 
-	eel_preferences_glade_connect_string_enum_option_menu (xml_dialog,
-							       NAUTILUS_FILE_MANAGEMENT_PROPERTIES_DEFAULT_VIEW_WIDGET,
-							       NAUTILUS_PREFERENCES_DEFAULT_FOLDER_VIEWER,
-							       (const char **) default_view_values);
-	eel_preferences_glade_connect_string_enum_option_menu (xml_dialog,
-							       NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ICON_VIEW_ZOOM_WIDGET,						     
-							       NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL,
-							       (const char **) zoom_values);
-	eel_preferences_glade_connect_string_enum_option_menu (xml_dialog,
-							       NAUTILUS_FILE_MANAGEMENT_PROPERTIES_LIST_VIEW_ZOOM_WIDGET,
-							       NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL,
-							       (const char **) zoom_values);
-	eel_preferences_glade_connect_string_enum_option_menu (xml_dialog,
-							       NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SORT_ORDER_WIDGET,
-							       NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_ORDER,
-							       (const char **) sort_order_values);
-	eel_preferences_glade_connect_string_enum_option_menu_slave (xml_dialog,
-								     NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SORT_ORDER_WIDGET,
-								     NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_SORT_ORDER);
-	eel_preferences_glade_connect_string_enum_option_menu (xml_dialog,
-							       NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_TEXT_WIDGET,
-							       NAUTILUS_PREFERENCES_SHOW_TEXT_IN_ICONS,
-							       (const char **) preview_values);
-	eel_preferences_glade_connect_string_enum_option_menu (xml_dialog,
-							       NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_IMAGE_WIDGET,
-							       NAUTILUS_PREFERENCES_SHOW_IMAGE_FILE_THUMBNAILS,
-							       (const char **) preview_values);
-	eel_preferences_glade_connect_string_enum_option_menu (xml_dialog,
-							       NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_SOUND_WIDGET,
-							       NAUTILUS_PREFERENCES_PREVIEW_SOUND,
-							       (const char **) preview_values);
-	eel_preferences_glade_connect_string_enum_option_menu (xml_dialog,
-							       NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_FOLDER_WIDGET,
-							       NAUTILUS_PREFERENCES_SHOW_DIRECTORY_ITEM_COUNTS,
-							       (const char **) preview_values);
-	eel_preferences_glade_connect_string_enum_option_menu (xml_dialog,
-							       NAUTILUS_FILE_MANAGEMENT_PROPERTIES_DATE_FORMAT_WIDGET,
-							       NAUTILUS_PREFERENCES_DATE_FORMAT,
-							       (const char **) date_format_values);
+	eel_preferences_glade_connect_string_enum_combo_box (xml_dialog,
+							     NAUTILUS_FILE_MANAGEMENT_PROPERTIES_DEFAULT_VIEW_WIDGET,
+							     NAUTILUS_PREFERENCES_DEFAULT_FOLDER_VIEWER,
+							     (const char **) default_view_values);
+	eel_preferences_glade_connect_string_enum_combo_box (xml_dialog,
+							     NAUTILUS_FILE_MANAGEMENT_PROPERTIES_ICON_VIEW_ZOOM_WIDGET,						     
+							     NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL,
+							     (const char **) zoom_values);
+	eel_preferences_glade_connect_string_enum_combo_box (xml_dialog,
+							     NAUTILUS_FILE_MANAGEMENT_PROPERTIES_LIST_VIEW_ZOOM_WIDGET,
+							     NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL,
+							     (const char **) zoom_values);
+	eel_preferences_glade_connect_string_enum_combo_box (xml_dialog,
+							     NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SORT_ORDER_WIDGET,
+							     NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_ORDER,
+							     (const char **) sort_order_values);
+	eel_preferences_glade_connect_string_enum_combo_box_slave (xml_dialog,
+								   NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SORT_ORDER_WIDGET,
+								   NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_SORT_ORDER);
+	eel_preferences_glade_connect_string_enum_combo_box (xml_dialog,
+							     NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_TEXT_WIDGET,
+							     NAUTILUS_PREFERENCES_SHOW_TEXT_IN_ICONS,
+							     (const char **) preview_values);
+	eel_preferences_glade_connect_string_enum_combo_box (xml_dialog,
+							     NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_IMAGE_WIDGET,
+							     NAUTILUS_PREFERENCES_SHOW_IMAGE_FILE_THUMBNAILS,
+							     (const char **) preview_values);
+	eel_preferences_glade_connect_string_enum_combo_box (xml_dialog,
+							     NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_SOUND_WIDGET,
+							     NAUTILUS_PREFERENCES_PREVIEW_SOUND,
+							     (const char **) preview_values);
+	eel_preferences_glade_connect_string_enum_combo_box (xml_dialog,
+							     NAUTILUS_FILE_MANAGEMENT_PROPERTIES_PREVIEW_FOLDER_WIDGET,
+							     NAUTILUS_PREFERENCES_SHOW_DIRECTORY_ITEM_COUNTS,
+							     (const char **) preview_values);
+	eel_preferences_glade_connect_string_enum_combo_box (xml_dialog,
+							     NAUTILUS_FILE_MANAGEMENT_PROPERTIES_DATE_FORMAT_WIDGET,
+							     NAUTILUS_PREFERENCES_DATE_FORMAT,
+							     (const char **) date_format_values);
 
 	eel_preferences_glade_connect_string_enum_radio_button (xml_dialog,
 								(const char **) click_behavior_components,
@@ -667,7 +628,7 @@
 			  G_CALLBACK (nautilus_file_management_properties_dialog_response_cb),
 			  xml_dialog);
 
-	nautilus_file_management_properties_dialog_set_icons (GTK_WINDOW (dialog));
+	gtk_window_set_icon_name (GTK_WINDOW (dialog), "file-manager");
 
 	if (window) {
 		gtk_window_set_screen (GTK_WINDOW (dialog), gtk_window_get_screen(window));
Index: nautilus-file-management-properties.glade
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-file-management-properties.glade,v
retrieving revision 1.16
diff -u -r1.16 nautilus-file-management-properties.glade
--- nautilus-file-management-properties.glade	22 Nov 2005 15:20:03 -0000	1.16
+++ nautilus-file-management-properties.glade	26 Nov 2005 11:53:56 -0000
@@ -14,7 +14,7 @@
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
   <property name="urgency_hint">False</property>
@@ -133,7 +133,7 @@
 			  <property name="spacing">6</property>
 
 			  <child>
-			    <widget class="GtkHBox" id="hbox11">
+			    <widget class="GtkHBox" id="hbox34">
 			      <property name="visible">True</property>
 			      <property name="homogeneous">False</property>
 			      <property name="spacing">12</property>
@@ -151,7 +151,6 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
-				  <property name="mnemonic_widget">default_view_optionmenu</property>
 				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 				  <property name="width_chars">-1</property>
 				  <property name="single_line_mode">False</property>
@@ -165,31 +164,12 @@
 			      </child>
 
 			      <child>
-				<widget class="GtkOptionMenu" id="default_view_optionmenu">
+				<widget class="GtkComboBox" id="default_view_combobox">
 				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="history">0</property>
-
-				  <child>
-				    <widget class="GtkMenu" id="menu1">
-
-				      <child>
-					<widget class="GtkMenuItem" id="icon_view1">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">Icon View</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="list_view1">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">List View</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-				    </widget>
-				  </child>
+				  <property name="items" translatable="yes">Icon View
+List View</property>
+				  <property name="add_tearoffs">False</property>
+				  <property name="focus_on_click">True</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -206,7 +186,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkHBox" id="hbox17">
+			    <widget class="GtkHBox" id="hbox11">
 			      <property name="visible">True</property>
 			      <property name="homogeneous">False</property>
 			      <property name="spacing">12</property>
@@ -224,7 +204,6 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
-				  <property name="mnemonic_widget">sort_order_optionmenu</property>
 				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 				  <property name="width_chars">-1</property>
 				  <property name="single_line_mode">False</property>
@@ -238,55 +217,15 @@
 			      </child>
 
 			      <child>
-				<widget class="GtkOptionMenu" id="sort_order_optionmenu">
+				<widget class="GtkComboBox" id="sort_order_combobox">
 				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="history">0</property>
-
-				  <child>
-				    <widget class="GtkMenu" id="menu4">
-
-				      <child>
-					<widget class="GtkMenuItem" id="by_name2">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">By Name</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="by_size2">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">By Size</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="by_type2">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">By Type</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="by_modification_date2">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">By Modification Date</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="by_emblems2">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">By Emblems</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-				    </widget>
-				  </child>
+				  <property name="items" translatable="yes">By Name
+By Size
+By Type
+By Modification Date
+By Emblems</property>
+				  <property name="add_tearoffs">False</property>
+				  <property name="focus_on_click">True</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -406,7 +345,7 @@
 			  <property name="spacing">6</property>
 
 			  <child>
-			    <widget class="GtkHBox" id="hbox13">
+			    <widget class="GtkHBox" id="hbox35">
 			      <property name="visible">True</property>
 			      <property name="homogeneous">False</property>
 			      <property name="spacing">12</property>
@@ -424,7 +363,6 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
-				  <property name="mnemonic_widget">iconview_zoom_optionmenu</property>
 				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 				  <property name="width_chars">-1</property>
 				  <property name="single_line_mode">False</property>
@@ -438,71 +376,17 @@
 			      </child>
 
 			      <child>
-				<widget class="GtkOptionMenu" id="iconview_zoom_optionmenu">
+				<widget class="GtkComboBox" id="icon_view_zoom_combobox">
 				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="history">0</property>
-
-				  <child>
-				    <widget class="GtkMenu" id="menu3">
-
-				      <child>
-					<widget class="GtkMenuItem" id="25%1">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">25%</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="50%1">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">50%</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="75%1">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">75%</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="100%1">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">100%</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="150%1">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">150%</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="200%1">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">200%</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="400%1">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">400%</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-				    </widget>
-				  </child>
+				  <property name="items" translatable="yes">25%
+50%
+75%
+100%
+150%
+200%
+400%</property>
+				  <property name="add_tearoffs">False</property>
+				  <property name="focus_on_click">True</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -622,7 +506,7 @@
 			  <property name="spacing">6</property>
 
 			  <child>
-			    <widget class="GtkHBox" id="hbox18">
+			    <widget class="GtkHBox" id="hbox36">
 			      <property name="visible">True</property>
 			      <property name="homogeneous">False</property>
 			      <property name="spacing">12</property>
@@ -640,7 +524,6 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
-				  <property name="mnemonic_widget">listview_zoom_optionmenu</property>
 				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 				  <property name="width_chars">-1</property>
 				  <property name="single_line_mode">False</property>
@@ -654,71 +537,17 @@
 			      </child>
 
 			      <child>
-				<widget class="GtkOptionMenu" id="listview_zoom_optionmenu">
+				<widget class="GtkComboBox" id="list_view_zoom_combobox">
 				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="history">0</property>
-
-				  <child>
-				    <widget class="GtkMenu" id="menu5">
-
-				      <child>
-					<widget class="GtkMenuItem" id="25%2">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">25%</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="50%2">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">50%</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="75%2">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">75%</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="100%2">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">100%</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="150%2">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">150%</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="200%2">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">200%</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="400%2">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">400%</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-				    </widget>
-				  </child>
+				  <property name="items" translatable="yes">25%
+50%
+75%
+100%
+150%
+200%
+400%</property>
+				  <property name="add_tearoffs">False</property>
+				  <property name="focus_on_click">True</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -1362,95 +1191,11 @@
 			      </child>
 
 			      <child>
-				<widget class="GtkOptionMenu" id="captions_0_optionmenu">
+				<widget class="GtkComboBox" id="captions_0_combobox">
 				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="history">0</property>
-
-				  <child>
-				    <widget class="GtkMenu" id="menu14">
-
-				      <child>
-					<widget class="GtkMenuItem" id="size3">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">size</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="type3">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">type</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="date_modified3">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">date modified</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="date_accessed3">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">date accessed</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="owner3">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">owner</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="group3">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">group</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="permissions3">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">permissions</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="octal_permissions3">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">octal permissions</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="mime_type3">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">MIME type</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="none3">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">none</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-				    </widget>
-				  </child>
+				  <property name="items" translatable="yes"></property>
+				  <property name="add_tearoffs">False</property>
+				  <property name="focus_on_click">True</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -1485,7 +1230,6 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
-				  <property name="mnemonic_widget">captions_1_optionmenu</property>
 				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 				  <property name="width_chars">-1</property>
 				  <property name="single_line_mode">False</property>
@@ -1499,95 +1243,11 @@
 			      </child>
 
 			      <child>
-				<widget class="GtkOptionMenu" id="captions_1_optionmenu">
+				<widget class="GtkComboBox" id="captions_1_combobox">
 				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="history">0</property>
-
-				  <child>
-				    <widget class="GtkMenu" id="menu15">
-
-				      <child>
-					<widget class="GtkMenuItem" id="menuitem7">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">size</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="menuitem8">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">type</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="menuitem9">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">date modified</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="menuitem10">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">date accessed</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="menuitem11">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">owner</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="menuitem12">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">group</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="menuitem13">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">permissions</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="menuitem14">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">octal permissions</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="menuitem15">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">MIME type</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="menuitem16">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">none</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-				    </widget>
-				  </child>
+				  <property name="items" translatable="yes"></property>
+				  <property name="add_tearoffs">False</property>
+				  <property name="focus_on_click">True</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -1635,95 +1295,11 @@
 			      </child>
 
 			      <child>
-				<widget class="GtkOptionMenu" id="captions_2_optionmenu">
+				<widget class="GtkComboBox" id="captions_2_combobox">
 				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="history">0</property>
-
-				  <child>
-				    <widget class="GtkMenu" id="menu16">
-
-				      <child>
-					<widget class="GtkMenuItem" id="menuitem17">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">size</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="menuitem18">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">type</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="menuitem19">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">date modified</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="menuitem20">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">date accessed</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="menuitem21">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">owner</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="menuitem22">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">group</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="menuitem23">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">permissions</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="menuitem24">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">octal permissions</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="menuitem25">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">MIME type</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="menuitem26">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">none</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-				    </widget>
-				  </child>
+				  <property name="items" translatable="yes"></property>
+				  <property name="add_tearoffs">False</property>
+				  <property name="focus_on_click">True</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -1817,7 +1393,6 @@
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">date_format_optionmenu</property>
 			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 			      <property name="width_chars">-1</property>
 			      <property name="single_line_mode">False</property>
@@ -1831,39 +1406,11 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkOptionMenu" id="date_format_optionmenu">
+			    <widget class="GtkComboBox" id="date_format_combobox">
 			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="history">0</property>
-
-			      <child>
-				<widget class="GtkMenu" id="menu17">
-
-				  <child>
-				    <widget class="GtkMenuItem" id="locale1">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">locale</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="iso1">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">iso</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-
-				  <child>
-				    <widget class="GtkMenuItem" id="informal1">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">informal</property>
-				      <property name="use_underline">True</property>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
+			      <property name="items" translatable="yes"></property>
+			      <property name="add_tearoffs">False</property>
+			      <property name="focus_on_click">True</property>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -2146,7 +1693,6 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
-				  <property name="mnemonic_widget">preview_text_optionmenu</property>
 				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 				  <property name="width_chars">-1</property>
 				  <property name="single_line_mode">False</property>
@@ -2160,39 +1706,13 @@
 			      </child>
 
 			      <child>
-				<widget class="GtkOptionMenu" id="preview_text_optionmenu">
+				<widget class="GtkComboBox" id="preview_text_combobox">
 				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="history">0</property>
-
-				  <child>
-				    <widget class="GtkMenu" id="menu9">
-
-				      <child>
-					<widget class="GtkMenuItem" id="always1">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">Always</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="local_files_only1">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">Local Files Only</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="never1">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">Never</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-				    </widget>
-				  </child>
+				  <property name="items" translatable="yes">Always
+Local Files Only
+Never</property>
+				  <property name="add_tearoffs">False</property>
+				  <property name="focus_on_click">True</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -2292,7 +1812,6 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
-				  <property name="mnemonic_widget">preview_image_optionmenu</property>
 				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 				  <property name="width_chars">-1</property>
 				  <property name="single_line_mode">False</property>
@@ -2306,39 +1825,13 @@
 			      </child>
 
 			      <child>
-				<widget class="GtkOptionMenu" id="preview_image_optionmenu">
+				<widget class="GtkComboBox" id="preview_image_combobox">
 				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="history">0</property>
-
-				  <child>
-				    <widget class="GtkMenu" id="menu10">
-
-				      <child>
-					<widget class="GtkMenuItem" id="always2">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">Always</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="local_files_only2">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">Local Files Only</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="never2">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">Never</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-				    </widget>
-				  </child>
+				  <property name="items" translatable="yes">Always
+Local Files Only
+Never</property>
+				  <property name="add_tearoffs">False</property>
+				  <property name="focus_on_click">True</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -2373,7 +1866,6 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
-				  <property name="mnemonic_widget">preview_image_size_optionmenu</property>
 				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 				  <property name="width_chars">-1</property>
 				  <property name="single_line_mode">False</property>
@@ -2387,79 +1879,18 @@
 			      </child>
 
 			      <child>
-				<widget class="GtkOptionMenu" id="preview_image_size_optionmenu">
+				<widget class="GtkComboBox" id="preview_image_size_combobox">
 				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="history">0</property>
-
-				  <child>
-				    <widget class="GtkMenu" id="menu11">
-
-				      <child>
-					<widget class="GtkMenuItem" id="100_k1">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">100 KB</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="500_k1">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">500 KB</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="1_mb1">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">1 MB</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="3_mb1">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">3 MB</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="5_mb1">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">5 MB</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="10_mb1">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">10 MB</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="100_mb1">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">100 MB</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="1_gb1">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">1 GB</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-				    </widget>
-				  </child>
+				  <property name="items" translatable="yes">100 KB
+500 KB
+1 MB
+3 MB
+5 MB
+10 MB
+100 MB
+1 GB</property>
+				  <property name="add_tearoffs">False</property>
+				  <property name="focus_on_click">True</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -2559,7 +1990,6 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
-				  <property name="mnemonic_widget">preview_sound_optionmenu</property>
 				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 				  <property name="width_chars">-1</property>
 				  <property name="single_line_mode">False</property>
@@ -2573,39 +2003,13 @@
 			      </child>
 
 			      <child>
-				<widget class="GtkOptionMenu" id="preview_sound_optionmenu">
+				<widget class="GtkComboBox" id="preview_sound_combobox">
 				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="history">0</property>
-
-				  <child>
-				    <widget class="GtkMenu" id="menu12">
-
-				      <child>
-					<widget class="GtkMenuItem" id="always3">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">Always</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="local_files_only3">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">Local Files Only</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="never3">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">Never</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-				    </widget>
-				  </child>
+				  <property name="items" translatable="yes">Always
+Local Files Only
+Never</property>
+				  <property name="add_tearoffs">False</property>
+				  <property name="focus_on_click">True</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -2705,7 +2109,6 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
-				  <property name="mnemonic_widget">preview_folder_optionmenu</property>
 				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 				  <property name="width_chars">-1</property>
 				  <property name="single_line_mode">False</property>
@@ -2719,39 +2122,13 @@
 			      </child>
 
 			      <child>
-				<widget class="GtkOptionMenu" id="preview_folder_optionmenu">
+				<widget class="GtkComboBox" id="preview_folder_combobox">
 				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="history">0</property>
-
-				  <child>
-				    <widget class="GtkMenu" id="menu13">
-
-				      <child>
-					<widget class="GtkMenuItem" id="always4">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">Always</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="local_files_only4">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">Local Files Only</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkMenuItem" id="never4">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">Never</property>
-					  <property name="use_underline">True</property>
-					</widget>
-				      </child>
-				    </widget>
-				  </child>
+				  <property name="items" translatable="yes">Always
+Local Files Only
+Never</property>
+				  <property name="add_tearoffs">False</property>
+				  <property name="focus_on_click">True</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
