[gnome-builder/wip/gtk4-port: 1044/1774] libide/sourceview: simplify context menu

[Christian Hergert <chergert src gnome org>]

commit 55555ac0bc87140b126461e0b5718c579fbfe018
Author: Christian Hergert <chergert redhat com>
Date:   Mon May 16 21:59:45 2022 -0700

    libide/sourceview: simplify context menu

 src/libide/sourceview/gtk/menus.ui    | 105 +++++++++++++++++-----------------
 src/plugins/beautifier/gtk/menus.ui   |  20 +++----
 src/plugins/comment-code/gtk/menus.ui |  34 +++++------
 src/plugins/retab/gtk/menus.ui        |  18 +++---
 4 files changed, 82 insertions(+), 95 deletions(-)
---
diff --git a/src/libide/sourceview/gtk/menus.ui b/src/libide/sourceview/gtk/menus.ui
index 118f9fe12..457bfedbc 100644
--- a/src/libide/sourceview/gtk/menus.ui
+++ b/src/libide/sourceview/gtk/menus.ui
@@ -1,52 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <menu id="ide-source-view-popup-menu">
-    <section id="ide-source-view-popup-menu-jump-section">
-      <item>
-        <attribute name="id">source-view-goto-def</attribute>
-        <attribute name="label" translatable="yes">_Go to Definition</attribute>
-        <attribute name="action">sourceview.goto-definition</attribute>
-        <attribute name="accel">&lt;alt&gt;period</attribute>
-      </item>
-      <item>
-        <attribute name="id">source-view-find-references</attribute>
-        <attribute name="label" translatable="yes">_Find references</attribute>
-        <attribute name="action">sourceview.find-references</attribute>
-        <attribute name="accel">&lt;ctrl&gt;&lt;shift&gt;space</attribute>
-      </item>
-    </section>
-    <section id="ide-source-view-popup-menu-files-section"/>
-    <section id="ide-source-view-popup-menu-undo-section">
-      <item>
-        <attribute name="label" translatable="yes">_Undo</attribute>
-        <attribute name="action">text.undo</attribute>
-        <attribute name="accel">&lt;control&gt;z</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">_Redo</attribute>
-        <attribute name="action">text.redo</attribute>
-        <attribute name="accel">&lt;control&gt;&lt;shift&gt;z</attribute>
-      </item>
-    </section>
     <section id="ide-source-view-popup-menu-clipboard-section">
+      <attribute name="display-hint">inline-buttons</attribute>
       <item>
+        <attribute name="verb-icon" type="s">'edit-cut-symbolic'</attribute>
         <attribute name="label" translatable="yes">C_ut</attribute>
         <attribute name="action">clipboard.cut</attribute>
-        <attribute name="accel">&lt;control&gt;x</attribute>
       </item>
       <item>
-        <attribute name="id">copy</attribute>
+        <attribute name="verb-icon" type="s">'edit-copy-symbolic'</attribute>
         <attribute name="label" translatable="yes">_Copy</attribute>
         <attribute name="action">clipboard.copy</attribute>
-        <attribute name="accel">&lt;control&gt;c</attribute>
       </item>
       <item>
+        <attribute name="verb-icon" type="s">'edit-paste-symbolic'</attribute>
         <attribute name="label" translatable="yes">_Paste</attribute>
         <attribute name="action">clipboard.paste</attribute>
-        <attribute name="accel">&lt;control&gt;v</attribute>
       </item>
-    </section>
-    <section id="ide-source-view-popup-menu-selection-section">
       <submenu id="ide-source-view-popup-menu-selection-submenu">
         <attribute name="label" translatable="yes">_Selection</attribute>
         <item>
@@ -94,27 +65,55 @@
         </section>
       </submenu>
     </section>
