[sound-juicer/subpop/missing-build-dependency: 1/4] App menu retirement

[Link Dupont <link src gnome org>]

commit 67d27ef7795fb1ca1a2ba9d31419af762b76a37f
Author: David Meikle <david meikle io>
Date:   Wed May 8 18:08:08 2019 +0100

    App menu retirement

 data/sound-juicer-menu.ui       | 58 -----------------------------
 data/sound-juicer.gresource.xml |  1 -
 data/sound-juicer.ui            | 81 ++++++++++++++++++++++++++++++++++++++++-
 po/POTFILES.in                  |  1 -
 4 files changed, 79 insertions(+), 62 deletions(-)
---
diff --git a/data/sound-juicer.gresource.xml b/data/sound-juicer.gresource.xml
index 5b12cbce..62baf674 100644
--- a/data/sound-juicer.gresource.xml
+++ b/data/sound-juicer.gresource.xml
@@ -3,7 +3,6 @@
   <gresource prefix="/org/gnome/sound-juicer">
     <file preprocess="xml-stripblanks">sj-album-chooser-dialog.ui</file>
     <file preprocess="xml-stripblanks">sound-juicer.ui</file>
-    <file alias="gtk/menus.ui" preprocess="xml-stripblanks">sound-juicer-menu.ui</file>
     <file alias="gtk/help-overlay.ui" preprocess="xml-stripblanks">sound-juicer-shortcuts.ui</file>
  </gresource>
 </gresources>
diff --git a/data/sound-juicer.ui b/data/sound-juicer.ui
index 214772ce..970bc741 100644
--- a/data/sound-juicer.ui
+++ b/data/sound-juicer.ui
@@ -1,11 +1,88 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.4"/>
+   <menu id="app-menu">
+    <section>
+      <submenu>
+        <attribute name="label" translatable="yes">Disc</attribute>
+        <section>
+          <item>
+            <attribute name="label" translatable="yes">Re-read</attribute>
+            <attribute name="action">app.re-read</attribute>
+            <attribute name="accel">&lt;Primary&gt;r</attribute>
+          </item>
+          <item>
+            <attribute name="label" translatable="yes">Duplicate</attribute>
+            <attribute name="action">app.duplicate</attribute>
+          </item>
+          <item>
+            <attribute name="label" translatable="yes">Eject</attribute>
+            <attribute name="action">app.eject</attribute>
+            <attribute name="accel">&lt;Primary&gt;j</attribute>
+          </item>
+        </section>
+      </submenu>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Open MusicBrainz</attribute>
+        <attribute name="action">app.submit-tracks</attribute>
+        <attribute name="accel">&lt;Primary&gt;s</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Preferences</attribute>
+        <attribute name="action">app.preferences</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Shortcuts</attribute>
+        <attribute name="action">win.show-help-overlay</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 Sound Juicer</attribute>
+        <attribute name="action">app.about</attribute>
+      </item>
+    </section>
+  </menu>
+
+
   <object class="GtkApplicationWindow" id="main_window">
     <property name="width_request">500</property>
     <property name="height_request">420</property>
-    <property name="title" translatable="yes">Sound Juicer</property>
     <signal name="delete_event" handler="on_delete_event"/>
+    <child type="titlebar">
+      <object class="GtkHeaderBar" id="headerbar">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="show_close_button">True</property>
+        <property name="title" translatable="yes">Sound Juicer</property>
+        <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>
       <object class="GtkBox" id="vbox1">
         <property name="visible">True</property>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6fb3211e..b8f41544 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,7 +5,6 @@ data/org.gnome.SoundJuicer.desktop.in.in
 data/appdata/org.gnome.SoundJuicer.appdata.xml.in
 data/sj-album-chooser-dialog.ui
 data/sound-juicer.ui
-data/sound-juicer-menu.ui
 data/sound-juicer-shortcuts.ui
 libjuicer/sj-error.c
 libjuicer/sj-extractor.c