2007-08-13 Murray Cumming <murrayc@murrayc.com>

[modest] / src / maemo / ui / modest-main-window-ui.xml

diff --git a/src/maemo/ui/modest-main-window-ui.xml b/src/maemo/ui/modest-main-window-ui.xml
index 15311e8..3140026 100644 (file)
--- a/src/maemo/ui/modest-main-window-ui.xml
+++ b/src/maemo/ui/modest-main-window-ui.xml
@@ -68,7 +68,7 @@
     <menu name="ViewMenu" action="View">
       <menuitem name="ViewSortMenu" action="ViewSort"/>
       <separator/>
-      <menuitem name="ViewToggleFoldersMenu" action="ViewToggleFolders"/>
+      <menuitem name="ViewToggleFoldersMenu" action="ToggleFolders"/>
       <menuitem name="ViewToggleFullscreenMenu" action="ViewToggleFullscreen"/>
       <separator/>
       <menu name="ViewShowToolbarMainMenu" action="ViewShowToolbar">
@@ -76,6 +76,7 @@
         <menuitem name="ViewShowToolbarFullScreenMenu" action="ViewShowToolbarFullScreen"/>
       </menu>
       <separator/>
+      <placeholder name="ViewMenuAdditions" />
    </menu>
     
     <menu name="ToolsMenu" action="Tools">
@@ -87,6 +88,7 @@
         <menuitem name="ToolsSendReceiveAllMenu"  action="ToolsSendReceiveAll"/>
         <menuitem name="ToolsSendReceiveCancelSendingMenu"  action="ToolsSendReceiveCancelSending"/>
         <separator/>
+        <placeholder name="ToolsMenuAdditions" />
       </menu>
       <separator/>
       <menuitem name="ToolsContactsMenu" action="ToolsContacts"/>
@@ -105,33 +107,46 @@
     <toolitem action="ToolbarMessageNew"/> 
     <toolitem action="ToolbarMessageReply"/> 
     <toolitem action="ToolbarDeleteMessage"/>
-    <toolitem action="ToolbarToggleView"/>
+    <toolitem action="ToggleFolders"/>
     <toolitem action="ToolbarSort"/>
     <toolitem action="ToolbarSendReceive"/>
+    <placeholder name="ProgressBarView" />
+    <toolitem action="ToolbarCancel"/>
   </toolbar>
 
   <popup name="HeaderViewCSM">
-    <menuitem action="EmailReply"/>
-    <menuitem action="EmailForward"/>
+    <menuitem action="HeaderViewCSMReply"/>
+    <menuitem action="HeaderViewCSMReplyAll"/>
+    <menuitem action="HeaderViewCSMForward"/>
+    <menuitem action="HeaderViewCSMCancelSending"/>
+    <separator/>
+    <menuitem action="HeaderViewCSMCut"/>
+    <menuitem action="HeaderViewCSMCopy"/>
+    <menuitem action="HeaderViewCSMPaste"/>
+    <separator/>
+    <menuitem action="HeaderViewCSMDelete"/>
+    <menuitem action="HeaderViewCSMHelp"/>
   </popup>
-  
+
   <popup name="FolderViewCSM">
     <menuitem action="FolderViewCSMNewFolder"/>
     <menuitem action="FolderViewCSMRenameFolder"/>
+    <menuitem action="FolderViewCSMDeleteFolder"/>
     <separator/>
     <menuitem action="FolderViewCSMPasteMsgs"/>
     <separator/>
-    <menuitem action="FolderViewCSMDeleteFolder"/>
     <separator/>
     <menuitem action="FolderViewCSMSearchMessages"/>
     <menuitem action="FolderViewCSMHelp"/>
   </popup>
 
-  <popup name="ToolbarReplyCSM">
+  <popup name="ToolbarReplyCSM" action="ToolbarCSM">
     <menuitem action="ToolbarMessageForward"/>
     <menuitem action="ToolbarMessageReplyAll"/>
-    <menuitem action="ToolbarMessageReply"/>
+<!--   <menuitem action="ToolbarMessageReply"/> -->
   </popup>
 
+  <accelerator name="AccelZoomMinus" action="ZoomMinus"/>
+  <accelerator name="AccelZoomPlus" action="ZoomPlus"/>
   <accelerator name="AccelToggleFullscreen" action="ToggleFullscreen"/>
 </ui>