Merge lp:~tintou/switchboard/search into lp:~elementary-pantheon/switchboard/switchboard

[Corentin Noël]

Changes are not made to the API.

Implementing the search feature at the server side (switchboard itself).

[lp:~tintou/switchboard/search]

532. By Corentin Noël on 2014-12-16

Fix focus issues with the search box.

[xapantu (xapantu)]

Looks like this was superseded a while ago, see the bug report.

Unmerged revisions

532. By Corentin Noël on 2014-12-16

Fix focus issues with the search box.

531. By Corentin Noël on 2014-12-16

Implement search feature.

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-04-14 20:39:34 +0000
+++ src/CMakeLists.txt	2014-12-16 00:30:51 +0000
@@ -2,6 +2,7 @@
     Switchboard.vala
     CategoryView.vala
     EmbeddedAlert.vala
+    SearchView.vala
     NavigationButton.vala
 )
 

=== added file 'src/SearchView.vala'
--- src/SearchView.vala	1970-01-01 00:00:00 +0000
+++ src/SearchView.vala	2014-12-16 00:30:51 +0000
@@ -0,0 +1,90 @@
+/***
+BEGIN LICENSE
+Copyright (C) 2011-2012 Avi Romanoff <[e-mail]>
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License version 2.1, as published
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranties of
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+END LICENSE
+***/
+
+public class Switchboard.SearchView : Gtk.ScrolledWindow {
+    public signal void switch_to_plug (Plug plug);
+    public signal void no_result ();
+    private GLib.List<SearchItem> results;
+    private Gtk.Grid grid;
+    public SearchView () {
+        expand = true;
+        results = new GLib.List<SearchItem> ();
+        grid = new Gtk.Grid ();
+        grid.expand = true;
+        grid.orientation = Gtk.Orientation.VERTICAL;
+        add_with_viewport (grid);
+    }
+
+    public async void search (string query) {
+        foreach (var result in results) {
+            result.destroy ();
+        }
+
+        while (results.length () != 0)
+            results.remove_link (results);
+
+        var plugs = PlugsManager.get_default ().get_plugs ();
+        foreach (Switchboard.Plug plug in plugs) {
+            var newresults = yield plug.search (query);
+            foreach (var entry in newresults.entries) {
+                var result = new SearchItem (plug, entry.key, entry.value);
+                result.switch_to_plug.connect ((plug) => switch_to_plug (plug));
+                results.append (result);
+                if (results.length () == 1)
+                    result.margin_top = 12;
+                grid.add (result);
+            }
+        }
+
+        if (results.length () == 0)
+            no_result ();
+
+        grid.show_all ();
+    }
+}
+
+public class Switchboard.SearchItem : Gtk.Button {
+    public signal void switch_to_plug (Plug plug);
+    
+    private Gtk.Image icon;
+    private Gtk.Label name_label;
+    public SearchItem (Plug plug, string label, string callback) {
+        relief = Gtk.ReliefStyle.NONE;
+        margin_start = margin_end = 12;
+        hexpand = true;
+        get_style_context ().add_class ("app");
+
+        name_label = new Gtk.Label (label);
+        name_label.xalign = 0.0f;
+        icon = new Gtk.Image.from_icon_name (plug.icon, Gtk.IconSize.DND);
+
+        var box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 12);
+        box.pack_start (icon, false);
+        box.pack_start (name_label, true);
+        box.margin_start = 12;
+        box.margin_top = box.margin_bottom = 3;
+        add (box);
+
+        clicked.connect (() => {
+            switch_to_plug (plug);
+            Idle.add (() => {
+                plug.search_callback (callback);
+                return false;
+            });
+        });
+    }
+}

=== modified file 'src/Switchboard.vala'
--- src/Switchboard.vala	2014-12-10 09:08:33 +0000
+++ src/Switchboard.vala	2014-12-16 00:30:51 +0000
@@ -45,6 +45,7 @@
         private Gtk.ScrolledWindow category_scrolled;
         private Switchboard.NavigationButton navigation_button;
         private Switchboard.CategoryView category_view;
+        private Switchboard.SearchView search_view;
 
         private Gee.LinkedList <string> loaded_plugs;
         private string all_settings_label = _("All Settings");
@@ -55,6 +56,7 @@
         private GLib.Settings settings;
         private int default_width = 0;
         private int default_height = 0;
+        private Switchboard.Plug plug_before_search = null;
 
         private static string? plug_to_open = null;
         private static bool opened_directly = false;
