From 90d4156ad06c297cb0030c5d3def03c771a5a78f Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 4 Nov 2008 15:39:10 +0000 Subject: ** Fix for bug #558354 2008-11-04 Milan Crha ** Fix for bug #558354 * gui/alarm-notify/alarm-notify.glade: * gui/alarm-notify/alarm-notify-dialog.h: (enum AlarmNotifyResult): * gui/alarm-notify/alarm-notify-dialog.c: (struct AlarmNotify), (dismiss_pressed_cb), (notified_alarms_dialog_new): * gui/alarm-notify/alarm-queue.c: (notify_dialog_cb): Changed "Close" button to "Dismiss All" and added a "Dismiss" button to the alarm notification dialog to be able to dismiss only some of the alarms shown in the dialog. svn path=/trunk/; revision=36740 --- calendar/ChangeLog | 13 +++ calendar/gui/alarm-notify/alarm-notify-dialog.c | 28 ++++- calendar/gui/alarm-notify/alarm-notify-dialog.h | 3 +- calendar/gui/alarm-notify/alarm-notify.glade | 144 +++++++++++++++++++++++- calendar/gui/alarm-notify/alarm-queue.c | 9 +- 5 files changed, 192 insertions(+), 5 deletions(-) (limited to 'calendar') diff --git a/calendar/ChangeLog b/calendar/ChangeLog index b335913d39..b48ea70b2f 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,16 @@ +2008-11-04 Milan Crha + + ** Fix for bug #558354 + + * gui/alarm-notify/alarm-notify.glade: + * gui/alarm-notify/alarm-notify-dialog.h: (enum AlarmNotifyResult): + * gui/alarm-notify/alarm-notify-dialog.c: (struct AlarmNotify), + (dismiss_pressed_cb), (notified_alarms_dialog_new): + * gui/alarm-notify/alarm-queue.c: (notify_dialog_cb): + Changed "Close" button to "Dismiss All" and added a "Dismiss" button + to the alarm notification dialog to be able to dismiss only some of + the alarms shown in the dialog. + 2008-11-04 Matthew Barnes * gui/calendar-commands.c: diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c index 61eea70f52..ee09c0dde4 100644 --- a/calendar/gui/alarm-notify/alarm-notify-dialog.c +++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c @@ -67,6 +67,7 @@ typedef struct { GtkWidget *snooze_time_min; GtkWidget *snooze_time_hrs; GtkWidget *snooze_btn; + GtkWidget *dismiss_btn; GtkWidget *minutes_label; GtkWidget *hrs_label; GtkWidget *description; @@ -191,7 +192,30 @@ snooze_pressed_cb (GtkButton *button, gpointer user_data) if (!snooze_timeout) snooze_timeout = DEFAULT_SNOOZE_MINS; (* funcinfo->func) (ALARM_NOTIFY_SNOOZE, snooze_timeout, funcinfo->func_data); +} + +static void +dismiss_pressed_cb (GtkButton *button, gpointer user_data) +{ + AlarmNotify *an = user_data; + GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (an->treeview)); + + g_return_if_fail (model != NULL); + if (gtk_tree_model_iter_n_children (model, NULL) <= 1) { + gtk_dialog_response (GTK_DIALOG (an->dialog), GTK_RESPONSE_CLOSE); + } else { + GtkTreeIter iter; + AlarmFuncInfo *funcinfo = NULL; + GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (an->treeview)); + + if (gtk_tree_selection_get_selected (selection, &model, &iter)) + gtk_tree_model_get (model, &iter, ALARM_FUNCINFO_COLUMN, &funcinfo, -1); + + g_return_if_fail (funcinfo); + + (* funcinfo->func) (ALARM_NOTIFY_DISMISS, -1, funcinfo->func_data); + } } static void @@ -256,10 +280,11 @@ notified_alarms_dialog_new (void) an->scrolledwindow = glade_xml_get_widget (an->xml, "treeview-scrolledwindow"); snooze_btn = glade_xml_get_widget (an->xml, "snooze-button"); an->snooze_btn = snooze_btn; + an->dismiss_btn = glade_xml_get_widget (an->xml, "dismiss-button"); edit_btn = glade_xml_get_widget (an->xml, "edit-button"); if (!(an->dialog && an->scrolledwindow && an->treeview && an->snooze_time_min && an->snooze_time_hrs - && an->description && an->location && edit_btn && snooze_btn)) { + && an->description && an->location && edit_btn && snooze_btn && an->dismiss_btn)) { g_message ("alarm_notify_dialog(): Could not find all widgets in Glade file!"); g_object_unref (an->xml); g_free (an); @@ -292,6 +317,7 @@ notified_alarms_dialog_new (void) g_signal_connect (edit_btn, "clicked", G_CALLBACK (edit_pressed_cb), an); g_signal_connect (snooze_btn, "clicked", G_CALLBACK (snooze_pressed_cb), an); + g_signal_connect (an->dismiss_btn, "clicked", G_CALLBACK (dismiss_pressed_cb), an); g_signal_connect (G_OBJECT (an->dialog), "response", G_CALLBACK (dialog_response_cb), an); g_signal_connect (G_OBJECT (an->dialog), "destroy", G_CALLBACK (dialog_destroyed_cb), an); diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.h b/calendar/gui/alarm-notify/alarm-notify-dialog.h index 4b2a3d9c95..7a94793eaa 100644 --- a/calendar/gui/alarm-notify/alarm-notify-dialog.h +++ b/calendar/gui/alarm-notify/alarm-notify-dialog.h @@ -32,7 +32,8 @@ typedef enum { ALARM_NOTIFY_CLOSE, ALARM_NOTIFY_SNOOZE, - ALARM_NOTIFY_EDIT + ALARM_NOTIFY_EDIT, + ALARM_NOTIFY_DISMISS } AlarmNotifyResult; typedef struct _AlarmNotificationsDialog AlarmNotificationsDialog; diff --git a/calendar/gui/alarm-notify/alarm-notify.glade b/calendar/gui/alarm-notify/alarm-notify.glade index 539bd66269..df1b1f92a2 100644 --- a/calendar/gui/alarm-notify/alarm-notify.glade +++ b/calendar/gui/alarm-notify/alarm-notify.glade @@ -37,11 +37,73 @@ True True True - gtk-close - True GTK_RELIEF_NORMAL True -7 + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-close + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Dismiss _All + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + @@ -527,6 +589,84 @@ False + + + + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-apply + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + _Dismiss + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + + + + 0 + False + False + + 0 diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index f320ccc42b..22b7766b4d 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -1248,6 +1248,13 @@ notify_dialog_cb (AlarmNotifyResult result, int snooze_mins, gpointer data) break; + case ALARM_NOTIFY_DISMISS: + if (alarm_notifications_dialog) { + GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (alarm_notifications_dialog->treeview)); + gtk_list_store_remove (GTK_LIST_STORE (model), &tray_data->iter); + } + break; + case ALARM_NOTIFY_CLOSE: d(printf("%s:%d (notify_dialog_cb) - Dialog close\n",__FILE__, __LINE__)); if (alarm_notifications_dialog) { @@ -1268,7 +1275,7 @@ notify_dialog_cb (AlarmNotifyResult result, int snooze_mins, gpointer data) /* Task to remove the tray icons */ tray_list_remove_icons (); - } + } break; -- cgit