From cc5c75e9f1153fa90e6d4cf566dd80bb26af9ee9 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Wed, 30 May 2001 01:11:00 +0000 Subject: New function. 2001-05-29 Federico Mena Quintero * gui/e-tasks.c (e_tasks_get_calendar_table): New function. * gui/tasks-control.c (tasks_control_activate): Connect to the "selection_changed" signal of the tasks widget here, not in tasks_control_new(). Also, update the sensitivity of the commands here for the first time. (tasks_control_deactivate): Disconnect from the signal here since it only makes sense to monitor selection changes while the control is active. (selection_changed_cb): Removed hack that tested the presence of the remote UI container. (sensitize_commands): New function. svn path=/trunk/; revision=10049 --- calendar/ChangeLog | 17 +++++++-- calendar/gui/e-tasks.c | 21 +++++++++++- calendar/gui/e-tasks.h | 3 ++ calendar/gui/gnome-cal.h | 5 +-- calendar/gui/tasks-control.c | 82 +++++++++++++++++++++++++++----------------- 5 files changed, 90 insertions(+), 38 deletions(-) diff --git a/calendar/ChangeLog b/calendar/ChangeLog index de14638714..7ae1a97da8 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,18 @@ +2001-05-29 Federico Mena Quintero + + * gui/e-tasks.c (e_tasks_get_calendar_table): New function. + + * gui/tasks-control.c (tasks_control_activate): Connect to the + "selection_changed" signal of the tasks widget here, not in + tasks_control_new(). Also, update the sensitivity of the commands + here for the first time. + (tasks_control_deactivate): Disconnect from the signal here since + it only makes sense to monitor selection changes while the control + is active. + (selection_changed_cb): Removed hack that tested the presence of + the remote UI container. + (sensitize_commands): New function. + 2001-05-28 Damon Chaplin * gui/e-week-view-layout.[hc]: @@ -42,8 +57,6 @@ event-editor.c. Made it store a clone of the component for when we need to expand the recurrence set. -2001-05-22 Federico Mena Quintero - * gui/dialogs/event-page.c (event_page_get_dates): New function. * gui/dialogs/editor-page.c (editor_page_set_dates): Renamed from diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c index 1686ac793a..609e2551c1 100644 --- a/calendar/gui/e-tasks.c +++ b/calendar/gui/e-tasks.c @@ -32,7 +32,6 @@ #include "widgets/menus/gal-view-menus.h" #include "dialogs/task-editor.h" #include "calendar-config.h" -#include "e-calendar-table.h" #include "calendar-config.h" #include "component-factory.h" @@ -635,6 +634,26 @@ e_tasks_setup_menus (ETasks *tasks, gtk_object_sink (GTK_OBJECT (collection)); } +/** + * e_tasks_get_calendar_table: + * @tasks: A tasks widget. + * + * Queries the #ECalendarTable contained in a tasks widget. + * + * Return value: The #ECalendarTable that the tasks widget uses to display its + * information. + **/ +ECalendarTable * +e_tasks_get_calendar_table (ETasks *tasks) +{ + ETasksPrivate *priv; + + g_return_val_if_fail (tasks != NULL, NULL); + g_return_val_if_fail (E_IS_TASKS (tasks), NULL); + + priv = tasks->priv; + return E_CALENDAR_TABLE (priv->tasks_view); +} /* This updates all the preference settings for all the ETasks widgets in use. */ diff --git a/calendar/gui/e-tasks.h b/calendar/gui/e-tasks.h index ed6fd8199f..63ec5df5e9 100644 --- a/calendar/gui/e-tasks.h +++ b/calendar/gui/e-tasks.h @@ -28,6 +28,7 @@ #include #include +#include "e-calendar-table.h" #define E_TYPE_TASKS (e_tasks_get_type ()) #define E_TASKS(obj) (GTK_CHECK_CAST ((obj), E_TYPE_TASKS, ETasks)) @@ -71,6 +72,8 @@ void e_tasks_delete_selected (ETasks *tasks); void e_tasks_setup_menus (ETasks *tasks, BonoboUIComponent *uic); +ECalendarTable *e_tasks_get_calendar_table (ETasks *tasks); + /* This updates all the preference settings for all the ETasks widgets in use. */ diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h index b9b5cd42a3..dbda38c593 100644 --- a/calendar/gui/gnome-cal.h +++ b/calendar/gui/gnome-cal.h @@ -68,10 +68,7 @@ CalClient *gnome_calendar_get_cal_client (GnomeCalendar *gcal); CalClient *gnome_calendar_get_task_pad_cal_client(GnomeCalendar *gcal); gboolean gnome_calendar_open (GnomeCalendar *gcal, const char *str_uri); -/* -int gnome_calendar_create (GnomeCalendar *gcal, - char *file); -*/ + void gnome_calendar_next (GnomeCalendar *gcal); void gnome_calendar_previous (GnomeCalendar *gcal); void gnome_calendar_goto (GnomeCalendar *gcal, diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c index 281846977b..e460e5fe00 100644 --- a/calendar/gui/tasks-control.c +++ b/calendar/gui/tasks-control.c @@ -54,7 +54,8 @@ static void tasks_control_activate_cb (BonoboControl *control, gpointer user_data); static void tasks_control_activate (BonoboControl *control, ETasks *tasks); -static void tasks_control_deactivate (BonoboControl *control); +static void tasks_control_deactivate (BonoboControl *control, + ETasks *tasks); static void tasks_control_new_task_cmd (BonoboUIComponent *uic, gpointer data, @@ -64,28 +65,6 @@ static void tasks_control_delete_cmd (BonoboUIComponent *uic, const char *path); -/* Callback used when the selection in the table changes */ -static void -selection_changed_cb (ETasks *tasks, int n_selected, gpointer data) -{ - BonoboControl *control; - BonoboUIComponent *uic; - Bonobo_UIContainer ui_container; - - control = BONOBO_CONTROL (data); - - uic = bonobo_control_get_ui_component (control); - g_assert (uic != NULL); - - ui_container = bonobo_ui_component_get_container (uic); - if (ui_container == CORBA_OBJECT_NIL) - return; - - bonobo_ui_component_set_prop (uic, "/commands/TasksDelete", "sensitive", - n_selected == 0 ? "0" : "1", - NULL); -} - BonoboControl * tasks_control_new (void) { @@ -110,9 +89,6 @@ tasks_control_new (void) GTK_SIGNAL_FUNC (tasks_control_activate_cb), tasks); - gtk_signal_connect (GTK_OBJECT (tasks), "selection_changed", - GTK_SIGNAL_FUNC (selection_changed_cb), control); - return control; } @@ -199,12 +175,42 @@ tasks_control_activate_cb (BonoboControl *control, gboolean activate, gpointer user_data) { + ETasks *tasks; + + tasks = E_TASKS (user_data); + if (activate) - tasks_control_activate (control, user_data); + tasks_control_activate (control, tasks); else - tasks_control_deactivate (control); + tasks_control_deactivate (control, tasks); +} + +/* Sensitizes the UI Component menu/toolbar commands based on the number of + * selected tasks. + */ +static void +sensitize_commands (ETasks *tasks, BonoboControl *control, int n_selected) +{ + BonoboUIComponent *uic; + + uic = bonobo_control_get_ui_component (control); + g_assert (uic != NULL); + + bonobo_ui_component_set_prop (uic, "/commands/TasksDelete", "sensitive", + n_selected == 0 ? "0" : "1", + NULL); } +/* Callback used when the selection in the table changes */ +static void +selection_changed_cb (ETasks *tasks, int n_selected, gpointer data) +{ + BonoboControl *control; + + control = BONOBO_CONTROL (data); + + sensitize_commands (tasks, control, n_selected); +} static BonoboUIVerb verbs [] = { BONOBO_UI_VERB ("TasksNewTask", tasks_control_new_task_cmd), @@ -220,11 +226,13 @@ static EPixmap pixmaps [] = { }; static void -tasks_control_activate (BonoboControl *control, - ETasks *tasks) +tasks_control_activate (BonoboControl *control, ETasks *tasks) { Bonobo_UIContainer remote_uih; BonoboUIComponent *uic; + int n_selected; + ECalendarTable *cal_table; + ETable *etable; uic = bonobo_control_get_ui_component (control); g_assert (uic != NULL); @@ -245,16 +253,28 @@ tasks_control_activate (BonoboControl *control, e_pixmaps_update (uic, pixmaps); + gtk_signal_connect (GTK_OBJECT (tasks), "selection_changed", + GTK_SIGNAL_FUNC (selection_changed_cb), control); + + cal_table = e_tasks_get_calendar_table (tasks); + etable = e_calendar_table_get_table (cal_table); + n_selected = e_table_selected_count (etable); + + sensitize_commands (tasks, control, n_selected); + bonobo_ui_component_thaw (uic, NULL); } static void -tasks_control_deactivate (BonoboControl *control) +tasks_control_deactivate (BonoboControl *control, ETasks *tasks) { BonoboUIComponent *uic = bonobo_control_get_ui_component (control); g_assert (uic != NULL); + /* Stop monitoring the "selection_changed" signal */ + gtk_signal_disconnect_by_data (GTK_OBJECT (tasks), control); + bonobo_ui_component_rm (uic, "/", NULL); bonobo_ui_component_unset_container (uic); } -- cgit v1.2.3