Fixes NB#76638

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

diff --git a/src/maemo/ui/modest-msg-edit-window-ui.xml b/src/maemo/ui/modest-msg-edit-window-ui.xml
index bcfcd4d..4ba8bd3 100644 (file)
--- a/src/maemo/ui/modest-msg-edit-window-ui.xml
+++ b/src/maemo/ui/modest-msg-edit-window-ui.xml
@@ -30,10 +30,21 @@
 
 <ui>
 
-  <menubar name="MenuBar">
+  <popup name="MenuBar">
+
+    <menu name="EmailMenu" action="Email">
+      <menuitem name="SendMenu" action="ActionsSend"/>
+      <menuitem name="SaveToDraftsMenu" action="ActionsSaveToDrafts"/>
+      <separator/>
+      <menuitem name="SelectContactsMenu" action="SelectContacts"/>
+      <menuitem name="CheckNamesMenu" action="CheckNames"/>
+      <separator/>
+      <menuitem name="NewMessageMenu" action="ActionsNewMessage"/>
+    </menu>
 
     <menu name="EditMenu" action="Edit">
       <menuitem name="UndoMenu" action="Undo"/>
+      <menuitem name="RedoMenu" action="Redo"/>
       <separator/>
       <menuitem name="CutMenu" action="Cut"/>
       <menuitem name="CopyMenu" action="Copy"/>
@@ -43,13 +54,6 @@
     </menu>
 
     <menu name="ViewMenu" action="View">
-      <menu name="ZoomMenu" action="Zoom">
-       <menuitem name="Zoom50Menu" action="Zoom50"/>
-       <menuitem name="Zoom100Menu" action="Zoom100"/>
-       <menuitem name="Zoom150Menu" action="Zoom150"/>
-       <menuitem name="Zoom200Menu" action="Zoom200"/>
-      </menu>
-      <separator/>
       <menuitem name="ViewToggleFullscreenMenu" action="ViewToggleFullscreen"/>
       <separator/>
       <menu name="ShowToolbarMenu" action="ShowToolbar">
@@ -63,7 +67,7 @@
 
     <menu name="FormatMenu" action="Format">
       <menuitem name="SelectFontMenu" action="SelectFont"/>
-      <menuitem name="BulletedListMenu" action="ActionsBulletedList"/>
+<!--      <menuitem name="BulletedListMenu" action="ActionsBulletedList"/> -->
       <menu name="AlignmentMenu" action="Alignment">
          <menuitem name="AlignmentLeftMenu" action="AlignmentLeft"/>
          <menuitem name="AlignmentCenterMenu" action="AlignmentCenter"/>
@@ -77,7 +81,10 @@
     </menu>
 
     <menu name="AttachmentsMenu" action="Attachments">
+      <menuitem name="AttachFileMenu" action="AttachFile"/>
       <menuitem name="InsertImageMenu" action="InsertImage"/>
+      <separator/>
+      <menuitem name="RemoveAttachmentsMenu" action="RemoveAttachments"/>
     </menu>
 
     <menu name="ToolsMenu" action="Tools">
@@ -86,25 +93,32 @@
        <menuitem name="MessagePriorityNormalMenu" action="MessagePriorityNormal"/>
        <menuitem name="MessagePriorityLowMenu" action="MessagePriorityLow"/>
       </menu>
+      <separator/>
+      <menuitem name="FindInMessageMenu" action="FindInMessage"/>
+      <menuitem name="ToolSearchMessagesMenu" action="SearchMessages"/>
+      <separator/>
+      <menuitem name="ToolsHelpMenu" action="Help"/>
+    </menu>
+
+    <menu name="CloseMenu" action="Close">
+      <menuitem name="CloseWindowMenu" action="CloseWindow"/>
+      <menuitem name="CloseAllWindowsMenu" action="CloseAllWindows"/>
     </menu>
 
-  </menubar>
+  </popup>
 
   <toolbar name="ToolBar">
     <toolitem action="ToolbarSend"/>
-    <!--<toolitem action="ActionFontFace"/>-->
-    <!--<toolitem action="ActionFontSize"/>-->
     <separator/>
-    <placeholder name="FontAttributes">
-    </placeholder>
+    <placeholder name="FontAttributes" />
     <toolitem action="ActionsBold"/>
     <toolitem action="ActionsItalics"/>
-    <placeholder name="FontColor">
-    </placeholder>
+    <placeholder name="FontColor" />
   </toolbar>
 
   <accelerator name="AccelZoomMinus" action="ZoomMinus"/>
   <accelerator name="AccelZoomPlus" action="ZoomPlus"/>
   <accelerator name="AccelToggleFullscreen" action="ToggleFullscreen"/>
+  <accelerator name="AccelCloseWindow" action="CloseWindowShortcut"/>
 
 </ui>