diff options
| author | Federico Mena Quintero <federico@ximian.com> | 2001-09-20 10:35:36 +0800 |
|---|---|---|
| committer | Federico Mena Quintero <federico@src.gnome.org> | 2001-09-20 10:35:36 +0800 |
| commit | b597fe284460110f74b30e225976ccf0590b4b9c (patch) | |
| tree | e79b64f087be42017d236eaf490546f96112d753 /calendar/gui/dialogs | |
| parent | 9ae341104ad563c81b2a8d14db9ae3af74a2b803 (diff) | |
| download | gsoc2013-evolution-b597fe284460110f74b30e225976ccf0590b4b9c.tar.gz gsoc2013-evolution-b597fe284460110f74b30e225976ccf0590b4b9c.tar.zst gsoc2013-evolution-b597fe284460110f74b30e225976ccf0590b4b9c.zip | |
Display a notification message always, in addition to playing the sound.
2001-09-19 Federico Mena Quintero <federico@ximian.com>
* gui/alarm-notify/alarm-queue.c (audio_notification): Display a
notification message always, in addition to playing the sound.
(procedure_notification): Present a confirmation dialog before
actually running the alarm's program.
(procedure_notification): Use gnome_execute_shell() instead of
gnome_execute_async() so that we handle multiple arguments
properly. Plus, it is most likely what the user expects.
(mail_notification): Display a message about unsupported email
reminders instead of blindly dropping the alarm.
* gui/dialogs/alarm-options.glade: Added an explanatory message
about mail alarms not being supported.
* gui/dialogs/alarm-page.glade: Removed the "Send an email"
option.
* gui/dialogs/alarm-page.c (action_map): Removed CAL_ALARM_EMAIL.
svn path=/trunk/; revision=13004
Diffstat (limited to 'calendar/gui/dialogs')
| -rw-r--r-- | calendar/gui/dialogs/alarm-options.glade | 4 | ||||
| -rw-r--r-- | calendar/gui/dialogs/alarm-page.c | 1 | ||||
| -rw-r--r-- | calendar/gui/dialogs/alarm-page.glade | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/calendar/gui/dialogs/alarm-options.glade b/calendar/gui/dialogs/alarm-options.glade index ad0c181561..02c5d3f953 100644 --- a/calendar/gui/dialogs/alarm-options.glade +++ b/calendar/gui/dialogs/alarm-options.glade @@ -267,9 +267,9 @@ days <class>GtkLabel</class> <name>malarm-group</name> <visible>False</visible> - <label>FIXME: mail alarm options</label> + <label>This is an email reminder, but Evolution does not yet support this kind of reminders. You will not be able to edit the options for this reminder.</label> <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> + <wrap>True</wrap> <xalign>0.5</xalign> <yalign>0.5</yalign> <xpad>0</xpad> diff --git a/calendar/gui/dialogs/alarm-page.c b/calendar/gui/dialogs/alarm-page.c index 5ef9a2c15c..e140392d98 100644 --- a/calendar/gui/dialogs/alarm-page.c +++ b/calendar/gui/dialogs/alarm-page.c @@ -87,7 +87,6 @@ enum { static const int action_map[] = { CAL_ALARM_DISPLAY, CAL_ALARM_AUDIO, - CAL_ALARM_EMAIL, CAL_ALARM_PROCEDURE, -1 }; diff --git a/calendar/gui/dialogs/alarm-page.glade b/calendar/gui/dialogs/alarm-page.glade index c1e6010431..fad62dad70 100644 --- a/calendar/gui/dialogs/alarm-page.glade +++ b/calendar/gui/dialogs/alarm-page.glade @@ -198,7 +198,6 @@ <can_focus>True</can_focus> <items>Display a message Play a sound -Send an email Run a program </items> <initial_choice>0</initial_choice> |