Fixes NB#76638
[modest] / src / maemo / ui / modest-msg-edit-window-ui.xml
index df432c5..4ba8bd3 100644 (file)
@@ -30,7 +30,7 @@
 
 <ui>
 
-  <menubar name="MenuBar">
+  <popup name="MenuBar">
 
     <menu name="EmailMenu" action="Email">
       <menuitem name="SendMenu" action="ActionsSend"/>
       <menuitem name="CheckNamesMenu" action="CheckNames"/>
       <separator/>
       <menuitem name="NewMessageMenu" action="ActionsNewMessage"/>
-      <separator/>
-      <menuitem name="DeleteMenu" action="ActionsDelete"/>
     </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"/>
     </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">
@@ -75,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"/>
@@ -91,6 +83,7 @@
     <menu name="AttachmentsMenu" action="Attachments">
       <menuitem name="AttachFileMenu" action="AttachFile"/>
       <menuitem name="InsertImageMenu" action="InsertImage"/>
+      <separator/>
       <menuitem name="RemoveAttachmentsMenu" action="RemoveAttachments"/>
     </menu>
 
        <menuitem name="MessagePriorityLowMenu" action="MessagePriorityLow"/>
       </menu>
       <separator/>
-<!--
-      <menuitem name="ToolsFindOnPageMenu" action="ToolsFindOnPage"/>
-      <menuitem name="ToolSearchMessagesMenu" action="ToolSearchMessages"/>
+      <menuitem name="FindInMessageMenu" action="FindInMessage"/>
+      <menuitem name="ToolSearchMessagesMenu" action="SearchMessages"/>
       <separator/>
--->
       <menuitem name="ToolsHelpMenu" action="Help"/>
     </menu>
 
       <menuitem name="CloseAllWindowsMenu" action="CloseAllWindows"/>
     </menu>
 
-  </menubar>
+  </popup>
 
   <toolbar name="ToolBar">
     <toolitem action="ToolbarSend"/>
-    <!--<toolitem action="ActionFontFace"/>-->
-    <!--<toolitem action="ActionFontSize"/>-->
     <separator/>
     <placeholder name="FontAttributes" />
     <toolitem action="ActionsBold"/>
   <accelerator name="AccelZoomMinus" action="ZoomMinus"/>
   <accelerator name="AccelZoomPlus" action="ZoomPlus"/>
   <accelerator name="AccelToggleFullscreen" action="ToggleFullscreen"/>
+  <accelerator name="AccelCloseWindow" action="CloseWindowShortcut"/>
 
 </ui>