<ui>
- <menubar name="MenuBar">
+ <popup name="MenuBar">
<menu name="MessageMenu" action="Email">
<menuitem name="MessageReplyMenu" action="EmailReply"/>
<separator/>
<menuitem name="ViewToggleFullscreenMenu" action="ViewToggleFullscreen"/>
<separator/>
+ <menu name="ViewShowToolbarMenu" action="ViewShowToolbar">
+ <menuitem name="ViewShowToolbarNormalScreenMenu" action="ViewShowToolbarNormalScreen"/>
+ <menuitem name="ViewShowToolbarFullScreenMenu" action="ViewShowToolbarFullScreen"/>
+ </menu>
+ <separator/>
<menuitem name="ViewPreviousMessageMenu" action="ViewPreviousMessage"/>
<menuitem name="ViewNextMessageMenu" action="ViewNextMessage"/>
</menu>
+ <menu name="AttachmentsMenu" action="Attachments">
+ <menuitem name="ViewAttachmentMenu" action="ViewAttachment"/>
+ <menuitem name="SaveAttachmentMenu" action="SaveAttachment"/>
+ <menuitem name="RemoveAttachmentMenu" action="RemoveAttachment"/>
+ </menu>
+
<menu name="ToolsMenu" action="Tools">
<menuitem name="ToolsAddToContactsMenu" action="ToolsAddToContacts"/>
<separator/>
+ <menuitem name="ToolsFindInMessageMenu" action="ToolsFindInMessage"/>
+ <menuitem name="ToolsSearchMessagesMenu" action="ToolsSearchMessages"/>
+ <separator/>
+ <menuitem name="ToolsHelpMenu" action="ToolsHelp"/>
</menu>
<menu name="CloseMenu" action="Close">
<menuitem name="CloseWindowMenu" action="CloseWindow"/>
<menuitem name="CloseAllWindowsMenu" action="CloseAllWindows"/>
</menu>
- </menubar>
+ </popup>
<toolbar name="ToolBar">
- <toolitem action="ToolbarMessageNew"/>
<toolitem action="ToolbarMessageReply"/>
-<!-- <toolitem action="ToolbarMessageReplyAll"/> -->
-<!-- <toolitem action="ToolbarMessageForward"/> -->
<toolitem action="ToolbarMessageMoveTo"/>
<toolitem action="ToolbarDeleteMessage"/>
<toolitem action="FindInMessage"/>
<toolitem action="ToolbarMessageBack"/>
<toolitem action="ToolbarMessageNext"/>
- <placeholder name="ToolbarProgressbar"/>
+ <placeholder name="ProgressbarView">
+ </placeholder>
+ <toolitem action="ToolbarCancel"/>
</toolbar>
<popup name="ToolbarReplyCSM">
- <menuitem name="MessageReplyMenu" action="EmailReply"/>
<menuitem name="MessageReplyAllMenu" action="EmailReplyAll"/>
<menuitem name="MessageForwardMenu" action="EmailForward"/>
</popup>