Merge lp:~jeremywootten/pantheon-files/fix-1604300-merge-find-functionalities-part1 into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Combine the two search modes. Ctrl + F and Type-ahead now do the same thing

This branch removes the two modes of search (current folder/begins-with and global/contains) - search now always performs the full search.

[Danielle Foré (danrabbit)]

As far as I can tell, this branch makes the full search appear when typing but it:

* Makes Ctrl + F not do anything at all. This is probably unexpected.
* Breaks the type-ahead filter feature by not prioritizing results from the pwd.

I think I would consider merging this as is to introduce regressions

review: Needs Fixing

[lp:~jeremywootten/pantheon-files/fix-1604300-merge-find-functionalities-part1]

2414. By Jeremy Wootten on 2016-12-26

Fix Ctrl-F

[Jeremy Wootten (jeremywootten)]

I have fixed the problem with Ctrl-F.

The sorting of the results is dealt with in part2 of this series, in order to keep the diff size down.

[lp:~jeremywootten/pantheon-files/fix-1604300-merge-find-functionalities-part1]

2415. By Jeremy Wootten on 2017-01-13

Merge trunk to r2444 and resolve conflicts

[Danielle Foré (danrabbit)]

It still seems that there are two modes. A difference I noticed:

With Ctrl + F:
* Starting in home, typing "Down" and pressing enter takes me to "Downloads

With Typing:
* Starting in home, typing "Down" and pressing enter takes me to the non-existent folder "Down"

[Danielle Foré (danrabbit)]

I'm going to approve since it's a minor issue. We have a few more branches to go through that might solve it along the way :)

review: Approve

=== modified file 'libwidgets/Interfaces/SearchableInterface.vala'
--- libwidgets/Interfaces/SearchableInterface.vala	2016-12-31 19:42:09 +0000
+++ libwidgets/Interfaces/SearchableInterface.vala	2017-01-13 13:31:29 +0000
@@ -26,8 +26,6 @@
 
         public abstract void cancel ();
         public abstract void search (string txt, GLib.File search_location);
-        public abstract void set_search_current_directory_only (bool only);
-        public abstract void set_begins_with_only (bool only);
         public abstract bool has_popped_up ();
     }
 }

=== modified file 'libwidgets/View/SearchResults.vala'
--- libwidgets/View/SearchResults.vala	2016-12-31 19:42:09 +0000
+++ libwidgets/View/SearchResults.vala	2017-01-13 13:31:29 +0000
@@ -83,8 +83,6 @@
 
         bool local_search_finished = false;
         bool global_search_finished = false;
-        protected bool search_current_directory_only = false;
-        protected bool begins_with_only = false;
 
         bool is_grabbing = false;
         Gdk.Device? device = null;
@@ -288,7 +286,6 @@
                 return null;
             });
 
-            if (!search_current_directory_only) {
                 get_zg_results.begin (search_term);
 
                 var bookmarks_matched = new Gee.LinkedList<Match> ();
@@ -300,16 +297,6 @@
                 }
 
                 add_results (bookmarks_matched, bookmark_results);
-            } else {
-                global_search_finished = true;
-            }
-        }
-
-        public void set_search_current_directory_only (bool only) {
-            search_current_directory_only = only;
-        }
-        public void set_begins_with_only (bool only) {
-            begins_with_only = only;
         }
 
         /** Signal handlers **/
