Add menu and toolbar UI for calendars, memos and tasks.

svn path=/branches/kill-bonobo/; revision=36299

8 files changed, 135 insertions, 434 deletions

diff --git a/ui/Makefile.am b/ui/Makefile.am
index 5023d30148..fb02f4f427 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -1,17 +1,16 @@
 XML_FILES =					\
 	evolution.xml				\
-	evolution-addressbook.xml		\
-	evolution-calendar.xml			\
 	evolution-mail-message.xml		\
 	evolution-mail-list.xml			\
 	evolution-mail-global.xml		\
-	evolution-mail-messagedisplay.xml	\
-	evolution-memos.xml			\
-	evolution-tasks.xml
+	evolution-mail-messagedisplay.xml
 
 UI_FILES =					\
+	evolution-calendars.ui			\
 	evolution-contacts.ui			\
-	evolution-shell.ui
+	evolution-memos.ui			\
+	evolution-shell.ui			\
+	evolution-tasks.ui
 
 evolutionui_DATA = $(UI_FILES) $(XML_FILES)
 
diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml
deleted file mode 100644
index 999509013b..0000000000
--- a/ui/evolution-addressbook.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<Root>
-  <commands>
-
-    <cmd name="ContactDelete"
-	 _tip="Delete selected contacts"
-	 accel="*Control*d" pixtype="pixbuf"/>
-
-    <cmd name="ContactsPrint"
-	 _tip="Print selected contacts"
-	 accel="*Control*p" pixtype="pixbuf"/>
-
-    <cmd name="ContactsPrintPreview"
-	 _tip="Previews the contacts to be printed"
-         pixtype="pixbuf"/>
-
-    <cmd name="ContactsView"
-	 _tip="View the current contact"
-	 accel="*Control*o"/>
-
-    <cmd name="ContactStop"
-	 _tip="Stop Loading"
-	 pixtype="stock" pixname="gtk-stop"/>
-
-    <cmd name="ContactsCut" _label="Cut"
-	 _tip="Cut the selection"
-	 accel="*Control*x" pixtype="pixbuf"/>
-
-    <cmd name="ContactsCopy" _label="Copy"
-	 _tip="Copy the selection"
-	 accel="*Control*c" pixtype="pixbuf"/>
-
-    <cmd name="ContactsPaste" _label="Paste"
-	 _tip="Paste the clipboard"
-	 accel="*Control*v" pixtype="pixbuf"/>
-
-    <cmd name="ContactsSelectAll" _label="Select All"
-	 _tip="Select all contacts" accel="*Control*a"
-	 pixtype="stock" pixname="gtk-select-all"/>
-
-    <cmd name="ContactsSaveAsVCard" _label="Save as VCard..."
-	 _tip="Save selected contacts as a VCard."
-	 accel="*Control*s" pixtype="pixbuf"/>
-
-    <cmd name="ContactsSendContactToOther" _label="Forward Contact"
-	 _tip="Send selected contacts to another person."
-	 pixtype="pixbuf"/>
-
-    <cmd name="ContactsSendMessageToContact" _label="Send message to contact"
-	 _tip="Send a message to the selected contacts."
-	 pixtype="pixbuf"/>
-
-    <cmd name="ContactsCopyToFolder" _label="Copy to Folder..."
-	 _tip="Copy Selected Contacts to Another Folder..."
-	 accel="*Control**Shift*y"/>
-
-    <cmd name="ContactsMoveToFolder" _label="Move to Folder..."
-	 _tip="Move Selected Contacts to Another Folder..."
-	 accel="*Control**Shift*v"/>
-
-    <cmd name="ContactsViewPreview" _label="Contact _Preview"
-	 _tip="Show contact preview window"
-	 accel="*Control*m"
-	 type="toggle"/>
- 
-    <cmd name="FolderCreate" _label="_New"
-         _tip="Create a new addressbook folder"
-	 pixtype="pixbuf"/>
-
-    <cmd name="FolderCopy" _label="_Copy Folder Contacts To"
-	 _tip="Copy the contacts of the selected folder into another folder" 
-	 pixtype="pixbuf"/>  
- 
-    <cmd name="FolderMove" _label="_Move Folder Contacts To"
-	 _tip="Move the contacts of the selected folder into another folder" 
-	 pixtype="pixbuf"/>  
-
-    <cmd name="FolderSave" _label="_Save Folder Contacts As VCard"
-	 _tip="Save the contacts of the selected folder as VCard"
-	 pixtype="pixbuf"/>   
-
-    <cmd name="FolderDelete" _label="_Delete"
-	 _tip="Delete the selected folder"
-	 pixtype="pixbuf"/>
-
-    <cmd name="FolderRename" _label="_Rename"
-	 _tip="Rename the selected folder"
-	 pixtype="pixbuf"
-	 accel="F2"/>   
-
-    <cmd name="ChangeFolderProperties" _label="_Properties"
-	 _tip="Change the properties of the selected folder"
-	 pixtype="pixbuf"/>   
-
-  </commands>
-
-  <menu>
-    <submenu name="File">
-      <placeholder name="FileOps">
-	<menuitem name="ContactsView"
-		  verb="" _label="_Open"/>
-	<menuitem name="ContactsSaveAsVCard"
-		  verb="" _label="_Save Contact as VCard..."/>
-	<menuitem name="FolderSave" 
-		  verb="" _label="S_ave Address Book As VCard"/>
-      </placeholder>
-
-      <placeholder name="Print">
-	<menuitem name="ContactsPrintPreview" verb="" _label="Print Pre_view"/>
-	<menuitem name="ContactsPrint" verb="" _label="_Print..."/>
-      </placeholder>
-
-    </submenu>
-
-    <submenu name="View" _label="_View">
-      <menuitem name="ContactsViewPreview" verb="" _label="Contact _Preview"/>
-    </submenu>
-
-    <submenu name="Edit" _label="_Edit">
-      <placeholder name="EditPlaceholder">
-	<menuitem name="ContactsSelectAll" verb="" _label="Select _All"/>
-
-	<separator f="" name="eadbk2"/>
-
-	<menuitem name="ContactsCut" verb="" _label="C_ut"/>
-	
-	<menuitem name="ContactsCopy" verb="" _label="_Copy"/>
-	
-	<menuitem name="ContactsPaste" verb="" _label="_Paste"/>
-
-	<separator f="" name="eadbk6"/>
-
-	<menuitem name="ContactDelete" verb="" _label="_Delete Contact"/>
-	
-	<menuitem name="FolderDelete" verb="" _label="Del_ete Address Book"/>
-      </placeholder>
-    </submenu>
-
-    <placeholder name="FolderPlaceholder">
-    </placeholder>      
-
-    <placeholder name="ActionsPlaceholder">
-      <submenu name="Actions" _label="_Actions">
-	<menuitem name="ContactsSendContactToOther"
-		  _label="_Forward Contact..." verb=""/>
-
-	<menuitem name="ContactsSendMessageToContact"
-		  _label="_Send Message to Contact..." verb=""/>
-	<menuitem name="ContactActionStop" verb="ContactStop" _label="St_op"/>
-
-	<separator f="" name="eadbk5"/>
-
-	<menuitem name="ContactsCopyToFolder" _label="_Copy Contact to..." verb=""/>
-	<menuitem name="ContactsMoveToFolder" _label="_Move Contact to..." verb=""/>
-	
-	<separator f="" name="eadbk4"/>
-
-	<menuitem name="FolderCopy" verb="" _label="Co_py All Contacts To..."/>
-
-	<menuitem name="FolderMove" verb="" _label="Mo_ve All Contacts To..."/>
-
-	<separator f="" name="eadbk3"/>
-
-	<menuitem name="ChangeFolderProperties" verb="" _label="Address _Book Properties"/>
-
-      </submenu>
-    </placeholder>
-
-  </menu>
-
-  <dockitem name="Toolbar">
-    <toolitem name="ContactsPrint" verb=""
-	      _label="Print" pixtype="pixbuf"/>
-
-    <toolitem name="ContactDelete" verb=""
-	      _label="Delete" pixtype="pixbuf"/>
-
-    <toolitem name="ContactStop" verb=""
-	      _label="Stop"/>
-
-  </dockitem>
-
-  <keybindings>
-    <accel name="Delete" verb="ContactDelete"/>
-    <accel name="BackSpace" verb="ContactDelete"/>
-    <accel name="F16" verb="ContactsCopy"/>
-    <accel name="F18" verb="ContactsPaste"/>
-    <accel name="F20" verb="ContactsCut"/>
-  </keybindings>
-
-</Root>
diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml
deleted file mode 100644
index 5d7a5d875b..0000000000
--- a/ui/evolution-calendar.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<Root>
-  <commands>
-    <cmd name="EventOpen" _tip="View the current appointment" accel="*Control*o"/>
-    <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="CalendarPrev" _tip="Go back" pixtype="pixbuf"/>
-    <cmd name="CalendarToday" _tip="Select today" pixtype="pixbuf"/>
-    <cmd name="CalendarNext" _tip="Go forward" pixtype="pixbuf"/>
-    <cmd name="CalendarGoto" _tip="Select a specific date" pixtype="pixbuf"/>
-
-    <cmd name="ShowDayView" _tip="Show one day" pixtype="pixbuf"/>
-    <cmd name="ShowWorkWeekView" _tip="Show the working week" pixtype="pixbuf"/>
-    <cmd name="ShowWeekView" _tip="Show one week" pixtype="pixbuf"/>
-    <cmd name="ShowMonthView" _tip="Show one month" pixtype="pixbuf"/>
-    <cmd name="ShowListView" _tip="Show as list" pixtype="pixbuf"/>
-
-    <cmd name="Cut" _tip="Cut the selection" accel="*Control*x" pixtype="pixbuf"/>
-    <cmd name="Copy" _tip="Copy the selection" accel="*Control*c" pixtype="pixbuf"/>
-    <cmd name="Paste" _tip="Paste the clipboard" accel="*Control*v" pixtype="pixbuf"/>
-
-    <cmd name="Delete" _tip="Delete the appointment" accel="*Control*d" pixtype="pixbuf"/>
-    <cmd name="DeleteOccurrence" _tip="Delete this occurrence" pixtype="pixbuf"/>
-    <cmd name="DeleteAllOccurrences" _tip="Delete all occurrences" pixtype="pixbuf"/>
-    
-    <cmd name="CalendarPurge" _label="Purg_e" _tip="Purge old appointments and meetings" accel="*Control*e"/>
-  </commands>
-
-  <menu>
-    <submenu name="File">
-      <placeholder name="FileOps">
-        <menuitem name="EventOpen" verb="EventOpen" _label="_Open Appointment"/>
-      </placeholder>
-      <placeholder name="Print">
-	<menuitem name="PrintPreview" verb="CalendarPrintPreview"
-		  _label="Print Pre_view"/>
-
-	<menuitem name="Print" verb="CalendarPrint" accel="*Control*p"
-		  _label="_Print..."/>
-      </placeholder>
-
-    </submenu>
-
-    <submenu name="Edit" _label="_Edit">
-      <placeholder name="EditPlaceholder">
-      	<menuitem name="Cut" verb="" _label="C_ut"/>
-      	<menuitem name="Copy" verb="" _label="_Copy"/>
-      	<menuitem name="Paste" verb="" _label="_Paste"/>
-
-      	<separator/>
-
-      	<menuitem name="Delete" verb="" _label="_Delete"/>
-	<menuitem name="DeleteOccurrence" verb="" _label="Delete this _Occurrence"/>
-	<menuitem name="DeleteAllOccurrences" verb="" _label="Delete _all Occurrences"/>
-      </placeholder>
-    </submenu>
-
-    <submenu name="View">
-      <placeholder name="ViewBegin">
-	<menuitem name="Today" verb="CalendarToday" _label="Select _Today"
-                  accel="*Control*t"/>
-	<menuitem name="Goto" verb="CalendarGoto" _label="Select _Date" accel="*Control*g"/>
-	<separator f="" name="ecal"/>
-      </placeholder>
-
-     </submenu>
-
-    <placeholder name="ActionsPlaceholder">
-    <submenu name="Actions" _label="_Actions">
-	<menuitem name="CalendarPurge" verb=""/>
-    </submenu>
-    </placeholder>
-  </menu>
-
-  <dockitem name="Toolbar">
-  
-    <toolitem name="Print" verb="CalendarPrint" _label="Print" pixtype="pixbuf"/>
-    <toolitem name="Delete" verb="" _label="Delete" pixtype="pixbuf"/>
-
-    <separator f="" name="ecal2"/>
-
-    <toolitem name="Prev" verb="CalendarPrev" _label="Previous" pixtype="pixbuf"/> 
-    <toolitem name="Today" verb="CalendarToday" _label="Today" pixtype="pixbuf"/>
-    <toolitem name="Next" verb="CalendarNext" _label="Next" pixtype="pixbuf"/>
-
-    <separator f="" name="ecal3"/>
-
-    <toolitem name="Goto" verb="CalendarGoto" _label="Go To" priority="1" pixtype="pixbuf"/>
-
-    <separator f="" name="ecal4"/>
-
-    <toolitem name="DayView" verb="ShowDayView" _label="Day" priority="1" pixtype="pixbuf"/>
-    <toolitem name="WorkWeekView" verb="ShowWorkWeekView" _label="Work Week" priority="1" pixtype="pixbuf"/>
-    <toolitem name="WeekView" verb="ShowWeekView" _label="Week" priority="1" pixtype="pixbuf"/>
-    <toolitem name="MonthView" verb="ShowMonthView" _label="Month" priority="1" pixtype="pixbuf"/>
-    <toolitem name="ListView" verb="ShowListView" _label="List" priority="1" pixtype="pixbuf"/>
-
-  </dockitem>
-
-</Root>
diff --git a/ui/evolution-calendars.ui b/ui/evolution-calendars.ui
new file mode 100644
index 0000000000..5bda2a179f
--- /dev/null
+++ b/ui/evolution-calendars.ui
@@ -0,0 +1,55 @@
+<ui>
+  <menubar name='main-menu'>
+    <menu action='file-menu'>
+      <placeholder name='file-actions'>
+        <menuitem action='event-open'/>
+      </placeholder>
+      <placeholder name='print-actions'>
+        <menuitem action='calendar-print-preview'/>
+        <menuitem action='calendar-print'/>
+      </placeholder>
+    </menu>
+    <menu action='edit-menu'>
+      <placeholder name='edit-actions'>
+        <menuitem action='event-clipboard-cut'/>
+        <menuitem action='event-clipboard-copy'/>
+        <menuitem action='event-clipboard-paste'/>
+        <separator/>
+        <menuitem action='event-delete'/>
+        <menuitem action='event-delete-occurrence'/>
+        <menuitem action='event-delete-occurrence-all'/>
+      </placeholder>
+    </menu>
+    <menu action='view-menu'>
+      <menuitem action='calendar-go-today'/>
+      <menuitem action='calendar-jump-to'/>
+      <separator/>
+      <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'/>
+    </menu>
+    <placeholder name='custom-menus'>
+      <menu action='actions-menu'>
+        <menuitem action='calendar-purge'/>
+      </menu>
+    </placeholder>
+  </menubar>
+  <toolbar name='main-toolbar'>
+    <toolitem action='calendar-print'/>
+    <toolitem action='event-delete'/>
+    <separator/>
+    <toolitem action='calendar-go-back'/>
+    <toolitem action='calendar-go-today'/>
+    <toolitem action='calendar-go-forward'/>
+    <separator/>
+    <toolitem action='calendar-jump-to'/>
+    <separator/>
+    <toolitem action='calendar-view-day'/>
+    <toolitem action='calendar-view-workweek'/>
+    <toolitem action='calendar-view-week'/>
+    <toolitem action='calendar-view-month'/>
+    <toolitem action='calendar-view-list'/>
+  </toolbar>
+</ui>
diff --git a/ui/evolution-memos.ui b/ui/evolution-memos.ui
new file mode 100644
index 0000000000..a2a70455ba
--- /dev/null
+++ b/ui/evolution-memos.ui
@@ -0,0 +1,33 @@
+<ui>
+  <menubar name='main-menu'>
+    <menu action='file-menu'>
+      <placeholder name='file-actions'>
+        <menuitem action='memo-open'/>
+      </placeholder>
+      <placeholder name='print-actions'>
+        <menuitem action='memo-print-preview'/>
+        <menuitem action='memo-print'/>
+      </placeholder>
+    </menu>
+    <menu action='edit-menu'>
+      <placeholder name='edit-actions'>
+        <menuitem action='memo-clipboard-cut'/>
+        <menuitem action='memo-clipboard-copy'/>
+        <menuitem action='memo-clipboard-paste'/>
+        <separator/>
+        <menuitem action='memo-delete'/>
+      </placeholder>
+    </menu>
+    <menu action='view-menu'>
+      <menuitem action='memo-preview'/>
+    </menu>
+  </menubar>
+  <toolbar name='main-toolbar'>
+    <toolitem action='memo-clipboard-cut'/>
+    <toolitem action='memo-clipboard-copy'>
+    <toolitem action='memo-clipboard-paste'/>
+    <separator/>
+    <toolitem action='memo-print'/>
+    <toolitem action='memo-delete'/>
+  </toolbar>
+</ui>
diff --git a/ui/evolution-memos.xml b/ui/evolution-memos.xml
deleted file mode 100644
index 9a132d2add..0000000000
--- a/ui/evolution-memos.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<Root>
-  <commands>
-    <cmd name="MemosOpenMemo" _tip="View the selected memo" accel="*Control*o"/>
-    <cmd name="MemosPrint" _tip="Print the list of memos" pixtype="pixbuf"
-	 accel="*Control*p"/>
-    <cmd name="MemosPrintPreview" _tip="Previews the list of memos to be printed" pixtype="pixbuf"/>
-
-    <cmd name="MemosCut" _tip="Cut selected memo" accel="*Control*x" pixtype="pixbuf"/>
-    <cmd name="MemosCopy" _tip="Copy selected memo" accel="*Control*c" pixtype="pixbuf"/>
-    <cmd name="MemosPaste" _tip="Paste memo from the clipboard" accel="*Control*v" pixtype="pixbuf"/>
-    <cmd name="MemosDelete" _tip="Delete selected memos" accel="*Control*d" sensitive="0"
-         pixtype="pixbuf"/>
-
-  </commands>
-  
-  <menu>
-    <submenu name="File">
-      <placeholder name="FileOps">
-        <menuitem name="OpenMemo" verb="MemosOpenMemo" _label="_Open Memo"/>
-      </placeholder>
-      <placeholder name="Print">
-	<menuitem name="PrintPreview" verb="MemosPrintPreview" _label="Print Pre_view"/>
-
-	<menuitem name="Print" verb="MemosPrint" accel="*Control*p" _label="_Print..."/>
-      </placeholder>
-
-    </submenu>
-
-    <submenu name="Edit" _label="_Edit">
-      <placeholder name="EditPlaceholder">
-        <menuitem name="MemosCut" verb="" _label="C_ut"/>
-        <menuitem name="MemosCopy" verb="" _label="_Copy"/>
-        <menuitem name="MemosPaste" verb="" _label="_Paste"/>
-        
-		<separator/>
-        
-		<menuitem name="MemosDelete" verb="" _label="_Delete"/>
-      </placeholder>
-    </submenu>
-
-  </menu>
-
-  <dockitem name="Toolbar">
-    <toolitem name="Cut" _label="Cut" verb="MemosCut" pixtype="pixbuf"/>
-    <toolitem name="Copy" _label="Copy" verb="MemosCopy" pixtype="pixbuf"/>
-    <toolitem name="Paste" _label="Paste" verb="MemosPaste" pixtype="pixbuf"/>
-
-    <separator/>
-
-    <toolitem name="Print" _label="Print" verb="MemosPrint" pixtype="pixbuf"/>
-
-    <toolitem name="Delete" _label="Delete" verb="MemosDelete" pixtype="pixbuf"/>
-
-  </dockitem>
-
-</Root>
diff --git a/ui/evolution-tasks.ui b/ui/evolution-tasks.ui
new file mode 100644
index 0000000000..ccfccd77bf
--- /dev/null
+++ b/ui/evolution-tasks.ui
@@ -0,0 +1,42 @@
+<ui>
+  <menubar name='main-menu'/>
+    <menu action='file-menu'>
+      <placeholder name='file-actions'>
+        <menuitem action='task-open'/>
+      </placeholder>
+      <placeholder name='print-actions'>
+        <menuitem action='task-print-preview'/>
+        <menuitem action='task-print'/>
+      </placeholder>
+    </menu>
+    <menu action='edit-menu'>
+      <placeholder name='edit-actions'>
+        <menuitem action='task-clipboard-cut'/>
+        <menuitem action='task-clipboard-copy'/>
+        <menuitem action='task-clipboard-paste'/>
+        <separator/>
+        <menuitem action='task-delete'/>
+        <separator/>
+        <menuitem action='task-mark-complete'/>
+      </placeholder>
+    </menu>
+    <menu action='view-menu'>
+      <menuitem action='task-preview'/>
+    </menu>
+    <placeholder name='custom-menus'>
+      <menu action='actions-menu'>
+        <menuitem name='task-purge'/>
+        <menuitem name='task-assign'/>
+        <menuitem name='task-forward'/>
+      </menu>
+    </placeholder>
+  </menubar>
+  <toolbar name='main-toolbar'/>
+    <toolitem action='task-clipboard-cut'/>
+    <toolitem action='task-clipboard-copy'/>
+    <toolitem action='task-clipboard-paste'/>
+    <separator/>
+    <toolitem action='task-print'/>
+    <toolitem action='task-delete'/>
+  </toolbar>
+</ui>
diff --git a/ui/evolution-tasks.xml b/ui/evolution-tasks.xml
deleted file mode 100644
index e0902b6806..0000000000
--- a/ui/evolution-tasks.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<Root>
-  <commands>
-    <cmd name="TasksOpenTask" _tip="View the selected task" accel="*Control*o"/>
-    <cmd name="TasksPrint" _tip="Print the list of tasks" pixtype="pixbuf"
-	 accel="*Control*p"/>
-    <cmd name="TasksPrintPreview" _tip="Previews the list of tasks to be printed" pixtype="pixbuf"/>
-
-    <cmd name="TasksCut" _tip="Cut selected tasks" accel="*Control*x" pixtype="pixbuf"/>
-    <cmd name="TasksCopy" _tip="Copy selected tasks" accel="*Control*c" pixtype="pixbuf"/>
-    <cmd name="TasksPaste" _tip="Paste tasks from the clipboard" accel="*Control*v" pixtype="pixbuf"/>
-    <cmd name="TasksDelete" _tip="Delete selected tasks" accel="*Control*d" sensitive="0"
-         pixtype="pixbuf"/>
-    <cmd name="TasksMarkComplete" _tip="Mark selected tasks as complete" accel="*Control*k" sensitive="0"/>
-
-    <cmd name="TasksPurge" _label="Purg_e" _tip="Delete completed tasks" accel="*Control*e"/>
-    <cmd name="TasksAssign" _label="_Assign Task"/>
-    <cmd name="TasksForward" _label="_Forward as iCalendar" accel="*Control*f" pixtype="pixbuf"/>
-
-    <cmd name="ViewPreview" _tip="Show task preview window" accel="*Control*m" type="toggle"/>
-
-  </commands>
-  
-  <menu>
-    <submenu name="File">
-      <placeholder name="FileOps">
-        <menuitem name="OpenTask" verb="TasksOpenTask" _label="_Open Task"/>
-      </placeholder>
-      <placeholder name="Print">
-	<menuitem name="PrintPreview" verb="TasksPrintPreview" _label="Print Pre_view"/>
-
-	<menuitem name="Print" verb="TasksPrint" accel="*Control*p" _label="_Print..."/>
-      </placeholder>
-
-    </submenu>
-
-    <submenu name="Edit" _label="_Edit">
-      <placeholder name="EditPlaceholder">
-	<menuitem name="TasksCut" verb="" _label="C_ut"/>
-	<menuitem name="TasksCopy" verb="" _label="_Copy"/>
-	<menuitem name="TasksPaste" verb="" _label="_Paste"/>
-
-	<separator/>
-
-	<menuitem name="TasksDelete" verb="" _label="_Delete"/>
-
-	<separator/>
-
-	<menuitem name="TasksMarkComplete" verb="" _label="Mar_k as Complete"/>
-      </placeholder>
-    </submenu>
-
-    <submenu name="View" _label="_View">
-      <placeholder name="ViewPreview">
-        <menuitem name="ViewPreview" verb="" _label="Task _Preview"/>
-      </placeholder>
-    </submenu>
-
-    <placeholder name="ActionsPlaceholder">
-    <submenu name="Actions" _label="_Actions">
-	<menuitem name="TasksPurge" verb=""/>
-	<menuitem name="TasksAssign" verb=""/>
-	<menuitem name="TasksForward" verb=""/>
-    </submenu>
-    </placeholder>
-
-  </menu>
-
-  <dockitem name="Toolbar">
-    <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="Print" _label="Print" verb="TasksPrint" pixtype="pixbuf"/>
-
-    <toolitem name="Delete" _label="Delete" verb="TasksDelete" pixtype="pixbuf"/>
-
-  </dockitem>
-
-</Root>