This patch includes a lot of work to refactor and reorganize the

[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 471c6dc..e1eef55 100644 (file)
--- a/src/maemo/ui/modest-main-window-ui.xml
+++ b/src/maemo/ui/modest-main-window-ui.xml
@@ -30,7 +30,7 @@
 
 <ui>
 
-  <menubar name="MenuBar">
+  <popup name="MenuBar">
     
     <menu name="EmailMenu" action="Email">
       <menu name="EmailNewMainMenu" action="EmailNew">
@@ -46,18 +46,17 @@
       <menuitem name="EmailContentsMenu"     action="EmailContents"/>
       <menuitem name="EmailPurgeAttachmentsMenu" action="EmailPurgeAttachments"/>
       <separator/>
+      <menuitem name="EmailRenameMenu" action="EmailRenameFolder"/>
       <menuitem name="EmailDeleteMenu" action="EmailDelete"/>
       <separator/>
       <menuitem name="EmailDetailsMenu" action="EmailDetails"/>
     </menu>
     
     <menu name="EditMenu" action="Edit">
-      <menuitem name="EditUndoMenu" action="EditUndo"/>
-      <separator/>
-      <menuitem name="EditCutMenu" action="EditCut"/>
-      <menuitem name="EditCopyMenu" action="EditCopy"/>
-      <menuitem name="EditPasteMenu" action="EditPaste"/>
-      <separator/>
+<!--       <menuitem name="EditCutMenu" action="EditCut"/> -->
+<!--       <menuitem name="EditCopyMenu" action="EditCopy"/> -->
+<!--       <menuitem name="EditPasteMenu" action="EditPaste"/> -->
+<!--       <separator/> -->
       <menuitem name="EditSelectAllMenu" action="EditSelectAll"/>
       <menuitem name="EditMarkAsReadMenu" action="EditMarkAsRead"/>
       <menuitem name="EditMarkAsUnreadMenu" action="EditMarkAsUnread"/>
@@ -68,7 +67,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">
@@ -101,31 +100,40 @@
       <menuitem name="CloseWindowMenu"     action="CloseWindow"/>
       <menuitem name="CloseAllWindowsMenu" action="CloseAllWindows"/>
     </menu>
-  </menubar>
+  </popup>
 
   <toolbar name="ToolBar">
     <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" action="HeaderViewCSM">
-    <menuitem action="EmailReply"/>
-    <menuitem action="EmailForward"/>
+  <popup name="HeaderViewCSM">
+    <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" action="FolderViewCSM">
+
+  <popup name="FolderViewCSM">
     <menuitem action="FolderViewCSMNewFolder"/>
     <menuitem action="FolderViewCSMRenameFolder"/>
+    <menuitem action="FolderViewCSMDeleteFolder"/>
     <separator/>
-    <menuitem action="FolderViewCSMPasteMsgs"/>
+<!--    <menuitem action="FolderViewCSMPasteMsgs"/> -->
     <separator/>
-    <menuitem action="FolderViewCSMDeleteFolder"/>
     <separator/>
     <menuitem action="FolderViewCSMSearchMessages"/>
     <menuitem action="FolderViewCSMHelp"/>
@@ -134,8 +142,10 @@
   <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>