make spacing consistent with calendar xml file, add expunge command and

2002-01-03  JP Rosevear  <jpr@ximian.com>

	* evolution-tasks.xml: make spacing consistent with calendar xml
	file, add expunge command and actions menu and add accelerator for
	delete

	* evolution-calendar.xml: add an accelerator for delete and put in
	a separator to be consistent with the mailer

svn path=/trunk/; revision=15237

3 files changed, 82 insertions, 62 deletions

diff --git a/ui/ChangeLog b/ui/ChangeLog
index 96405bde3e..72555bbaac 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,12 @@
+2002-01-03  JP Rosevear  <jpr@ximian.com>
+
+	* evolution-tasks.xml: make spacing consistent with calendar xml
+	file, add expunge command and actions menu and add accelerator for
+	delete
+
+	* evolution-calendar.xml: add an accelerator for delete and put in
+	a separator to be consistent with the mailer
+
 2001-12-03  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* evolution-mail-message.xml: Add an "Add Sender to Address Book"
diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml
index e570e186dd..e50572fceb 100644
--- a/ui/evolution-calendar.xml
+++ b/ui/evolution-calendar.xml
@@ -23,7 +23,8 @@
     <cmd name="Cut" _tip="Cut the selection" accel="*Control*x"/>
     <cmd name="Copy" _tip="Copy the selection" accel="*Control*c"/>
     <cmd name="Paste" _tip="Paste the clipboard" accel="*Control*v"/>
-    <cmd name="Delete" _tip="Delete the appointment"/>
+
+    <cmd name="Delete" _tip="Delete the appointment" accel="*Control*d"/>
 
     <cmd name="PublishFreeBusy" _tip="Publish Free/Busy information for this calendar"/>
   </commands>
@@ -58,6 +59,9 @@
       	<menuitem name="Cut" verb="" _label="C_ut" pixtype="pixbuf"/>
       	<menuitem name="Copy" verb="" _label="_Copy" pixtype="pixbuf"/>
       	<menuitem name="Paste" verb="" _label="_Paste" pixtype="pixbuf"/>
+
+      	<separator/>
+
       	<menuitem name="Delete" verb="" _label="_Delete" pixtype="pixbuf"/>
       </submenu>
     </placeholder>
diff --git a/ui/evolution-tasks.xml b/ui/evolution-tasks.xml
index 9907d3818f..d492f4deda 100644
--- a/ui/evolution-tasks.xml
+++ b/ui/evolution-tasks.xml
@@ -1,68 +1,75 @@
 <Root>
+  <commands>
+    <cmd name="TasksNewTask" pixtype="pixbuf" _tip="Create a new task"/>
 
-        <commands>
-		<cmd name="TasksNewTask" pixtype="pixbuf" _tip="Create a new task"/>
-		<cmd name="TasksDelete" _label="Delete" _tip="Delete selected tasks" 
-accel="Delete" sensitive="0"/>
+    <cmd name="TasksCut" _tip="Cut selected task" accel="*Control*x"/>
+    <cmd name="TasksCopy" _tip="Copy selected task" accel="*Control*c"/>
+    <cmd name="TasksPaste" _tip="Paste task from the clipboard" accel="*Control*v"/>
+    <cmd name="TasksDelete" _label="Delete" _tip="Delete selected tasks" 
+         accel="*Control*d" sensitive="0"/>
 
-		<cmd name="TasksCut" _tip="Cut selected task" accel="*Control*x"/>
-		<cmd name="TasksCopy" _tip="Copy selected task" accel="*Control*c"/>
-		<cmd name="TasksPaste" _tip="Paste task from the clipboard" accel="*Control*v"/>
+    <cmd name="TasksExpunge" _label="_Expunge" _tip="Delete completed tasks" 
+         accel="*Control*e"/>
 
-		<cmd name="TasksSettings" _tip="Configure the task view's settings"/>
-  	</commands>
+    <cmd name="TasksSettings" _tip="Configure the task view's settings"/>
+  </commands>
   
