Sync layout of kmmainwin.rc with upstream file

1 files changed, 97 insertions, 96 deletions

diff --git a/kde4-profiles/common/share/apps/kmail/kmmainwin.rc b/kde4-profiles/common/share/apps/kmail/kmmainwin.rc
index 703e906..28a5331 100644
--- a/kde4-profiles/common/share/apps/kmail/kmmainwin.rc
+++ b/kde4-profiles/common/share/apps/kmail/kmmainwin.rc
@@ -1,44 +1,45 @@
-<!DOCTYPE kpartgui>
 <!-- This file should be synchronized with kmail_part.rc to provide
      the same menu entries at the same place in KMail and Kontact  -->
-<kpartgui version="432" name="kmmainwin">
+
+<!DOCTYPE kpartgui>
+<kpartgui version="432" name="kmmainwin" >
  <MenuBar>
-  <Menu noMerge="1" name="file">
+  <Menu noMerge="1" name="file" >
    <text>&amp;File</text>
-   <Menu name="file_new">
-    <text context="@title:menu New message, folder or new window.">New</text>
-    <Action name="new_message"/>
-    <Action name="new_from_template"/>
-    <Separator/>
-    <Action name="new_folder"/>
-    <Separator/>
-    <Action name="new_mail_client"/>
+   <Menu name="file_new" >
+     <text context="@title:menu New message, folder or new window.">New</text>
+     <Action name="new_message" />
+     <Action name="new_from_template" />
+     <Separator/>
+     <Action name="new_folder" />
+     <Separator/>
+     <Action name="new_mail_client" />
    </Menu>
    <Separator/>
-   <Action name="file_open"/>
-   <Action name="file_save_as"/>
+   <Action name="file_open" />
+   <Action name="file_save_as" />
    <Action name="import"/>
-   <Action name="file_print"/>
+   <Action name="file_print" />
    <Separator/>
-   <Action name="expire_all_folders"/>
+   <Action name="expire_all_folders" />
    <Action name="file_invalidate_imap_cache"/>
    <Action name="empty_trash"/>
    <Separator/>
-   <Action name="online_status"/>
-   <Action name="check_mail"/>
+   <Action name="online_status" />
+   <Action name="check_mail" />
    <Action name="favorite_check_mail"/>
-   <Action name="check_mail_in"/>
-   <Action name="send_queued"/>
-   <Action name="send_queued_via"/>
+   <Action name="check_mail_in" />
+   <Action name="send_queued" />
+   <Action name="send_queued_via" />
    <Separator/>
-   <Action name="file_quit"/>
+   <Action name="file_quit" />
   </Menu>
-  <Menu noMerge="1" name="edit">
+  <Menu noMerge="1" name="edit" >
    <text>&amp;Edit</text>
-   <Action name="kmail_undo"/>
-   <Action name="kmail_redo"/>
+   <Action name="kmail_undo" />
+   <Action name="kmail_redo" />
    <Separator/>
-   <Action name="kmail_copy"/>
+   <Action name="kmail_copy" />
    <Separator/>
    <Action name="copy_folder"/>
    <Action name="cut_folder"/>
@@ -48,14 +49,14 @@
    <Action name="cut_messages"/>
    <Action name="paste_messages"/>
    <Separator/>
-   <Action name="move_to_trash"/>
-   <Action name="move_thread_to_trash"/>
+   <Action name="move_to_trash" />
+   <Action name="move_thread_to_trash" />
    <Separator/>
-   <Action name="search_messages"/>
-   <Action name="find_in_messages"/>
+   <Action name="search_messages" />
+   <Action name="find_in_messages" />
    <Separator/>
-   <Action name="mark_all_messages"/>
-   <Action name="mark_all_text"/>
+   <Action name="mark_all_messages" />
+   <Action name="mark_all_text" />
   </Menu>
   <Menu noMerge="1" name="view">
    <text>&amp;View</text>
@@ -76,7 +77,7 @@
    <Action name="toggle_mimeparttree"/>
    <Separator/>
    <Action name="toggle_fixedfont"/>
-   <Action name="encoding"/>
+   <Action name="encoding" />
   </Menu>
   <Menu noMerge="1" name="go">
    <text>&amp;Go</text>
@@ -92,71 +93,71 @@
    <Separator/>
    <Action name="go_next_unread_text"/>
   </Menu>
-  <Menu noMerge="1" name="folder">
+  <Menu noMerge="1" name="folder" >
    <text>F&amp;older</text>
-   <Action name="new_folder"/>
+   <Action name="new_folder" />
    <Separator/>
-   <Action name="mark_all_as_read"/>
+   <Action name="mark_all_as_read" />
    <Separator/>
-   <Action name="refresh_folder"/>
+   <Action name="refresh_folder" />
    <Separator/>
-   <Action name="empty"/>
-   <Action name="archive_folder"/>
-   <Action name="delete_folder"/>
-   <Action name="remove_duplicate_messages"/>
+   <Action name="empty" />
+   <Action name="archive_folder" />
+   <Action name="delete_folder" />
+   <Action name="remove_duplicate_messages" />
    <Separator/>
-   <Action name="prefer_html"/>
-   <Action name="prefer_html_external_refs"/>
-   <Action name="thread_messages"/>
-   <Action name="thread_messages_by_subject"/>
+   <Action name="prefer_html" />
+   <Action name="prefer_html_external_refs" />
+   <Action name="thread_messages" />
+   <Action name="thread_messages_by_subject" />
    <Separator/>
