aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-03-16 06:51:13 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-03-16 06:51:13 +0800
commitc85ad2279bcfc8e85e6c6b5824e851da92173582 (patch)
treec0e77b54e2ed6a5fece1ff5469f7bd048636a329 /mail
parent95c4e2623b6f22473ee4a304d485400728ed8b09 (diff)
downloadgsoc2013-evolution-c85ad2279bcfc8e85e6c6b5824e851da92173582.tar
gsoc2013-evolution-c85ad2279bcfc8e85e6c6b5824e851da92173582.tar.gz
gsoc2013-evolution-c85ad2279bcfc8e85e6c6b5824e851da92173582.tar.bz2
gsoc2013-evolution-c85ad2279bcfc8e85e6c6b5824e851da92173582.tar.lz
gsoc2013-evolution-c85ad2279bcfc8e85e6c6b5824e851da92173582.tar.xz
gsoc2013-evolution-c85ad2279bcfc8e85e6c6b5824e851da92173582.tar.zst
gsoc2013-evolution-c85ad2279bcfc8e85e6c6b5824e851da92173582.zip
[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
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/folder-browser-factory.c4
2 files changed, 10 insertions, 0 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index ca252f840b..73fdb90ed4 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-15 Ettore Perazzoli <ettore@ximian.com>
+
+ * folder-browser-factory.c (control_activate): Set the UI
+ component on the search bar.
+
2002-03-14 Dan Winship <danw@ximian.com>
* component-factory.c (folder_types): Remove "mailstorage", since
@@ -38,6 +43,7 @@
default size of the window, so we don't get this itty-bitty window
the size of a quarter on the screen when it first gets shown.
+>>>>>>> 1.2080
2002-03-12 Jeffrey Stedfast <fejj@ximian.com>
* mail-display.c (on_link_clicked): Handle digest: urls.
diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index 52f39a8218..395dc26ae8 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -99,6 +99,8 @@ control_activate (BonoboControl *control,
if (fb->folder)
mail_refresh_folder (fb->folder, NULL, NULL);
+
+ e_search_bar_set_ui_component (E_SEARCH_BAR (fb->search), uic);
}
static void
@@ -118,6 +120,8 @@ control_deactivate (BonoboControl *control,
folder_browser_set_ui_component (fb, NULL);
folder_browser_set_shell_view (fb, CORBA_OBJECT_NIL);
+
+ e_search_bar_set_ui_component (E_SEARCH_BAR (fb->search), NULL);
}
static void