[gnome-klotski: 1/2] menus: Update for GNOME 3.32 recommendations

[Michael Catanzaro <mcatanzaro src gnome org>]

commit c0d063bd43c878a24243b3a888df8f193b5b6507
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Thu Dec 6 12:04:16 2018 -0500

    menus: Update for GNOME 3.32 recommendations
    
    https://gitlab.gnome.org/GNOME/Initiatives/wikis/App-Menu-Retirement

 data/Makefile.am          |  1 -
 data/klotski-menus.ui     | 28 ----------------------------
 data/klotski.ui           | 37 +++++++++++++++++++++++++++++++++++++
 po/POTFILES.in            |  1 -
 src/klotski.gresource.xml |  3 ---
 5 files changed, 37 insertions(+), 33 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 85f5287..64b6578 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -6,7 +6,6 @@ gsettings_SCHEMAS = org.gnome.klotski.gschema.xml
 man_MANS = gnome-klotski.6
 
 dist_noinst_DATA = \
-       klotski-menus.ui \
        klotski.ui \
        klotski.css
 
diff --git a/data/klotski.ui b/data/klotski.ui
index 27afd14..58c0908 100644
--- a/data/klotski.ui
+++ b/data/klotski.ui
@@ -1,6 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="3.12"/>
+  <menu id="app-menu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Scores</attribute>
+        <attribute name="action">app.scores</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Help</attribute>
+        <attribute name="action">app.help</attribute>
+        <attribute name="accel">F1</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">_About Klotski</attribute>
+        <attribute name="action">app.about</attribute>
+      </item>
+    </section>
+  </menu>
   <object class="GtkPopover" id="puzzles_popover">
     <property name="visible">False</property>
     <property name="name">puzzles-popover</property>
@@ -309,6 +328,24 @@
             <property name="pack-type">end</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkMenuButton" id="menu_button">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="menu-model">app-menu</property>
+            <child>
+              <object class="GtkImage">
+                <property name="visible">True</property>
+                <property name="icon_name">open-menu-symbolic</property>
+                <property name="icon_size">1</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="pack_type">end</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
       </object>
     </child>
     <child>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f6edc08..b78a11d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,7 +4,6 @@
 data/gnome-klotski.appdata.xml.in
 data/gnome-klotski.desktop.in
 [type: gettext/glade]data/klotski.ui
-[type: gettext/glade]data/klotski-menus.ui
 data/org.gnome.klotski.gschema.xml
 src/gnome-klotski.vala
 src/klotski-window.vala
diff --git a/src/klotski.gresource.xml b/src/klotski.gresource.xml
index cf8c5eb..6d53446 100644
--- a/src/klotski.gresource.xml
+++ b/src/klotski.gresource.xml
@@ -4,7 +4,4 @@
     <file preprocess="xml-stripblanks" alias="klotski.ui">../data/klotski.ui</file>
     <file alias="klotski.css">../data/klotski.css</file>
   </gresource>
-  <gresource prefix="/org/gnome/klotski/gtk">
-    <file preprocess="xml-stripblanks" alias="menus.ui">../data/klotski-menus.ui</file>
-  </gresource>
 </gresources>