diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2002-03-16 06:51:13 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2002-03-16 06:51:13 +0800 |
| commit | c85ad2279bcfc8e85e6c6b5824e851da92173582 (patch) | |
| tree | c0e77b54e2ed6a5fece1ff5469f7bd048636a329 /calendar/gui/tasks-control.c | |
| parent | 95c4e2623b6f22473ee4a304d485400728ed8b09 (diff) | |
| download | gsoc2013-evolution-c85ad2279bcfc8e85e6c6b5824e851da92173582.tar.gz 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 'calendar/gui/tasks-control.c')
| -rw-r--r-- | calendar/gui/tasks-control.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c index 6ae2a45565..53e3eb239f 100644 --- a/calendar/gui/tasks-control.c +++ b/calendar/gui/tasks-control.c @@ -101,7 +101,7 @@ static void tasks_control_print_preview_cmd (BonoboUIComponent *uic, BonoboControl * -tasks_control_new (void) +tasks_control_new (void) { BonoboControl *control; GtkWidget *tasks; @@ -109,11 +109,11 @@ tasks_control_new (void) tasks = e_tasks_new (); if (!tasks) return NULL; - gtk_widget_show (tasks); control = bonobo_control_new (tasks); if (!control) { + gtk_widget_destroy (tasks); g_message ("control_factory_fn(): could not create the control!"); return NULL; } @@ -303,6 +303,8 @@ tasks_control_activate (BonoboControl *control, ETasks *tasks) uic = bonobo_control_get_ui_component (control); g_assert (uic != NULL); + e_tasks_set_ui_component (tasks, uic); + remote_uih = bonobo_control_get_remote_ui_container (control); bonobo_ui_component_set_container (uic, remote_uih); bonobo_object_release_unref (remote_uih, NULL); @@ -347,8 +349,11 @@ static void tasks_control_deactivate (BonoboControl *control, ETasks *tasks) { BonoboUIComponent *uic = bonobo_control_get_ui_component (control); + g_assert (uic != NULL); + e_tasks_set_ui_component (tasks, NULL); + e_tasks_discard_view_menus (tasks); /* Stop monitoring the "selection_changed" signal */ |