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

[Michael Catanzaro <mcatanzaro src gnome org>]

commit ae97bae6a426ce5cd3edf6dc43a31f150fcd3e6f
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Thu Dec 6 13:09:46 2018 -0500

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

 data/Makefile.am                 |  1 -
 data/gnome-nibbles.gresource.xml |  3 ---
 data/nibbles.ui                  | 41 ++++++++++++++++++++++++++++++++++++++++
 po/POTFILES.in                   |  1 -
 4 files changed, 41 insertions(+), 5 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index ffe9618..a490057 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -16,7 +16,6 @@ gsettings_SCHEMAS = org.gnome.nibbles.gschema.xml
 dist_man_MANS = gnome-nibbles.6
 
 dist_noinst_DATA = \
-       nibbles-menus.ui \
        nibbles.ui \
        nibbles.css \
        scoreboard.ui \
diff --git a/data/gnome-nibbles.gresource.xml b/data/gnome-nibbles.gresource.xml
index 8648686..adddd20 100644
--- a/data/gnome-nibbles.gresource.xml
+++ b/data/gnome-nibbles.gresource.xml
@@ -8,8 +8,5 @@
     <file>controls-grid.ui</file>
     <file>preferences-dialog.ui</file>
   </gresource>
-  <gresource prefix="/org/gnome/Nibbles/gtk">
-    <file alias="menus.ui">nibbles-menus.ui</file>
-  </gresource>
 </gresources>
 
diff --git a/data/nibbles.ui b/data/nibbles.ui
index 0d5b434..ffe5c32 100644
--- a/data/nibbles.ui
+++ b/data/nibbles.ui
@@ -1,5 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+    <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">_Preferences</attribute>
+                <attribute name="action">app.preferences</attribute>
+            </item>
+            <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 Nibbles</attribute>
+                <attribute name="action">app.about</attribute>
+            </item>
+        </section>
+    </menu>
     <object class="GtkHeaderBar" id="headerbar">
         <property name="visible">True</property>
         <property name="title" translatable="yes">Nibbles</property>
@@ -26,6 +49,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>
     <object class="GtkApplicationWindow" id="nibbles-window">
         <property name="title" translatable="yes">Nibbles</property>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 63ea370..d32a36e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,7 +2,6 @@
 # Please keep this file in alphabetical order.
 [encoding: UTF-8]
 [type: gettext/glade]data/controls-grid.ui
-[type: gettext/glade]data/nibbles-menus.ui
 [type: gettext/glade]data/nibbles.ui
 data/org.gnome.Nibbles.appdata.xml.in
 data/org.gnome.Nibbles.desktop.in