Clear the rdate and exrule lists from the component if we are setting a

2000-11-12  Federico Mena Quintero  <federico@helixcode.com>

	* gui/event-editor.c (recur_to_comp_object): Clear the rdate and
	exrule lists from the component if we are setting a simple
	recurrence.
	(recur_to_comp_object): Set the exdate list here instead of in
	dialog_to_comp_object().
	(preview_recur): New function to tag the recurrence preview
	calendar based on the information from the dialog box.
	(fill_exception_widgets): Fill the exception widgets here; moved
	over from fill_widgets().
	(fill_recurrence_widgets): Call preview_recur().  Also, call
	fill_exception_widgets() first of all.
	(recurrence_type_toggled_cb): Call preview_recur().
	(recur_interval_selection_done_cb): Likewise.
	(recur_ending_selection_done_cb): Likewise.
	(recurrence_exception_add_cb): Likewise.
	(recurrence_exception_modify_cb): Likewise.
	(recurrence_exception_delete_cb): Likewise.
	(date_changed_cb): Likewise.
	(recur_interval_value_changed_cb): Likewise, new function.

	* gui/tag-calendar.[ch]: New files with utilities for tagging
	calendars.  mark.[ch] should go away some day.

	* gui/tag-calendar.c (tag_calendar): Moved over from
	gnome_calendar_tag_calendar().  Take in a CalClient instead of a
	GnomeCalendar.  Added API docs.
	(tag_calendar_by_comp): New function to tag a calendar based on a
	single calendar component instead of a whole client.

	* gui/gnome-cal.c (initial_load): Use tag_calendar_by_client().
	(obj_updated_cb): Likewise.
	(obj_removed_cb): Likewise.
	(gnome_calendar_on_date_navigator_date_range_changed): Likewise.
	(editor_closed_cb): Free the closure.
	(destroy_editor_cb): Renamed from free_uid().  Do not free the
	UID; just unref the event editor.  Our destroy handler to it will
	free things properly.  This will also cause the corresponding
	calendar client to be unrefed.
	(editor_closed_cb): Use a flag on the GnomeCalendar to decide
	whether to remove the editor from the hash table.  This is sort of
	icky.

	* gui/calendar-model.c (obj_updated_cb): If the object is new, we
	have to use e_table_model_row_inserted(), not row_changed().
	Thanks to JP Rosevear for reporting this.

	* gui/Makefile.am (evolution_calendar_SOURCES): Added
	tag-calendar.[ch] to the list of sources.

svn path=/trunk/; revision=6547

3 files changed, 50 insertions, 76 deletions

diff --git a/calendar/gui/dialogs/alarm-notify.glade.h b/calendar/gui/dialogs/alarm-notify.glade.h
index c7b8918e06..053395a4c5 100644
--- a/calendar/gui/dialogs/alarm-notify.glade.h
+++ b/calendar/gui/dialogs/alarm-notify.glade.h
@@ -1,10 +1,10 @@
 /*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
+ * Translatable strings file generated by extract-ui.
+ * Add this file to your project's POTFILES.in
  * DO NOT compile it as part of your application.
  */
 
 gchar *s = N_("Close");
-gchar *s = N_("Snooze");
 gchar *s = N_("Edit appointment");
+gchar *s = N_("Snooze");
 gchar *s = N_("Snooze time (minutes)");
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.glade.h b/calendar/gui/dialogs/cal-prefs-dialog.glade.h
index 0a29d11999..71ba85a8bd 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.glade.h
+++ b/calendar/gui/dialogs/cal-prefs-dialog.glade.h
@@ -1,67 +1,52 @@
 /*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
+ * Translatable strings file generated by extract-ui.
+ * Add this file to your project's POTFILES.in
  * DO NOT compile it as part of your application.
  */
 
-gchar *s = N_("Calendar Preferences");
-gchar *s = N_("Work week");
-gchar *s = N_("Mon");
-gchar *s = N_("Tue");
-gchar *s = N_("Wed");
-gchar *s = N_("Thu");
-gchar *s = N_("Fri");
-gchar *s = N_("Sat");
-gchar *s = N_("Sun");
-gchar *s = N_("First day of week:");
-gchar *s = N_("Monday");
-gchar *s = N_("Tuesday");
-gchar *s = N_("Wednesday");
-gchar *s = N_("Thursday");
-gchar *s = N_("Friday");
-gchar *s = N_("Saturday");
-gchar *s = N_("Sunday");
-gchar *s = N_("Start of day:");
-gchar *s = N_("End of day:");
-gchar *s = N_("Display options");
-gchar *s = N_("Time divisions:");
-gchar *s = N_("Time format:");
-gchar *s = N_("Show appointment end times");
-gchar *s = N_("Compress weekends");
 gchar *s = N_("12 hour (am/pm)");
 gchar *s = N_("24 hour");
