From b5f7399b2c1c5f9f9387bbc60af6520a2e09e051 Mon Sep 17 00:00:00 2001
From: Zander Brown <ZanderBrown@users.noreply.github.com>
Date: Sun, 27 May 2018 14:32:15 +0100
Subject: [PATCH] RIP appmenu

F5 -> <primary>r for refresh
---
 hammond-gtk/resources/gtk/help-overlay.ui | 4 ++--
 hammond-gtk/resources/gtk/menus.ui        | 9 ++-------
 hammond-gtk/src/headerbar.rs              | 2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/hammond-gtk/resources/gtk/help-overlay.ui b/hammond-gtk/resources/gtk/help-overlay.ui
index 25bd08a..40b17da 100644
--- a/hammond-gtk/resources/gtk/help-overlay.ui
+++ b/hammond-gtk/resources/gtk/help-overlay.ui
@@ -14,7 +14,7 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="visible">True</property>
-                <property name="accelerator">F5</property>
+                <property name="accelerator">&lt;primary&gt;r</property>
                 <property name="title" translatable="yes" context="shortcut window">Check for new episodes</property>
               </object>
             </child>
@@ -30,4 +30,4 @@
       </object>
     </child>
   </object>
-</interface>
+</interface>
\ No newline at end of file
diff --git a/hammond-gtk/resources/gtk/menus.ui b/hammond-gtk/resources/gtk/menus.ui
index 10bc0eb..58de81a 100644
--- a/hammond-gtk/resources/gtk/menus.ui
+++ b/hammond-gtk/resources/gtk/menus.ui
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
-  <menu id="app-menu">
+  <menu id="menu">
     <section>
       <item>
         <attribute name="label" translatable="yes">_Check for new episodes</attribute>
         <attribute name="action">app.refresh</attribute>
-        <attribute name="accel">F5</attribute>
+        <attribute name="accel">&lt;primary&gt;r</attribute>
       </item>
       <item>
         <attribute name="label" translatable="yes">_Import Shows</attribute>
@@ -36,11 +36,6 @@
         <attribute name="label" translatable="yes">_About</attribute>
         <attribute name="action">app.about</attribute>
       </item>
-      <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>
\ No newline at end of file
diff --git a/hammond-gtk/src/headerbar.rs b/hammond-gtk/src/headerbar.rs
index 5bab96c..cca65b4 100644
--- a/hammond-gtk/src/headerbar.rs
+++ b/hammond-gtk/src/headerbar.rs
@@ -44,7 +44,7 @@ impl Default for Header {
         let update_spinner = builder.get_object("update_spinner").unwrap();
         let menu_popover = builder.get_object("menu_popover").unwrap();
         let menus = gtk::Builder::new_from_resource("/org/gnome/Hammond/gtk/menus.ui");
-        let app_menu = menus.get_object("app-menu").unwrap();
+        let app_menu = menus.get_object("menu").unwrap();
 
         Header {
             container: header,