-	<menu>
-		<submenu name="File">
-
-                        <submenu name="New">
-				<placeholder name="NewFirstItem">
-	  				<menuitem name="NewTask"
-	  				verb="TasksNewTask"
-					_label="_Task"
-	                                accel="*Control*n"
-					pixtype="pixbuf"/>
-	                        </placeholder>
-	                </submenu>
-      
-		</submenu>
-
-		<placeholder name="EditPlaceholder">
-			<submenu name="Edit" _label="_Edit">
-				<menuitem name="TasksCut" verb="" _label="C_ut" pixtype="pixbuf"/>
-				<menuitem name="TasksCopy" verb="" _label="_Copy" pixtype="pixbuf"/>
-				<menuitem name="TasksPaste" verb="" _label="_Paste" pixtype="pixbuf"/>
-				<menuitem name="TasksDelete" verb="" _label="_Delete" pixtype="pixbuf"/>
-			</submenu>
-		</placeholder>
-
-    		<submenu name="Tools">
-      			<placeholder name="ComponentPlaceholder">
-		    		<menuitem name="TasksSettings"
-					  _label="Tasks Settings..."
-					  verb="" pixtype="pixbuf"/>
-				<separator/>
-		        </placeholder>
-		</submenu>
-	</menu>
-
-	<dockitem name="Toolbar">
-		<toolitem name="New" _label="New Task" verb="TasksNewTask"
-		priority="1" pixtype="pixbuf"/>
-
-	  	<separator/>
-
-		<toolitem name="Cut" _label="Cut" verb="TasksCut"
-		pixtype="pixbuf"/>
-		<toolitem name="Copy" _label="Copy" verb="TasksCopy"
-		pixtype="pixbuf"/>
-		<toolitem name="Paste" _label="Paste" verb="TasksPaste"
-		pixtype="pixbuf"/>
-
-	  	<separator/>
-
-		<toolitem name="Delete" verb="TasksDelete" pixtype="pixbuf"/>
-
-	</dockitem>
+  <menu>
+    <submenu name="File">
+      <submenu name="New">
+	<placeholder name="NewFirstItem">
+	  <menuitem name="NewTask" verb="TasksNewTask" _label="_Task"
+	            accel="*Control*n" pixtype="pixbuf"/>
+	  <separator/>
+	</placeholder>
+      </submenu>
+    </submenu>
+
+    <placeholder name="EditPlaceholder">
+      <submenu name="Edit" _label="_Edit">
+	<menuitem name="TasksCut" verb="" _label="C_ut" pixtype="pixbuf"/>
+	<menuitem name="TasksCopy" verb="" _label="_Copy" pixtype="pixbuf"/>
+	<menuitem name="TasksPaste" verb="" _label="_Paste" pixtype="pixbuf"/>
+
+	<separator/>
+
+	<menuitem name="TasksDelete" verb="" _label="_Delete" pixtype="pixbuf"/>
+      </submenu>
+    </placeholder>
+
+    <placeholder name="ComponentActionsPlaceholder">
+      <submenu name="Actions" _label="_Actions">
+	<menuitem name="NewTask" verb="CalendarNewTask" _label="Create a New _Task" pixtype="pixbuf"/>
+
+	<separator/>
+
+	<menuitem name="TasksExpunge" verb="" pixtype="pixbuf"/>
+
+      </submenu>
+    </placeholder>
+
+    <submenu name="Tools">
+      <placeholder name="ComponentPlaceholder">
+        <menuitem name="TasksSettings" _label="Tasks Settings..." verb="" pixtype="pixbuf"/>
+
+	<separator/>
+      </placeholder>
+    </submenu>
+  </menu>
+
+  <dockitem name="Toolbar">
+    <toolitem name="New" _label="New Task" verb="TasksNewTask" priority="1" pixtype="pixbuf"/>
+
+    <separator/>
+
+    <toolitem name="Cut" _label="Cut" verb="TasksCut" pixtype="pixbuf"/>
+    <toolitem name="Copy" _label="Copy" verb="TasksCopy" pixtype="pixbuf"/>
+    <toolitem name="Paste" _label="Paste" verb="TasksPaste" pixtype="pixbuf"/>
+
+    <separator/>
+
+    <toolitem name="Delete" verb="TasksDelete" pixtype="pixbuf"/>
+
+  </dockitem>
 
 </Root>