-gchar *s = N_("60 minutes");
-gchar *s = N_("30 minutes");
-gchar *s = N_("15 minutes");
-gchar *s = N_("10 minutes");
-gchar *s = N_("05 minutes");
-gchar *s = N_("Date navigator options");
-gchar *s = N_("Show week numbers");
+gchar *s = N_("Alarms timeout after");
+gchar *s = N_("Audio Alarms");
+gchar *s = N_("Beep when alarm windows appear.");
 gchar *s = N_("Calendar");
-gchar *s = N_("Show");
+gchar *s = N_("Calendar Preferences");
+gchar *s = N_("Colors");
+gchar *s = N_("Compress weekends");
+gchar *s = N_("Date navigator options");
+gchar *s = N_("Defaults");
+gchar *s = N_("Display options");
 gchar *s = N_("Due Date");
-gchar *s = N_("Time Until Due");
-gchar *s = N_("Priority");
+gchar *s = N_("Enable snoozing for");
+gchar *s = N_("End of day:");
+gchar *s = N_("First day of week:");
+gchar *s = N_("Fri");
 gchar *s = N_("Highlight");
-gchar *s = N_("Overdue Items");
 gchar *s = N_("Items Due Today");
+gchar *s = N_("Items Due Today:");
 gchar *s = N_("Items Not Yet Due");
-gchar *s = N_("Colors");
-gchar *s = N_("Pick a color");
-gchar *s = N_("Pick a color");
-gchar *s = N_("Pick a color");
 gchar *s = N_("Items Not Yet Due:");
-gchar *s = N_("Items Due Today:");
+gchar *s = N_("Mon");
+gchar *s = N_("Overdue Items");
 gchar *s = N_("Overdue Items:");
-gchar *s = N_("TaskPad");
-gchar *s = N_("Defaults");
+gchar *s = N_("Pick a color");
+gchar *s = N_("Priority");
 gchar *s = N_("Remind me of all appointments");
-gchar *s = N_("minutes before they occur.");
+gchar *s = N_("Reminders");
+gchar *s = N_("Sat");
+gchar *s = N_("Show");
+gchar *s = N_("Show appointment end times");
+gchar *s = N_("Show week numbers");
+gchar *s = N_("Start of day:");
+gchar *s = N_("Sun");
+gchar *s = N_("TaskPad");
+gchar *s = N_("Thu");
+gchar *s = N_("Time Until Due");
+gchar *s = N_("Time divisions:");
+gchar *s = N_("Time format:");
+gchar *s = N_("Tue");
 gchar *s = N_("Visual Alarms");
-gchar *s = N_("Beep when alarm windows appear.");
-gchar *s = N_("Audio Alarms");
-gchar *s = N_("Alarms timeout after");
-gchar *s = N_("seconds.");
-gchar *s = N_("Enable snoozing for");
+gchar *s = N_("Wed");
+gchar *s = N_("Work week");
+gchar *s = N_("minutes before they occur.");
 gchar *s = N_("seconds.");
-gchar *s = N_("Reminders");
diff --git a/calendar/gui/dialogs/task-editor-dialog.glade.h b/calendar/gui/dialogs/task-editor-dialog.glade.h
index 8ba4eea0a1..5aa32dd38b 100644
--- a/calendar/gui/dialogs/task-editor-dialog.glade.h
+++ b/calendar/gui/dialogs/task-editor-dialog.glade.h
@@ -1,31 +1,20 @@
 /*
- * Translatable strings file generated by Glade.
- * Add this file to your project's POTFILES.in.
+ * Translatable strings file generated by extract-ui.
+ * Add this file to your project's POTFILES.in
  * DO NOT compile it as part of your application.
  */
 
-gchar *s = N_("task-editor-dialog");
-gchar *s = N_("S_ummary");
-gchar *s = N_("Sta_rt Date:");
-gchar *s = N_("_Due Date:");
 gchar *s = N_("% Comp_lete:");
-gchar *s = N_("_Status:");
-gchar *s = N_("Not Started");
-gchar *s = N_("In Progress");
-gchar *s = N_("Completed");
-gchar *s = N_("Cancelled");
-gchar *s = N_("_Priority:");
-gchar *s = N_("High");
-gchar *s = N_("Normal");
-gchar *s = N_("Low");
 gchar *s = N_("C_lassification:");
-gchar *s = N_("None");
-gchar *s = N_("Public");
-gchar *s = N_("Private");
-gchar *s = N_("Confidential");
-gchar *s = N_("_Contacts...");
 gchar *s = N_("Ca_tegories...");
-gchar *s = N_("Task");
 gchar *s = N_("Date Completed:");
-gchar *s = N_("URL:");
 gchar *s = N_("Details");
+gchar *s = N_("S_ummary");
+gchar *s = N_("Sta_rt Date:");
+gchar *s = N_("Task");
+gchar *s = N_("URL:");
+gchar *s = N_("_Contacts...");
+gchar *s = N_("_Due Date:");
+gchar *s = N_("_Priority:");
+gchar *s = N_("_Status:");
+gchar *s = N_("task-editor-dialog");