@@ -365,12 +352,7 @@
 
             if (mods != 0 && !only_shift_pressed) {
                 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) {
+                    if (event.keyval == Gdk.Key.l) {
                         cancel (); /* release any grab */
                         exit (false); /* Do not exit navigate mode */
                         return true;
@@ -842,7 +824,7 @@
                 depth++;
             }
 
-            if ((search_current_directory_only && depth > 1) || depth > MAX_DEPTH) {
+            if (depth > MAX_DEPTH) {
                 return;
             }
 
@@ -861,7 +843,7 @@
                         continue;
                     }
 
-                    if (info.get_file_type () == FileType.DIRECTORY && !search_current_directory_only) {
+                    if (info.get_file_type () == FileType.DIRECTORY) {
                         directory_queue.add (folder.resolve_relative_path (info.get_name ()));
                     }
 
@@ -978,15 +960,8 @@
         bool term_matches (string term, string name)
         {
             /**TODO** improve */
-
             /* term is assumed to be down */
-            bool res;
-            if (begins_with_only)
-                res = name.normalize ().casefold ().has_prefix (term);
-            else
-                res = name.normalize ().casefold ().contains (term);
-
-            return res;
+            return name.normalize ().casefold ().contains (term);
         }
 
         string get_category_header (string title)

=== modified file 'src/View/AbstractDirectoryView.vala'
--- src/View/AbstractDirectoryView.vala	2016-12-31 19:42:09 +0000
+++ src/View/AbstractDirectoryView.vala	2017-01-13 13:31:29 +0000
@@ -2867,7 +2867,8 @@
             if (no_mods || only_shift_pressed) {
                 /* Use printable characters to initiate search */
                 if (((unichar)(Gdk.keyval_to_unicode (keyval))).isprint ()) {
-                    window.win_actions.activate_action ("find", "CURRENT_DIRECTORY_ONLY");
+                    window.win_actions.activate_action ("find", null);
+
                     window.key_press_event (event);
                     return true;
                 }

=== modified file 'src/View/Widgets/LocationBar.vala'
--- src/View/Widgets/LocationBar.vala	2016-12-27 18:19:20 +0000
+++ src/View/Widgets/LocationBar.vala	2017-01-13 13:31:29 +0000
@@ -183,14 +183,17 @@
             bread.set_placeholder ("");
         }
 
-        public bool enter_search_mode (bool local_only, bool begins_with_only) {
+        public bool enter_search_mode () {
             if (!sensitive) {
                 return false;
             }
 
-            search_results.set_search_current_directory_only (local_only);
-            search_results.set_begins_with_only (begins_with_only);
+//~ <<<<<<< TREE
+//~ =======
+//~             search_results.set_search_current_directory_only (local_only);
+//~             search_results.set_begins_with_only (begins_with_only);
 
+//~ >>>>>>> MERGE-SOURCE
             if (!search_mode) {
                 /* Initialise search mode but do not search until first character has been received */
                 if (set_focussed ()) {

=== modified file 'src/View/Widgets/TopMenu.vala'
--- src/View/Widgets/TopMenu.vala	2016-12-27 18:19:20 +0000
+++ src/View/Widgets/TopMenu.vala	2017-01-13 13:31:29 +0000
@@ -112,8 +112,8 @@
             location_bar.escape.connect (() => {escape ();});
         }
 
-        public bool enter_search_mode (bool local_only, bool begins_with_only) {
-            return location_bar.enter_search_mode (local_only, begins_with_only);
+        public bool enter_search_mode () {
+            return location_bar.enter_search_mode ();
         }
 
         public bool enter_navigate_mode () {

=== modified file 'src/View/Window.vala'
--- src/View/Window.vala	2016-12-26 17:17:11 +0000
+++ src/View/Window.vala	2017-01-13 13:31:29 +0000
@@ -32,7 +32,7 @@
             {"undo", action_undo},
             {"redo", action_redo},
             {"bookmark", action_bookmark},
-            {"find", action_find, "s"},
+            {"find", action_find},
             {"tab", action_tab, "s"},
             {"go_to", action_go_to, "s"},
             {"zoom", action_zoom, "s"},
@@ -515,18 +515,12 @@
         }
 
         private void action_find (GLib.SimpleAction action, GLib.Variant? param) {
-            string search_scope = param.get_string ();
-            if (search_scope == "CURRENT_DIRECTORY_ONLY") {
-                /* Do not initiate search while slot is frozen e.g. during loading */
-                if (current_tab == null || current_tab.is_frozen) {
-                    return;
-                }
-                /* Just search current directory for filenames beginning with term */
-                top_menu.enter_search_mode (true, true);
-            } else {
-                /* Slot is frozen, but only because already searching */
-                top_menu.enter_search_mode (false, false);
+            /* Do not initiate search while slot is frozen e.g. during loading */
+            if (current_tab == null || current_tab.is_frozen) {
+                return;
             }
+
+            top_menu.enter_search_mode ();
         }
 
         private bool adding_window = false;
@@ -1077,7 +1071,7 @@
             application.set_accels_for_action ("win.redo", {"<Ctrl><Shift>Z"});
             application.set_accels_for_action ("win.select_all", {"<Ctrl>A"});
             application.set_accels_for_action ("win.bookmark", {"<Ctrl>D"});
-            application.set_accels_for_action ("win.find::GLOBAL", {"<Ctrl>F"});
+            application.set_accels_for_action ("win.find", {"<Ctrl>F"});
             application.set_accels_for_action ("win.tab::NEW", {"<Ctrl>T"});
             application.set_accels_for_action ("win.tab::CLOSE", {"<Ctrl>W"});
             application.set_accels_for_action ("win.tab::NEXT", {"<Ctrl>Page_Down"});