[evolution] Bug 601516 - Calendar views missing from calendar popup menu

[Matthew Barnes <mbarnes src gnome org>]

commit 8f15511a1e0ee0f301b35ce033c993ed1a58b4ee
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed Nov 11 10:16:26 2009 -0500

    Bug 601516 - Calendar views missing from calendar popup menu
    
    This also fixes a couple other popup menu glitches.

 modules/calendar/e-cal-shell-view-actions.h |   14 ++++++++------
 modules/calendar/e-cal-shell-view.c         |   26 +++++++++++++++++---------
 ui/evolution-calendars.ui                   |   10 +++++++++-
 3 files changed, 34 insertions(+), 16 deletions(-)
---
diff --git a/modules/calendar/e-cal-shell-view-actions.h b/modules/calendar/e-cal-shell-view-actions.h
index 46d8992..e056493 100644
--- a/modules/calendar/e-cal-shell-view-actions.h
+++ b/modules/calendar/e-cal-shell-view-actions.h
@@ -69,26 +69,28 @@
 	E_SHELL_WINDOW_ACTION ((window), "event-clipboard-cut")
 #define E_SHELL_WINDOW_ACTION_EVENT_CLIPBOARD_PASTE(window) \
 	E_SHELL_WINDOW_ACTION ((window), "event-clipboard-paste")
+#define E_SHELL_WINDOW_ACTION_EVENT_DELEGATE(window) \
+	E_SHELL_WINDOW_ACTION ((window), "event-delegate")
 #define E_SHELL_WINDOW_ACTION_EVENT_DELETE(window) \
 	E_SHELL_WINDOW_ACTION ((window), "event-delete")
 #define E_SHELL_WINDOW_ACTION_EVENT_DELETE_OCCURRENCE(window) \
 	E_SHELL_WINDOW_ACTION ((window), "event-delete-occurrence")
 #define E_SHELL_WINDOW_ACTION_EVENT_DELETE_OCCURRENCE_ALL(window) \
 	E_SHELL_WINDOW_ACTION ((window), "event-delete-occurrence-all")
+#define E_SHELL_WINDOW_ACTION_EVENT_FORWARD(window) \
+	E_SHELL_WINDOW_ACTION ((window), "event-forward")
 #define E_SHELL_WINDOW_ACTION_EVENT_OPEN(window) \
 	E_SHELL_WINDOW_ACTION ((window), "event-open")
-#define E_SHELL_WINDOW_ACTION_OCCURRENCE_MOVABLE(window) \
-	E_SHELL_WINDOW_ACTION ((window), "event-occurrence-movable")
-#define E_SHELL_WINDOW_ACTION_EVENT_DELEGATE(window) \
-	E_SHELL_WINDOW_ACTION ((window), "event-delegate")
+#define E_SHELL_WINDOW_ACTION_EVENT_PRINT(window) \
+	E_SHELL_WINDOW_ACTION ((window), "event-print")
 #define E_SHELL_WINDOW_ACTION_EVENT_SCHEDULE(window) \
 	E_SHELL_WINDOW_ACTION ((window), "event-schedule")
-#define E_SHELL_WINDOW_ACTION_EVENT_FORWARD(window) \
-	E_SHELL_WINDOW_ACTION ((window), "event-forward")
 #define E_SHELL_WINDOW_ACTION_EVENT_REPLY(window) \
 	E_SHELL_WINDOW_ACTION ((window), "event-reply")
 #define E_SHELL_WINDOW_ACTION_EVENT_REPLY_ALL(window) \
 	E_SHELL_WINDOW_ACTION ((window), "event-reply-all")
+#define E_SHELL_WINDOW_ACTION_EVENT_OCCURRENCE_MOVABLE(window) \
+	E_SHELL_WINDOW_ACTION ((window), "event-occurrence-movable")
 
 /* Memo Pad Actions */
 #define E_SHELL_WINDOW_ACTION_CALENDAR_MEMOPAD_CLIPBOARD_COPY(window) \
diff --git a/modules/calendar/e-cal-shell-view.c b/modules/calendar/e-cal-shell-view.c
index 00a71f5..b696660 100644
--- a/modules/calendar/e-cal-shell-view.c
+++ b/modules/calendar/e-cal-shell-view.c
@@ -384,6 +384,12 @@ cal_shell_view_update_actions (EShellView *shell_view)
 	sensitive = editable;
 	gtk_action_set_sensitive (action, sensitive);
 
+	action = ACTION (EVENT_DELEGATE);
+	sensitive =
+		(n_selected == 1) && editable &&
+		is_delegatable && is_meeting;
+	gtk_action_set_sensitive (action, sensitive);
+
 	action = ACTION (EVENT_DELETE);
 	sensitive = (n_selected > 0) && editable && !recurring;
 	gtk_action_set_sensitive (action, sensitive);
@@ -396,24 +402,26 @@ cal_shell_view_update_actions (EShellView *shell_view)
 	sensitive = (n_selected > 0) && editable && recurring;
 	gtk_action_set_sensitive (action, sensitive);
 
-	action = ACTION (EVENT_OPEN);
+	action = ACTION (EVENT_FORWARD);
 	sensitive = (n_selected == 1);
 	gtk_action_set_sensitive (action, sensitive);
 
-	action = ACTION (OCCURRENCE_MOVABLE);
-	sensitive = (n_selected == 1) && editable && recurring && is_instance;
+	action = ACTION (EVENT_OCCURRENCE_MOVABLE);
+	sensitive =
+		(n_selected == 1) && editable &&
+		recurring && is_instance;
 	gtk_action_set_sensitive (action, sensitive);
 
-	action = ACTION (EVENT_DELEGATE);
-	sensitive = (n_selected == 1) && editable && is_delegatable && is_meeting;
+	action = ACTION (EVENT_OPEN);
+	sensitive = (n_selected == 1);
 	gtk_action_set_sensitive (action, sensitive);
 
-	action = ACTION (EVENT_SCHEDULE);
-	sensitive = (n_selected == 1) && editable && !is_meeting;
+	action = ACTION (EVENT_PRINT);
+	sensitive = (n_selected == 1);
 	gtk_action_set_sensitive (action, sensitive);
 
-	action = ACTION (EVENT_FORWARD);
-	sensitive = TRUE;
+	action = ACTION (EVENT_SCHEDULE);
+	sensitive = (n_selected == 1) && editable && !is_meeting;
 	gtk_action_set_sensitive (action, sensitive);
 
 	action = ACTION (EVENT_REPLY);
diff --git a/ui/evolution-calendars.ui b/ui/evolution-calendars.ui
index f717065..04f4ac3 100644
--- a/ui/evolution-calendars.ui
+++ b/ui/evolution-calendars.ui
@@ -67,7 +67,15 @@
     <separator/>
     <menuitem action='event-popup-clipboard-paste'/>
     <separator/>
-    <menuitem action='gal-view-menu'/>
+    <menu action='gal-view-menu'>
+      <menuitem action='calendar-view-day'/>
+      <menuitem action='calendar-view-workweek'/>
+      <menuitem action='calendar-view-week'/>
+      <menuitem action='calendar-view-month'/>
+      <menuitem action='calendar-view-list'/>
+      <separator/>
+      <menuitem action='gal-define-views'/>
+    </menu>
     <menuitem action='calendar-popup-go-today'/>
     <menuitem action='calendar-popup-jump-to'/>
   </popup>