+    <section id="ide-source-view-popup-menu-undo-section">
+      <attribute name="display-hint">inline-buttons</attribute>
+      <attribute name="label" translatable="yes">Undo</attribute>
+      <item>
+        <attribute name="label" translatable="yes">Undo</attribute>
+        <attribute name="action">text.undo</attribute>
+        <attribute name="verb-icon">edit-undo-symbolic</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Redo</attribute>
+        <attribute name="action">text.redo</attribute>
+        <attribute name="verb-icon">edit-redo-symbolic</attribute>
+      </item>
+    </section>
     <section id="ide-source-view-popup-menu-zoom-section">
-      <submenu id="ide-source-view-popup-menu-zoom-section-submenu">
-        <attribute name="label" translatable="yes">_Zoom</attribute>
-        <item>
-          <attribute name="label" translatable="yes">Zoom _In</attribute>
-          <attribute name="action">sourceview.increase-font-size</attribute>
-          <attribute name="accel">&lt;control&gt;plus</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Zoom _Out</attribute>
-          <attribute name="action">sourceview.decrease-font-size</attribute>
-            <attribute name="accel">&lt;control&gt;minus</attribute>
-        </item>
-        <section id="ide-source-view-popup-menu-zoom-section-submenu-reset">
-          <item>
-            <attribute name="label" translatable="yes">_Reset</attribute>
-            <attribute name="action">sourceview.reset-font-size</attribute>
-            <attribute name="accel">&lt;control&gt;0</attribute>
-          </item>
-        </section>
-      </submenu>
+      <attribute name="label" translatable="yes">Zoom</attribute>
+      <attribute name="display-hint">inline-buttons</attribute>
+      <item>
+        <attribute name="label" translatable="yes">Zoom Out</attribute>
+        <attribute name="verb-icon">zoom-out-symbolic</attribute>
+        <attribute name="action">zoom.out</attribute>
+        <attribute name="accel">&lt;control&gt;minus</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Reset Zoom</attribute>
+        <attribute name="verb-icon">zoom-original-symbolic</attribute>
+        <attribute name="action">zoom.one</attribute>
+        <attribute name="accel">&lt;control&gt;0</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Zoom In</attribute>
+        <attribute name="verb-icon">zoom-in-symbolic</attribute>
+        <attribute name="action">zoom.in</attribute>
+        <attribute name="accel">&lt;control&gt;plus</attribute>
+      </item>
     </section>
+    <section id="ide-source-view-popup-menu-jump-section">
+      <item>
+        <attribute name="id">source-view-goto-def</attribute>
+        <attribute name="label" translatable="yes">_Go to Definition</attribute>
+        <attribute name="action">sourceview.goto-definition</attribute>
+        <attribute name="accel">&lt;alt&gt;period</attribute>
+      </item>
+      <item>
+        <attribute name="id">source-view-find-references</attribute>
+        <attribute name="label" translatable="yes">_Find references</attribute>
+        <attribute name="action">sourceview.find-references</attribute>
+      </item>
+    </section>
+    <section id="ide-source-view-popup-menu-files-section"/>
   </menu>
 </interface>
diff --git a/src/plugins/beautifier/gtk/menus.ui b/src/plugins/beautifier/gtk/menus.ui
index a6c85cf44..f3ee60407 100644
--- a/src/plugins/beautifier/gtk/menus.ui
+++ b/src/plugins/beautifier/gtk/menus.ui
@@ -1,17 +1,13 @@
 <?xml version="1.0"?>
 <interface>
-  <menu id="ide-source-view-popup-menu">
-    <section id="ide-source-view-popup-menu-selection-section">
-      <submenu id="ide-source-view-popup-menu-selection-submenu">
-        <section id="gb-beautify-section">
-          <attribute name="after">ide-source-view-popup-menu-line-section</attribute>
-          <submenu id="gb-beautify-submenu">
-            <attribute name="label" translatable="yes">_Beautify</attribute>
-            <section id="gb-beautify-default-section">
-            </section>
-            <section id="gb-beautify-profiles-section">
-            </section>
-          </submenu>
+  <menu id="ide-source-view-popup-menu-selection-submenu">
+    <section id="gb-beautify-section">
+      <attribute name="after">ide-source-view-popup-menu-line-section</attribute>
+      <submenu id="gb-beautify-submenu">
+        <attribute name="label" translatable="yes">_Beautify</attribute>
+        <section id="gb-beautify-default-section">
+        </section>
+        <section id="gb-beautify-profiles-section">
         </section>
       </submenu>
     </section>
