Consistency fixes, and reindented the goddamn thing.

2001-07-26  Federico Mena Quintero  <federico@ximian.com>

	* evolution-calendar.xml: Consistency fixes, and reindented the
	goddamn thing.

svn path=/trunk/; revision=11454

2 files changed, 118 insertions, 142 deletions

diff --git a/ui/ChangeLog b/ui/ChangeLog
index 68355b4416..d31420461b 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-26  Federico Mena Quintero  <federico@ximian.com>
+
+	* evolution-calendar.xml: Consistency fixes, and reindented the
+	goddamn thing.
+
 2001-07-27  Jason Leach  <jleach@ximian.com>
 
 	* evolution-addressbook.xml: Removed the unused "Settings"
diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml
index 2554368d8c..7ded8a0479 100644
--- a/ui/evolution-calendar.xml
+++ b/ui/evolution-calendar.xml
@@ -1,153 +1,124 @@
 <Root>
-	<commands>
-		<cmd name="CalendarNew"    _tip="Create a new calendar" _label="Calendar"/>
-		<cmd name="CalendarOpen"   _tip="Open Calendar" _label="Open"/>
-		<cmd name="CalendarSaveAs" _tip="Save calendar as something else" _label="Save As"/>
-		<cmd name="CalendarPrint"  _tip="Print this Calendar" _label="Print"
-		 pixtype="pixbuf"/>
-		<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"
-		 pixtype="stock" pixname="Home"/>
-		<cmd name="CalendarNext" _label="Next" _tip="Go forward in time" 
-		 pixtype="stock" pixname="Forward"/>
-		<cmd name="CalendarGoto" _label="Go To" priority="1"
-		 _tip="Go to a specific date" pixtype="stock" pixname="Jump To"/>
-		<cmd name="ShowDayView" _label="Day" _tip="Show 1 day" pixtype="pixbuf"/>
-		<cmd name="ShowWorkWeekView" _label="5 Days" _tip="Show the working week"
-		 pixtype="pixbuf"/>
-		<cmd name="ShowWeekView" _label="Week" _tip="Show 1 week" pixtype="pixbuf"/>
-		<cmd name="ShowMonthView" _label="Month" _tip="Show 1 month" pixtype="pixbuf"/>
-
-		<cmd name="CutEvent" _label="Cut" _tip="Cut the selection"
-		 pixtype="stock" pixname="Cut" accel="*Control*x"/>
-		<cmd name="CopyEvent" _label="Copy"
-                 _tip="Copy the selection" pixtype="stock" pixname="Copy"
-                 accel="*Control*c"/>
-		<cmd name="PasteEvent" _label="Paste"
-                 _tip="Paste the clipboard" pixtype="stock" pixname="Paste"
-                 accel="*Control*v"/>
-
-	        <cmd name="PublishFreeBusy" _label="Publish Free/Busy Information"
-                _tip="Publish Free/Busy information for this calendar"/>
-	</commands>
-
-	<menu>
-		<submenu name="File">
-
-			<submenu name="New" _label="_New">
-
-	                        <placeholder name="NewFirstItem">
-					<menuitem name="CalendarNew" verb="EditNewAppointment"
-					_label="_Appointment" accel="*Control*n"
-					 pixtype="pixbuf"/>
-	                        </placeholder>
-			</submenu>
-
-			<placeholder name="FileOps">
-				
-				<menuitem name="CalendarOpen" verb=""
-					_label="_Open Calendar" accel="*Control*o"/>
-
-				<menuitem name="CalendarSaveAs" verb=""
-				_label="_Save As..." accel="*Control*a"/>
-
-			</placeholder>
-
-			<placeholder name="Print">
-	                        <menuitem name="Print Preview" verb="CalendarPrintPreview"
-                                _label="Print Preview"
-		    	        _tip="Previews the calendar to be printed"
-				pixtype="pixbuf"/>
-	  
-				<menuitem name="Print" verb="CalendarPrint"
-				_label="_Print..." _tip="Print calendar"
-	                        accel="*Control*p" pixtype="pixbuf"/>
-			</placeholder>
-
-		</submenu>
-
-		<submenu name="Edit">
-			<menuitem name="CutEvent" verb="" _label="C_ut"/>
-
-                        <menuitem name="CopyEvent" verb="" _label="_Copy"/>
-
-                        <menuitem name="PasteEvent" verb="" _label="_Paste"/>
-		</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="_Calendar Settings..." pixtype="pixbuf"/>
-	                </placeholder>
-		</submenu>
-
-                <submenu name="Actions">
-                        <placeholder name="Component">
-	                        <menuitem name="CalendarNew" verb="EditNewAppointment"/>
-	                        <menuitem verb="EditNewEvent"/>
-
-                                <separator/>
-
-	                        <menuitem name="PublishFreeBusy" verb=""/>
-	                </placeholder>
-                </submenu>
-	</menu>
+  <commands>
+    <cmd name="CalendarNewAppointment" _tip="Create a new appointment"
+	 accel="*Control*n"/>
+    <cmd name="CalendarNewEvent" _tip="Create an event for the whole day"/>
+
+    <cmd name="CalendarPrint" _tip="Print this Calendar" pixtype="pixbuf" 
+	 accel="*Control*p"/>
+    <cmd name="CalendarPrintPreview" _tip="Previews the calendar to be printed" pixtype="pixbuf"/>
+    <cmd name="CalendarSettings" _tip="Configure the calendar's settings"/>
+
+    <cmd name="CalendarPrev" _tip="Go back in time" pixtype="stock" pixname="Back"/>
+    <cmd name="CalendarToday" _tip="Go to present time" pixtype="stock" pixname="Home"/>
+    <cmd name="CalendarNext" _tip="Go forward in time" pixtype="stock" pixname="Forward"/>
+    <cmd name="CalendarGoto" _tip="Go to a specific date" pixtype="stock" pixname="Jump To"/>
 
