[balsa/remove-app-menu: 4/5] ui/main-window.ui: Shuffle some menu items

[Peter Bloomfield <peterb src gnome org>]

commit 430dc73d72684c82f1311e92bcdb9f0d0bef1a5f
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Mon Jan 21 17:19:14 2019 -0500

    ui/main-window.ui: Shuffle some menu items
    
    * ui/main-window.ui: Shuffle some menu items;
      see https://gitlab.gnome.org/GNOME/balsa/issues/14

 ChangeLog         |  5 ++++
 ui/main-window.ui | 71 +++++++++++++++++++++++++++++--------------------------
 2 files changed, 43 insertions(+), 33 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d82dccacb..f78be4718 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,11 @@
          webkit version 2.20;
          (libbalsa_html_new): do not auto-load images if any are
          external (that is, not cid: data)
+2019-01-21  Peter Bloomfield  <pbloomfield bellsouth net>
+
+       * ui/main-window.ui: Shuffle some menu items;
+       see https://gitlab.gnome.org/GNOME/balsa/issues/14
+
 2019-01-21  Peter Bloomfield  <pbloomfield bellsouth net>
 
        * ui/main-window.ui: Restore 'm' shortcut for "New message"
diff --git a/ui/main-window.ui b/ui/main-window.ui
index c138b3506..f4998a014 100644
--- a/ui/main-window.ui
+++ b/ui/main-window.ui
@@ -97,35 +97,14 @@
           <attribute name='action'>win.autocrypt-db</attribute>
                </item>
       </section>
-      <section>
-        <submenu>
-          <attribute name='label' translatable='yes'>_Preferences</attribute>
-          <item>
-            <attribute name='label'
-              translatable='yes'>_Settings…</attribute>
-            <attribute name='action'>win.settings</attribute>
-          </item>
-          <item>
-            <attribute name='label'
-              translatable='yes'>_Toolbars…</attribute>
-            <attribute name='action'>win.toolbars</attribute>
-          </item>
-          <item>
-            <attribute name='label'
-              translatable='yes'>_Identities…</attribute>
-            <attribute name='action'>win.identities</attribute>
-          </item>
-        </submenu>
-      </section>
       <section>
         <item>
-          <attribute name='label' translatable='yes'>_Help</attribute>
-          <attribute name='action'>win.help</attribute>
-        </item>
-        <item>
-          <attribute name='label' translatable='yes'>_About Balsa</attribute>
-          <attribute name='action'>win.about</attribute>
+          <attribute name='label'
+            translatable='yes'>Empty _Trash</attribute>
+          <attribute name='action'>win.empty-trash</attribute>
         </item>
+      </section>
+      <section>
         <item>
           <attribute name='label' translatable='yes'>_Quit</attribute>
           <attribute name='action'>win.quit</attribute>
@@ -186,6 +165,26 @@
           <attribute name='action'>win.export-filters</attribute>
         </item>
       </section>
+      <section>
+        <submenu>
+          <attribute name='label' translatable='yes'>_Preferences</attribute>
+          <item>
+            <attribute name='label'
+              translatable='yes'>_Settings…</attribute>
+            <attribute name='action'>win.settings</attribute>
+          </item>
+          <item>
+            <attribute name='label'
+              translatable='yes'>_Toolbars…</attribute>
+            <attribute name='action'>win.toolbars</attribute>
+          </item>
+          <item>
+            <attribute name='label'
+              translatable='yes'>_Identities…</attribute>
+            <attribute name='action'>win.identities</attribute>
+          </item>
+        </submenu>
+      </section>
     </submenu>
     <submenu>
       <attribute name='label' translatable='yes'>_View</attribute>
@@ -396,13 +395,6 @@
           <attribute name='accel'>&lt;Primary&gt;w</attribute>
         </item>
       </section>
-      <section>
-        <item>
-          <attribute name='label'
-            translatable='yes'>Empty _Trash</attribute>
-          <attribute name='action'>win.empty-trash</attribute>
-        </item>
-      </section>
       <section>
         <item>
           <attribute name='label'
@@ -540,5 +532,18 @@
         </item>
       </section>
     </submenu>
+    <submenu>
+      <attribute name='label' translatable='yes'>_Help</attribute>
+      <section>
+        <item>
+          <attribute name='label' translatable='yes'>_Contents</attribute>
+          <attribute name='action'>win.help</attribute>
+        </item>
+        <item>
+          <attribute name='label' translatable='yes'>_About Balsa</attribute>
+          <attribute name='action'>win.about</attribute>
+        </item>
+      </section>
+    </submenu>
   </menu>
 </interface>