Fixes leak 19/26

[modest] / src / maemo / ui / modest-msg-view-window-ui.xml

diff --git a/src/maemo/ui/modest-msg-view-window-ui.xml b/src/maemo/ui/modest-msg-view-window-ui.xml
index 7d916c5..244140e 100644 (file)
--- a/src/maemo/ui/modest-msg-view-window-ui.xml
+++ b/src/maemo/ui/modest-msg-view-window-ui.xml
@@ -31,13 +31,12 @@
 <ui>
 
   <menubar name="MenuBar">
-
     <menu name="MessageMenu" action="Email">
       <menuitem name="MessageReplyMenu" action="EmailReply"/>
       <menuitem name="MessageReplyAllMenu" action="EmailReplyAll"/>
       <menuitem name="MessageForwardMenu" action="EmailForward"/>
       <separator/>
-      <menuitem name="MessageNewMenu"  action="EmailNew"/>
+      <menuitem name="MessageNewMenu"  action="EmailNewDefault"/>
       <separator/>
       <menuitem name="MessageDeleteMenu" action="EmailDelete"/>
       <separator/>
@@ -64,14 +63,30 @@
        <menuitem name="Zoom200Menu" action="Zoom200"/>
       </menu>
       <separator/>
-      <menuitem name="ShowToggleFullscreenMenu" action="ShowToggleFullscreen"/>
+      <menuitem name="ViewToggleFullscreenMenu" action="ViewToggleFullscreen"/>
+      <separator/>
+      <menu name="ViewShowToolbarMenu" action="ViewShowToolbar">
+       <menuitem name="ViewShowToolbarNormalScreenMenu" action="ViewShowToolbarNormalScreen"/>
+       <menuitem name="ViewShowToolbarFullScreenMenu" action="ViewShowToolbarFullScreen"/>
+      </menu>
       <separator/>
       <menuitem name="ViewPreviousMessageMenu" action="ViewPreviousMessage"/>
       <menuitem name="ViewNextMessageMenu" action="ViewNextMessage"/>
     </menu>
 
+    <menu name="AttachmentsMenu" action="Attachments">
+      <menuitem name="ViewAttachmentMenu" action="ViewAttachment"/>
+      <menuitem name="SaveAttachmentMenu" action="SaveAttachment"/>
+      <menuitem name="RemoveAttachmentMenu" action="RemoveAttachment"/>
+    </menu>
+
    <menu name="ToolsMenu" action="Tools">
       <menuitem name="ToolsAddToContactsMenu" action="ToolsAddToContacts"/>
+      <separator/>
+      <menuitem name="ToolsFindInMessageMenu" action="ToolsFindInMessage"/>
+      <menuitem name="ToolsSearchMessagesMenu" action="ToolsSearchMessages"/>
+      <separator/>
+      <menuitem name="ToolsHelpMenu" action="ToolsHelp"/>
    </menu>
 
    <menu name="CloseMenu" action="Close">
@@ -81,20 +96,18 @@
   </menubar>
 
   <toolbar name="ToolBar">
-    <toolitem action="ToolbarMessageNew"/>
     <toolitem action="ToolbarMessageReply"/> 
-<!--     <toolitem action="ToolbarMessageReplyAll"/> -->
-<!--     <toolitem action="ToolbarMessageForward"/>  -->
     <toolitem action="ToolbarMessageMoveTo"/>
     <toolitem action="ToolbarDeleteMessage"/>
     <toolitem action="FindInMessage"/>
-    <toolitem action="ToolbarMessageBack"/>
-    <toolitem action="ToolbarMessageForward"/>
-    <placeholder name="ToolbarProgressbar"/>
+    <toolitem action="ToolbarMessageBack" position="bot"/>
+    <toolitem action="ToolbarMessageNext" position="bot"/>
+    <placeholder name="ProgressbarView" position="bot">
+    </placeholder>
+    <toolitem action="ToolbarCancel" position="bot"/>
   </toolbar>
 
   <popup name="ToolbarReplyCSM">
-      <menuitem name="MessageReplyMenu" action="EmailReply"/>
       <menuitem name="MessageReplyAllMenu" action="EmailReplyAll"/>
       <menuitem name="MessageForwardMenu" action="EmailForward"/>
   </popup>
@@ -102,7 +115,5 @@
   <accelerator name="AccelZoomMinus" action="ZoomMinus"/>
   <accelerator name="AccelZoomPlus" action="ZoomPlus"/>
   <accelerator name="AccelToggleFullscreen" action="ToggleFullscreen"/>
-  <accelerator name="AccelScrollUp" action="ScrollUp"/>
-  <accelerator name="AccelScrollDown" action="ScrollDown"/>
 
   </ui>