diff --git a/src/plugins/comment-code/gtk/menus.ui b/src/plugins/comment-code/gtk/menus.ui
index 94ca5bcf8..84e215a31 100644
--- a/src/plugins/comment-code/gtk/menus.ui
+++ b/src/plugins/comment-code/gtk/menus.ui
@@ -1,24 +1,20 @@
 <?xml version="1.0"?>
 <interface>
-  <menu id="ide-source-view-popup-menu">
-    <section id="ide-source-view-popup-menu-selection-section">
-      <submenu id="ide-source-view-popup-menu-selection-submenu">
-        <section id="ide-source-view-popup-menu-selection-comment-code-section">
-          <attribute name="after">ide-source-view-popup-menu-line-section</attribute>
-          <item>
-            <attribute name="label" translatable="yes">_Comment code</attribute>
-            <attribute name="action">comment-code.comment-code</attribute>
-            <attribute name="target" type="s">'0'</attribute>
-            <attribute name="accel">&lt;control&gt;m</attribute>
-          </item>
-          <item>
-            <attribute name="label" translatable="yes">Unco_mment code</attribute>
-            <attribute name="action">comment-code.comment-code</attribute>
-            <attribute name="target" type="s">'1'</attribute>
-            <attribute name="accel">&lt;control&gt;&lt;shift&gt;m</attribute>
-          </item>
-        </section>
-      </submenu>
+  <menu id="ide-source-view-popup-menu-selection-submenu">
+    <section id="ide-source-view-popup-menu-selection-comment-code-section">
+      <attribute name="after">ide-source-view-popup-menu-line-section</attribute>
+      <item>
+        <attribute name="label" translatable="yes">_Comment code</attribute>
+        <attribute name="action">comment-code.comment-code</attribute>
+        <attribute name="target" type="s">'0'</attribute>
+        <attribute name="accel">&lt;control&gt;m</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Unco_mment code</attribute>
+        <attribute name="action">comment-code.comment-code</attribute>
+        <attribute name="target" type="s">'1'</attribute>
+        <attribute name="accel">&lt;control&gt;&lt;shift&gt;m</attribute>
+      </item>
     </section>
   </menu>
 </interface>
diff --git a/src/plugins/retab/gtk/menus.ui b/src/plugins/retab/gtk/menus.ui
index 94dec8c07..661f16386 100644
--- a/src/plugins/retab/gtk/menus.ui
+++ b/src/plugins/retab/gtk/menus.ui
@@ -1,16 +1,12 @@
 <?xml version="1.0"?>
 <interface>
-  <menu id="ide-source-view-popup-menu">
-    <section id="ide-source-view-popup-menu-selection-section">
-      <submenu id="ide-source-view-popup-menu-selection-submenu">
-        <section id="ide-source-view-popup-menu-selection-retab-section">
-          <attribute name="after">ide-source-view-popup-menu-line-section</attribute>
-          <item>
-            <attribute name="label" translatable="yes">_Reformat tabs</attribute>
-            <attribute name="action">retab.retab</attribute>
-          </item>
-        </section>
-      </submenu>
+  <menu id="ide-source-view-popup-menu-selection-submenu">
+    <section id="ide-source-view-popup-menu-selection-retab-section">
+      <attribute name="after">ide-source-view-popup-menu-line-section</attribute>
+      <item>
+        <attribute name="label" translatable="yes">_Reformat tabs</attribute>
+        <attribute name="action">retab.retab</attribute>
+      </item>
     </section>
   </menu>
 </interface>