* src/modest-ui-actions.[ch]:

[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 9dcd5c6..4d27342 100644 (file)
--- a/src/maemo/ui/modest-msg-edit-window-ui.xml
+++ b/src/maemo/ui/modest-msg-edit-window-ui.xml
@@ -32,7 +32,21 @@
 
   <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"/>
+      <separator/>
+      <menuitem name="DeleteMenu" action="ActionsDelete"/>
+    </menu>
+
     <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,35 +64,60 @@
       <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">
+      <menu name="MessagePriorityMenu" action="MessagePriority">
+       <menuitem name="MessagePriorityHighMenu" action="MessagePriorityHigh"/>
+       <menuitem name="MessagePriorityNormalMenu" action="MessagePriorityNormal"/>
+       <menuitem name="MessagePriorityLowMenu" action="MessagePriorityLow"/>
+      </menu>
+    </menu>
+
+    <menu name="CloseMenu" action="Close">
+      <menuitem name="CloseWindowMenu" action="CloseWindow"/>
+      <menuitem name="CloseAllWindowsMenu" action="CloseAllWindows"/>
     </menu>
 
   </menubar>
 
   <toolbar name="ToolBar">
-    <toolitem action="ActionsSend"/>
+    <toolitem action="ToolbarSend"/>
     <!--<toolitem action="ActionFontFace"/>-->
     <!--<toolitem action="ActionFontSize"/>-->
+    <separator/>
+    <placeholder name="FontAttributes">
+    </placeholder>
     <toolitem action="ActionsBold"/>
     <toolitem action="ActionsItalics"/>
-    <placeholder name="FontAttributes">
+    <placeholder name="FontColor">
     </placeholder>
-    <toolitem action="ActionsBulletedList"/>
   </toolbar>
 
   <accelerator name="AccelZoomMinus" action="ZoomMinus"/>