Merge lp:~jeremywootten/pantheon-files/refix-interactive-search into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Fix interactive search using the pathbar.

This branch corrects a conflict resolution error made when merging the branch that was supposed to fix it which rendered that fix ineffective.

[Artem Anufrij (artem-anufrij)]

Hey Jeremy,

what do you think about following behavior:

1. open a folder
2. typing a search text
 --- new feature
3. Press CTRL+F for switch to global search instead "CURRENT_DIRECTORY_ONLY".

??

In the currently version its not possible.

review: Needs Information (behavior)

[Jeremy Wootten (jeremywootten)]

I don't see why that cannot be implemented quite easily. Give me a day or so.

[Artem Anufrij (artem-anufrij)]

1. Enter a search text
2. Select a result item
3. Press enter

expected:
"files" selects the file and scrolls it into view.

currently:
"files" selects the file, but they will be not scrolled into view.

following behavior would be perfect, in my opinion:

1. Type search text

2. Navigate with the arrow keys in the result popup.
 -> selected file will be selected and scrolled into view.

3. On press enter
 -> run selected file.

what do you think about?

review: Needs Information (behavior)

[Artem Anufrij (artem-anufrij)]

It think it will be useful, if the filenames will be checked like "contains (searchtext)" instead "starts_with (searchtext)".

[lp:~jeremywootten/pantheon-files/refix-interactive-search]

1658. By Jeremy Wootten on 2014-12-01

Convert from local to global search with Ctrl-F

1659. By Jeremy Wootten on 2014-12-01

Fix scroll to selected file

1660. By Jeremy Wootten on 2014-12-01

Selection follows cursor

1661. By Jeremy Wootten on 2014-12-01

Fix bugs in selection follows cursor

1662. By Jeremy Wootten on 2014-12-01

Merge trunk rev 1659

[Jeremy Wootten (jeremywootten)]

Scroll to selected file fixed.
Selection in current directory follows search view cursor implemented.

[lp:~jeremywootten/pantheon-files/refix-interactive-search]

1663. By Jeremy Wootten on 2014-12-01

Ensure location pathbar loses focus after accepting search result

[Jeremy Wootten (jeremywootten)]

The global search performs a "contains (text)" search but the local search in the current directory performs a "begins with (text)" search in order to match the existing behaviour of the trunk and the native interactive search of Gtk.TreeView.

It would be easy to use a "contains (text)" search for both but I think this should be be cleared by the UI team.

[Jeremy Wootten (jeremywootten)]

I don't think its a good idea to "run" the selected search result (i.e. load it into the appropriate default application) - the user may not want this. However, you can suggest it to the UI team.

[PerfectCarl (name-is-carl)]

The local search (ie what happens what I type text in the view) works.
But the display flickers quite a lot each time I type another key.

Let's say I have a unique subfolder 'good' in my folder and that I'm starting to type 'g'.
The focus goes in the pathbar (as expected) and then I continue to type 'o', 'o' and so on.

Each time the dropbox is re-created with exactly the same item.
It feels very slow and it flickers a lot as we can see the dropbox being cleared and
repopulated with the same item.

Global search (Ctrl+F) works nicely.

I feel like the UX team should really do a pass on this to be sure that
everything feels the way it should.

Code is approved

review: Approve ((code))

[Danielle Foré (danrabbit)]

The flickering problem is something we face in Midori and is already present in trunk, so I wouldn't block this branch based on that. But it is indeed pretty annoying :/

I think we should maintain the "begins with" behavior. I think there's a lot of people (like me) that rely on this behavior to navigate quickly. I know there was a quite an uproar when Nautilus changed its behavior regarding "type ahead".

I'm going to approve, because I think this feature is super important. But I do think there's room for discussion and improvement regarding type ahead and search in general and it would be desirable to have a single consistent search results UI :)

review: Approve (ux)

