Merge lp:~jeremywootten/pantheon-files/fix-backspace-in-columnv-view into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Fix behaviour of Miller View on pressing BackSpace and history buttons (lp:1074664 lp:1393053)

This branch changes the behaviour of Miller view in response to BackSpace key press and pressing the "Back" button. Instead of always making a new root view, if possible sub-folders are closed until the specified folder is reached.

[Cody Garver (codygarver)]

Conflicts with trunk

[lp:~jeremywootten/pantheon-files/fix-backspace-in-columnv-view]

2029. By Jeremy Wootten on 2016-04-30

Merge trunk to r2130

2030. By Jeremy Wootten on 2016-04-30

Close slots before destroying their container in Miller View to silence terminal warnings

[Jeremy Wootten (jeremywootten)]

Merged trunk and fixed subsequently noticed terminal warnings when truncating Miller View.

[Cody Garver (codygarver)]

Commented some code style issues in the diff

[lp:~jeremywootten/pantheon-files/fix-backspace-in-columnv-view]

2031. By Jeremy Wootten on 2016-05-02

Fix code style

[Jeremy Wootten (jeremywootten)]

Code style fixed

[Zisu Andrei (matzipan)]

LGTM.

review: Approve

=== modified file 'libcore/AbstractSlot.vala'
--- libcore/AbstractSlot.vala	2015-12-30 12:21:30 +0000
+++ libcore/AbstractSlot.vala	2016-05-02 11:14:36 +0000
@@ -32,11 +32,15 @@
 
             protected set {_directory = value;}
         }
+
+        public GOF.File file {
+            get {return directory.file;}
+        }
         public GLib.File location  {
             get {return directory.location;}
         }
         public string uri {
-            get { return directory.file.uri;}
+            get {return directory.file.uri;}
         }
         public bool can_create {get {return directory != null && !directory.is_trash;}}
         public virtual bool locked_focus {
@@ -70,7 +74,8 @@
         public abstract unowned AbstractSlot? get_current_slot ();
         public abstract void reload (bool non_local_only = false);
         public abstract void grab_focus ();
-        public abstract void user_path_change_request (GLib.File loc, bool allow_mode_change = true);
+        public abstract void user_path_change_request (GLib.File loc, bool allow_mode_change, bool make_root);
+
         public abstract void select_first_for_empty_selection ();
         public abstract void select_glib_files (GLib.List<GLib.File> locations, GLib.File? focus_location);
         protected abstract void make_view ();
 
=== modified file 'src/View/AbstractDirectoryView.vala'
--- src/View/AbstractDirectoryView.vala	2016-05-02 07:46:06 +0000
+++ src/View/AbstractDirectoryView.vala	2016-05-02 11:14:36 +0000
@@ -374,8 +374,16 @@
         }
 
         public void select_first_for_empty_selection () {
-            if (selected_files == null)
-                set_cursor (new Gtk.TreePath.from_indices (0), false, true, true);
+            if (selected_files == null) {
+                Idle.add_full (GLib.Priority.LOW, () => {
+                    if (!tree_frozen) {
+                        set_cursor (new Gtk.TreePath.from_indices (0), false, true, true);
+                        return false;
+                    } else {
+                        return true;
+                    }
+                });
+            }
         }
         public void select_glib_files (GLib.List<GLib.File> location_list, GLib.File? focus_location) {
             unselect_all ();
@@ -553,7 +561,7 @@
             }
         }
 
