[sysprof] app-menu: move to using window menu instead of app-menu

[Christian Hergert <chergert src gnome org>]

commit bf1472b0095a5b2e671ff6bfedad18331347d9fb
Author: Christian Hergert <chergert redhat com>
Date:   Mon Sep 24 20:55:20 2018 -0700

    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(-)
---
diff --git a/src/resources/sysprof.gresource.xml b/src/resources/sysprof.gresource.xml
index c074c1c..8fed68d 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 0bd7b6d..12b8dea 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>