Implement "search messages" action (fixes NB#57209).

[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..52bcfff 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/>
@@ -64,14 +64,26 @@
        <menuitem name="Zoom200Menu" action="Zoom200"/>
       </menu>
       <separator/>
-      <menuitem name="ShowToggleFullscreenMenu" action="ShowToggleFullscreen"/>
+      <menuitem name="ViewToggleFullscreenMenu" action="ViewToggleFullscreen"/>
       <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="ToolsFindOnPageMenu" action="ToolsFindOnPage"/> -->
+      <menuitem name="ToolsSearchMessagesMenu" action="ToolsSearchMessages"/>
+      <separator/>
+      <menuitem name="ToolsHelpMenu" action="ToolsHelp"/>
    </menu>
 
    <menu name="CloseMenu" action="Close">
@@ -89,8 +101,10 @@
     <toolitem action="ToolbarDeleteMessage"/>
     <toolitem action="FindInMessage"/>
     <toolitem action="ToolbarMessageBack"/>
-    <toolitem action="ToolbarMessageForward"/>
-    <placeholder name="ToolbarProgressbar"/>
+    <toolitem action="ToolbarMessageNext"/>
+    <placeholder name="ProgressbarView">
+    </placeholder>
+    <toolitem action="ToolbarCancel"/>
   </toolbar>
 
   <popup name="ToolbarReplyCSM">
@@ -102,7 +116,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>