X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fui%2Fmodest-msg-edit-window-ui.xml;h=bcfcd4df3d0eb45a8b47c5c133ea0aba191be29e;hp=8987bc1c8c0cd8c3ce2f221a6b7fb9eb62d9187a;hb=23b77fcc7767731bd6d8b59c303afc393694908c;hpb=b93b64adaaf2947f8b35889981af6ad96b18fd31

diff --git a/src/maemo/ui/modest-msg-edit-window-ui.xml b/src/maemo/ui/modest-msg-edit-window-ui.xml
index 8987bc1..bcfcd4d 100644
--- a/src/maemo/ui/modest-msg-edit-window-ui.xml
+++ b/src/maemo/ui/modest-msg-edit-window-ui.xml
@@ -33,6 +33,8 @@
   <menubar name="MenuBar">
 
     <menu name="EditMenu" action="Edit">
+      <menuitem name="UndoMenu" action="Undo"/>
+      <separator/>
       <menuitem name="CutMenu" action="Cut"/>
       <menuitem name="CopyMenu" action="Copy"/>
       <menuitem name="PasteMenu" action="Paste"/>
@@ -50,22 +52,32 @@
       <separator/>
       <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="AttachmentsMenu" action="Attachments">
-      <menuitem name="InsertImageMenu" action="InsertImage"/>
-    </menu>
-
     <menu name="FormatMenu" action="Format">
-      <menuitem name="BackgroundColorMenu" action="BackgroundColor"/>
+      <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>
-      <menuitem name="BulletedListMenu" action="ActionsBulletedList"/>
+      <separator/>
+      <menu name="FileFormatMenu" action="FileFormat">
+	<menuitem name="FileFormatPlainTextMenu" action="FileFormatPlainText"/>
+	<menuitem name="FileFormatFormattedTextMenu" action="FileFormatFormattedText"/>
+      </menu>
+    </menu>
+
+    <menu name="AttachmentsMenu" action="Attachments">
+      <menuitem name="InsertImageMenu" action="InsertImage"/>
     </menu>
 
     <menu name="ToolsMenu" action="Tools">
@@ -79,7 +91,7 @@
   </menubar>
 
   <toolbar name="ToolBar">
-    <toolitem action="ActionsSend"/>
+    <toolitem action="ToolbarSend"/>
     <!--<toolitem action="ActionFontFace"/>-->
     <!--<toolitem action="ActionFontSize"/>-->
     <separator/>