* Implement remain dimming rules (toolbar and context sensitive menus)

[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 0840a08..b261c36 100644 (file)
--- a/src/maemo/ui/modest-main-window-ui.xml
+++ b/src/maemo/ui/modest-main-window-ui.xml
@@ -68,14 +68,15 @@
     <menu name="ViewMenu" action="View">
       <menuitem name="ViewSortMenu" action="ViewSort"/>
       <separator/>
-      <menuitem name="ViewFoldersMenu" action="ViewFolders"/>
-      <menuitem name="ShowToggleFullscreenMenu" action="ShowToggleFullscreen"/>
+      <menuitem name="ViewToggleFoldersMenu" action="ViewToggleFolders"/>
+      <menuitem name="ViewToggleFullscreenMenu" action="ViewToggleFullscreen"/>
       <separator/>
       <menu name="ViewShowToolbarMainMenu" action="ViewShowToolbar">
         <menuitem name="ViewShowToolbarNormalScreenMenu" action="ViewShowToolbarNormalScreen"/>
         <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"/>
@@ -108,21 +110,38 @@
     <toolitem action="ToolbarToggleView"/>
     <toolitem action="ToolbarSort"/>
     <toolitem action="ToolbarSendReceive"/>
+    <placeholder name="ProgressBarView" />
+    <toolitem action="ToolbarCancel"/>
   </toolbar>
 
-  <popup name="HeaderViewContextMenu">
-    <menuitem action="EmailReply"/>
-    <menuitem action="EmailForward"/>
+  <popup name="HeaderViewCSM">
+    <menuitem action="HeaderViewCSMOpen"/>
+    <menuitem action="HeaderViewCSMReply"/>
+    <menuitem action="HeaderViewCSMReplyAll"/>
+    <menuitem action="HeaderViewCSMForward"/>
+    <separator/>
+    <menuitem action="HeaderViewCSMCut"/>
+    <menuitem action="HeaderViewCSMCopy"/>
+    <menuitem action="HeaderViewCSMPaste"/>
+    <separator/>
+    <menuitem action="HeaderViewCSMDelete"/>
+    <menuitem action="HeaderViewCSMCancelSending"/>
+    <menuitem action="HeaderViewCSMHelp"/>
   </popup>
   
-  <popup name="FolderViewContextMenu">
-    <menuitem action="EmailNewFolder"/>
-    <menuitem action="FoldersDelete"/>
-    <menuitem action="FoldersRename"/>
-    <menuitem action="FoldersMoveToTrash"/>
+  <popup name="FolderViewCSM">
+    <menuitem action="FolderViewCSMNewFolder"/>
+    <menuitem action="FolderViewCSMRenameFolder"/>
+    <separator/>
+    <menuitem action="FolderViewCSMPasteMsgs"/>
+    <separator/>
+    <menuitem action="FolderViewCSMDeleteFolder"/>
+    <separator/>
+    <menuitem action="FolderViewCSMSearchMessages"/>
+    <menuitem action="FolderViewCSMHelp"/>
   </popup>
 
-  <popup name="ToolbarReplyContextMenu">
+  <popup name="ToolbarReplyCSM" action="ToolbarCSM">
     <menuitem action="ToolbarMessageForward"/>
     <menuitem action="ToolbarMessageReplyAll"/>
     <menuitem action="ToolbarMessageReply"/>