From 7d1eac18cade10b74408e72ead7abc5b119ee369 Mon Sep 17 00:00:00 2001
From: Zander Brown <zbrown@gnome.org>
Date: Sat, 5 Aug 2023 18:21:22 +0100
Subject: [PATCH] ifs: move menu to XML

See: https://gitlab.gnome.org/GNOME/gimp/-/issues/9776
---
 plug-ins/ifs-compose/ifs-compose.c           | 56 +-------------------
 plug-ins/ifs-compose/ifs-menus.gresource.xml |  6 +++
 plug-ins/ifs-compose/ifs-menus.ui            | 54 +++++++++++++++++++
 plug-ins/ifs-compose/meson.build             |  5 ++
 po-plug-ins/POTFILES.in                      |  1 +
 5 files changed, 67 insertions(+), 55 deletions(-)
 create mode 100644 plug-ins/ifs-compose/ifs-menus.gresource.xml
 create mode 100644 plug-ins/ifs-compose/ifs-menus.ui

diff --git a/plug-ins/ifs-compose/ifs-compose.c b/plug-ins/ifs-compose/ifs-compose.c
index edf9a70d9b..9886f08b5f 100644
--- a/plug-ins/ifs-compose/ifs-compose.c
+++ b/plug-ins/ifs-compose/ifs-compose.c
@@ -475,61 +475,7 @@ ifs_run (GimpProcedure        *procedure,
   ifs->app = gtk_application_new (NULL, G_APPLICATION_FLAGS_NONE);
 #endif
 
-  ifs->builder = gtk_builder_new_from_string (
-      "<interface>"
-        "<menu id=\"ifs-compose-menu\">"
-          "<section>"
-            "<item>"
-              "<attribute name=\"label\" translatable=\"yes\">Move</attribute>"
-              "<attribute name=\"action\">app.transform</attribute>"
-              "<attribute name=\"target\">move</attribute>"
-            "</item>"
-            "<item>"
-              "<attribute name=\"label\" translatable=\"yes\">Rotate</attribute>"
-              "<attribute name=\"action\">app.transform</attribute>"
-              "<attribute name=\"target\">rotate</attribute>"
-            "</item>"
-            "<item>"
-              "<attribute name=\"label\" translatable=\"yes\">Stretch</attribute>"
-              "<attribute name=\"action\">app.transform</attribute>"
-              "<attribute name=\"target\">stretch</attribute>"
-            "</item>"
-          "</section>"
-          "<section>"
-            "<item>"
-              "<attribute name=\"label\" translatable=\"yes\">New</attribute>"
-              "<attribute name=\"action\">app.new</attribute>"
-            "</item>"
-            "<item>"
-              "<attribute name=\"label\" translatable=\"yes\">Delete</attribute>"
-              "<attribute name=\"action\">app.delete</attribute>"
-            "</item>"
-            "<item>"
-              "<attribute name=\"label\" translatable=\"yes\">Undo</attribute>"
-              "<attribute name=\"action\">app.undo</attribute>"
-            "</item>"
-            "<item>"
-              "<attribute name=\"label\" translatable=\"yes\">Redo</attribute>"
-              "<attribute name=\"action\">app.redo</attribute>"
-            "</item>"
-            "<item>"
-              "<attribute name=\"label\" translatable=\"yes\">Select All</attribute>"
-              "<attribute name=\"action\">app.select-all</attribute>"
-            "</item>"
-            "<item>"
-              "<attribute name=\"label\" translatable=\"yes\">Recompute Center</attribute>"
-              "<attribute name=\"action\">app.center</attribute>"
-            "</item>"
-          "</section>"
-          "<section>"
-            "<item>"
-              "<attribute name=\"label\" translatable=\"yes\">Render Options</attribute>"
-              "<attribute name=\"action\">app.options</attribute>"
-            "</item>"
-          "</section>"
-        "</menu>"
-      "</interface>",
-      -1);
+  ifs->builder = gtk_builder_new_from_resource ("/org/gimp/ifs/ifs-menus.ui");
 
   gegl_init (NULL, NULL);
 
diff --git a/plug-ins/ifs-compose/ifs-menus.gresource.xml b/plug-ins/ifs-compose/ifs-menus.gresource.xml
new file mode 100644
index 0000000000..c0299acbab
--- /dev/null
+++ b/plug-ins/ifs-compose/ifs-menus.gresource.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gimp/ifs/">
+    <file preprocess="xml-stripblanks">ifs-menus.ui</file>
+  </gresource>
+</gresources>
diff --git a/plug-ins/ifs-compose/ifs-menus.ui b/plug-ins/ifs-compose/ifs-menus.ui
new file mode 100644
index 0000000000..1a6a3b7cde
--- /dev/null
+++ b/plug-ins/ifs-compose/ifs-menus.ui
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <menu id="ifs-compose-menu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Move</attribute>
+        <attribute name="action">app.transform</attribute>
+        <attribute name="target">move</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Rotate</attribute>
+        <attribute name="action">app.transform</attribute>
+        <attribute name="target">rotate</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Stretch</attribute>
+        <attribute name="action">app.transform</attribute>
+        <attribute name="target">stretch</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">New</attribute>
+        <attribute name="action">app.new</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Delete</attribute>
+        <attribute name="action">app.delete</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Undo</attribute>
+        <attribute name="action">app.undo</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Redo</attribute>
+        <attribute name="action">app.redo</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Select All</attribute>
+        <attribute name="action">app.select-all</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Recompute Center</attribute>
+        <attribute name="action">app.center</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Render Options</attribute>
+        <attribute name="action">app.options</attribute>
+      </item>
+    </section>
+  </menu>
+</interface>
\ No newline at end of file
diff --git a/plug-ins/ifs-compose/meson.build b/plug-ins/ifs-compose/meson.build
index 71d399e572..9ccdc2118c 100644
--- a/plug-ins/ifs-compose/meson.build
+++ b/plug-ins/ifs-compose/meson.build
@@ -6,6 +6,11 @@ plugin_sources = [
   'ifs-compose.c',
 ]
 
+plugin_sources += gnome.compile_resources(
+  'ifs-menus',
+  'ifs-menus.gresource.xml',
+)
+
 if platform_windows
   plugin_sources += windows.compile_resources(
     gimp_plugins_rc,
diff --git a/po-plug-ins/POTFILES.in b/po-plug-ins/POTFILES.in
index e61fe25af3..e785b476f0 100644
--- a/po-plug-ins/POTFILES.in
+++ b/po-plug-ins/POTFILES.in
@@ -162,6 +162,7 @@ plug-ins/help-browser/help-browser.c
 plug-ins/help/gimphelpdomain.c
 plug-ins/help/gimphelplocale.c
 plug-ins/ifs-compose/ifs-compose.c
+plug-ins/ifs-compose/ifs-menus.ui
 plug-ins/imagemap/imap_about.c
 plug-ins/imagemap/imap_browse.c
 plug-ins/imagemap/imap_circle.c