[cheese] Remove app menu

[David King <davidk src gnome org>]

commit 48882da6a6dc4fc1c19e15f5210c9e10feb67ff5
Author: Robert Ancell <robert ancell canonical com>
Date:   Mon Jul 2 14:09:49 2018 +1200

    Remove app menu
    
    https://wiki.gnome.org/Initiatives/GnomeGoals/AppMenuRetirement

 data/headerbar.ui | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 data/menus.ui     | 29 -----------------------------
 2 files changed, 47 insertions(+), 29 deletions(-)
---
diff --git a/data/headerbar.ui b/data/headerbar.ui
index 05be6210..f2fb0475 100644
--- a/data/headerbar.ui
+++ b/data/headerbar.ui
@@ -1,4 +1,28 @@
 <interface domain="cheese">
+  <menu id="primary_menu">
+    <section>
+      <item>
+        <attribute name="accel">F11</attribute>
+        <attribute name="label" translatable="yes">_Fullscreen</attribute>
+        <attribute name="action">app.fullscreen</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">P_references</attribute>
+        <attribute name="action">app.preferences</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="accel">F1</attribute>
+        <attribute name="label" translatable="yes">_Help</attribute>
+        <attribute name="action">app.help</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">_About Cheese</attribute>
+        <attribute name="action">app.about</attribute>
+      </item>
+    </section>
+  </menu>
   <object class="GtkHeaderBar" id="header_bar">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Take a Photo</property>
@@ -6,5 +30,28 @@
     <style>
       <class name="titlebar"/>
     </style>
+    <child>
+      <object class="GtkMenuButton" id="menu_button">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="receives_default">False</property>
+        <property name="use_underline">True</property>
+        <property name="menu_model">primary_menu</property>
+        <child>
+          <object class="GtkImage">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="icon_name">open-menu-symbolic</property>
+            <property name="icon_size">1</property>
+          </object>
+        </child>
+        <style>
+          <class name="image-button"/>
+        </style>
+      </object>
+      <packing>
+        <property name="pack_type">end</property>
+      </packing>
+    </child>
   </object>
 </interface>
diff --git a/data/menus.ui b/data/menus.ui
index 1ff54c03..bc077da3 100644
--- a/data/menus.ui
+++ b/data/menus.ui
@@ -1,33 +1,4 @@
 <interface domain="cheese">
-    <menu id="app-menu">
-        <section>
-            <item>
-                <attribute name="accel">F11</attribute>
-                <attribute name="label" translatable="yes">_Fullscreen</attribute>
-                <attribute name="action">app.fullscreen</attribute>
-            </item>
-            <item>
-                <attribute name="label" translatable="yes">P_references</attribute>
-                <attribute name="action">app.preferences</attribute>
-            </item>
-        </section>
-        <section>
-            <item>
-                <attribute name="accel">F1</attribute>
-                <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>
-            <item>
-                <attribute name="accel">&lt;Primary&gt;q</attribute>
-                <attribute name="label" translatable="yes">_Quit</attribute>
-                <attribute name="action">app.quit</attribute>
-            </item>
-        </section>
-    </menu>
     <menu id="thumbview-menu">
         <section>
             <item>