From cb72111910c8820fb103822668bf743b1cd19b35 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 9 Sep 2019 09:32:03 +1000
Subject: [PATCH] gui: make the app menu translatable

Fixes #216

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 data/tuhi.gresource.xml |  1 +
 data/ui/AppMenu.ui      | 26 ++++++++++++++++++++++++++
 po/POTFILES             |  1 +
 tuhi/gui/window.py      | 32 +-------------------------------
 4 files changed, 29 insertions(+), 31 deletions(-)
 create mode 100644 data/ui/AppMenu.ui

diff --git a/data/tuhi.gresource.xml b/data/tuhi.gresource.xml
index 6c33ca0..a724036 100644
--- a/data/tuhi.gresource.xml
+++ b/data/tuhi.gresource.xml
@@ -9,5 +9,6 @@
         <file preprocess="xml-stripblanks">ui/SetupPerspective.ui</file>
         <file preprocess="xml-stripblanks">ui/ErrorPerspective.ui</file>
         <file preprocess="xml-stripblanks">input-tablet-missing-symbolic.svg</file>
+        <file preprocess="xml-stripblanks">ui/AppMenu.ui</file>
     </gresource>
 </gresources>
diff --git a/data/ui/AppMenu.ui b/data/ui/AppMenu.ui
new file mode 100644
index 0000000..f30cac7
--- /dev/null
+++ b/data/ui/AppMenu.ui
@@ -0,0 +1,26 @@
+<interface>
+  <menu id="primary-menu">
+  <section>
+      <item>
+        <attribute name="label" translatable="yes">Portrait</attribute>
+        <attribute name="action">win.orientation</attribute>
+        <attribute name="target">portrait</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Landscape</attribute>
+        <attribute name="action">win.orientation</attribute>
+        <attribute name="target">landscape</attribute>
+      </item>
+  </section>
+  <section>
+      <item>
+        <attribute name="label" translatable="yes">Help</attribute>
+        <attribute name="action">app.help</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">About</attribute>
+        <attribute name="action">app.about</attribute>
+      </item>
+    </section>
+  </menu>
+</interface>
diff --git a/po/POTFILES b/po/POTFILES
index a7c5e0f..ccb0df9 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -2,6 +2,7 @@ data/org.freedesktop.Tuhi.appdata.xml.in.in
 data/org.freedesktop.Tuhi.desktop.in
 
 data/ui/AboutDialog.ui.in
+data/ui/AppMenu.ui
 data/ui/Drawing.ui
 data/ui/DrawingPerspective.ui
 data/ui/ErrorPerspective.ui
diff --git a/tuhi/gui/window.py b/tuhi/gui/window.py
index f6e9a68..6206872 100644
--- a/tuhi/gui/window.py
+++ b/tuhi/gui/window.py
@@ -24,36 +24,6 @@ from gi.repository import Gtk, Gio, GLib, GObject  # NOQA
 
 logger = logging.getLogger('tuhi.gui.window')
 
-MENU_XML = """
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <menu id="primary-menu">
-  <section>
-      <item>
-        <attribute name="label" translatable="yes">Portrait</attribute>
-        <attribute name="action">win.orientation</attribute>
-        <attribute name="target">portrait</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Landscape</attribute>
-        <attribute name="action">win.orientation</attribute>
-        <attribute name="target">landscape</attribute>
-      </item>
-  </section>
-  <section>
-      <item>
-        <attribute name="label" translatable="yes">Help</attribute>
-        <attribute name="action">app.help</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">About</attribute>
-        <attribute name="action">app.about</attribute>
-      </item>
-    </section>
-  </menu>
-</interface>
-"""
-
 
 @Gtk.Template(resource_path="/org/freedesktop/Tuhi/ui/ErrorPerspective.ui")
 class ErrorPerspective(Gtk.Box):
@@ -140,7 +110,7 @@ class MainWindow(Gtk.ApplicationWindow):
         action.set_state(GLib.Variant.new_string(Config().orientation))
         self.add_action(action)
 
-        builder = Gtk.Builder.new_from_string(MENU_XML, -1)
+        builder = Gtk.Builder.new_from_resource('/org/freedesktop/Tuhi/ui/AppMenu.ui')
         menu = builder.get_object("primary-menu")
         self.menubutton1.set_menu_model(menu)