From 8709e919997a8188d9e13cdfcd3bc65eda3cf9a2 Mon Sep 17 00:00:00 2001
From: Alx Sa <cmyk.student@gmail.com>
Date: Wed, 9 Aug 2023 14:48:21 +0000
Subject: [PATCH] plug-ins: Make GFig menus translatable

Based on the IMAP port in !1031, this moves the menu code to a separate file
so that gettext can access it for translation.
---
 plug-ins/gfig/gfig-menu.ui             | 147 ++++++++++++++++++++++++
 plug-ins/gfig/gfig-menus.gresource.xml |   6 +
 plug-ins/gfig/gfig.c                   | 149 +------------------------
 plug-ins/gfig/meson.build              |   5 +
 po-plug-ins/POTFILES.in                |   1 +
 5 files changed, 160 insertions(+), 148 deletions(-)
 create mode 100644 plug-ins/gfig/gfig-menu.ui
 create mode 100644 plug-ins/gfig/gfig-menus.gresource.xml

diff --git a/plug-ins/gfig/gfig-menu.ui b/plug-ins/gfig/gfig-menu.ui
new file mode 100644
index 0000000000..d6238b46f5
--- /dev/null
+++ b/plug-ins/gfig/gfig-menu.ui
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+<menu id="gfig-menubar">
+  <section>
+    <submenu>
+      <attribute name="label" translatable="yes">File</attribute>
+        <item>
+          <attribute name="label" translatable="yes">Open</attribute>
+          <attribute name="action">app.open</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Save</attribute>
+          <attribute name="action">app.save</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Close</attribute>
+          <attribute name="action">app.close</attribute>
+        </item>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">Edit</attribute>
+        <item>
+          <attribute name="label" translatable="yes">Undo</attribute>
+          <attribute name="action">app.undo</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Clear</attribute>
+          <attribute name="action">app.clear</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Grid</attribute>
+          <attribute name="action">app.grid</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Preferences</attribute>
+          <attribute name="action">app.preferences</attribute>
+        </item>
+    </submenu>
+  </section>
+</menu>
+<menu id="gfig-toolbar">
+  <section>
+    <item>
+      <attribute name="label" translatable="yes">Line</attribute>
+      <attribute name="action">app.shape</attribute>
+      <attribute name="target">line</attribute>
+    </item>
+    <item>
+      <attribute name="label" translatable="yes">Rectangle</attribute>
+      <attribute name="action">app.shape</attribute>
+      <attribute name="target">rectangle</attribute>
+    </item>
+    <item>
+      <attribute name="label" translatable="yes">Circle</attribute>
+      <attribute name="action">app.shape</attribute>
+      <attribute name="target">circle</attribute>
+    </item>
+    <item>
+      <attribute name="label" translatable="yes">Ellipse</attribute>
+      <attribute name="action">app.shape</attribute>
+      <attribute name="target">ellipse</attribute>
+    </item>
+    <item>
+      <attribute name="label" translatable="yes">Arc</attribute>
+      <attribute name="action">app.shape</attribute>
+      <attribute name="target">arc</attribute>
+    </item>
+    <item>
+      <attribute name="label" translatable="yes">Polygon</attribute>
+      <attribute name="action">app.shape</attribute>
+      <attribute name="target">polygon</attribute>
+    </item>
+    <item>
+      <attribute name="label" translatable="yes">Star</attribute>
+      <attribute name="action">app.shape</attribute>
+      <attribute name="target">star</attribute>
+    </item>
+    <item>
+      <attribute name="label" translatable="yes">Spiral</attribute>
+      <attribute name="action">app.shape</attribute>
+      <attribute name="target">spiral</attribute>
+    </item>
+    <item>
+      <attribute name="label" translatable="yes">Bezier</attribute>
+      <attribute name="action">app.shape</attribute>
+      <attribute name="target">bezier</attribute>
+    </item>
+    <item>
+      <attribute name="label" translatable="yes">Move Object</attribute>
+      <attribute name="action">app.shape</attribute>
+      <attribute name="target">move-obj</attribute>
+    </item>
+    <item>
+      <attribute name="label" translatable="yes">Move Point</attribute>
+      <attribute name="action">app.shape</attribute>
+      <attribute name="target">move-point</attribute>
+    </item>
+    <item>
+      <attribute name="label" translatable="yes">Copy</attribute>
+      <attribute name="action">app.shape</attribute>
+      <attribute name="target">copy</attribute>
+    </item>
+    <item>
+      <attribute name="label" translatable="yes">Delete</attribute>
+      <attribute name="action">app.shape</attribute>
+      <attribute name="target">delete</attribute>
+    </item>
+    <item>
+      <attribute name="label" translatable="yes">Select</attribute>
+      <attribute name="action">app.shape</attribute>
+      <attribute name="target">select</attribute>
+    </item>
+  </section>
+  <section>
+    <item>
+      <attribute name="label" translatable="yes">Raise</attribute>
+      <attribute name="action">app.raise</attribute>
+    </item>
+    <item>
+      <attribute name="label" translatable="yes">Lower</attribute>
+      <attribute name="action">app.lower</attribute>
+    </item>
+    <item>
+      <attribute name="label" translatable="yes">Top</attribute>
+      <attribute name="action">app.top</attribute>
+    </item>
+    <item>
+      <attribute name="label" translatable="yes">Bottom</attribute>
+      <attribute name="action">app.bottom</attribute>
+    </item>
+  </section>
+  <section>
+    <item>
+      <attribute name="label" translatable="yes">Show Previous</attribute>
+      <attribute name="action">app.show-prev</attribute>
+    </item>
+    <item>
+      <attribute name="label" translatable="yes">Show Next</attribute>
+      <attribute name="action">app.show-next</attribute>
+    </item>
+    <item>
+      <attribute name="label" translatable="yes">Show All</attribute>
+      <attribute name="action">app.show-all</attribute>
+    </item>
+  </section>
+</menu>
+</interface>
\ No newline at end of file
diff --git a/plug-ins/gfig/gfig-menus.gresource.xml b/plug-ins/gfig/gfig-menus.gresource.xml
new file mode 100644
index 0000000000..c6fb8ae8b3
--- /dev/null
+++ b/plug-ins/gfig/gfig-menus.gresource.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gimp/gfig/">
+    <file preprocess="xml-stripblanks">gfig-menu.ui</file>
+  </gresource>
+</gresources>
\ No newline at end of file
diff --git a/plug-ins/gfig/gfig.c b/plug-ins/gfig/gfig.c
index d58060024f..78107e8eb5 100644
--- a/plug-ins/gfig/gfig.c
+++ b/plug-ins/gfig/gfig.c
@@ -232,154 +232,7 @@ gfig_run (GimpProcedure        *procedure,
 #endif
   gfig->success = FALSE;
 
-  gfig->builder = gtk_builder_new_from_string (
-      "<interface>"
-        "<menu id=\"gfig-menubar\">"
-          "<section>"
-            "<submenu>"
-              "<attribute name=\"label\">File</attribute>"
-                "<item>"
-                  "<attribute name=\"label\" translatable=\"yes\">Open</attribute>"
-                  "<attribute name=\"action\">app.open</attribute>"
-                "</item>"
-                "<item>"
-                  "<attribute name=\"label\" translatable=\"yes\">Save</attribute>"
-                  "<attribute name=\"action\">app.save</attribute>"
-                "</item>"
-                "<item>"
-                  "<attribute name=\"label\" translatable=\"yes\">Close</attribute>"
-                  "<attribute name=\"action\">app.close</attribute>"
-                "</item>"
-            "</submenu>"
-            "<submenu>"
-              "<attribute name=\"label\">Edit</attribute>"
-                "<item>"
-                  "<attribute name=\"label\" translatable=\"yes\">Undo</attribute>"
-                  "<attribute name=\"action\">app.undo</attribute>"
-                "</item>"
-                "<item>"
-                  "<attribute name=\"label\" translatable=\"yes\">Clear</attribute>"
-                  "<attribute name=\"action\">app.clear</attribute>"
-                "</item>"
-                "<item>"
-                  "<attribute name=\"label\" translatable=\"yes\">Grid</attribute>"
-                  "<attribute name=\"action\">app.grid</attribute>"
-                "</item>"
-                "<item>"
-                  "<attribute name=\"label\" translatable=\"yes\">Preferences</attribute>"
-                  "<attribute name=\"action\">app.preferences</attribute>"
-                "</item>"
-            "</submenu>"
-          "</section>"
-        "</menu>"
-        "<menu id=\"gfig-toolbar\">"
-          "<section>"
-            "<item>"
-              "<attribute name=\"label\" translatable=\"yes\">Line</attribute>"
-              "<attribute name=\"action\">app.shape</attribute>"
-              "<attribute name=\"target\">line</attribute>"
-            "</item>"
-            "<item>"
-              "<attribute name=\"label\" translatable=\"yes\">Rectangle</attribute>"
-              "<attribute name=\"action\">app.shape</attribute>"
-              "<attribute name=\"target\">rectangle</attribute>"
-            "</item>"
-            "<item>"
-              "<attribute name=\"label\" translatable=\"yes\">Circle</attribute>"
-              "<attribute name=\"action\">app.shape</attribute>"
-              "<attribute name=\"target\">circle</attribute>"
-            "</item>"
-            "<item>"
-              "<attribute name=\"label\" translatable=\"yes\">Ellipse</attribute>"
-              "<attribute name=\"action\">app.shape</attribute>"
-              "<attribute name=\"target\">ellipse</attribute>"
-            "</item>"
-            "<item>"
-              "<attribute name=\"label\" translatable=\"yes\">Arc</attribute>"
-              "<attribute name=\"action\">app.shape</attribute>"
-              "<attribute name=\"target\">arc</attribute>"
-            "</item>"
-            "<item>"
-              "<attribute name=\"label\" translatable=\"yes\">Polygon</attribute>"
-              "<attribute name=\"action\">app.shape</attribute>"
-              "<attribute name=\"target\">polygon</attribute>"
-            "</item>"
-            "<item>"
-              "<attribute name=\"label\" translatable=\"yes\">Star</attribute>"
-              "<attribute name=\"action\">app.shape</attribute>"
-              "<attribute name=\"target\">star</attribute>"
-            "</item>"
-            "<item>"
-              "<attribute name=\"label\" translatable=\"yes\">Spiral</attribute>"
-              "<attribute name=\"action\">app.shape</attribute>"
-              "<attribute name=\"target\">spiral</attribute>"
-            "</item>"
-            "<item>"
-              "<attribute name=\"label\" translatable=\"yes\">Bezier</attribute>"
-              "<attribute name=\"action\">app.shape</attribute>"
-              "<attribute name=\"target\">bezier</attribute>"
-            "</item>"
-            "<item>"
-              "<attribute name=\"label\" translatable=\"yes\">Move Object</attribute>"
-              "<attribute name=\"action\">app.shape</attribute>"
-              "<attribute name=\"target\">move-obj</attribute>"
-            "</item>"
-            "<item>"
-              "<attribute name=\"label\" translatable=\"yes\">Move Point</attribute>"
-              "<attribute name=\"action\">app.shape</attribute>"
-              "<attribute name=\"target\">move-point</attribute>"
-            "</item>"
-            "<item>"
-              "<attribute name=\"label\" translatable=\"yes\">Copy</attribute>"
-              "<attribute name=\"action\">app.shape</attribute>"
-              "<attribute name=\"target\">copy</attribute>"
-            "</item>"
-            "<item>"
-              "<attribute name=\"label\" translatable=\"yes\">Delete</attribute>"
-              "<attribute name=\"action\">app.shape</attribute>"
-              "<attribute name=\"target\">delete</attribute>"
-            "</item>"
-            "<item>"
-              "<attribute name=\"label\" translatable=\"yes\">Select</attribute>"
-              "<attribute name=\"action\">app.shape</attribute>"
-              "<attribute name=\"target\">select</attribute>"
-            "</item>"
-          "</section>"
-          "<section>"
-            "<item>"
-              "<attribute name=\"label\" translatable=\"yes\">Raise</attribute>"
-              "<attribute name=\"action\">app.raise</attribute>"
-            "</item>"
-            "<item>"
-              "<attribute name=\"label\" translatable=\"yes\">Lower</attribute>"
-              "<attribute name=\"action\">app.lower</attribute>"
-            "</item>"
-            "<item>"
-              "<attribute name=\"label\" translatable=\"yes\">Top</attribute>"
-              "<attribute name=\"action\">app.top</attribute>"
-            "</item>"
-            "<item>"
-              "<attribute name=\"label\" translatable=\"yes\">Bottom</attribute>"
-              "<attribute name=\"action\">app.bottom</attribute>"
-            "</item>"
-          "</section>"
-          "<section>"
-            "<item>"
-              "<attribute name=\"label\" translatable=\"yes\">Show Previous</attribute>"
-              "<attribute name=\"action\">app.show-prev</attribute>"
-            "</item>"
-            "<item>"
-              "<attribute name=\"label\" translatable=\"yes\">Show Next</attribute>"
-              "<attribute name=\"action\">app.show-next</attribute>"
-            "</item>"
-            "<item>"
-              "<attribute name=\"label\" translatable=\"yes\">Show All</attribute>"
-              "<attribute name=\"action\">app.show-all</attribute>"
-            "</item>"
-          "</section>"
-        "</menu>"
-      "</interface>",
-      -1);
+  gfig->builder = gtk_builder_new_from_resource ("/org/gimp/gfig/gfig-menu.ui");
 
   gfig_context = g_new0 (GFigContext, 1);
 
diff --git a/plug-ins/gfig/meson.build b/plug-ins/gfig/meson.build
index 30f5c1d4b5..d05740f327 100644
--- a/plug-ins/gfig/meson.build
+++ b/plug-ins/gfig/meson.build
@@ -23,6 +23,11 @@ plugin_sources = [
   gfig_icon_sources,
 ]
 
+plugin_sources += gnome.compile_resources(
+  'gfig-menus',
+  'gfig-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 838e4b4ec1..e61fe25af3 100644
--- a/po-plug-ins/POTFILES.in
+++ b/po-plug-ins/POTFILES.in
@@ -139,6 +139,7 @@ plug-ins/gfig/gfig-preview.c
 plug-ins/gfig/gfig-spiral.c
 plug-ins/gfig/gfig-star.c
 plug-ins/gfig/gfig.c
+plug-ins/gfig/gfig-menu.ui
 plug-ins/gimpressionist/brush.c
 plug-ins/gimpressionist/color.c
 plug-ins/gimpressionist/general.c