-        protected void select_gof_file (GOF.File file) {
+        public void select_gof_file (GOF.File file) {
             var iter = Gtk.TreeIter ();
             if (!model.get_first_iter_for_file (file, out iter))
                 return; /* file not in model */
 
=== modified file 'src/View/AbstractTreeView.vala'
--- src/View/AbstractTreeView.vala	2016-04-27 11:49:47 +0000
+++ src/View/AbstractTreeView.vala	2016-05-02 11:14:36 +0000
@@ -251,7 +251,7 @@
         }
 
         protected override void scroll_to_cell (Gtk.TreePath? path, bool scroll_to_top) {
-            if (tree == null || path == null || slot.directory.permission_denied)
+            if (tree == null || path == null || slot.directory.permission_denied || slot.directory.is_empty ())
                 return;
 
             tree.scroll_to_cell (path, name_column, scroll_to_top, 0.5f, 0.5f);
 
=== modified file 'src/View/ColumnView.vala'
--- src/View/ColumnView.vala	2015-08-17 09:30:23 +0000
+++ src/View/ColumnView.vala	2016-05-02 11:14:36 +0000
@@ -94,9 +94,12 @@
                 /* Do not emit alert sound on left and right cursor keys in Miller View */
                 case Gdk.Key.Left:
                 case Gdk.Key.Right:
-                    if (no_mods)
+                case Gdk.Key.BackSpace:
+                    if (no_mods) {
+                        /* Pass event to MillerView */ 
+                        slot.colpane.key_press_event (event);
                         return true;
-
+                    }
                     break;
 
                 default:
 
=== modified file 'src/View/IconView.vala'
--- src/View/IconView.vala	2016-04-30 11:18:13 +0000
+++ src/View/IconView.vala	2016-05-02 11:14:36 +0000
@@ -129,7 +129,7 @@
         }
 
         public override void unselect_all () {
-            tree.unselect_all ();
+                tree.unselect_all ();
         }
 
         public override void select_path (Gtk.TreePath? path) {
@@ -250,7 +250,7 @@
         }
 
         protected override void scroll_to_cell (Gtk.TreePath? path, bool scroll_to_top) {
-            if (tree == null || path == null || slot.directory.permission_denied)
+            if (tree == null || path == null || slot.directory.permission_denied || slot.directory.is_empty ())
                 return;
 
             tree.scroll_to_path (path, scroll_to_top, 0.5f, 0.5f);
@@ -260,7 +260,7 @@
                                                     Gtk.CellRenderer renderer,
                                                     bool start_editing,
                                                     bool scroll_to_top) {
-            scroll_to_cell(path, scroll_to_top);
+            scroll_to_cell (path, scroll_to_top);
             tree.set_cursor (path, renderer, start_editing);
         }
 
 
=== modified file 'src/View/Miller.vala'
--- src/View/Miller.vala	2015-12-30 12:21:30 +0000
+++ src/View/Miller.vala	2016-05-02 11:14:36 +0000
@@ -55,8 +55,6 @@
             content_box.pack_start (scrolled_window);
             content_box.show_all ();
 
-            colpane.add_events (Gdk.EventMask.KEY_RELEASE_MASK);
-            colpane.key_release_event.connect (on_key_released);
             make_view ();
         }
 
@@ -98,6 +96,7 @@
 
             if (host != null) {
                 truncate_list_after_slot (host);
+                host.select_gof_file (slot.file);
                 host.colpane.add (hpane1);
                 slot.directory.init ();
             } else
@@ -108,11 +107,6 @@
             if (slot_list.length () <= 0)
                 return;
 
-            /* destroy the nested slots */
-            ((Marlin.View.Slot)(slot)).colpane.@foreach ((w) => {
-                    w.destroy ();
-            });
-
             uint n = slot.slot_number;
 
             slot_list.@foreach ((s) => {
@@ -122,6 +116,10 @@
                 }
             });
 
+            ((Marlin.View.Slot)(slot)).colpane.@foreach ((w) => {
+                w.destroy ();
+            });
+
             slot_list.nth (n).next = null;
             calculate_total_width ();
             current_slot = slot;
@@ -144,13 +142,79 @@
 /** Signal handling **/
 /*********************/
 
