[gnome-builder/wip/gtk4-port: 811/1774] plugins/project-tree: more menuing work

[Christian Hergert <chergert src gnome org>]

commit ffc6138a600c9b42ede925b60340b8c3f60b27a7
Author: Christian Hergert <chergert redhat com>
Date:   Fri Apr 29 10:21:51 2022 -0700

    plugins/project-tree: more menuing work
    
    What still seems to be the problem is that project-tree is getting loaded
    right after buildui, rather than the other way around.

 src/plugins/debuggerui/debuggerui.plugin |  2 +-
 src/plugins/debuggerui/gtk/menus.ui      | 21 +++++++++++++--------
 src/plugins/valgrind/gtk/menus.ui        | 20 ++++++++++++--------
 src/plugins/valgrind/valgrind.plugin     |  2 +-
 4 files changed, 27 insertions(+), 18 deletions(-)
---
diff --git a/src/plugins/debuggerui/debuggerui.plugin b/src/plugins/debuggerui/debuggerui.plugin
index a0261cbcc..e927ab27d 100644
--- a/src/plugins/debuggerui/debuggerui.plugin
+++ b/src/plugins/debuggerui/debuggerui.plugin
@@ -2,7 +2,7 @@
 Authors=Christian Hergert <christian hergert me>
 Builtin=true
 Copyright=Copyright © 2014-2018 Christian Hergert
-Depends=project-tree;buildui;
+Depends=buildui;
 Description=Builder's visual debugger
 Embedded=_gbp_debuggerui_register_types
 Hidden=true
diff --git a/src/plugins/debuggerui/gtk/menus.ui b/src/plugins/debuggerui/gtk/menus.ui
index 75a0eae15..013d47da1 100644
--- a/src/plugins/debuggerui/gtk/menus.ui
+++ b/src/plugins/debuggerui/gtk/menus.ui
@@ -13,14 +13,19 @@
       </item>
     </section>
   </menu>
-  <menu id="project-tree-run-with-submenu">
-    <section id="project-tree-menu-run-with-section">
-      <item>
-        <attribute name="id">project-tree-menu-debug</attribute>
-        <attribute name="label" translatable="yes">Run with _Debugger</attribute>
-        <attribute name="action">buildui.run-with-handler</attribute>
-        <attribute name="target" type="s">'debugger'</attribute>
-      </item>
+  <menu id="project-tree-menu">
+    <section id="project-tree-menu-foundry-section">
+      <submenu id="project-tree-run-with-submenu">
+        <section id="project-tree-menu-run-with-section">
+          <item>
+            <attribute name="id">project-tree-menu-debug</attribute>
+            <attribute name="label" translatable="yes">Run with _Debugger</attribute>
+            <attribute name="action">buildui.run-with-handler</attribute>
+            <attribute name="target" type="s">'debugger'</attribute>
+            <attribute name="hidden-when">action-disabled</attribute>
+          </item>
+        </section>
+      </submenu>
     </section>
   </menu>
 </interface>
diff --git a/src/plugins/valgrind/gtk/menus.ui b/src/plugins/valgrind/gtk/menus.ui
index 971e6d527..5fc65cd53 100644
--- a/src/plugins/valgrind/gtk/menus.ui
+++ b/src/plugins/valgrind/gtk/menus.ui
@@ -13,14 +13,18 @@
       </item>
     </section>
   </menu>
-  <menu id="project-tree-run-with-submenu">
-    <section id="project-tree-menu-run-with-section">
-      <item>
-        <attribute name="id">project-tree-menu-valgrind</attribute>
-        <attribute name="label" translatable="yes">Run with Valgrind</attribute>
-        <attribute name="action">buildui.run-with-handler</attribute>
-        <attribute name="target" type="s">'valgrind'</attribute>
-      </item>
+  <menu id="project-tree-menu">
+    <section id="project-tree-menu-foundry-section">
+      <submenu id="project-tree-run-with-submenu">
+        <section id="project-tree-menu-run-with-section">
+          <item>
+            <attribute name="id">project-tree-menu-valgrind</attribute>
+            <attribute name="label" translatable="yes">Run with Valgrind</attribute>
+            <attribute name="action">buildui.run-with-handler</attribute>
+            <attribute name="target" type="s">'valgrind'</attribute>
+          </item>
+        </section>
+      </submenu>
     </section>
   </menu>
 </interface>
diff --git a/src/plugins/valgrind/valgrind.plugin b/src/plugins/valgrind/valgrind.plugin
index a5eb0da1b..712032d36 100644
--- a/src/plugins/valgrind/valgrind.plugin
+++ b/src/plugins/valgrind/valgrind.plugin
@@ -2,7 +2,7 @@
 Authors=Christian Hergert <christian hergert me>
 Builtin=true
 Copyright=Copyright © 2017-2022 Christian Hergert
-Depends=project-tree;buidui;
+Depends=buildui;
 Description=Provides integration with valgrind
 Embedded=_gbp_valgrind_register_types
 Module=valgrind