[meld] Move items from horizontal-icon section to regular menu items

[Kai Willadsen <kaiw src gnome org>]

commit 59b8f98adc9dbd648d8e4be0684101c908e5dcf4
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Fri Aug 12 10:01:36 2022 +1000

    Move items from horizontal-icon section to regular menu items
    
    The horizontal icon section doesn't really establish a particularly
    coherent grouping of functions, and this style is not widely used enough
    for it to be familiar to all users.
    
    We've just moved items to relevant submenus, except for Refresh which
    we're giving additional prominence because it's still needed somewhat
    regularly for certain use cases.

 meld/resources/gtk/menus.ui | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)
---
diff --git a/meld/resources/gtk/menus.ui b/meld/resources/gtk/menus.ui
index 83d19c6d..a2829f3a 100644
--- a/meld/resources/gtk/menus.ui
+++ b/meld/resources/gtk/menus.ui
@@ -1,25 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <menu id="gear-menu">
-    <section>
-      <attribute name="display-hint">horizontal-buttons</attribute>
-      <item>
-        <attribute name="label" translatable="yes">Refresh</attribute>
-        <attribute name="action">view.refresh</attribute>
-        <attribute name="verb-icon">view-refresh-symbolic</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Stop</attribute>
-        <attribute name="action">win.stop</attribute>
-        <attribute name="verb-icon">process-stop-symbolic</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Fullscreen</attribute>
-        <attribute name="action">win.fullscreen</attribute>
-        <attribute name="verb-icon">view-fullscreen-symbolic</attribute>
-        <attribute name="accel">F11</attribute>
-      </item>
-    </section>
     <section>
       <attribute name="id">file-section</attribute>
       <item>
@@ -39,6 +20,13 @@
         <attribute name="action">view.open-external</attribute>
       </item>
     </section>
+    <section>
+      <attribute name="id">refresh-section</attribute>
+      <item>
+        <attribute name="label" translatable="yes">Refresh Comparison</attribute>
+        <attribute name="action">view.refresh</attribute>
+      </item>
+    </section>
     <section>
       <attribute name="id">find-section</attribute>
       <item>
@@ -55,6 +43,11 @@
         <attribute name="label" translatable="yes">View</attribute>
         <section>
           <attribute name="id">view-section</attribute>
+          <item>
+            <attribute name="label" translatable="yes">Fullscreen</attribute>
+            <attribute name="action">win.fullscreen</attribute>
+            <attribute name="accel">F11</attribute>
+          </item>
           <item>
             <attribute name="label" translatable="yes">Overview Map</attribute>
             <attribute name="action">view.show-overview-map</attribute>
@@ -78,6 +71,10 @@
       </submenu>
       <submenu>
         <attribute name="label" translatable="yes">Comparison</attribute>
+        <item>
+          <attribute name="label" translatable="yes">Stop</attribute>
+          <attribute name="action">win.stop</attribute>
+        </item>
         <section>
           <attribute name="id">merge-section</attribute>
           <item>