=== modified file 'src/View/AbstractDirectoryView.vala'
--- src/View/AbstractDirectoryView.vala	2014-11-25 13:01:07 +0000
+++ src/View/AbstractDirectoryView.vala	2014-12-01 12:20:59 +0000
@@ -372,7 +372,7 @@
                     if (model.get_first_iter_for_file (file, out iter)) {
                         Gtk.TreePath path = model.get_path (iter);
                         if (path != null) {
-                            if (focus_location == file.location)
+                            if (focus_location.equal (file.location))
                                 set_cursor (path, false, true, false); /* set cursor and select */
                             else
                                 select_path (path);
@@ -2244,6 +2244,16 @@
                     break;
             }
 
+            /* Use find function instead of view interactive search */
+            if (no_mods || only_shift_pressed) {
+                /* Use printable characters to initiate search */
+                if (((unichar)(Gdk.keyval_to_unicode (event.keyval))).isprint ()) {
+                    window.win_actions.activate_action ("find", "CURRENT_DIRECTORY_ONLY");
+                    window.key_press_event (event);
+                    return true;
+                } 
+            }
+
             return false;
         }
 

=== modified file 'src/View/LocationBar.vala'
--- src/View/LocationBar.vala	2014-11-25 22:49:10 +0000
+++ src/View/LocationBar.vala	2014-12-01 12:20:59 +0000
@@ -252,10 +252,15 @@
                 win.current_tab.focus_location (file);
 
                 search_mode = false;
