[gthumb] Use GtkComboBox instead of GtkOptionMenu for search, bug 575017

[Michael J. Chudobiak <mjc src gnome org>]

commit 6383d4b989689d5a47561a3e70406b2c5f425959
Author: Lincoln de Sousa <lincoln alfaiati net>
Date:   Thu May 28 12:38:22 2009 -0400

    Use GtkComboBox instead of GtkOptionMenu for search, bug 575017
---
 data/glade/gthumb_search.glade |   50 +++++----------------------------------
 src/dlg-search.c               |   17 ++++++++----
 2 files changed, 18 insertions(+), 49 deletions(-)

diff --git a/data/glade/gthumb_search.glade b/data/glade/gthumb_search.glade
index a377e42..addbb84 100644
--- a/data/glade/gthumb_search.glade
+++ b/data/glade/gthumb_search.glade
@@ -473,49 +473,13 @@
 		  <property name="spacing">5</property>
 
 		  <child>
-		    <widget class="GtkOptionMenu" id="s_date_optionmenu">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="history">0</property>
-
-		      <child internal-child="menu">
-			<widget class="GtkMenu" id="convertwidget1">
-			  <property name="visible">True</property>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="convertwidget2">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Any</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="convertwidget3">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Before</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="convertwidget4">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Equal to</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkMenuItem" id="convertwidget5">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">After</property>
-			      <property name="use_underline">True</property>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
+                    <widget class="GtkComboBox" id="s_date_optionmenu">
+                      <property name="visible">True</property>
+                      <property name="items" translatable="yes">Any
+Before
+Equal to
+After</property>
+                    </widget>
 		    <packing>
 		      <property name="padding">0</property>
 		      <property name="expand">False</property>
diff --git a/src/dlg-search.c b/src/dlg-search.c
index 042a591..ab05b28 100644
--- a/src/dlg-search.c
+++ b/src/dlg-search.c
@@ -308,7 +308,7 @@ search_clicked_cb (GtkWidget  *widget,
 
 	/* * date scope pattern */
 
-	search_data_set_date_scope (data->search_data, gtk_option_menu_get_history (GTK_OPTION_MENU (data->s_date_optionmenu)));
+	search_data_set_date_scope (data->search_data, gtk_combo_box_get_active (GTK_COMBO_BOX (data->s_date_optionmenu)));
 
 	/* * date */
 
@@ -489,10 +489,10 @@ choose_tags_cb (GtkWidget  *widget,
 
 
 static void
-date_option_changed_cb (GtkOptionMenu *option_menu,
+date_option_changed_cb (GtkComboBox   *option_menu,
 			DialogData    *data)
 {
-	gtk_widget_set_sensitive (data->s_date_dateedit, gtk_option_menu_get_history (option_menu) != 0);
+	gtk_widget_set_sensitive (data->s_date_dateedit, gtk_combo_box_get_active (option_menu) != 0);
 }
 
 
@@ -574,6 +574,11 @@ dlg_search_ui (GthBrowser *browser,
 
 	data->s_choose_tags_button = glade_xml_get_widget (data->gui, "s_choose_tags_button");
 	data->s_date_optionmenu = glade_xml_get_widget (data->gui, "s_date_optionmenu");
+
+	/* Forcing date scope start with its first option (Any) selected */
+	gtk_combo_box_set_active (GTK_COMBO_BOX (data->s_date_optionmenu),
+				  0);
+
 	data->s_date_dateedit = glade_xml_get_widget (data->gui, "s_date_dateedit");
 
 	if (catalog_path == NULL) {
@@ -653,8 +658,8 @@ dlg_search_ui (GthBrowser *browser,
 		gtk_entry_set_text (GTK_ENTRY (data->s_tags_entry),
 				    search_data->keywords_pattern);
 
-		gtk_option_menu_set_history (GTK_OPTION_MENU (data->s_date_optionmenu),
-					     search_data->date_scope);
+		gtk_combo_box_set_active (GTK_COMBO_BOX (data->s_date_optionmenu),
+					  search_data->date_scope);
 		gnome_date_edit_set_time (GNOME_DATE_EDIT (data->s_date_dateedit),
 					  search_data->date);
 
@@ -663,7 +668,7 @@ dlg_search_ui (GthBrowser *browser,
 
 	/**/
 
-	gtk_widget_set_sensitive (data->s_date_dateedit, gtk_option_menu_get_history (GTK_OPTION_MENU (data->s_date_optionmenu)) != 0);
+	gtk_widget_set_sensitive (data->s_date_dateedit, gtk_combo_box_get_active (GTK_COMBO_BOX (data->s_date_optionmenu)) != 0);
 
 	/* Set the signals handlers. */