This is a manual merge of branch drop split view intro trunk.

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

diff --git a/src/hildon2/ui/modest-msg-edit-window-ui.xml b/src/hildon2/ui/modest-msg-edit-window-ui.xml
index 149b3c2..0845ca2 100644 (file)
--- a/src/hildon2/ui/modest-msg-edit-window-ui.xml
+++ b/src/hildon2/ui/modest-msg-edit-window-ui.xml
@@ -33,55 +33,33 @@
   <menubar 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"/>
-      <menuitem name="PasteMenu" action="Paste"/>
-      <separator/>
-      <menuitem name="SelectAllMenu" action="SelectAll"/>
     </menu>
 
     <menu name="ViewMenu" action="View">
-      <menuitem name="ViewToggleFullscreenMenu" action="ViewToggleFullscreen"/>
-      <separator/>
-      <menu name="ShowToolbarMenu" action="ShowToolbar">
-       <menuitem name="ViewShowToolbarNormalScreenMenu" action="ViewShowToolbarNormalScreen"/>
-       <menuitem name="ViewShowToolbarFullScreenMenu" action="ViewShowToolbarFullScreen"/>
-      </menu>
-      <separator/>
       <menuitem name="ViewCcFieldMenu" action="ViewCcField"/>
       <menuitem name="ViewBccFieldMenu" action="ViewBccField"/>
     </menu>
 
     <menu name="FormatMenu" action="Format">
-      <menuitem name="SelectFontMenu" action="SelectFont"/>
-<!--      <menuitem name="BulletedListMenu" action="ActionsBulletedList"/> -->
       <menu name="AlignmentMenu" action="Alignment">
          <menuitem name="AlignmentLeftMenu" action="AlignmentLeft"/>
          <menuitem name="AlignmentCenterMenu" action="AlignmentCenter"/>
          <menuitem name="AlignmentRightMenu" action="AlignmentRight"/>
       </menu>
       <separator/>
-      <menu name="FileFormatMenu" action="FileFormat">
-       <menuitem name="FileFormatPlainTextMenu" action="FileFormatPlainText"/>
-       <menuitem name="FileFormatFormattedTextMenu" action="FileFormatFormattedText"/>
-      </menu>
+      <menuitem name="FileFormatPlainTextMenu" action="FileFormatPlainText"/>
+      <menuitem name="FileFormatFormattedTextMenu" action="FileFormatFormattedText"/>
     </menu>
 
     <menu name="AttachmentsMenu" action="Attachments">
-      <menuitem name="AttachFileMenu" action="AttachFile"/>
       <menuitem name="InsertImageMenu" action="InsertImage"/>
       <separator/>
       <menuitem name="RemoveAttachmentsMenu" action="RemoveAttachments"/>
@@ -95,9 +73,6 @@
       </menu>
       <separator/>
       <menuitem name="FindInMessageMenu" action="FindInMessage"/>
-      <menuitem name="ToolSearchMessagesMenu" action="SearchMessages"/>
-      <separator/>
-      <menuitem name="ToolsHelpMenu" action="Help"/>
     </menu>
 
   </menubar>
@@ -115,5 +90,9 @@
   <accelerator name="AccelZoomPlus" action="ZoomPlus"/>
   <accelerator name="AccelToggleFullscreen" action="ToggleFullscreen"/>
   <accelerator name="AccelCloseWindow" action="CloseWindowShortcut"/>
+  <accelerator name="CutMenu" action="Cut"/>
+  <accelerator name="CopyMenu" action="Copy"/>
+  <accelerator name="PasteMenu" action="Paste"/>
+  <accelerator name="SelectAllMenu" action="SelectAll"/>
 
 </ui>