* src/maemo/modest-msg-edit-window-ui.xml:

[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 6c8531e..b57d6b8 100644 (file)
--- a/src/maemo/ui/modest-msg-view-window-ui.xml
+++ b/src/maemo/ui/modest-msg-view-window-ui.xml
@@ -37,7 +37,7 @@
       <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/>
@@ -66,13 +66,28 @@
       <separator/>
       <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">
@@ -82,7 +97,6 @@
   </menubar>
 
   <toolbar name="ToolBar">
-    <toolitem action="ToolbarMessageNew"/>
     <toolitem action="ToolbarMessageReply"/> 
 <!--     <toolitem action="ToolbarMessageReplyAll"/> -->
 <!--     <toolitem action="ToolbarMessageForward"/>  -->
@@ -91,11 +105,12 @@
     <toolitem action="FindInMessage"/>
     <toolitem action="ToolbarMessageBack"/>
     <toolitem action="ToolbarMessageNext"/>
-    <placeholder name="ToolbarProgressbar"/>
+    <placeholder name="ProgressbarView">
+    </placeholder>
+    <toolitem action="ToolbarCancel"/>
   </toolbar>
 
   <popup name="ToolbarReplyCSM">
-      <menuitem name="MessageReplyMenu" action="EmailReply"/>
       <menuitem name="MessageReplyAllMenu" action="EmailReplyAll"/>
       <menuitem name="MessageForwardMenu" action="EmailForward"/>
   </popup>