Pulling stuff up from the branch

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

	* cal-util/cal-component.c (cal_component_set_categories): If the
	categories string is empty, remove the property
	(get_period_list): Fixes from clahey to handle the new rdate
	format in libical
	(set_period_list): ditto

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

	* gui/event-editor.c (fill_reminder_widgets): Match new
	append_alarm signature
	(reminder_to_comp_object): only add alarms tagged as new, no
	longer delete all alarms first
	(append_reminder): the row data is now of type ReminderData,
	rename from append_alarm
	(reminder_add_cb): math new append_alarm signature
	(reminder_delete_cb): if the alarm existed before the dialog was
	loaded, delete it immediately from the cal component

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

	* gui/event-editor-dialog.glade: Gui tweaks for bugs 1248 and 1246

	* gui/dialogs/task-editor-dialog.glade: ditto

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

	* gui/e-week-view.c (e_week_view_show_popup_menu): Make the menus more
	consistent

	* gui/e-day-view.c (e_day_view_on_event_right_click): ditto

	* gui/e-calendar-table.c: ditto

svn path=/trunk/; revision=8037

9 files changed, 67 insertions, 36 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index a44200642a..caa22296f9 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -18,6 +18,21 @@
 	(reminder_delete_cb): if the alarm existed before the dialog was
 	loaded, delete it immediately from the cal component
 
+2001-02-06  JP Rosevear  <jpr@ximian.com>
+
+	* gui/event-editor-dialog.glade: Gui tweaks for bugs 1248 and 1246
+
+	* gui/dialogs/task-editor-dialog.glade: ditto
+
+2001-02-06  JP Rosevear  <jpr@ximian.com>
+
+	* gui/e-week-view.c (e_week_view_show_popup_menu): Make the menus more
+	consistent
+
+	* gui/e-day-view.c (e_day_view_on_event_right_click): ditto
+
+	* gui/e-calendar-table.c: ditto
+
 2001-02-05  JP Rosevear  <jpr@ximian.com>
 
 	* cal-util/cal-component.c (cal_component_alarm_set_trigger): Set
diff --git a/calendar/gui/dialogs/task-editor-dialog.glade b/calendar/gui/dialogs/task-editor-dialog.glade
index ea4adcc5e2..000cb42cbd 100644
--- a/calendar/gui/dialogs/task-editor-dialog.glade
+++ b/calendar/gui/dialogs/task-editor-dialog.glade
@@ -76,7 +76,7 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label3</name>
-	    <label>S_ummary</label>
+	    <label>Su_mmary</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
 	    <xalign>0.5</xalign>
@@ -485,7 +485,6 @@ Confidential
 	    <class>GtkButton</class>
 	    <name>contacts-button</name>
 	    <can_focus>True</can_focus>
-	    <relief>GTK_RELIEF_NORMAL</relief>
 	    <child>
 	      <padding>0</padding>
 	      <expand>False</expand>
@@ -524,7 +523,6 @@ Confidential
 	    <class>GtkButton</class>
 	    <name>categories-button</name>
 	    <can_focus>True</can_focus>
-	    <relief>GTK_RELIEF_NORMAL</relief>
 	    <child>
 	      <padding>0</padding>
 	      <expand>False</expand>
diff --git a/calendar/gui/dialogs/task-editor-dialog.glade.h b/calendar/gui/dialogs/task-editor-dialog.glade.h
index 052fe951dd..bf568eb358 100644
--- a/calendar/gui/dialogs/task-editor-dialog.glade.h
+++ b/calendar/gui/dialogs/task-editor-dialog.glade.h
@@ -5,25 +5,28 @@
  */
 
 gchar *s = N_("task-editor-dialog");
-gchar *s = N_("S_ummary");
+gchar *s = N_("Su_mmary");
 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_("Not Started\n"
+              "In Progress\n"
+              "Completed\n"
+              "Cancelled\n"
+              "");
 gchar *s = N_("_Priority:");
-gchar *s = N_("High");
-gchar *s = N_("Normal");
-gchar *s = N_("Low");
-gchar *s = N_("Undefined");
+gchar *s = N_("High\n"
+              "Normal\n"
+              "Low\n"
+              "Undefined\n"
+              "");
 gchar *s = N_("C_lassification:");
-gchar *s = N_("None");
-gchar *s = N_("Public");
-gchar *s = N_("Private");
-gchar *s = N_("Confidential");
+gchar *s = N_("None\n"
+              "Public\n"
+              "Private\n"
+              "Confidential\n"
+              "");
 gchar *s = N_("_Contacts...");
 gchar *s = N_("Ca_tegories...");
 gchar *s = N_("Task");
