From bf1472b0095a5b2e671ff6bfedad18331347d9fb Mon Sep 17 00:00:00 2001
From: Christian Hergert <chergert@redhat.com>
Date: Mon, 24 Sep 2018 20:55:20 -0700
Subject: [PATCH] app-menu: move to using window menu instead of app-menu

This starts moving things towards our 3.32 goals of using window menus
intead of the app-menu.
---
 src/resources/gtk/menus.ui          | 35 -----------------------
 src/resources/sysprof.gresource.xml |  1 -
 src/resources/ui/sp-window.ui       | 44 +++++++++++++++++++++++++++--
 3 files changed, 42 insertions(+), 38 deletions(-)
 delete mode 100644 src/resources/gtk/menus.ui

diff --git a/src/resources/gtk/menus.ui b/src/resources/gtk/menus.ui
deleted file mode 100644
index ccdbb94c..00000000
--- a/src/resources/gtk/menus.ui
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<interface>
-  <menu id="app-menu">
-    <section id="app-menu-new-section">
-      <item>
-        <attribute name="label" translatable="yes">_New Window</attribute>
-        <attribute name="action">app.new-window</attribute>
-      </item>
-    </section>
-    <section id="app-menu-open-section">
-      <item>
-        <attribute name="label" translatable="yes">_Open Capture</attribute>
-        <attribute name="action">app.open-capture</attribute>
-      </item>
-    </section>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">About</attribute>
-        <attribute name="action">app.about</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Help</attribute>
-        <attribute name="action">app.help</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Keyboard Shortcuts</attribute>
-        <attribute name="action">app.show-help-overlay</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">_Quit</attribute>
-        <attribute name="action">app.quit</attribute>
-      </item>
-    </section>
-  </menu>
-</interface>
diff --git a/src/resources/sysprof.gresource.xml b/src/resources/sysprof.gresource.xml
index c074c1c1..8fed68dc 100644
--- a/src/resources/sysprof.gresource.xml
+++ b/src/resources/sysprof.gresource.xml
@@ -2,7 +2,6 @@
 <gresources>
   <gresource prefix="/org/gnome/sysprof">
     <!-- Automatic GTK resources -->
-    <file>gtk/menus.ui</file>
     <file>gtk/help-overlay.ui</file>
 
     <!-- Theme overrides -->
diff --git a/src/resources/ui/sp-window.ui b/src/resources/ui/sp-window.ui
index 0bd7b6d5..12b8dea4 100644
--- a/src/resources/ui/sp-window.ui
+++ b/src/resources/ui/sp-window.ui
@@ -261,17 +261,30 @@
             <property name="visible">true</property>
           </object>
         </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="action-name">app.new-window</property>
+            <property name="text" translatable="yes">New Window</property>
+            <property name="visible">true</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSeparator">
+            <property name="orientation">horizontal</property>
+            <property name="visible">true</property>
+          </object>
+        </child>
         <child>
           <object class="GtkModelButton">
             <property name="action-name">win.open-capture</property>
-            <property name="text" translatable="yes">Open</property>
+            <property name="text" translatable="yes">Open Capture…</property>
             <property name="visible">true</property>
           </object>
         </child>
         <child>
           <object class="GtkModelButton">
             <property name="action-name">win.save-capture</property>
-            <property name="text" translatable="yes">Save As</property>
+            <property name="text" translatable="yes">Save As…</property>
             <property name="visible">true</property>
           </object>
         </child>
@@ -301,6 +314,33 @@
             <property name="visible">true</property>
           </object>
         </child>
+        <child>
+          <object class="GtkSeparator">
+            <property name="orientation">horizontal</property>
+            <property name="visible">true</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="action-name">app.show-help-overlay</property>
+            <property name="text" translatable="yes">Keyboard Shortcuts</property>
+            <property name="visible">true</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="action-name">app.help</property>
+            <property name="text" translatable="yes">Help</property>
+            <property name="visible">true</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkModelButton">
+            <property name="action-name">app.about</property>
+            <property name="text" translatable="yes">About Sysprof</property>
+            <property name="visible">true</property>
+          </object>
+        </child>
       </object>
     </child>
   </object>