X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2Fui%2Fmodest-main-window-ui.xml;h=11d1f7b18edb5a3496c5ceddd618beeb9265c0b8;hb=82eb8b5accf8762ab2359470f468a0a02260c344;hp=09aee19529e0cd12cd89e33f8c29d1f72333e792;hpb=92bf0a5958540f7ee518cb8d921816e3d4164eb2;p=modest

diff --git a/src/maemo/ui/modest-main-window-ui.xml b/src/maemo/ui/modest-main-window-ui.xml
index 09aee19..11d1f7b 100644
--- a/src/maemo/ui/modest-main-window-ui.xml
+++ b/src/maemo/ui/modest-main-window-ui.xml
@@ -46,16 +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="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"/>
@@ -106,10 +107,10 @@
     <toolitem action="ToolbarMessageReply"/> 
     <toolitem action="ToolbarDeleteMessage"/>
     <toolitem action="ToggleFolders"/>
-    <toolitem action="ToolbarSort"/>
-    <toolitem action="ToolbarSendReceive"/>
-    <placeholder name="ProgressBarView" />
-    <toolitem action="ToolbarCancel"/>
+    <toolitem action="ToolbarSort" position="bot"/>
+    <toolitem action="ToolbarSendReceive" position="bot"/>
+    <placeholder name="ProgressBarView"  position="bot"/>
+    <toolitem action="ToolbarCancel" position="bot"/>
   </toolbar>
 
   <popup name="HeaderViewCSM">
@@ -117,10 +118,10 @@
     <menuitem action="HeaderViewCSMReplyAll"/>
     <menuitem action="HeaderViewCSMForward"/>
     <menuitem action="HeaderViewCSMCancelSending"/>
-    <separator/>
-    <menuitem action="HeaderViewCSMCut"/>
-    <menuitem action="HeaderViewCSMCopy"/>
-    <menuitem action="HeaderViewCSMPaste"/>
+<!--     <separator/> -->
+<!--     <menuitem action="HeaderViewCSMCut"/> -->
+<!--     <menuitem action="HeaderViewCSMCopy"/> -->
+<!--     <menuitem action="HeaderViewCSMPaste"/> -->
     <separator/>
     <menuitem action="HeaderViewCSMDelete"/>
     <menuitem action="HeaderViewCSMHelp"/>
@@ -131,7 +132,7 @@
     <menuitem action="FolderViewCSMRenameFolder"/>
     <menuitem action="FolderViewCSMDeleteFolder"/>
     <separator/>
-    <menuitem action="FolderViewCSMPasteMsgs"/>
+<!--    <menuitem action="FolderViewCSMPasteMsgs"/> -->
     <separator/>
     <separator/>
     <menuitem action="FolderViewCSMSearchMessages"/>