[meld/ui-next] Rearrange previously-application menus to match other redesigns

[Kai Willadsen <kaiw src gnome org>]

commit 196c306635a14902e6ef48edea3a6237b697a371
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Wed Mar 20 09:02:53 2019 +1000

    Rearrange previously-application menus to match other redesigns
    
    This is inspired by the gedit ordering.

 meld/accelerators.py        |  1 +
 meld/resources/gtk/menus.ui | 22 +++++-----------------
 2 files changed, 6 insertions(+), 17 deletions(-)
---
diff --git a/meld/accelerators.py b/meld/accelerators.py
index b87c0fc9..cff837f0 100644
--- a/meld/accelerators.py
+++ b/meld/accelerators.py
@@ -4,6 +4,7 @@ from gi.repository import Gtk
 
 def register_accels(app: Gtk.Application):
     view_accels = (
+        ('app.quit', '<Primary>Q'),
         ('view.find', '<Primary>F'),
         ('view.find-next', '<Primary>G'),
         ('view.find-previous', '<Primary><Shift>G'),
diff --git a/meld/resources/gtk/menus.ui b/meld/resources/gtk/menus.ui
index 959eab2e..f63e9822 100644
--- a/meld/resources/gtk/menus.ui
+++ b/meld/resources/gtk/menus.ui
@@ -119,36 +119,24 @@
         </section>
       </submenu>
     </section>
-    <section>
-      <attribute name="id">window-section</attribute>
-      <item>
-        <attribute name="label" translatable="yes">_Close</attribute>
-        <attribute name="action">win.close</attribute>
-      </item>
-    </section>
     <section>
       <attribute name="id">application-section</attribute>
       <item>
         <attribute name="label" translatable="yes">_Preferences</attribute>
         <attribute name="action">app.preferences</attribute>
       </item>
-      <item>
-        <attribute name="label" translatable="yes">_Help</attribute>
-        <attribute name="action">app.help</attribute>
-        <attribute name="accel">F1</attribute>
-      </item>
       <item>
         <attribute name="label" translatable="yes">Keyboard Shortcuts</attribute>
         <attribute name="action">win.show-help-overlay</attribute>
       </item>
       <item>
-        <attribute name="label" translatable="yes">_About</attribute>
-        <attribute name="action">app.about</attribute>
+        <attribute name="label" translatable="yes">_Help</attribute>
+        <attribute name="action">app.help</attribute>
+        <attribute name="accel">F1</attribute>
       </item>
       <item>
-        <attribute name="label" translatable="yes">_Quit</attribute>
-        <attribute name="action">app.quit</attribute>
-        <attribute name="accel">&lt;Primary&gt;q</attribute>
+        <attribute name="label" translatable="yes">_About Meld</attribute>
+        <attribute name="action">app.about</attribute>
       </item>
     </section>
   </menu>