Merge lp:~donadigo/switchboard/plug-use-search-entry into lp:~elementary-pantheon/switchboard/switchboard

[Adam Bieńkowski]

Proivde use_search_entry in the Switchboard.Plug abstract class to set switchboard's plug entry sensitive and also search_entry_changed (text) to inform the plug that the entry has changed.

Used in shortcuts searching in keyboard plug:
https://code.launchpad.net/~donadigo/switchboard-plug-keyboard/search-shortcuts

[Corentin Noël (tintou)]

This does already the job :

public abstract async Gee.TreeMap<string, string> search (string search);

indeed, our client doesn't make use of this right now, but here is how it should work:
 * When the search entry is changed, it calls this search function with the search string
 * The TreeMap contains some "Keyboard → Behavior → Duration", "keyboard<sep>behavior" if there are result, otherwise it is empty.
So it is up to the client to show the search results, but it's currently not implemented in the client.

review: Needs Fixing

Unmerged revisions

557. By Adam Bieńkowski on 2015-04-25

Provide use_search_entry key and search_entry_changed in library in order to use search entry directly in the plugs

=== modified file 'lib/Plug.vala'
--- lib/Plug.vala	2014-11-04 23:12:02 +0000
+++ lib/Plug.vala	2015-04-25 13:34:27 +0000
@@ -67,6 +67,12 @@
      * Inform if the plug should be shown or not
      */
     public bool can_show { get; set; default=true;}
+
+    /**
+     * Makes entry sensitive in order
+     * to use it in plugs.
+     */
+    public bool use_search_entry { get; set; default=false; }
     
     /**
      * Inform the application that the plug can now be listed in the available plugs
@@ -74,6 +80,11 @@
     public signal void visibility_changed ();
     
     /**
+     * Inform the plug that the text in search entry has changed 
+     */    
+    public signal void search_entry_changed (string text);
+  
+    /**
      * Returns the widget that contain the whole interface.
      *
      * @return a {@link Gtk.Widget} containing the interface.
@@ -108,4 +119,4 @@
      * @param location a {@link string} that represents the setting to show.
      */
     public abstract void search_callback (string location);
-}
\ No newline at end of file
+}

=== modified file 'src/Switchboard.vala'
--- src/Switchboard.vala	2015-04-09 08:46:22 +0000
+++ src/Switchboard.vala	2015-04-25 13:34:27 +0000
@@ -362,7 +362,11 @@
                 stack.set_transition_type (Gtk.StackTransitionType.SLIDE_LEFT_RIGHT);
             }
 
-            search_box.sensitive = false;
+            if (plug.use_search_entry)
+                search_box.sensitive = true;
+            else    
+                search_box.sensitive = false;
+
             plug.shown ();
             stack.set_visible_child_name (plug.code_name);
             category_scrolled.hide ();
@@ -402,7 +406,11 @@
             search_box.margin_right = 5;
             search_box.sensitive = false;
             search_box.changed.connect(() => {
-                category_view.filter_plugs(search_box.get_text ());
+                // Check if the current plug is visible and uses search entry
+                if ((stack.get_visible_child_name () == current_plug.code_name && current_plug.use_search_entry))
+                    current_plug.search_entry_changed (search_box.get_text ());
+                else     
+                    category_view.filter_plugs(search_box.get_text ());
             });
             search_box.key_press_event.connect ((event) => {
                 if (event.keyval == Gdk.Key.Return) {
@@ -431,8 +439,8 @@
                 if (event.keyval in NAVIGATION_KEYS)
                     return false;
 
-                // Don't focus if it is a modifier or if search_box is already focused
-                if ((event.is_modifier == 0) && !search_box.has_focus)
+                // Don't focus if it is a modifier, if search_box is already focused or the current plug is active
+                if ((event.is_modifier == 0) && !search_box.has_focus && stack.get_visible_child_name () != current_plug.code_name)
                     search_box.grab_focus ();
 
                 return false;