[Start implementing the new Search Bar design.]

* e-search-bar.c (init): Init various members to NULL.
(set_dropdown): Removed.
(add_dropdown): Removed.
(set_menu): New.
(add_menu_items): New.
(set_option): No need to setup the dropdown size here anymore.
(verb_cb): Function implementing the search menu verbs.
(update_bonobo_menus): New.
(e_search_bar_set_ui_component): New.

* e-search-bar.h: Remove the dropdown button stuff from struct
ESearchBar.  Add `uic' and `items' members.

* e-filter-bar.c (e_filter_bar_new): Get a @uic arg.

* folder-browser-factory.c (control_activate): Set the UI
component on the search bar.

* gui/tasks-control.c (tasks_control_activate): Call
`e_tasks_set_ui_component()' here to give it the
BonoboUIComponent.
(tasks_control_deactivate): Likewise, call it here to unset the
BonoboUIComponent.

* gui/e-tasks.c (e_tasks_set_ui_component): New.

* gui/calendar-commands.c (calendar_control_activate): Call
gnome_calendar_set_ui_component() here.
(calendar_control_deactivate): ...And here, with a NULL
BonoboUIComponent.

* gui/gnome-cal.c (gnome_calendar_set_ui_component): New.

* gui/component/addressbook.c (control_activate): Call
`e_search_bar_set_ui_component()' to set the BonoboUIComponent for
the search bar.

* gui/component/GNOME_Evolution_Addressbook.oaf.in: Add an icon
for the LDAP sources configuration control.

svn path=/trunk/; revision=16178

1 files changed, 45 insertions, 27 deletions

diff --git a/widgets/misc/e-search-bar.h b/widgets/misc/e-search-bar.h
index 0787a332da..18c4b370c1 100644
--- a/widgets/misc/e-search-bar.h
+++ b/widgets/misc/e-search-bar.h
@@ -22,6 +22,8 @@
 
 #include <gtk/gtkhbox.h>
 
+#include <bonobo/bonobo-ui-component.h>
+
 #ifdef __cplusplus
 extern "C" {
 #pragma }
@@ -62,14 +64,16 @@ typedef struct _ESearchBarClass  ESearchBarClass;
 struct _ESearchBar
 {
 	GtkHBox parent;
+
+	BonoboUIComponent *ui_component;
+
+	GSList *menu_items;
 	
 	/* item specific fields */
-	GtkWidget *dropdown;
 	GtkWidget *option;
 	GtkWidget *entry;
 	GtkWidget *suboption; /* an option menu for the choices associated with some options */
 	
-
 	/* PRIVATE */
 	GtkWidget *dropdown_holder;	/* holds the dropdown */
 	GtkWidget *option_menu;
@@ -99,31 +103,45 @@ struct _ESearchBarClass
 
 
 GtkType    e_search_bar_get_type   (void);
-void       e_search_bar_set_menu   (ESearchBar *search_bar, ESearchBarItem *menu_items);
-void	   e_search_bar_add_menu   (ESearchBar *search_bar, ESearchBarItem *menu_item);
-
-void       e_search_bar_set_option (ESearchBar *search_bar, ESearchBarItem *option_items);
-void       e_search_bar_set_suboption (ESearchBar *search_bar, int option_id,
-				       ESearchBarSubitem *subitems);
-
-void       e_search_bar_construct  (ESearchBar     *search_bar,
-				    ESearchBarItem *menu_items,
-				    ESearchBarItem *option_items);
-GtkWidget *e_search_bar_new        (ESearchBarItem *menu_items,
-				    ESearchBarItem *option_items);
-
-void       e_search_bar_set_menu_sensitive(ESearchBar *search_bar, int id, gboolean state);
-
-void       e_search_bar_set_item_id    (ESearchBar *search_bar, int id);
-int        e_search_bar_get_item_id    (ESearchBar *search_bar);
-
-void       e_search_bar_set_subitem_id (ESearchBar *search_bar, int id);
-int        e_search_bar_get_subitem_id (ESearchBar *search_bar);
-
-void       e_search_bar_set_ids (ESearchBar *search_bar, int item_id, int subitem_id);
-
-void       e_search_bar_set_text             (ESearchBar *search_bar, const char *text);
-char      *e_search_bar_get_text             (ESearchBar *search_bar);
+void       e_search_bar_construct  (ESearchBar        *search_bar,
+				    ESearchBarItem    *menu_items,
+				    ESearchBarItem    *option_items);
+GtkWidget *e_search_bar_new        (ESearchBarItem    *menu_items,
+				    ESearchBarItem    *option_items);
+
+void  e_search_bar_set_ui_component  (ESearchBar        *search_bar,
+				      BonoboUIComponent *ui_component);
+
+void  e_search_bar_set_menu  (ESearchBar     *search_bar,
+			      ESearchBarItem *menu_items);
+void  e_search_bar_add_menu  (ESearchBar     *search_bar,
+			      ESearchBarItem *menu_item);
+
+void  e_search_bar_set_option     (ESearchBar        *search_bar,
+				   ESearchBarItem    *option_items);
+void  e_search_bar_set_suboption  (ESearchBar        *search_bar,
+				   int                option_id,
+				   ESearchBarSubitem *subitems);
+
+void  e_search_bar_set_menu_sensitive  (ESearchBar *search_bar,
+					int         id,
+					gboolean    state);
+
+void  e_search_bar_set_item_id  (ESearchBar *search_bar,
+				 int         id);
+int   e_search_bar_get_item_id  (ESearchBar *search_bar);
+
+void  e_search_bar_set_subitem_id  (ESearchBar *search_bar,
+				    int         id);
+int   e_search_bar_get_subitem_id  (ESearchBar *search_bar);
+
+void  e_search_bar_set_ids  (ESearchBar *search_bar,
+			     int         item_id,
+			     int         subitem_id);
+
+void  e_search_bar_set_text  (ESearchBar *search_bar,
+			      const char *text);
+char *e_search_bar_get_text  (ESearchBar *search_bar);
 
 #ifdef __cplusplus
 }