Merge branch 'bye-app-menu-gtk3' into 'gtk-3-24'

widget-factory: move app menu contents to primary menu

See merge request GNOME/gtk!364

demos/widget-factory/Makefile.am

@@ -63,7 +63,6 @@ uninstall-update-icon-cache:
 EXTRA_DIST += 				\
 	widget-factory.ui 		\
 	widget-factory.css		\
-	menus.ui 			\
 	help-overlay.ui			\
 	widget-factory.gresource.xml	\
 	data/source.svg			\

demos/widget-factory/menus.ui

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <menu id="app-menu">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">About</attribute>
-        <attribute name="action">app.about</attribute>
-      </item>
-    </section>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">_Quit</attribute>
-        <attribute name="action">app.quit</attribute>
-        <attribute name="accel">&lt;Primary&gt;q</attribute>
-      </item>
-    </section>
-  </menu>
-</interface>

demos/widget-factory/widget-factory.gresource.xml

@@ -6,9 +6,6 @@
   <gresource prefix="/org/gtk/WidgetFactory">
     <file>widget-factory.css</file>
   </gresource>
-  <gresource prefix="/org/gtk/WidgetFactory/gtk">
-    <file preprocess="xml-stripblanks">menus.ui</file>
-  </gresource>
   <gresource prefix="/org/gtk/WidgetFactory/gtk">
     <file preprocess="xml-stripblanks">help-overlay.ui</file>
   </gresource>

demos/widget-factory/widget-factory.ui

@@ -16,6 +16,16 @@
         <attribute name="action">win.transition</attribute>
       </item>
     </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Keyboard Shortcuts</attribute>
+        <attribute name="action">win.show-help-overlay</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">_About Widget Factory</attribute>
+        <attribute name="action">app.about</attribute>
+      </item>
+    </section>
   </menu>
   <menu id="dinner_menu">
     <section>