get the new reminder widgets (sync_entries): different callback data

2001-02-05  JP Rosevear  <jpr@ximian.com>

	* gui/event-editor.c (get_widgets): get the new reminder widgets
	(sync_entries): different callback data
	(summary_changed_cb): take different data and handle various cases
	(init_widgets): connect signals for the new widgets
	(get_alarm_duration_string): give a text string of the alarm
	duration
	(get_alarm_string): give a string representing the alarm
	(fill_widgets): make sure we don't loop infinitely and remove old
	alarm cruft
	(reminder_to_comp_object): dump alarm info in the gui into the cal
	component
	(append_alarm): add alarm to the clist
	(reminder_add_cb): create new alarm
	(reminder_delete_cb): remove the alarm from the list

	* gui/event-editor-dialog.glade: Update gui

	* gui/e-calendar-table.c: include gnome.h for all the menu stuff

	* gui/calendar-summary.c: for internationalization

	* gui/tasks-control.c: include gnome.h

	* gui/e-tasks.c: ditto

	* gui/e-itip-control.c: ditto

	* cal-util/cal-recur.c (cal_recur_set_rule_end_date): Update for
	libical changes

svn path=/trunk/; revision=8003

1 files changed, 32 insertions, 25 deletions

diff --git a/calendar/gui/event-editor-dialog.glade.h b/calendar/gui/event-editor-dialog.glade.h
index 05cfff27f8..8e18c42104 100644
--- a/calendar/gui/event-editor-dialog.glade.h
+++ b/calendar/gui/event-editor-dialog.glade.h
@@ -17,24 +17,29 @@ gchar *s = N_("_Confidential");
 gchar *s = N_("_Contacts");
 gchar *s = N_("Ca_tegories...");
 gchar *s = N_("General");
-gchar *s = N_("Minutes");
-gchar *s = N_("Hours");
-gchar *s = N_("Days");
-gchar *s = N_("Minutes");
-gchar *s = N_("Hours");
-gchar *s = N_("Days");
-gchar *s = N_("Minutes");
-gchar *s = N_("Hours");
-gchar *s = N_("Days");
-gchar *s = N_("Minutes");
-gchar *s = N_("Hours");
-gchar *s = N_("Days");
-gchar *s = N_("_Display");
-gchar *s = N_("_Program");
-gchar *s = N_("_Mail");
-gchar *s = N_("Mail _to:");
-gchar *s = N_("_Run program:");
-gchar *s = N_("_Audio");
+gchar *s = N_("Appointment Basics");
+gchar *s = N_("Su_mmary:");
+gchar *s = N_("_Starting date:");
+gchar *s = N_("Reminders");
+gchar *s = N_("Show a dialog\n"
+              "Play a sound\n"
+              "Send an email\n"
+              "Run a program\n"
+              "");
+gchar *s = N_("minute(s)\n"
+              "hour(s)\n"
+              "day(s)\n"
+              "");
+gchar *s = N_("before\n"
+              "after\n"
+              "");
+gchar *s = N_("start of appointment\n"
+              "end of appointment\n"
+              "");
+gchar *s = N_("Settings...");
+gchar *s = N_("label55");
+gchar *s = N_("Add");
+gchar *s = N_("Delete");
 gchar *s = N_("Reminder");
 gchar *s = N_("Appointment Basics");
 gchar *s = N_("Su_mmary:");
@@ -44,13 +49,15 @@ gchar *s = N_("No recurrence");
 gchar *s = N_("Simple recurrence");
 gchar *s = N_("Custom recurrence");
 gchar *s = N_("Every");
-gchar *s = N_("day(s)");
-gchar *s = N_("week(s)");
-gchar *s = N_("month(s)");
-gchar *s = N_("year(s)");
-gchar *s = N_("for");
-gchar *s = N_("until");
-gchar *s = N_("forever");
+gchar *s = N_("day(s)\n"
+              "week(s)\n"
+              "month(s)\n"
+              "year(s)\n"
+              "");
+gchar *s = N_("for\n"
+              "until\n"
+              "forever\n"
+              "");
 gchar *s = N_("Exceptions");
 gchar *s = N_("Add");
 gchar *s = N_("Modify");