started some code to show the currently displayed dates in the folder

2001-07-30  Damon Chaplin  <damon@ximian.com>

	* gui/gnome-cal.c:
	* gui/calendar-commands.c (clear_folder_bar_label): started some code
	to show the currently displayed dates in the folder title bar.
	Unfinished.

	* gui/e-itip-control.c (set_date_label):
	* conduits/todo/todo-conduit.c (local_record_from_comp):
	* conduits/calendar/calendar-conduit.c (local_record_from_comp): free
	the CalComponentDateTimes. (Note the iTIP control needs updating for
	timezone support.)

	* cal-util/cal-component.c: Changed CalComponentDateTime so that the
	TZID is malloc'ed and freed rather than being a pointer to a static
	string. This was causing problems as sometimes we were freeing the
	string that was being pointed to, so we got corrupted TZIDs.

	* gui/comp-util.c (cal_comp_util_add_exdate): set TZID to NULL.
	DATE values do not have timezones.

	* gui/e-week-view.c:
	* gui/e-day-view.c: Moved 'Paste' after the New Appointment commands,
	since I think they are more commonly-used. Also added underlined
	accelerator keys.

	* gui/e-calendar-table.c: changed 'Edit this task' to 'Open' in the
	popup menu to be consistent with other folders, and separated from the
	clipboard commands. Also changed to use EPopupMenu so the accelerators
	work, and the masks may be useful at some point.

	* gui/dialogs/recurrence-page.c: use DATE values for UNTIL, since
	that makes it simpler. Fixes bug #5034.

	* gui/calendar-config.c (calendar_config_set_timezone): strdup the
	location string. Fixes bug #4990.

	* gui/tag-calendar.c (tag_calendar_cb): take 1 off iend as the times
	don't include the end time.

	* gui/e-week-view-layout.c (e_week_view_layout_event): fixed
	days_shown. Fixes bug #5709.

	* cal-client/cal-client.c (cal_client_get_timezone): took out some
	debugging messages.

svn path=/trunk/; revision=11494

1 files changed, 23 insertions, 19 deletions

diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 7f11e2d7b5..ca12b87176 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -3280,7 +3280,7 @@ e_day_view_on_event_double_click (EDayView *day_view,
 
 enum {
 	/*
-	 * This is used to "flag" events that can not be editted
+	 * This is used to "flag" events that can not be edited
 	 */
 	MASK_EDITABLE = 1,
 
@@ -3303,49 +3303,53 @@ enum {
 };
 
 static EPopupMenu main_items [] = {
-	{ N_("Paste"), NULL,
-	  e_day_view_on_paste, NULL, 0 },
+	{ N_("New _Appointment"), NULL,
+	  e_day_view_on_new_appointment, NULL, 0 },
+	{ N_("New All Day _Event"), NULL,
+	  e_day_view_on_new_event, NULL, 0 },
 
 	{ "", NULL, NULL, NULL, 0 },
 
-	{ N_("New Appointment"), NULL,
-	  e_day_view_on_new_appointment, NULL, 0 },
-	{ N_("New All Day Event"), NULL,
-	  e_day_view_on_new_event, NULL, 0 },
+	{ N_("_Paste"), NULL,
+	  e_day_view_on_paste, NULL, 0 },
 
 	{ "", NULL, NULL, NULL, 0 },
 
-	{ N_("Go to Today"), NULL,
+	{ N_("Go to _Today"), NULL,
 	  e_day_view_on_goto_today, NULL, 0 },
-	{ N_("Go to Date..."), NULL,
+	{ N_("_Go to Date..."), NULL,
 	  e_day_view_on_goto_date, NULL, 0 },
 
 	{ NULL, NULL, NULL, NULL, 0 }
 };
 
 static EPopupMenu child_items [] = {
-	{ N_("Open"), NULL,
+	{ N_("_Open"), NULL,
 	  e_day_view_on_edit_appointment, NULL, MASK_EDITABLE | MASK_EDITING },
-	{ N_("Delete this Appointment"), NULL,
+	{ N_("_Delete this Appointment"), NULL,
 	  e_day_view_on_delete_appointment, NULL, MASK_EDITABLE | MASK_SINGLE | MASK_EDITING },
-	{ N_("Cut"), NULL,
+
+	/* Only show this separator if one of the above is shown. */
+	{ "", NULL, NULL, NULL, MASK_EDITABLE | MASK_EDITING },
+
+
+	{ N_("C_ut"), NULL,
 	  e_day_view_on_cut, NULL, MASK_EDITABLE | MASK_EDITING },
-	{ N_("Copy"), NULL,
+	{ N_("_Copy"), NULL,
 	  e_day_view_on_copy, NULL, 0 },
-	{ N_("Paste"), NULL,
+	{ N_("_Paste"), NULL,
 	  e_day_view_on_paste, NULL, 0 },
 
-	{ "", NULL, NULL, NULL, MASK_SINGLE},
 
 	/*
 	 * The following are only shown if this is a recurring event
 	 */
-	{ "", NULL, NULL, NULL, MASK_SINGLE},
-	{ N_("Make this Occurrence Movable"), NULL,
+	{ "", NULL, NULL, NULL, MASK_RECURRING | MASK_EDITING },
+	{ N_("Make this Occurrence _Movable"), NULL,
 	  e_day_view_on_unrecur_appointment, NULL, MASK_RECURRING | MASK_EDITING },
-	{ N_("Delete this Occurrence"), NULL,
+	{ N_("Delete this _Occurrence"), NULL,
 	  e_day_view_on_delete_occurrence, NULL, MASK_RECURRING | MASK_EDITING },
-	{ N_("Delete all Occurrences"), NULL,
+	{ N_("Delete _All Occurrences"), NULL,
 	  e_day_view_on_delete_appointment, NULL, MASK_RECURRING | MASK_EDITING },
 	
 	{ NULL, NULL, NULL, NULL, 0 }