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, 37 insertions, 22 deletions

diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index a513dbf6f5..d49a571608 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -38,6 +38,7 @@
 #include <gal/e-table/e-cell-toggle.h>
 #include <gal/e-table/e-cell-text.h>
 #include <gal/e-table/e-cell-combo.h>
+#include <gal/widgets/e-popup-menu.h>
 #include <widgets/misc/e-cell-date-edit.h>
 #include "e-calendar-table.h"
 #include "calendar-config.h"
@@ -836,25 +837,38 @@ delete_cb (GtkWidget *menuitem, gpointer data)
 	e_calendar_table_delete_selected (cal_table);
 }
 
-static GnomeUIInfo tasks_popup_one[] = {
-	GNOMEUIINFO_ITEM_NONE (N_("Edit this task"), NULL, e_calendar_table_on_open_task),
-	GNOMEUIINFO_ITEM_NONE (N_("Cut"), NULL, e_calendar_table_on_cut),
-	GNOMEUIINFO_ITEM_NONE (N_("Copy"), NULL, e_calendar_table_on_copy),
-	GNOMEUIINFO_ITEM_NONE (N_("Paste"), NULL, e_calendar_table_on_paste),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("Mark as complete"), NULL, mark_as_complete_cb),
-	GNOMEUIINFO_ITEM_NONE (N_("Delete this task"), NULL, delete_cb),
-	GNOMEUIINFO_END
+
+enum {
+	MASK_SINGLE	= 1 << 0,	/* For commands that work on 1 task. */
+	MASK_MULTIPLE	= 1 << 1,	/* For commands for multiple tasks. */
 };
 
-static GnomeUIInfo tasks_popup_many[] = {
-	GNOMEUIINFO_ITEM_NONE (N_("Cut"), NULL, e_calendar_table_on_cut),
-	GNOMEUIINFO_ITEM_NONE (N_("Copy"), NULL, e_calendar_table_on_copy),
-	GNOMEUIINFO_ITEM_NONE (N_("Paste"), NULL, e_calendar_table_on_paste),
-	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_ITEM_NONE (N_("Mark tasks as complete"), NULL, mark_as_complete_cb),
-	GNOMEUIINFO_ITEM_NONE (N_("Delete selected tasks"), NULL, delete_cb),
-	GNOMEUIINFO_END
+
+static EPopupMenu tasks_popup_menu [] = {
+	{ N_("_Open"), NULL,
+	  e_calendar_table_on_open_task, NULL, MASK_SINGLE },
+	{ "", NULL, NULL, NULL, MASK_SINGLE },
+
+	{ N_("C_ut"), NULL,
+	  e_calendar_table_on_cut, NULL, 0 },
+	{ N_("_Copy"), NULL,
+	  e_calendar_table_on_copy, NULL, 0 },
+	{ N_("_Paste"), NULL,
+	  e_calendar_table_on_paste, NULL, 0 },
+
+	{ "", NULL, NULL, NULL, 0 },
+
+	{ N_("_Mark as Complete"), NULL,
+	  mark_as_complete_cb, NULL, MASK_SINGLE },
+	{ N_("_Delete this Task"), NULL,
+	  delete_cb, NULL, MASK_SINGLE },
+
+	{ N_("_Mark Tasks as Complete"), NULL,
+	  mark_as_complete_cb, NULL, MASK_MULTIPLE },
+	{ N_("_Delete Selected Tasks"), NULL,
+	  delete_cb, NULL, MASK_MULTIPLE },
+
+	{ NULL, NULL, NULL, NULL, 0 }
 };
 
 static gint
@@ -864,19 +878,20 @@ e_calendar_table_on_right_click (ETable *table,
 				 GdkEventButton *event,
 				 ECalendarTable *cal_table)
 {
-	GtkWidget *popup_menu;
 	int n_selected;
+	int hide_mask = 0;
+	int disable_mask = 0;
 
 	n_selected = e_table_selected_count (table);
 	g_assert (n_selected > 0);
 
 	if (n_selected == 1)
-		popup_menu = gnome_popup_menu_new (tasks_popup_one);
+		hide_mask = MASK_MULTIPLE;
 	else
-		popup_menu = gnome_popup_menu_new (tasks_popup_many);
+		hide_mask = MASK_SINGLE;
 
-	gnome_popup_menu_do_popup_modal (popup_menu, NULL, NULL, event, cal_table);
-	gtk_widget_destroy (popup_menu);
+	e_popup_menu_run (tasks_popup_menu, (GdkEvent *) event,
+			  disable_mask, hide_mask, cal_table);
 
 	return TRUE;
 }