-        public override void user_path_change_request (GLib.File loc, bool allow_mode_change = false) {
-            /* user request always make new root */
-            var slot = slot_list.first().data;
-            assert (slot != null);
-            truncate_list_after_slot (slot); /* Sets current slot */
-            root_location = loc;
-            slot.user_path_change_request (loc, false);
+        public override void user_path_change_request (GLib.File loc, bool allow_mode_change = false, bool make_root = false) {
+            /* Requests from history buttons, pathbar come here with make_root = false.
+             * These do not create a new root and automatic mode change for icon directories is not allowed.
+             * Requests from the sidebar have make_root = true
+             */
+            change_path (loc, make_root);
+        }
+
+        private void change_path (GLib.File loc, bool make_root) {
+            var first_slot = slot_list.first ().data;
+            string root_uri = first_slot.uri;
+            string target_uri = loc.get_uri ();
+            bool found = false;
+
+            if (!make_root && target_uri.has_prefix (root_uri) && target_uri != root_uri) {
+                /* Try to add location relative to each slot in turn, starting at end */
+                var copy_slot_list = slot_list.copy ();
+                copy_slot_list.reverse ();
+                foreach (Marlin.View.Slot s in copy_slot_list) {
+                    if (add_relative_path (s, loc)) {
+                        found = true;
+                        break;
+                    }
+                }
+            }
+
+            /* If requested location is not a child of any slot, start a new tree */
+            if (!found) {
+                truncate_list_after_slot (first_slot);
+                if (loc.get_uri () != first_slot.uri) {
+                    first_slot.user_path_change_request (loc, false, true);
+                    root_location = loc;
+                    /* Sidebar requests make_root true - first directory will be selected;
+                     * Go_up requests make_root false - previous directory will be selected
+                     */
+                    if (make_root) {
+                        first_slot.select_first_for_empty_selection ();
+                    }
+                }
+            }
+        }
+
+        private bool add_relative_path (Marlin.View.Slot root, GLib.File loc) {
+            if (root.location.get_uri () == loc.get_uri ()) {
+                truncate_list_after_slot (root);
+                return true;
+            }
+            string? relative_path = PF.FileUtils.escape_uri (root.location.get_relative_path (loc), false);
+            if (relative_path != null && relative_path.length > 0) {
+                truncate_list_after_slot (root);
+                string [] dirs = relative_path.split (Path.DIR_SEPARATOR_S);
+                string last_uri = root.uri;
+                if (last_uri.has_suffix (Path.DIR_SEPARATOR_S))
+                    last_uri = last_uri.slice (0, -1);
+
+                foreach (string d in dirs) {
+                    if (d.length > 0) {
+                        last_uri = GLib.Path.build_path (Path.DIR_SEPARATOR_S, last_uri, d);
+
+                        var last_slot = slot_list.last ().data;
+                        var file = GLib.File.new_for_uri (last_uri);
+                        var list = new List<File> ();
+                        list.prepend (file);
+                        last_slot.select_glib_files (list, file);
+                        Thread.usleep (100000);
+                        add_location (file, last_slot);
+
+                    }
+                }
+            } else {
+                return false;
+            }
+            return true;
         }
 
         private void connect_slot_signals (Slot slot) {
@@ -160,6 +224,7 @@
             slot.miller_slot_request.connect (on_miller_slot_request);
             slot.size_change.connect (update_total_width);
             slot.folder_deleted.connect (on_slot_folder_deleted);
+            slot.colpane.key_press_event.connect (on_key_pressed);
             slot.path_changed.connect (on_slot_path_changed);
         }
 
@@ -170,14 +235,18 @@
             slot.miller_slot_request.disconnect (on_miller_slot_request);
             slot.size_change.disconnect (update_total_width);
             slot.folder_deleted.disconnect (on_slot_folder_deleted);
+            slot.colpane.key_press_event.disconnect (on_key_pressed);
             slot.path_changed.disconnect (on_slot_path_changed);
         }
 
         private void on_miller_slot_request (Marlin.View.Slot slot, GLib.File loc, bool make_root) {
-            if (make_root)
-                user_path_change_request (loc);
-            else
+            if (make_root) {
+                /* Start a new tree with root at loc */ 
+                change_path (loc, true);
+            } else {
+                /* Just add another column to the end. */
                 add_location (loc, slot);
+            }
         }
 
         private bool on_slot_horizontal_scroll_event (double delta_x) {
@@ -251,7 +320,7 @@
             }
         }
 
