[d-feet: 1/3] menus: Follow GNOME 3.32 menu guidelines

[Thomas Bechtold <toabctl src gnome org>]

commit 185cff5833c92a959f6e67c2fd6f80729efe68ff
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Wed Dec 5 13:28:02 2018 -0500

    menus: Follow GNOME 3.32 menu guidelines
    
    https://gitlab.gnome.org/GNOME/Initiatives/wikis/App-Menu-Retirement

 data/ui/Makefile.am      |  1 -
 data/ui/app-menu.ui      | 22 ----------------------
 data/ui/mainwindow.ui    | 11 +++++++++++
 po/POTFILES.in           |  1 -
 src/dfeet/application.py |  4 ----
 5 files changed, 11 insertions(+), 28 deletions(-)
---
diff --git a/data/ui/Makefile.am b/data/ui/Makefile.am
index 67594d0..97066c6 100644
--- a/data/ui/Makefile.am
+++ b/data/ui/Makefile.am
@@ -6,7 +6,6 @@ ui_DATA =                       \
        executedialog.ui        \
        introspection.ui        \
        mainwindow.ui           \
-       app-menu.ui             \
        $(NULL)
 
 EXTRA_DIST =                   \
diff --git a/data/ui/mainwindow.ui b/data/ui/mainwindow.ui
index b672df1..86a0f6e 100644
--- a/data/ui/mainwindow.ui
+++ b/data/ui/mainwindow.ui
@@ -22,6 +22,17 @@
         <attribute name="action">win.close-bus</attribute>
       </item>
     </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">About D-Feet</attribute>
+        <attribute name="action">app.about</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Help</attribute>
+        <attribute name="action">app.help</attribute>
+        <attribute name="accel">F1</attribute>
+      </item>
+    </section>
   </menu>
   <object class="GtkHeaderBar" id="headerbar">
     <property name="visible">True</property>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4e31d24..57ce784 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,7 +4,6 @@ data/org.gnome.dfeet.appdata.xml.in
 data/org.gnome.dfeet.desktop.in.in
 data/org.gnome.dfeet.gschema.xml
 [type: gettext/glade]data/ui/addconnectiondialog.ui
-[type: gettext/glade]data/ui/app-menu.ui
 [type: gettext/glade]data/ui/bus.ui
 [type: gettext/glade]data/ui/executedialog.ui
 [type: gettext/glade]data/ui/introspection.ui
diff --git a/src/dfeet/application.py b/src/dfeet/application.py
index a0cd917..c5666c5 100644
--- a/src/dfeet/application.py
+++ b/src/dfeet/application.py
@@ -22,8 +22,6 @@ class DFeetApp(Gtk.Application):
     # Note that the function in C startup() becomes do_startup() in Python
     def do_startup(self):
         Gtk.Application.do_startup(self)
-        builder = Gtk.Builder()
-        builder.add_from_file(os.path.join(self.data_dir, "ui", "app-menu.ui"))
 
         # create actions
         action = Gio.SimpleAction.new("about", None)
@@ -38,8 +36,6 @@ class DFeetApp(Gtk.Application):
         action.connect("activate", self.action_quit_cb)
         self.add_action(action)
 
-        self.set_app_menu(builder.get_object("app-menu"))
-
     def action_quit_cb(self, action, parameter):
         self.quit()