diff --git a/calendar/gui/dialogs/task-page.glade b/calendar/gui/dialogs/task-page.glade
index ea4adcc5e2..000cb42cbd 100644
--- a/calendar/gui/dialogs/task-page.glade
+++ b/calendar/gui/dialogs/task-page.glade
@@ -76,7 +76,7 @@
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label3</name>
-	    <label>S_ummary</label>
+	    <label>Su_mmary</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
 	    <xalign>0.5</xalign>
@@ -485,7 +485,6 @@ Confidential
 	    <class>GtkButton</class>
 	    <name>contacts-button</name>
 	    <can_focus>True</can_focus>
-	    <relief>GTK_RELIEF_NORMAL</relief>
 	    <child>
 	      <padding>0</padding>
 	      <expand>False</expand>
@@ -524,7 +523,6 @@ Confidential
 	    <class>GtkButton</class>
 	    <name>categories-button</name>
 	    <can_focus>True</can_focus>
-	    <relief>GTK_RELIEF_NORMAL</relief>
 	    <child>
 	      <padding>0</padding>
 	      <expand>False</expand>
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index 1292e1f91c..ab3db722b1 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -395,13 +395,16 @@ e_calendar_table_on_double_click (ETable *table,
 
 
 static GnomeUIInfo e_calendar_table_popup_uiinfo[] = {
-	{ GNOME_APP_UI_ITEM, N_("Open..."),
-	  N_("Open the task"), e_calendar_table_on_open_task,
-	  NULL, NULL, 0, 0, 0, 0 },
 	{ GNOME_APP_UI_ITEM, N_("Mark Complete"),
 	  N_("Mark the task complete"), e_calendar_table_on_mark_task_complete,
 	  NULL, NULL, 0, 0, 0, 0 },
-	{ GNOME_APP_UI_ITEM, N_("Delete"),
+
+	GNOMEUIINFO_SEPARATOR,
+
+	{ GNOME_APP_UI_ITEM, N_("Edit this task..."),
+	  N_("Edit the task"), e_calendar_table_on_open_task,
+	  NULL, NULL, 0, 0, 0, 0 },
+	{ GNOME_APP_UI_ITEM, N_("Delete this task"),
 	  N_("Delete the task"), e_calendar_table_on_delete_task,
 	  NULL, NULL, 0, 0, 0, 0 },
 
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 50f86989ee..b84ce99157 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -3010,17 +3010,24 @@ e_day_view_on_event_right_click (EDayView *day_view,
 	static struct menu_item child_items[] = {
 		{ N_("Edit this appointment..."), (GtkSignalFunc) e_day_view_on_edit_appointment, NULL, TRUE },
 		{ N_("Delete this appointment"), (GtkSignalFunc) e_day_view_on_delete_appointment, NULL, TRUE },
-		{ NULL, NULL, NULL, TRUE },
+
+		{ NULL, NULL, NULL, TRUE},
+		
 		{ N_("New appointment..."), (GtkSignalFunc) e_day_view_on_new_appointment, NULL, TRUE }
 	};
 
 	static struct menu_item recur_child_items[] = {
-		{ N_("Edit this appointment..."), (GtkSignalFunc) e_day_view_on_edit_appointment, NULL, TRUE },
 		{ N_("Make this appointment movable"), (GtkSignalFunc) e_day_view_on_unrecur_appointment, NULL, TRUE },
+
+		{ NULL, NULL, NULL, TRUE},
+
+		{ N_("Edit this appointment..."), (GtkSignalFunc) e_day_view_on_edit_appointment, NULL, TRUE },
 		{ N_("Delete this occurrence"), (GtkSignalFunc) e_day_view_on_delete_occurrence, NULL, TRUE },
 		{ N_("Delete all occurrences"), (GtkSignalFunc) e_day_view_on_delete_appointment, NULL, TRUE },
-		{ NULL, NULL, NULL, TRUE },
-		{ N_("New appointment..."), (GtkSignalFunc) e_day_view_on_new_appointment, NULL, TRUE }
+
+		{ NULL, NULL, NULL, TRUE},
+
+		{ N_("New appointment..."), (GtkSignalFunc) e_day_view_on_new_appointment, NULL, TRUE },
 	};
 
 	have_selection = GTK_WIDGET_HAS_FOCUS (day_view)
@@ -3044,13 +3051,13 @@ e_day_view_on_event_right_click (EDayView *day_view,
 		not_being_edited = TRUE;
 
 		if (cal_component_has_recurrences (event->comp)) {
-			items = 6;
+			items = 7;
 			context_menu = &recur_child_items[0];
 			context_menu[0].sensitive = not_being_edited;
-			context_menu[1].sensitive = not_being_edited;
 			context_menu[2].sensitive = not_being_edited;
 			context_menu[3].sensitive = not_being_edited;
-			context_menu[5].sensitive = have_selection;
+			context_menu[4].sensitive = not_being_edited;
+			context_menu[6].sensitive = have_selection;
 		} else {
 			items = 4;
 			context_menu = &child_items[0];
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 9e8a562f20..b647dcc4a7 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -3213,16 +3213,23 @@ e_week_view_show_popup_menu (EWeekView	     *week_view,
 	static struct menu_item child_items[] = {
 		{ N_("Edit this appointment..."), (GtkSignalFunc) e_week_view_on_edit_appointment, NULL, TRUE },
 		{ N_("Delete this appointment"), (GtkSignalFunc) e_week_view_on_delete_appointment, NULL, TRUE },
+
 		{ NULL, NULL, NULL, TRUE },
+
 		{ N_("New appointment..."), (GtkSignalFunc) e_week_view_on_new_appointment, NULL, TRUE }
 	};
 
 	static struct menu_item recur_child_items[] = {
-		{ N_("Edit this appointment..."), (GtkSignalFunc) e_week_view_on_edit_appointment, NULL, TRUE },
 		{ N_("Make this appointment movable"), (GtkSignalFunc) e_week_view_on_unrecur_appointment, NULL, TRUE },
+
+		{ NULL, NULL, NULL, TRUE },
+
+		{ N_("Edit this appointment..."), (GtkSignalFunc) e_week_view_on_edit_appointment, NULL, TRUE },
 		{ N_("Delete this occurrence"), (GtkSignalFunc) e_week_view_on_delete_occurrence, NULL, TRUE },
 		{ N_("Delete all occurrences"), (GtkSignalFunc) e_week_view_on_delete_appointment, NULL, TRUE },
+
 		{ NULL, NULL, NULL, TRUE },
+
 		{ N_("New appointment..."), (GtkSignalFunc) e_week_view_on_new_appointment, NULL, TRUE }
 	};
 
@@ -3243,13 +3250,13 @@ e_week_view_show_popup_menu (EWeekView	     *week_view,
 		not_being_edited = TRUE;
 
 		if (cal_component_has_recurrences (event->comp)) {
-			num_items = 6;
+			num_items = 7;
 			context_menu = &recur_child_items[0];
 			context_menu[0].sensitive = not_being_edited;
-			context_menu[1].sensitive = not_being_edited;
 			context_menu[2].sensitive = not_being_edited;
 			context_menu[3].sensitive = not_being_edited;
-			context_menu[5].sensitive = have_selection;
+			context_menu[4].sensitive = not_being_edited;
+			context_menu[6].sensitive = have_selection;
 		} else {
 			num_items = 4;
 			context_menu = &child_items[0];
diff --git a/calendar/gui/event-editor-dialog.glade b/calendar/gui/event-editor-dialog.glade
index 36e62c41d6..8e8ea8dc9f 100644
--- a/calendar/gui/event-editor-dialog.glade
+++ b/calendar/gui/event-editor-dialog.glade
@@ -456,7 +456,7 @@
 	<class>GtkLabel</class>
 	<child_name>Notebook:tab</child_name>
 	<name>label11</name>
-	<label>General</label>
+	<label>Appointment</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
 	<xalign>0.5</xalign>
diff --git a/calendar/gui/event-editor-dialog.glade.h b/calendar/gui/event-editor-dialog.glade.h
index 8e18c42104..82296cb106 100644
--- a/calendar/gui/event-editor-dialog.glade.h
+++ b/calendar/gui/event-editor-dialog.glade.h
@@ -16,7 +16,7 @@ gchar *s = N_("Pri_vate");
 gchar *s = N_("_Confidential");
 gchar *s = N_("_Contacts");
 gchar *s = N_("Ca_tegories...");
-gchar *s = N_("General");
+gchar *s = N_("Appointment");
 gchar *s = N_("Appointment Basics");
 gchar *s = N_("Su_mmary:");
 gchar *s = N_("_Starting date:");