@@ -233,6 +235,7 @@
                 update_saved_state ();
                 return false;
             });
+
             main_window.window_state_event.connect ((event) => {
                 if (event.new_window_state == Gdk.WindowState.MAXIMIZED)
                     settings.set_enum ("window-state", WindowState.MAXIMIZED);
@@ -241,6 +244,7 @@
 
                 return false;
             });
+
             setup_toolbar ();
 
             // Set up accelerators (hotkeys)
@@ -263,6 +267,16 @@
             category_scrolled.add_with_viewport (category_view);
             category_scrolled.set_vexpand (true);
 
+            search_view = new Switchboard.SearchView ();
+            search_view.no_result.connect (() => {
+                show_alert (_("No settings found"), _("Try changing your search terms"), Gtk.MessageType.INFO);
+            });
+
+            search_view.switch_to_plug.connect ((plug) => {
+                search_box.text = "";
+                load_plug (plug);
+            });
+
             // Set up UI
             alert_view = new Granite.Widgets.EmbeddedAlert ();
             alert_view.set_vexpand (true);
@@ -270,6 +284,7 @@
 
             stack = new Gtk.Stack ();
             stack.expand = true;
+            stack.add_named (search_view, "search");
             stack.add_named (alert_view, "alert");
             stack.add_named (category_scrolled, "main");
             stack.transition_type = Gtk.StackTransitionType.SLIDE_LEFT_RIGHT;
@@ -280,8 +295,6 @@
             navigation_button.hide ();
 
             main_window.size_allocate.connect (() => {
-                if (opened_directly)
-                    search_box.sensitive = false;
                 category_view.recalculate_columns ();
             });
 
@@ -342,7 +355,6 @@
         private void handle_navigation_button_clicked () {
             if (navigation_button.get_text () == all_settings_label) {
                 opened_directly = false;
-                search_box.sensitive = true;
                 switch_to_icons ();
                 navigation_button.hide ();
             } else {
@@ -360,10 +372,10 @@
                 stack.set_transition_type (Gtk.StackTransitionType.SLIDE_LEFT_RIGHT);
             }
 
-            search_box.sensitive = false;
             plug.shown ();
             stack.set_visible_child_name (plug.code_name);
             category_scrolled.hide ();
+            plug_before_search = plug;
         }
 
         // Switches back to the icons
@@ -373,15 +385,13 @@
             }
             category_scrolled.show ();
             stack.set_visible_child (category_scrolled);
-            current_plug.hidden ();
+            if (current_plug != null)
+                current_plug.hidden ();
 
             // Reset state
             reset_title ();
-            search_box.set_text ("");
             search_box.sensitive = Switchboard.PlugsManager.get_default ().has_plugs ();
-
-            if (search_box.sensitive)
-                search_box.has_focus = true;
+            plug_before_search = null;
 
             return true;
         }
@@ -400,18 +410,35 @@
             search_box.margin_right = 5;
             search_box.sensitive = false;
             search_box.changed.connect(() => {
-                category_view.filter_plugs(search_box.get_text ());
+                if (search_box.text.strip () == "") {
+                    if (plug_before_search != null)
+                        switch_to_plug (plug_before_search);
+                    else
+                        switch_to_icons ();
+                    return;
+                }
+
+                search_view.search.begin (search_box.text);
+                if (stack.visible_child_name != "alert")
+                    stack.set_visible_child_name ("search");
+                else
+                    stack.set_visible_child_full ("search", Gtk.StackTransitionType.NONE);
+                category_scrolled.hide ();
             });
 
             // Focus typing to the search bar
             main_window.key_press_event.connect ((event) => {
                 // alt+left should go back to all settings
-                if ((event.state | Gdk.ModifierType.MOD1_MASK) != 0 && event.keyval == Gdk.Key.Left) {
+                if (Gdk.ModifierType.MOD1_MASK in event.state && event.keyval == Gdk.Key.Left) {
                     navigation_button.clicked ();
                 }
 
                 // Don't focus if it is a modifier or if search_box is already focused
-                if ((event.is_modifier == 0) && !search_box.has_focus)
+                if ((event.is_modifier == 0) &&
+                    !search_box.has_focus &&
+                    (stack.visible_child_name == "alert"
+                    || stack.visible_child_name == "search"
+                    || stack.visible_child_name == "main"))
                     search_box.grab_focus ();
 
                 return false;