<menubar name="MenuBar">
- <menu name="MessageMenu" action="Message">
- <menuitem name="MessageNewMenu" action="MessageNew"/>
- <menuitem name="MessageOpenMenu" action="MessageOpen"/>
+ <menu name="EmailMenu" action="Email">
+ <menu name="EmailNewMainMenu" action="EmailNew">
+ <menuitem name="EmailNewMessageMenu" action="EmailNewMessage"/>
+ <menuitem name="EmailNewFolderMenu" action="EmailNewFolder"/>
+ </menu>
+ <menuitem name="EmailOpenMenu" action="EmailOpen"/>
<separator/>
- <menuitem name="MessageCancelSendingMenu" action="MessageCancelSending"/>
- <menuitem name="MessageSendMenu" action="MessageSend"/>
+ <menuitem name="EmailReplyMenu" action="EmailReply"/>
+ <menuitem name="EmailReplyAllMenu" action="EmailReplyAll"/>
+ <menuitem name="EmailForwardMenu" action="EmailForward"/>
<separator/>
- <menuitem name="MessageDeleteMenu" action="MessageDelete"/>
+ <menuitem name="EmailContentsMenu" action="EmailContents"/>
+ <menuitem name="EmailPurgeAttachmentsMenu" action="EmailPurgeAttachments"/>
<separator/>
- <menuitem name="MessageSendReceiveMenu" action="MessageSendReceive"/>
- <menuitem name="MessageContentsMenu" action="MessageContents"/>
- <menuitem name="MessageDetailsMenu" action="MessageDetails"/>
+ <menuitem name="EmailDeleteMenu" action="EmailDelete"/>
+ <separator/>
+ <menuitem name="EmailDetailsMenu" action="EmailDetails"/>
</menu>
<menu name="EditMenu" action="Edit">
<menuitem name="EditCopyMenu" action="EditCopy"/>
<menuitem name="EditPasteMenu" action="EditPaste"/>
<separator/>
- <menuitem name="EditSelectMenu" action="EditSelect"/>
+ <menuitem name="EditSelectAllMenu" action="EditSelectAll"/>
+ <menuitem name="EditMarkAsReadMenu" action="EditMarkAsRead"/>
+ <menuitem name="EditMarkAsUnreadMenu" action="EditMarkAsUnread"/>
+ <separator/>
<menuitem name="EditMoveToMenu" action="EditMoveTo"/>
</menu>
<menu name="ViewMenu" action="View">
<menuitem name="ViewSortMenu" action="ViewSort"/>
<separator/>
- <menuitem name="ViewFoldersMenu" action="ViewFolders"/>
- <menuitem name="ViewFullscreenMenu" action="ViewFullscreen"/>
+ <menuitem name="ViewToggleFoldersMenu" action="ViewToggleFolders"/>
+ <menuitem name="ViewToggleFullscreenMenu" action="ViewToggleFullscreen"/>
<separator/>
- <menuitem name="ViewThumbnailsMenu" action="ViewThumbnails"/>
- <menuitem name="ViewDetailsMenu" action="ViewDetails"/>
+ <menu name="ViewShowToolbarMainMenu" action="ViewShowToolbar">
+ <menuitem name="ViewShowToolbarNormalScreenMenu" action="ViewShowToolbarNormalScreen"/>
+ <menuitem name="ViewShowToolbarFullScreenMenu" action="ViewShowToolbarFullScreen"/>
+ </menu>
<separator/>
- <menuitem name="ViewShowToolbarMenu" action="ViewShowToolbar"/>
+ <placeholder name="ViewMenuAdditions" />
</menu>
-
- <menu name="FoldersMenu" action="Folders">
- <menuitem name="FoldersNewMenu" action="FoldersNew"/>
- <menuitem name="FoldersManageMenu" action="FoldersManage"/>
- <separator/>
- <menuitem name="FoldersDetailsMenu" action="FoldersDetails"/>
- <separator/>
- </menu>
-
- <menu name="AccountsMenu" action="Accounts">
- <menuitem name="AccountsNewMenu" action="AccountsNew"/>
- <separator/>
- <menuitem name="AccountsManageMenu" action="AccountsManage"/>
- <menuitem name="AccountsConfigureSMTPMenu" action="AccountsConfigureSMTP"/>
- </menu>
<menu name="ToolsMenu" action="Tools">
- <menuitem name="ToolsSettingsMenu" action="ToolsSettings"/>
+ <menuitem name="ToolsSettingsMenu" action="ToolsSettings"/>
+ <menuitem name="ToolsAccountsMenu" action="ToolsAccounts"/>
+ <menuitem name="ToolsSMTPServersMenu" action="ToolsSMTPServers"/>
<separator/>
- <menuitem name="ToolsAddToContactsMenu" action="ToolsAddToContacts"/>
- <menuitem name="ToolsContactsMenu" action="ToolsContacts"/>
- <menuitem name="ToolsFontSettingsMenu" action="ToolsFontSettings"/>
+ <menu name="ToolsSendReceiveMainMenu" action="ToolsSendReceive">
+ <menuitem name="ToolsSendReceiveAllMenu" action="ToolsSendReceiveAll"/>
+ <menuitem name="ToolsSendReceiveCancelSendingMenu" action="ToolsSendReceiveCancelSending"/>
+ <separator/>
+ <placeholder name="ToolsMenuAdditions" />
+ </menu>
<separator/>
+ <menuitem name="ToolsContactsMenu" action="ToolsContacts"/>
<menuitem name="ToolsSearchMessagesMenu" action="ToolsSearchMessages"/>
<separator/>
<menuitem name="ToolsHelpMenu" action="ToolsHelp"/>
<toolbar name="ToolBar">
<toolitem action="ToolbarMessageNew"/>
- <separator/>
<toolitem action="ToolbarMessageReply"/>
- <toolitem action="ToolbarMessageReplyAll"/>
- <toolitem action="ToolbarMessageForward"/>
- <separator/>
- <toolitem action="ToolbarSendReceive"/>
- <!-- <toolitem action="ToolbarToggleView"/> -->
- <separator/>
<toolitem action="ToolbarDeleteMessage"/>
- <separator/>
+ <toolitem action="ToolbarToggleView"/>
+ <toolitem action="ToolbarSort"/>
+ <toolitem action="ToolbarSendReceive"/>
+ <placeholder name="ProgressBarView" />
+ <toolitem action="ToolbarCancel"/>
</toolbar>
- <popup name="HeaderViewContextMenu">
- <menuitem action="MessageReply"/>
- <menuitem action="MessageForward"/>
+ <popup name="HeaderViewCSM">
+ <menuitem action="HeaderViewCSMOpen"/>
+ <menuitem action="HeaderViewCSMReply"/>
+ <menuitem action="HeaderViewCSMReplyAll"/>
+ <menuitem action="HeaderViewCSMForward"/>
+ <separator/>
+ <menuitem action="HeaderViewCSMCut"/>
+ <menuitem action="HeaderViewCSMCopy"/>
+ <menuitem action="HeaderViewCSMPaste"/>
+ <separator/>
+ <menuitem action="HeaderViewCSMDelete"/>
+ <menuitem action="HeaderViewCSMCancelSending"/>
+ <menuitem action="HeaderViewCSMHelp"/>
</popup>
- <popup name="FolderViewContextMenu">
- <menuitem action="FoldersNew"/>
- <menuitem action="FoldersDelete"/>
- <menuitem action="FoldersRename"/>
- <menuitem action="FoldersMoveToTrash"/>
+ <popup name="FolderViewCSM">
+ <menuitem action="FolderViewCSMNewFolder"/>
+ <menuitem action="FolderViewCSMRenameFolder"/>
+ <separator/>
+ <menuitem action="FolderViewCSMPasteMsgs"/>
+ <separator/>
+ <menuitem action="FolderViewCSMDeleteFolder"/>
+ <separator/>
+ <menuitem action="FolderViewCSMSearchMessages"/>
+ <menuitem action="FolderViewCSMHelp"/>
+ </popup>
+
+ <popup name="ToolbarReplyCSM" action="ToolbarCSM">
+ <menuitem action="ToolbarMessageForward"/>
+ <menuitem action="ToolbarMessageReplyAll"/>
+ <menuitem action="ToolbarMessageReply"/>
</popup>
+ <accelerator name="AccelToggleFullscreen" action="ToggleFullscreen"/>
</ui>