Remove Hildon1 conditional code from hildon2.

[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 842ed9e..e563c99 100644 (file)
--- a/src/hildon2/ui/modest-msg-edit-window-ui.xml
+++ b/src/hildon2/ui/modest-msg-edit-window-ui.xml
@@ -40,7 +40,6 @@
 
     <menu name="EditMenu" action="Edit">
       <menuitem name="UndoMenu" action="Undo"/>
-      <menuitem name="RedoMenu" action="Redo"/>
     </menu>
 
     <menu name="ViewMenu" action="View">
@@ -49,7 +48,6 @@
     </menu>
 
     <menu name="FormatMenu" action="Format">
-      <menuitem name="SelectFontMenu" action="SelectFont"/>
       <menu name="AlignmentMenu" action="Alignment">
          <menuitem name="AlignmentLeftMenu" action="AlignmentLeft"/>
          <menuitem name="AlignmentCenterMenu" action="AlignmentCenter"/>
@@ -67,6 +65,7 @@
     </menu>
 
     <menu name="ToolsMenu" action="Tools">
+      <menuitem name="MessageSettingsMenu" action="MessageSettings"/>
       <menu name="MessagePriorityMenu" action="MessagePriority">
        <menuitem name="MessagePriorityHighMenu" action="MessagePriorityHigh"/>
        <menuitem name="MessagePriorityNormalMenu" action="MessagePriorityNormal"/>
@@ -79,17 +78,16 @@
   </menubar>
 
   <toolbar name="ToolBar">
-    <toolitem action="ToolbarSend"/>
-    <separator/>
     <placeholder name="FontAttributes" />
     <toolitem action="ActionsBold"/>
     <toolitem action="ActionsItalics"/>
     <placeholder name="FontColor" />
   </toolbar>
 
-  <accelerator name="AccelZoomMinus" action="ZoomMinus"/>
-  <accelerator name="AccelZoomPlus" action="ZoomPlus"/>
   <accelerator name="AccelToggleFullscreen" action="ToggleFullscreen"/>
   <accelerator name="AccelCloseWindow" action="CloseWindowShortcut"/>
+  <accelerator name="AccelSend" action="SendShortcut"/>
+  <accelerator name="AccelSend2" action="SendShortcut2"/>
+  <accelerator name="AccelUndo" action="Undo"/>
 
 </ui>