From f4b4da4fcb6a59f56c1fff88ba08a6c9995b807c Mon Sep 17 00:00:00 2001
From: Miguel de Icaza <miguel@ximian.com>
Date: Sun, 18 Mar 2001 08:16:40 +0000
Subject: Added ShowWeekView, ShowMonthView, ShowDay, ShowWorkWeek to the View
 menu.

2001-03-17  Miguel de Icaza  <miguel@ximian.com>

	* evolution-calendar.xml: Added ShowWeekView, ShowMonthView,
	ShowDay, ShowWorkWeek to the View menu.

	* evolution.xml, evolution-mail.xml: Provide "Actions" in the
	toplevel evolution.  Fill in Actions/Component in Evolution-mail
	(no visual changes, just internal changes).

	* evolution-calendar.xml: Added Actions menu.  Added New Verb
	EditNewEvent.

2001-03-17  Miguel de Icaza  <miguel@ximian.com>

	* gui/e-day-view.c (e_day_view_on_new_event,
	e_day_view_on_new_appointment): Simplifed this function to use the
	shared code.

	* gui/e-week-view.c (e_week_view_on_new_event,
	e_week_view_on_new_appointment): ditto.

	* gui/gnome-cal.c (gnome_calendar_new_appointment_for): New
	function used to launch editor components with a time range.   A
	bunch of functions use this code now instead of duplicating code
	all over the place

svn path=/trunk/; revision=8794
---
 ui/ChangeLog              | 12 ++++++++++++
 ui/evolution-calendar.xml | 31 ++++++++++++++++++++++++++++++-
 ui/evolution-mail.xml     |  8 ++++----
 ui/evolution.xml          |  6 +++++-
 4 files changed, 51 insertions(+), 6 deletions(-)

(limited to 'ui')

diff --git a/ui/ChangeLog b/ui/ChangeLog
index a82b480191..da70413b31 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,15 @@
+2001-03-17  Miguel de Icaza  <miguel@ximian.com>
+
+	* evolution-calendar.xml: Added ShowWeekView, ShowMonthView,
+	ShowDay, ShowWorkWeek to the View menu.
+
+	* evolution.xml, evolution-mail.xml: Provide "Actions" in the
+	toplevel evolution.  Fill in Actions/Component in Evolution-mail
+	(no visual changes, just internal changes).
+
+	* evolution-calendar.xml: Added Actions menu.  Added New Verb
+	EditNewEvent. 
+
 2001-03-16  Miguel de Icaza  <miguel@ximian.com>
 
 	* evolution-mail.xml: Added accelerator to elements missing
diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml
index 3c5cc500d5..adf8b3cf9d 100644
--- a/ui/evolution-calendar.xml
+++ b/ui/evolution-calendar.xml
@@ -8,6 +8,8 @@
 		<cmd name="CalendarPreferences" _tip="Alter preferences"/>
 		<cmd name="EditNewAppointment" _label="New Appointment"
 		 priority="1" _tip="Create a new appointment" pixtype="stock" pixname="New"/>
+		<cmd name="EditNewEvent" _label="New _Event"
+		 priority="1" _tip="Create a new all day Event"/>
 		<cmd name="CalendarPrev" _label="Prev" _tip="Go back in time"
 		 pixtype="stock" pixname="Back"/>
 		<cmd name="CalendarToday" _label="Today" _tip="Go to present time"
@@ -45,7 +47,7 @@
 			</placeholder>
 
 			<placeholder name="Print">
-	                        <menuitem name="Print Preview" verb="PrintPreviewMessage"
+	                        <menuitem name="Print Preview" verb="CalendarPrintPreview"
                                 _label="Print Preview"
 		    	        _tip="Previews the message to be printed"/>
 	  
@@ -61,12 +63,39 @@
 
 		</submenu>
 
+                <submenu name="View">
+                	<placeholder name="ViewBegin">
+	                        <menuitem verb="CalendarToday"
+	                        _label="Go to _Today"/>
+	                        <menuitem verb="CalendarGoto"
+	                        _label="Go to _Date"/>
+	                        <separator/>
+	                </placeholder>
+
+                        <placeholder name="ViewAfterControl">
+		                <separator/>
+	                	<menuitem verb="ShowDayView" _label="_Day"/>
+	                	<menuitem verb="ShowWorkWeekView"
+	                	_label="W_ork Week"/>
+	                	<menuitem verb="ShowWeekView" _label="_Week"/>
+	                	<menuitem verb="ShowMonthView"
+	                	_label="_Month"/>
+	                </placeholder>
+                </submenu>
+    
                 <submenu name="Tools" _label="_Tools">
                 	<placeholder name="Component">
 				<menuitem name="CalendarPreferences" verb=""
 			 	_label="Settings..."/>
 	                </placeholder>
 		</submenu>
+
+                <submenu name="Actions">
+                        <placeholder name="Component">
+	                        <menuitem verb="EditNewAppointment"/>
+	                        <menuitem verb="EditNewEvent"/>
+	                </placeholder>
+                </submenu>
 	</menu>
 
 	<dockitem name="Toolbar">
diff --git a/ui/evolution-mail.xml b/ui/evolution-mail.xml
index 1570c7a59b..5620640dae 100644
--- a/ui/evolution-mail.xml
+++ b/ui/evolution-mail.xml
@@ -127,8 +127,8 @@
         </submenu>
     </submenu>
 
-    <placeholder name="Component">
-      	<submenu name="Actions" _label="_Actions">
+    <submenu name="Actions">
+        <placeholder name="Component">
       	    <menuitem name="SendReceive" verb="MailGetSend"
       	     _label="_Send and Receive"/>
       	      
@@ -189,8 +189,8 @@
 
             <menuitem name="ActionsEmptyTrash" verb="" _label="Empty _Trash"
       	    accel=""/>
-      	</submenu>
-    </placeholder>
+      	</placeholder>
+    </submenu>
     
     <submenu name="Tools" _label="_Tools">
         <placeholder name="Component">
diff --git a/ui/evolution.xml b/ui/evolution.xml
index a0176241bb..cdc8fd0b8e 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -106,10 +106,10 @@
 	                <placeholder name="ViewBegin"/>
 	    		<menuitem name="ShortcutBar" id="ViewShortcutBar"/>
 			<menuitem name="FolderBar" id="ViewFolderBar"/>
+	                <placeholder name="ViewAfterControl"/>
 		</submenu>
 
 		<placeholder name="Component"/>
-	        <placeholder name="Actions"/>
 
 	        <submenu name="Tools" _label="_Tools">
 		        <placeholder name="Component"/>
@@ -118,6 +118,10 @@
 			 _label="Customi_ze Toolbars..." pos="bottom"/>
 		</submenu>
 
+	        <submenu name="Actions" _label="_Actions">
+	                <placeholder name="Component"/>
+	        </submenu>
+
 		<submenu name="Help" _label="_Help">
 
 			<menuitem name="HelpIndex" verb=""
-- 
cgit v1.2.3