-   <Action name="folder_mailinglist_properties"/>
-   <Action name="folder_shortcut_command"/>
-   <Action name="modify"/>
+   <Action name="folder_mailinglist_properties" />
+   <Action name="folder_shortcut_command" />
+   <Action name="modify" />
   </Menu>
-  <Menu noMerge="1" name="message">
+  <Menu noMerge="1" name="message" >
    <text>&amp;Message</text>
-   <Action name="new_message"/>
-   <Action name="post_message"/>
-   <Separator/>
-   <Action name="reply"/>
-   <Action name="reply_all"/>
-   <Menu noMerge="1" name="reply_special">
-    <text>Reply Special</text>
-    <Action name="reply_author"/>
-    <Action name="reply_list"/>
-    <Action name="noquotereply"/>
-    <Separator/>
-    <Action name="custom_reply"/>
-    <Action name="custom_reply_all"/>
+   <Action name="new_message" />
+   <Action name="post_message" />
+   <Separator/>
+   <Action name="reply" />
+   <Action name="reply_all" />
+   <Menu noMerge="1" name="reply_special" >
+     <text>Reply Special</text>
+     <Action name="reply_author" />
+     <Action name="reply_list" />
+     <Action name="noquotereply" />
+     <Separator/>
+     <Action name="custom_reply" />
+     <Action name="custom_reply_all" />
    </Menu>
    <Menu name="menubar_message_forward">
-    <text>&amp;Forward</text>
-    <ActionList name="forward_action_list"/>
-    <Separator/>
-    <Action name="custom_forward"/>
+     <text>&amp;Forward</text>
+     <ActionList name="forward_action_list"/>
+     <Separator/>
+     <Action name="custom_forward" />
    </Menu>
-   <Action name="send_again"/>
+   <Action name="send_again" />
    <Action name="edit"/>
    <Separator/>
-   <Action name="copy_to"/>
-   <Action name="move_to"/>
+   <Action name="copy_to" />
+   <Action name="move_to" />
    <Separator/>
-   <Action name="set_status"/>
-   <Action name="thread_status"/>
+   <Action name="set_status" />
+   <Action name="thread_status" />
    <Separator/>
    <Action name="create_filter"/>
-   <Menu name="apply_filter_actions">
-    <text>A&amp;pply Filter</text>
-    <Action name="apply_filters"/>
-    <ActionList name="menu_filter_actions"/>
+   <Menu name="apply_filter_actions" >
+     <text>A&amp;pply Filter</text>
+     <Action name="apply_filters" />
+     <ActionList name="menu_filter_actions" />
    </Menu>
    <Separator/>
    <Action name="create_todo"/>
   </Menu>
   <Menu noMerge="1" name="tools">
    <text>&amp;Tools</text>
-   <Action name="search_messages"/>
+   <Action name="search_messages" />
    <Separator/>
    <Action name="addressbook"/>
    <Action name="tools_start_certman"/>
@@ -175,37 +176,37 @@
    <text>&amp;Settings</text>
    <Merge name="StandardToolBarMenuHandler"/>
    <Action name="show_quick_search"/>
-   <Action append="save_merge" name="filter"/>
-   <Action append="save_merge" name="popFilter"/>
-   <Action append="save_merge" name="sieveFilters"/>
-   <Separator/>
-   <Action group="settings_configure" name="options_configure_keybinding"/>
-   <Action group="settings_configure" name="kmail_configure_notifications"/>
-   <Action group="settings_configure" name="options_configure_toolbars"/>
-   <Action group="settings_configure" name="kmail_configure_kmail"/>
+   <Action name="filter" append="save_merge"/>
+   <Action name="popFilter" append="save_merge"/>
+   <Action name="sieveFilters" append="save_merge"/>
+   <Separator/>
+   <Action name="options_configure_keybinding" group="settings_configure"/>
+   <Action name="kmail_configure_notifications" group="settings_configure"/>
+   <Action name="options_configure_toolbars" group="settings_configure" />
+   <Action name="kmail_configure_kmail" group="settings_configure"/>
   </Menu>
   <Menu name="help">
    <text>&amp;Help</text>
    <Action name="help_kmail_welcomepage"/>
   </Menu>
  </MenuBar>
- <ToolBar noMerge="1" fullWidth="true" name="mainToolBar">
+ <ToolBar noMerge="1" name="mainToolBar" fullWidth="true" >
   <text>Main Toolbar</text>
-  <Action name="new_message"/>
-  <Action name="file_print"/>
-  <Separator name="separator_0"/>
-  <Action name="check_mail_in"/>
-  <Separator name="separator_1"/>
-  <Action name="message_reply_menu"/>
+  <Action name="new_message" />
+  <Action name="file_print" />
+  <Separator/>
+  <Action name="check_mail_in" />
+  <Separator/>
+  <Action name="message_reply_menu" />
   <Action name="message_forward"/>
-  <Separator name="separator_2"/>
+  <Separator/>
   <Action name="go_prev_unread_message"/>
   <Action name="go_next_unread_message"/>
-  <Separator name="separator_3"/>
-  <Action name="move_to_trash"/>
-  <Separator name="separator_4"/>
-  <ActionList name="toolbar_filter_actions"/>
-  <ActionList name="toolbar_messagetag_actions"/>
+  <Separator/>
+  <Action name="move_to_trash" />
+  <Separator/>
+  <ActionList name="toolbar_filter_actions" />
+  <ActionList name="toolbar_messagetag_actions" />
   <Action name="create_todo"/>
   <Action name="openin_addr_book"/>
  </ToolBar>