[baobab] window: use a "Scan Folder" button instead of gear menu

[Stefano Facchini <sfacchini src gnome org>]

commit 2613269f6180627d8a9a819fc4923fb126f620f0
Author: Stefano Facchini <stefano facchini gmail com>
Date:   Sun Oct 29 15:17:01 2017 +0100

    window: use a "Scan Folder" button instead of gear menu
    
    No need for a menu with only one item in it.

 src/baobab-application.vala |    2 +-
 src/baobab-main-window.ui   |   31 +++++++++----------------------
 src/baobab-window.vala      |   12 +++---------
 3 files changed, 13 insertions(+), 32 deletions(-)
---
diff --git a/src/baobab-application.vala b/src/baobab-application.vala
index 97e7da8..d895f76 100644
--- a/src/baobab-application.vala
+++ b/src/baobab-application.vala
@@ -82,7 +82,7 @@ namespace Baobab {
             }
             Gtk.StyleContext.add_provider_for_screen (Gdk.Screen.get_default (), css_provider, 
Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
 
-            set_accels_for_action ("win.gear-menu", { "F10" });
+            set_accels_for_action ("win.scan-folder", { "<Primary>o" });
             set_accels_for_action ("win.reload", { "<Primary>r" });
         }
 
diff --git a/src/baobab-main-window.ui b/src/baobab-main-window.ui
index 6716d9c..0f88273 100644
--- a/src/baobab-main-window.ui
+++ b/src/baobab-main-window.ui
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
-  <menu id="winmenu">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">Scan Folder…</attribute>
-        <attribute name="action">win.scan-folder</attribute>
-      </item>
-    </section>
-  </menu>
   <object class="GtkMenu" id="treeview_popup_menu">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -48,6 +40,15 @@
       <class name="titlebar"/>
     </style>
     <child>
+      <object class="GtkButton" id="scan_button">
+        <property name="action_name">win.scan-folder</property>
+        <property name="label" translatable="yes">Scan Folder…</property>
+      </object>
+      <packing>
+        <property name="pack_type">start</property>
+      </packing>
+    </child>
+    <child>
       <object class="GtkButton" id="back_button">
         <property name="valign">center</property>
         <property name="can_focus">True</property>
@@ -87,20 +88,6 @@
         <property name="pack_type">end</property>
       </packing>
     </child>
-    <child>
-      <object class="GtkMenuButton" id="menu_button">
-        <property name="valign">center</property>
-        <property name="menu_model">winmenu</property>
-        <property name="action_name">win.gear-menu</property>
-        <property name="direction">none</property>
-        <style>
-          <class name="image-button"/>
-        </style>
-      </object>
-      <packing>
-        <property name="pack_type">end</property>
-      </packing>
-    </child>
   </object>
   <template class="BaobabWindow" parent="GtkApplicationWindow">
     <property name="title" translatable="yes">Disk Usage Analyzer</property>
diff --git a/src/baobab-window.vala b/src/baobab-window.vala
index 5165d05..4c6ddb6 100644
--- a/src/baobab-window.vala
+++ b/src/baobab-window.vala
@@ -29,12 +29,12 @@ namespace Baobab {
         [GtkChild]
         private Gtk.HeaderBar header_bar;
         [GtkChild]
+        private Gtk.Button scan_button;
+        [GtkChild]
         private Gtk.Button back_button;
         [GtkChild]
         private Gtk.Button reload_button;
         [GtkChild]
-        private Gtk.MenuButton menu_button;
-        [GtkChild]
         private Gtk.Stack main_stack;
         [GtkChild]
         private Gtk.Widget home_page;
@@ -82,7 +82,6 @@ namespace Baobab {
         static Gdk.Cursor busy_cursor;
 
         private const GLib.ActionEntry[] action_entries = {
-            { "gear-menu", on_show_gear_menu_activate , null, "false", null},
             { "show-home-page", on_show_home_page_activate },
             { "scan-folder", on_scan_folder_activate },
             { "reload", on_reload_activate },
@@ -197,11 +196,6 @@ namespace Baobab {
             show ();
         }
 
-        void on_show_gear_menu_activate (SimpleAction action) {
-            var state = action.get_state ().get_boolean ();
-            action.set_state (new Variant.boolean (!state));
-        }
-
         void on_show_home_page_activate () {
             if (active_location != null && active_location.scanner != null) {
                 active_location.scanner.cancel ();
@@ -499,7 +493,7 @@ namespace Baobab {
         }
 
         void set_ui_state (Gtk.Widget child, bool busy) {
-            menu_button.visible = (child == home_page);
+            scan_button.visible = (child == home_page);
             reload_button.visible = (child == result_page);
             back_button.visible = (child == result_page);