-	<dockitem name="Toolbar">
-		<toolitem name="New" verb="EditNewAppointment" pixtype="pixbuf"/>
+    <cmd name="ShowDayView" _tip="Show 1 day" pixtype="pixbuf"/>
+    <cmd name="ShowWorkWeekView" _tip="Show the working week" pixtype="pixbuf"/>
+    <cmd name="ShowWeekView" _tip="Show 1 week" pixtype="pixbuf"/>
+    <cmd name="ShowMonthView" _tip="Show 1 month" pixtype="pixbuf"/>
+
+    <cmd name="CutEvent" _tip="Cut the selection" pixtype="stock"
+	 pixname="Cut" accel="*Control*x"/>
+    <cmd name="CopyEvent" _tip="Copy the selection" pixtype="stock" 
+	 pixname="Copy" accel="*Control*c"/>
+    <cmd name="PasteEvent" _tip="Paste the clipboard" pixtype="stock" 
+	 pixname="Paste" accel="*Control*v"/>
+
+    <cmd name="PublishFreeBusy" _tip="Publish Free/Busy information for this calendar"/>
+  </commands>
+
+  <menu>
+    <submenu name="File">
+
+      <submenu name="New">
+
+	<placeholder name="NewFirstItem">
+	  <menuitem name="NewAppointment" verb="CalendarNewAppointment"
+		    _label="_Appointment..." pixtype="pixbuf"/>
+	  <separator/>
+	</placeholder>
+
+      </submenu>
+
+      <placeholder name="Print">
+	<menuitem name="PrintPreview" verb="CalendarPrintPreview"
+		  _label="Print Preview" pixtype="pixbuf"/>
+
+	<menuitem name="Print" verb="CalendarPrint"
+		  _label="_Print..." _tip="Print calendar" pixtype="pixbuf"/>
+      </placeholder>
+
+    </submenu>
+
+    <submenu name="Edit">
+      <menuitem name="CutEvent" verb="" _label="C_ut"/>
+      <menuitem name="CopyEvent" verb="" _label="_Copy"/>
+      <menuitem name="PasteEvent" verb="" _label="_Paste"/>
+    </submenu>
+
+    <submenu name="View">
+      <placeholder name="ViewBegin">
+	<menuitem name="Today" verb="CalendarToday" _label="Go to _Today"/>
+	<menuitem name="Goto" verb="CalendarGoto" _label="Go to _Date"/>
+	<separator/>
+      </placeholder>
+
+      <placeholder name="ViewAfterControl">
+	<separator/>
+	<menuitem name="DayView" verb="ShowDayView" _label="_Day"/>
+	<menuitem name="WorkWeekView" verb="ShowWorkWeekView" _label="W_ork Week"/>
+	<menuitem name="WeekView" verb="ShowWeekView" _label="_Week"/>
+	<menuitem name="MonthView" verb="ShowMonthView" _label="_Month"/>
+      </placeholder>
+    </submenu>
+
+    <submenu name="Tools" _label="_Tools">
+      <placeholder name="Component">
+	<menuitem name="CalendarSettings" verb="" _label="_Calendar Settings..." pixtype="pixbuf"/>
+      </placeholder>
+    </submenu>
+
+    <submenu name="Actions">
+      <placeholder name="Component">
+	<menuitem name="NewAppointment" verb="CalendarNewAppointment"
+		  _label="Create a _New Appointment" pixtype="pixbuf"/>
+	<menuitem name="NewEvent" verb="CalendarNewEvent" _label="Create a New All-Day _Event"/>
+
+	<separator/>
+
+	<menuitem name="PublishFreeBusy" verb="" _label="Publish Free/Busy Information"/>
+      </placeholder>
+    </submenu>
+  </menu>
+
+  <dockitem name="Toolbar">
+  
+    <toolitem name="New" verb="CalendarNewAppointment" _label="New Appointment"
+	      priority="1" pixtype="pixbuf"/>
+
+    <separator/>
+
+    <toolitem name="Print" verb="CalendarPrint" pixtype = "pixbuf"/>
 
