[balsa/remove-app-menu: 5/5] More menu shuffling

[Peter Bloomfield <peterb src gnome org>]

commit 9d1b024e5d96186704e77610a45b6d433beab062
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Tue Jan 22 17:54:44 2019 -0500

    More menu shuffling
    
    See https://gitlab.gnome.org/GNOME/balsa/issues/14
    
    * ui/main-window.ui:
      move "File → New → Message" to "Message → New…";
      move  "Mailbox → Close" to the foot of the "Mailbox" menu, and
      group "Remove Duplicates" and "Expunge Deleted Messages"
      immediately above it;
      move "Message → Next Message" and three friends to a new
      "Go" top-level menu.

 ChangeLog         | 12 ++++++++
 ui/main-window.ui | 89 ++++++++++++++++++++++++++++---------------------------
 2 files changed, 57 insertions(+), 44 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index f78be4718..02525f28b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,18 @@
          webkit version 2.20;
          (libbalsa_html_new): do not auto-load images if any are
          external (that is, not cid: data)
+2019-01-22  Peter Bloomfield  <pbloomfield bellsouth net>
+
+       More menu shuffling
+
+       * ui/main-window.ui:
+         move "File → New → Message" to "Message → New…";
+         move  "Mailbox → Close" to the foot of the "Mailbox" menu, and
+         group "Remove Duplicates" and "Expunge Deleted Messages"
+         immediately above it;
+         move "Message → Next Message" and three friends to a new
+         "Go" top-level menu.
+
 2019-01-21  Peter Bloomfield  <pbloomfield bellsouth net>
 
        * ui/main-window.ui: Shuffle some menu items;
diff --git a/ui/main-window.ui b/ui/main-window.ui
index f4998a014..72e74f419 100644
--- a/ui/main-window.ui
+++ b/ui/main-window.ui
@@ -5,13 +5,6 @@
       <section>
         <submenu>
           <attribute name='label' translatable='yes' context='window menu' comments='Translators: window 
menu item - New message or mailbox'>_New</attribute>
-          <section>
-            <item>
-              <attribute name='label' translatable='yes'>_Message</attribute>
-              <attribute name='action'>win.new-message</attribute>
-              <attribute name='accel'>m</attribute>
-            </item>
-          </section>
           <section>
             <item>
               <attribute name='label'
@@ -286,32 +279,6 @@
     </submenu>
     <submenu>
       <attribute name='label' translatable='yes'>Mail_box</attribute>
-      <section>
-        <item>
-          <attribute name='label'
-            translatable='yes'>Next Message</attribute>
-          <attribute name='action'>win.next-message</attribute>
-          <attribute name='accel'>n</attribute>
-        </item>
-        <item>
-          <attribute name='label'
-            translatable='yes'>Previous Message</attribute>
-          <attribute name='action'>win.previous-message</attribute>
-          <attribute name='accel'>p</attribute>
-        </item>
-        <item>
-          <attribute name='label'
-            translatable='yes'>Next Unread Message</attribute>
-          <attribute name='action'>win.next-unread</attribute>
-          <attribute name='accel'>&lt;Primary&gt;n</attribute>
-        </item>
-        <item>
-          <attribute name='label'
-            translatable='yes'>Next Flagged Message</attribute>
-          <attribute name='action'>win.next-flagged</attribute>
-          <attribute name='accel'>&lt;Primary&gt;&lt;Alt&gt;f</attribute>
-        </item>
-      </section>
       <section>
         <submenu>
             <attribute name='label'
@@ -385,34 +352,39 @@
       <section>
         <item>
           <attribute name='label'
-            translatable='yes'>E_xpunge Deleted Messages</attribute>
-          <attribute name='action'>win.mailbox-expunge</attribute>
+            translatable='yes'>Select _Filters…</attribute>
+          <attribute name='action'>win.select-filters</attribute>
         </item>
+      </section>
+      <section>
         <item>
           <attribute name='label'
-            translatable='yes'>_Close</attribute>
-          <attribute name='action'>win.mailbox-close</attribute>
-          <attribute name='accel'>&lt;Primary&gt;w</attribute>
+            translatable='yes'>_Remove Duplicates</attribute>
+          <attribute name='action'>win.remove-duplicates</attribute>
         </item>
-      </section>
-      <section>
         <item>
           <attribute name='label'
-            translatable='yes'>Select _Filters…</attribute>
-          <attribute name='action'>win.select-filters</attribute>
+            translatable='yes'>E_xpunge Deleted Messages</attribute>
+          <attribute name='action'>win.mailbox-expunge</attribute>
         </item>
       </section>
       <section>
         <item>
           <attribute name='label'
-            translatable='yes'>_Remove Duplicates</attribute>
-          <attribute name='action'>win.remove-duplicates</attribute>
+            translatable='yes'>_Close</attribute>
+          <attribute name='action'>win.mailbox-close</attribute>
+          <attribute name='accel'>&lt;Primary&gt;w</attribute>
         </item>
       </section>
     </submenu>
     <submenu>
       <attribute name='label' translatable='yes'>_Message</attribute>
       <section>
+        <item>
+          <attribute name='label' translatable='yes'>_New…</attribute>
+          <attribute name='action'>win.new-message</attribute>
+          <attribute name='accel'>m</attribute>
+        </item>
         <item>
           <attribute name='label'
             translatable='yes'>_Reply…</attribute>
@@ -532,6 +504,35 @@
         </item>
       </section>
     </submenu>
+    <submenu>
+      <attribute name='label' translatable='yes'>_Go</attribute>
+      <section>
+        <item>
+          <attribute name='label'
+            translatable='yes'>Next Message</attribute>
+          <attribute name='action'>win.next-message</attribute>
+          <attribute name='accel'>n</attribute>
+        </item>
+        <item>
+          <attribute name='label'
+            translatable='yes'>Previous Message</attribute>
+          <attribute name='action'>win.previous-message</attribute>
+          <attribute name='accel'>p</attribute>
+        </item>
+        <item>
+          <attribute name='label'
+            translatable='yes'>Next Unread Message</attribute>
+          <attribute name='action'>win.next-unread</attribute>
+          <attribute name='accel'>&lt;Primary&gt;n</attribute>
+        </item>
+        <item>
+          <attribute name='label'
+            translatable='yes'>Next Flagged Message</attribute>
+          <attribute name='action'>win.next-flagged</attribute>
+          <attribute name='accel'>&lt;Primary&gt;&lt;Alt&gt;f</attribute>
+        </item>
+      </section>
+    </submenu>
     <submenu>
       <attribute name='label' translatable='yes'>_Help</attribute>
       <section>