+                escape ();
+            });
+
+            search_results.cursor_changed.connect ((file) => {
+                win.current_tab.focus_location_if_in_current_directory (file, true);
             });
 
             search_results.first_match_found.connect ((file) => {
-                win.current_tab.focus_location_if_in_current_directory (file);
+                win.current_tab.focus_location_if_in_current_directory (file, true);
             });
 
             search_results.hide.connect (() => {

=== modified file 'src/View/SearchResults.vala'
--- src/View/SearchResults.vala	2014-11-14 11:47:50 +0000
+++ src/View/SearchResults.vala	2014-12-01 12:20:59 +0000
@@ -44,6 +44,7 @@
         const int DELAY_ADDING_RESULTS = 150;
 
         public signal void file_selected (File file);
+        public signal void cursor_changed (File? file);
         public signal void first_match_found (File? file);
 
         public Gtk.Entry entry { get; construct; }
@@ -83,6 +84,8 @@
         Gtk.TreeModelFilter filter;
         Gtk.ScrolledWindow scroll;
 
+        ulong cursor_changed_handler_id;
+
         public SearchResults (Gtk.Entry entry)
         {
             Object (entry: entry,
@@ -111,6 +114,7 @@
             scroll.hscrollbar_policy = Gtk.PolicyType.NEVER;
 
             view = new Gtk.TreeView ();
+            view.get_selection ().set_mode (Gtk.SelectionMode.BROWSE);
             view.headers_visible = false;
             view.show_expanders = false;
             view.level_indentation = 12;
@@ -189,6 +193,7 @@
                 Gtk.TreePath path;
                 Gtk.TreeIter iter;
 
+                SignalHandler.block (view, cursor_changed_handler_id);
                 view.get_path_at_pos ((int) e.x, (int) e.y, out path, null, null, null);
 
                 if (path != null) {
@@ -196,23 +201,55 @@
                     filter.convert_iter_to_child_iter (out iter, iter);
                     accept (iter);
                 }
-
+                SignalHandler.unblock (view, cursor_changed_handler_id);
                 return true;
             });
 
+            cursor_changed_handler_id = view.cursor_changed.connect (on_cursor_changed);
+
             key_release_event.connect (key_event);
             key_press_event.connect (key_event);
 
             entry.key_press_event.connect (entry_key_press);
         }
 
+        void on_cursor_changed () {
+            Gtk.TreeIter iter;
+            Gtk.TreePath? path = null;
+            var selected_paths = view.get_selection ().get_selected_rows (null);
+
+            if (selected_paths != null)
+                path = selected_paths.data;
+
+            if (path != null) {
+                filter.get_iter (out iter, path);
+                filter.convert_iter_to_child_iter (out iter, iter);
+                cursor_changed (get_file_at_iter (iter));
+            }
+
+        }
+
         bool entry_key_press (Gdk.EventKey event)
         {
             if (!get_mapped ())
                 return false;
 
+            var mods = event.state & Gtk.accelerator_get_default_mod_mask ();
+            bool only_control_pressed = (mods == Gdk.ModifierType.CONTROL_MASK);
+
+            if (mods != 0) {
+                if (only_control_pressed && event.keyval == Gdk.Key.f) {
+                    search_current_directory_only = false;
+                    begins_with_only = false;
+                    entry.changed ();
+                    return true;
+            } else
+                return false;
+            }
+
             switch (event.keyval) {
                 case Gdk.Key.Escape:
+                    cursor_changed (null); /* Clears selection in view */
                     popdown ();
                     return true;
                 case Gdk.Key.Return:
@@ -400,7 +437,7 @@
 
             y += entry_alloc.height;
 
-            if (y + height > workarea.x + workarea.height)
+            if (y + height > workarea.y + workarea.height)
                 height = workarea.y + workarea.height - y - 12;
 
             scroll.set_min_content_height (height);
@@ -415,6 +452,10 @@
             Gtk.TreeIter filter_iter;
 
             view.get_cursor (out path, null);
+
+            if (path == null)
+                return;
+
             filter.get_iter (out filter_iter, path);
 
             filter.convert_iter_to_child_iter (out iter, filter_iter);
@@ -569,6 +610,19 @@
             popdown ();
         }
 
+        File? get_file_at_iter (Gtk.TreeIter? iter)
+        {
+            if (iter == null) {
+                get_iter_at_cursor (out iter);
+            }
+
+            File? file = null;
+            if (iter != null)
+                list.@get (iter, 3, out file);
+
+            return file;
+        }
+
         public void clear ()
         {
             Gtk.TreeIter parent, iter;

=== modified file 'src/View/ViewContainer.vala'
--- src/View/ViewContainer.vala	2014-11-24 21:24:29 +0000
+++ src/View/ViewContainer.vala	2014-12-01 12:20:59 +0000
@@ -298,13 +298,16 @@
             get_current_slot ().set_active_state (is_active);
         }
 
-        public void focus_location (GLib.File? file, bool select_in_current_only = false) {
-            if (file == null) {
+        public void focus_location (GLib.File? file,
+                                    bool select_in_current_only = false,
+                                    bool unselect_others = false) {
+
+            if (unselect_others || file == null) {
                 get_current_slot ().set_all_selected (false);
-                return;
+                selected_locations = null;
             }
 
-            if (location.equal (file))
+            if (file == null || location.equal (file))
                 return;
 
             GLib.File? loc = null;
@@ -332,8 +335,10 @@
             }
         }
 
-        public void focus_location_if_in_current_directory (GLib.File? file) {
-            focus_location (file, true);
+        public void focus_location_if_in_current_directory (GLib.File? file,
+                                                            bool unselect_others = false) {
+
+            focus_location (file, true, unselect_others);
         }
 
         public string get_root_uri () {

=== modified file 'src/View/Window.vala'
--- src/View/Window.vala	2014-11-25 13:01:07 +0000
+++ src/View/Window.vala	2014-12-01 12:20:59 +0000
@@ -425,7 +425,7 @@
                 top_menu.location_bar.enter_search_mode (true, true);
             else
                 top_menu.location_bar.enter_search_mode ();
-                    
+
         }
 
         private void action_new_window (GLib.SimpleAction action, GLib.Variant? param) {
@@ -466,6 +466,10 @@
                 default:
                     break;
             }
+
+            /* cancel any unfinished location bar activity */
+            top_menu.location_bar.escape ();
+
             current_tab.change_view_mode (mode);
             update_view_mode (mode);
         }