Merge lp:~jeremywootten/pantheon-files/fix-1380265-implement-Ctrl+l-in-search into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Allow pressing Ctrl+L when in search mode

When in search mode, Ctrl-L should return to navigate mode to be consistent with behaviour when viewing directory.

Pending UX decision, it returns to showing the current directory path.

[Zisu Andrei (matzipan)]

Ctrl-L, I guess, comes from "Location". It doesn't make sense to press it again to go to the folder view. On the other hand. "ESC" seems to be working fine.

review: Disapprove

[Jeremy Wootten (jeremywootten)]

Under what circumstances is it returning to folder view with Ctrl-L? For me it returns to navigate mode. In navigate mode, pressing it again does nothing.

[Zisu Andrei (matzipan)]

I think I might've confused what the scope of this branch was. Testing it again now.

[Zisu Andrei (matzipan)]

If I'm in navigate mode and I press Ctrl+L, then the whole text is selected.

If I'm in search mode and I press Ctrl+L, no selection is happening.

review: Needs Fixing

[lp:~jeremywootten/pantheon-files/fix-1380265-implement-Ctrl+l-in-search]

2169. By Jeremy Wootten on 2016-06-30

Select path after exit search mode with Ctrl-L

[Jeremy Wootten (jeremywootten)]

OK, path now consistently selected after Ctrl-L.

[Zisu Andrei (matzipan)]

Press ctrl+l, type in a string which is not in the folder: I used "asd", press ctrl+l again, the path will not be set to the location path, but will maintain the string "asd".

review: Needs Fixing

[lp:~jeremywootten/pantheon-files/fix-1380265-implement-Ctrl+l-in-search]

2170. By Jeremy Wootten on 2016-07-02

Ctrl+L always resets entry to current directory path

[Jeremy Wootten (jeremywootten)]

Entry now resets to current directory path (selected) when Ctrl+L is pressed, whether in search, navigate or browse mode.

[lp:~jeremywootten/pantheon-files/fix-1380265-implement-Ctrl+l-in-search]

2171. By Jeremy Wootten on 2016-07-03

Merge trunk to r2229

[Zisu Andrei (matzipan)]

I double checked that I actually pulled your changes - I did, but it seems to have not changed anything, so:

Press ctrl+l, type in a string which is not in the folder: I used "asd", press ctrl+l again, the path will not be set to the location path, but will maintain the string "asd".

What is more, if I type in a string which does indeed match a file in the folder, I get the search list, but when I press ctrl+l now, nothing happens.

review: Needs Fixing

[Jeremy Wootten (jeremywootten)]

Strange!? I just tried your steps and it worked fine.

=== modified file 'libwidgets/Chrome/BasicBreadcrumbsEntry.vala'
--- libwidgets/Chrome/BasicBreadcrumbsEntry.vala	2016-04-29 11:47:42 +0000
+++ libwidgets/Chrome/BasicBreadcrumbsEntry.vala	2016-07-03 13:14:10 +0000
@@ -178,6 +178,10 @@
             if (event.is_modifier == 1) {
                 return true;
             }
+
+            var mods = event.state & Gtk.accelerator_get_default_mod_mask ();
+            bool only_control_pressed = (mods == Gdk.ModifierType.CONTROL_MASK);
+
             switch (event.keyval) {
                 case Gdk.Key.KP_Down:
                 case Gdk.Key.Down:
@@ -192,6 +196,17 @@
                 case Gdk.Key.Escape:
                     activate_path ("");
                     return true;
+
+                case Gdk.Key.l:
+                    if (only_control_pressed) {
+                        set_entry_text (current_dir_path);
+                        grab_focus ();
+                        return true;
+                    } else {
+                        break;
+                    }
+                default:
+                    break;
             }
             return base.key_press_event (event);
         }

=== modified file 'libwidgets/Interfaces/SearchableInterface.vala'
--- libwidgets/Interfaces/SearchableInterface.vala	2016-05-06 10:36:16 +0000
+++ libwidgets/Interfaces/SearchableInterface.vala	2016-07-03 13:14:10 +0000
@@ -22,7 +22,7 @@
         public signal void file_activated (GLib.File file);
         public signal void cursor_changed (GLib.File? file);
         public signal void first_match_found (GLib.File? file);
-        public signal void exit ();
+        public signal void exit (bool exit_navigate = true);
 
         public abstract void cancel ();
         public abstract void search (string txt, GLib.File search_location);

=== modified file 'libwidgets/View/LocationBar.vala'
--- libwidgets/View/LocationBar.vala	2016-05-15 00:40:54 +0000
+++ libwidgets/View/LocationBar.vala	2016-07-03 13:14:10 +0000
@@ -81,13 +81,18 @@
         private void on_search_results_realize () {
             (get_toplevel () as Gtk.Window).get_group ().add_window (search_results); /*Is this necessary every popup? */
         }
-        private void on_search_results_exit () {
+        private void on_search_results_exit (bool exit_navigate = true) {
             /* Search result widget ensures it has closed and released grab */
             bread.reset_im_context ();
             if (focus_timeout_id > 0) {
                 GLib.Source.remove (focus_timeout_id);
             }
-            escape ();
+            if (exit_navigate) {
+                escape ();
+            } else {
+                bread.set_entry_text (bread.get_breadcrumbs_path ());
+                enter_navigate_mode ();
+            }
         }
 
         protected override bool after_bread_focus_out_event (Gdk.EventFocus event) {

=== modified file 'libwidgets/View/SearchResults.vala'
--- libwidgets/View/SearchResults.vala	2016-05-15 00:40:54 +0000
+++ libwidgets/View/SearchResults.vala	2016-07-03 13:14:10 +0000
@@ -364,11 +364,19 @@
             bool only_alt_pressed = alt_pressed && ((mods & ~Gdk.ModifierType.MOD1_MASK) == 0);
 
             if (mods != 0 && !only_shift_pressed) {
-                if (only_control_pressed && event.keyval == Gdk.Key.f) {
-                    search_current_directory_only = false;
-                    begins_with_only = false;
-                    search (search_term, current_root);
-                    return true;
+                if (only_control_pressed) {
+                    if (event.keyval == Gdk.Key.f) {
+                        search_current_directory_only = false;
+                        begins_with_only = false;
+                        search (search_term, current_root);
+                        return true;
+                    } else if (event.keyval == Gdk.Key.l) {
+                        cancel (); /* release any grab */
+                        exit (false); /* Do not exit navigate mode */
+                        return true;
+                    } else {
+                        return parent.key_press_event (event);
+                    }
                 } else if (only_alt_pressed &&
                            event.keyval == Gdk.Key.Return ||
                            event.keyval == Gdk.Key.KP_Enter ||