-        private bool on_key_released (Gtk.Widget box, Gdk.EventKey event) {
+        private bool on_key_pressed (Gtk.Widget box, Gdk.EventKey event) {
             /* Only handle unmodified keys */
             if ((event.state & Gtk.accelerator_get_default_mod_mask ()) > 0)
                 return false;
@@ -292,23 +361,30 @@
                         return true;
                     }
                     break;
+
+                case Gdk.Key.BackSpace:
+                        if (current_position > 0)
+                            truncate_list_after_slot (slot_list.nth_data (current_position - 1));
+                        else {
+                            ctab.go_up ();
+                            return true;
+                        }
+                    break;
+
+                default:
+                    break;
             }
 
             if (to_activate != null) {
                 to_activate.active ();
                 to_activate.select_first_for_empty_selection ();
-                return true;
-            } else
-                return false;
+            }
+
+            return false;
         }
 
         private void on_slot_frozen_changed (Slot slot, bool frozen) {
-            /* Ensure all slots synchronise the frozen state and
-             *  suppress key press event processing when frozen */
-            if (frozen)
-                this.colpane.key_release_event.disconnect (on_key_released);
-            else
-                this.colpane.key_release_event.connect (on_key_released);
+            /* Ensure all slots synchronise the frozen state */
 
             slot_list.@foreach ((abstract_slot) => {
                 var s = abstract_slot as Marlin.View.Slot;
 
=== modified file 'src/View/Slot.vala'
--- src/View/Slot.vala	2016-04-19 10:32:22 +0000
+++ src/View/Slot.vala	2016-05-02 11:14:36 +0000
@@ -186,25 +186,27 @@
                 directory.track_longest_name = true;
         }
 
+        /* This delay in passing on the path change request is necessary to prevent occasional crashes
+         * due to undiagnosed bug.
+         */  
         private void schedule_path_change_request (GLib.File loc, int flag, bool make_root) {
             if (path_change_timeout_id > 0) {
                 warning ("Path change request received too rapidly");
                 return;
             }
             path_change_timeout_id = GLib.Timeout.add (20, () => {
-                on_path_change_request (loc, flag, make_root);
+                on_dir_view_path_change_request (loc, flag, make_root);
                 path_change_timeout_id = 0; 
                 return false;
             });
         }
 
-        private void on_path_change_request (GLib.File loc, int flag, bool make_root) {
+        private void on_dir_view_path_change_request (GLib.File loc, int flag, bool make_root) {
             if (flag == 0) { /* make view in existing container */
-                if (dir_view is FM.ColumnView) {
-                    miller_slot_request (loc, make_root);
-                } else {
-                    user_path_change_request (loc);
-                }
+                if (mode == Marlin.ViewMode.MILLER_COLUMNS)
+                    miller_slot_request (loc, make_root); /* signal to parent MillerView */
+                else
+                    user_path_change_request (loc, false, make_root); /* Handle ourselves */
             } else
                 ctab.new_container_request (loc, flag);
         }
@@ -251,8 +253,8 @@
             has_autosized = true;
         }
 
+        public override void user_path_change_request (GLib.File loc, bool allow_mode_change = true, bool make_root = true) {
         /** Only this function must be used to change or reload the path **/
-        public override void user_path_change_request (GLib.File loc, bool allow_mode_change = true) {
             assert (loc != null);
             var old_dir = directory;
             set_up_directory (loc);
@@ -325,6 +327,11 @@
                 dir_view.select_glib_files (files, focus_location);
         }
 
+        public void select_gof_file (GOF.File gof) {
+            if (dir_view != null)
+                dir_view.select_gof_file (gof);
+        }
+
         public override void select_first_for_empty_selection () {
             if (dir_view != null)
                 dir_view.select_first_for_empty_selection ();
 
=== modified file 'src/View/ViewContainer.vala'
--- src/View/ViewContainer.vala	2016-04-24 17:37:30 +0000
+++ src/View/ViewContainer.vala	2016-05-02 11:14:36 +0000
@@ -148,9 +148,10 @@
                 var parent_path = PF.FileUtils.get_parent_path_from_path (location.get_uri ());
                 parent = PF.FileUtils.get_file_for_path (parent_path);
             }
+
             /* Certain parents such as ftp:// will be returned as null as they are not browsable */
             if (parent != null) {
-                user_path_change_request (parent);
+                user_path_change_request (parent, false, false);
             }
         }
 
@@ -159,7 +160,7 @@
 
             if (loc != null) {
                 selected_locations.append (this.location);
-                user_path_change_request (File.new_for_commandline_arg (loc));
+                user_path_change_request (File.new_for_commandline_arg (loc), false, false);
             }
         }
 
@@ -167,7 +168,7 @@
             string? loc = browser.go_forward (n);
 
             if (loc != null)
-                user_path_change_request (File.new_for_commandline_arg (loc));
+                user_path_change_request (File.new_for_commandline_arg (loc), false, false);
         }
 
         public void add_view (Marlin.ViewMode mode, GLib.File loc) {
@@ -232,11 +233,11 @@
             refresh_slot_info (slot.location);
         }
 
-        private void user_path_change_request (GLib.File loc) {
+        public void user_path_change_request (GLib.File loc, bool allow_mode_change = true, bool make_root = true) {
             /* Ony call directly if it is known that a change of folder is required
              * otherwise call focus_location.
              */
-            view.user_path_change_request (loc);
+            view.user_path_change_request (loc, allow_mode_change, make_root);
         }
 
         public void new_container_request (GLib.File loc, int flag = 1) {
 
=== modified file 'src/View/Window.vala'
--- src/View/Window.vala	2016-04-30 11:18:13 +0000
+++ src/View/Window.vala	2016-05-02 11:14:36 +0000
@@ -1001,7 +1001,7 @@
                     mwcols.add_location (gfile, mwcols.current_slot);
                 }
             } else {
-                warning ("Invalid tip uri for Miller View");
+                warning ("Invalid tip uri for Miller View %s", unescaped_tip_uri);
             }
         }