[gnome-software] Remove app menu

[Richard Hughes <rhughes src gnome org>]

commit 276c93138c9dc9d4c8acb13f3ad925f026bef8af
Author: Robert Ancell <robert ancell canonical com>
Date:   Mon Jul 2 11:13:11 2018 +1200

    Remove app menu
    
    https://wiki.gnome.org/Initiatives/GnomeGoals/AppMenuRetirement
    
    Signed-off-by: Richard Hughes <richard hughsie com>

 po/POTFILES.in                   |  1 -
 src/gnome-software.gresource.xml |  1 -
 src/gnome-software.ui            | 37 +++++++++++++++++++++++++++++++++++++
 src/gs-menus.ui                  | 25 -------------------------
 4 files changed, 37 insertions(+), 27 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4ed4e75e..285c2ac5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -36,7 +36,6 @@ src/gs-installed-page.ui
 src/gs-loading-page.c
 src/gs-loading-page.ui
 src/gs-main.c
-src/gs-menus.ui
 src/gs-moderate-page.ui
 src/gs-overview-page.c
 src/gs-overview-page.ui
diff --git a/src/gnome-software.gresource.xml b/src/gnome-software.gresource.xml
index 298fcc65..8b5f48ca 100644
--- a/src/gnome-software.gresource.xml
+++ b/src/gnome-software.gresource.xml
@@ -2,7 +2,6 @@
 <gresources>
  <gresource prefix="/org/gnome/Software">
   <file preprocess="xml-stripblanks">gnome-software.ui</file>
-  <file preprocess="xml-stripblanks" alias="gtk/menus.ui">gs-menus.ui</file>
   <file preprocess="xml-stripblanks">gs-app-addon-row.ui</file>
   <file preprocess="xml-stripblanks">gs-app-folder-dialog.ui</file>
   <file preprocess="xml-stripblanks">gs-app-row.ui</file>
diff --git a/src/gnome-software.ui b/src/gnome-software.ui
index a8755701..e1e43e54 100644
--- a/src/gnome-software.ui
+++ b/src/gnome-software.ui
@@ -29,6 +29,23 @@
       </object>
     </child>
   </object>
+  <menu id="primary_menu">
+    <section id="accounts_menu">
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Software Repositories</attribute>
+        <attribute name="action">app.sources</attribute>
+        <attribute name="hidden-when">action-disabled</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_About</attribute>
+        <attribute name="action">app.about</attribute>
+      </item>
+    </section>
+  </menu>
   <object class="GtkApplicationWindow" id="window_software">
     <property name="can_focus">False</property>
     <property name="default-width">1200</property>
@@ -299,6 +316,26 @@
                 <property name="position">0</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkMenuButton" id="menu_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="sensitive">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>
+              </object>
+              <packing>
+                <property name="pack-type">end</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>