-		<separator/>
+    <separator/>
 
-		<toolitem name="Print" verb="CalendarPrint" pixtype = "pixbuf"/>
+    <toolitem name="Prev" verb="CalendarPrev"/>
+    <toolitem name="Today" verb="CalendarToday"/>
+    <toolitem name="Next" verb="CalendarNext"/>
 
-		<separator/>
+    <separator/>
 
-		<toolitem name="Prev" verb="CalendarPrev"/>
+    <toolitem name="Goto" verb="CalendarGoto" _label="Go To" priority="1"/>
 
-		<toolitem name="Today" verb="CalendarToday"/>
+    <separator/>
 
-		<toolitem name="Next" verb="CalendarNext"/>
+    <toolitem name="DayView" verb="ShowDayView" pixtype="pixbuf"/>
+    <toolitem name="WorkWeekView" verb="ShowWorkWeekView" pixtype="pixbuf"/>
+    <toolitem name="WeekView" verb="ShowWeekView" pixtype="pixbuf"/>
+    <toolitem name="MonthView" verb="ShowMonthView" pixtype="pixbuf"/>
 
-		<separator/>
-
-		<toolitem name="Goto" verb="CalendarGoto"/>
-		
-		<separator/>
-
-		<toolitem name="DayView" verb="ShowDayView" pixtype="pixbuf"/>
-
-		<toolitem name="WorkWeekView" verb="ShowWorkWeekView" pixtype="pixbuf"/>
-
-		<toolitem name="WeekView" verb="ShowWeekView" pixtype="pixbuf"/>
-
-		<toolitem name="MonthView" verb="ShowMonthView" pixtype="pixbuf"/>
-
-	</dockitem>
+  </dockitem>
 
 </Root>