Merge lp:~jeremywootten/pantheon-files/refactor-location-bar-preparation into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Move TopMenu widgets into libwidgets and some supporting classes into libcore

This branch is the first of a series aimed at refactoring the location bar in particular and the topmenu in general. The intention is to make these widgets self-contained and testable with defined interfaces. See lp:~jeremywootten/pantheon-files/experimental-refactor-fix-1461060-browser-like-search for the (almost) final version. The refactored location bar will have a more browser-like search behaviour. A separate LocationBarChooser widget will not be needed.

This branch moves the existing topmenu widgets into libwidgets but does not changes their behaviour. Consequential changes are made so that they still work.

The linked bug is fixed in passing.

=== modified file 'filechooser-module/CMakeLists.txt'
--- filechooser-module/CMakeLists.txt	2015-10-01 08:43:51 +0000
+++ filechooser-module/CMakeLists.txt	2015-11-14 13:22:20 +0000
@@ -9,8 +9,8 @@
 
 vala_precompile (VALA_C ${MODULE_NAME}
     ${CMAKE_SOURCE_DIR}/libwidgets/Resources.vala
-    ${CMAKE_SOURCE_DIR}/libwidgets/LocationBar.vala
-    ${CMAKE_SOURCE_DIR}/libwidgets/BreadcrumbsElements.vala
+    ${CMAKE_SOURCE_DIR}/libwidgets/Chrome/LocationBar.vala
+    ${CMAKE_SOURCE_DIR}/libwidgets/Chrome/BreadcrumbsElements.vala
     LocationBarChooser.vala
     FileChooserDialog.vala
     Plugin.vala
 
=== modified file 'libcore/AbstractSlot.vala'
--- libcore/AbstractSlot.vala	2015-07-24 08:01:21 +0000
+++ libcore/AbstractSlot.vala	2015-11-14 13:22:20 +0000
@@ -65,6 +65,7 @@
 
         public abstract unowned GLib.List<unowned GOF.File>? get_selected_files ();
         public abstract void set_active_state (bool set_active);
+        public abstract void set_frozen_state (bool is_frozen);
         public abstract unowned AbstractSlot? get_current_slot ();
         public abstract void reload (bool non_local_only = false);
         public abstract void grab_focus ();
 
=== renamed file 'src/Bookmark.vala' => 'libcore/Bookmark.vala'
=== renamed file 'src/BookmarkList.vala' => 'libcore/BookmarkList.vala'
=== modified file 'libcore/CMakeLists.txt'
--- libcore/CMakeLists.txt	2015-05-03 06:44:42 +0000
+++ libcore/CMakeLists.txt	2015-11-14 13:22:20 +0000
@@ -16,6 +16,11 @@
 vala_precompile(VALA_C ${PKGNAME}
     AbstractSidebar.vala
     AbstractSlot.vala
+    Bookmark.vala
+    BookmarkList.vala
+    DndHandler.vala
+    Enums.vala
+    MimeActions.vala
     gof-callwhenready.vala
     gof-directory-async.vala
     gof-preferences.vala
 
=== renamed file 'src/DndHandler.vala' => 'libcore/DndHandler.vala'
--- src/DndHandler.vala	2015-07-03 13:48:11 +0000
+++ libcore/DndHandler.vala	2015-11-14 13:22:20 +0000
@@ -19,7 +19,7 @@
     Authors: Jeremy Wootten <[e-mail]>
 ***/
 
-namespace FM {
+namespace Marlin {
     public class DndHandler : GLib.Object {
         Gdk.DragAction chosen = Gdk.DragAction.DEFAULT;
 
@@ -249,7 +249,7 @@
         public bool selection_data_is_uri_list (Gtk.SelectionData selection_data, uint info, out string? text) {
             text = null;
 
-            if (info == AbstractDirectoryView.TargetType.TEXT_URI_LIST &&
+            if (info == Marlin.TargetType.TEXT_URI_LIST &&
                 selection_data.get_format () == 8 &&
                 selection_data.get_length () > 0) {
 
 
=== renamed file 'src/Enums.vala' => 'libcore/Enums.vala'
--- src/Enums.vala	2015-08-17 08:16:55 +0000
+++ libcore/Enums.vala	2015-11-14 13:22:20 +0000
@@ -142,4 +142,11 @@
                 assert_not_reached ();
         }
     }
+    
+    public enum TargetType {
+        STRING,
+        TEXT_URI_LIST,
+        XDND_DIRECT_SAVE0,
+        NETSCAPE_URL
+    }
 }
 
=== renamed file 'src/MimeActions.vala' => 'libcore/MimeActions.vala'
=== added directory 'libwidgets/Animations'
=== renamed file 'libwidgets/Animations.vala' => 'libwidgets/Animations/Animations.vala'
=== modified file 'libwidgets/CMakeLists.txt'
--- libwidgets/CMakeLists.txt	2015-11-05 11:26:27 +0000
+++ libwidgets/CMakeLists.txt	2015-11-14 13:22:20 +0000
@@ -33,25 +33,39 @@
 )
 link_directories(${LIB_PATHS})
 
+include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../libcore/)
+include_directories (${CMAKE_CURRENT_BINARY_DIR}/../libcore/)
 include_directories (${CMAKE_CURRENT_BINARY_DIR})
 include_directories (${CMAKE_BINARY_DIR})
 
 vala_precompile(VALA_C ${PKGNAME}
+    FileUtils.vala
     Resources.vala
-    Animations.vala
     LocationBar.vala
-    BreadcrumbsElements.vala
+    SearchResults.vala
+    Animations/Animations.vala
+    Chrome/LocationBar.vala
+    Chrome/BreadcrumbsElements.vala
+    Chrome/TopMenu.vala
+    Chrome/ButtonWithMenu.vala
+    Chrome/ViewSwicher.vala
+    Chrome/XsEntry.vala
+    Chrome/ImgEventBox.vala
+    Chrome/Viewable.vala
+    Dialogs/ChooseAppDialog.vala
     Welcome.vala
 PACKAGES
     gtk+-3.0
     granite
     gee-0.8
     posix
+    zeitgeist-2.0
     pantheon-files-core
     pantheon-files-core-C
 OPTIONS
     --vapidir=${CMAKE_SOURCE_DIR}/libcore
     --vapidir=${CMAKE_BINARY_DIR}/libcore
+    --target-glib=2.32 # Needed for new thread API
     --thread
 GENERATE_VAPI
     pantheon-files-widgets
@@ -66,4 +80,4 @@
     SOVERSION ${PANTHEON_FILES_WIDGETS_SOVERSION})
 
 install (TARGETS ${PKGNAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/)
-target_link_libraries(${PKGNAME} ${DEPS_LIBRARIES})
+target_link_libraries(${PKGNAME} pantheon-files-core ${DEPS_LIBRARIES})
 
=== added directory 'libwidgets/Chrome'
=== renamed file 'libwidgets/BreadcrumbsElements.vala' => 'libwidgets/Chrome/BreadcrumbsElements.vala'
=== renamed file 'src/View/Chrome/ButtonWithMenu.vala' => 'libwidgets/Chrome/ButtonWithMenu.vala'
=== renamed file 'src/View/Chrome/ImgEventBox.vala' => 'libwidgets/Chrome/ImgEventBox.vala'
=== renamed file 'libwidgets/LocationBar.vala' => 'libwidgets/Chrome/LocationBar.vala'
=== renamed file 'src/View/Chrome/TopMenu.vala' => 'libwidgets/Chrome/TopMenu.vala'
--- src/View/Chrome/TopMenu.vala	2015-05-03 06:44:42 +0000
+++ libwidgets/Chrome/TopMenu.vala	2015-11-14 13:22:20 +0000
@@ -26,7 +26,7 @@
     public class TopMenu : Gtk.HeaderBar {
         public ViewSwitcher? view_switcher;
         public LocationBar? location_bar;
-        public Marlin.View.Window win;
+        public Marlin.Viewable win;
         public Chrome.ButtonWithMenu button_forward;
         public Chrome.ButtonWithMenu button_back;
 
@@ -40,7 +40,12 @@
            button_forward.set_sensitive (can);
         }
 
-        public TopMenu (Marlin.View.Window window) {
+        public signal void focus_location_request (GLib.File? location);
+        public signal void path_change_request (string path, Marlin.OpenFlag flag);
+        public signal void escape ();
+        public signal void reload_request ();
+        
+        public TopMenu (ViewSwitcher switcher, Marlin.Viewable window) {
             win = window;
 
             button_back = new Marlin.View.Chrome.ButtonWithMenu.from_icon_name ("go-previous-symbolic", Gtk.IconSize.LARGE_TOOLBAR);
@@ -62,27 +67,36 @@
                 back (1);
             });
 
-
-            view_switcher = new ViewSwitcher (win.win_actions.lookup_action ("view_mode") as GLib.SimpleAction);
-
+            view_switcher = switcher;
+            view_switcher.margin_right = 20;
             view_switcher.show_all ();
             pack_start (view_switcher);
 
             location_bar = new LocationBar (win);
+            connect_location_bar_signals ();
+            location_bar.show_all ();
+            pack_start (location_bar);
+
+            show ();
+        }
+
+        private void connect_location_bar_signals () {
             location_bar.escape.connect (win.grab_focus);
             location_bar.activate.connect (win.file_path_change_request);
             location_bar.activate_alternate.connect ((file) => {
                 win.add_tab (file, Marlin.ViewMode.CURRENT);
             });
-
-
-            location_bar.show_all ();
-            view_switcher.margin_right = 20;
-            pack_start (location_bar);
-
-            show ();
+            location_bar.reload_request.connect (() => {
+                reload_request ();
+            });
+            location_bar.focus_in_event.connect ((event) => {
+                return focus_in_event (event);
+            });
+            location_bar.focus_out_event.connect ((event) => {
+                return focus_out_event (event);
+            });
         }
-
+        
         public void set_back_menu (Gee.List<string> path_list) {
             /* Clear the back menu and re-add the correct entries. */
             var back_menu = new Gtk.Menu ();
 
=== renamed file 'src/View/Chrome/ViewSwicher.vala' => 'libwidgets/Chrome/ViewSwicher.vala'
--- src/View/Chrome/ViewSwicher.vala	2015-05-03 06:44:42 +0000
+++ libwidgets/Chrome/ViewSwicher.vala	2015-11-14 13:22:20 +0000
@@ -48,7 +48,6 @@
                     break;
                 }
 
-                Preferences.settings.set_enum ("default-viewmode", value);
                 freeze_update = true;
                 switcher.set_active (active_index);
                 freeze_update = false;
@@ -92,8 +91,6 @@
             switcher.append (miller);
             miller_sv = new GLib.Variant.string ("MILLER");
 
-            mode = (Marlin.ViewMode) Preferences.settings.get_enum("default-viewmode");
-
             switcher.mode_changed.connect ((image) => {
                 if (freeze_update) {
                     return;
 
=== added file 'libwidgets/Chrome/ViewWindowInterface.vala'
--- libwidgets/Chrome/ViewWindowInterface.vala	1970-01-01 00:00:00 +0000
+++ libwidgets/Chrome/ViewWindowInterface.vala	2015-11-14 13:22:20 +0000
@@ -0,0 +1,35 @@
+/*
+ * ViewWindowInterface.vala
+ * 
+ * Copyright 2015 jeremy <jeremy@jeremy-W54-55SU1-SUW>
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ * 
+ * 
+ */
+
+
+public interface Marlin.Viewable : Gtk.ApplicationWindow {
+    public abstract new void grab_focus ();
+    public abstract void file_path_change_request (GLib.File file);
+    public abstract void focus_location_request (GLib.File loc);
+    public abstract void add_tab (GLib.File location = GLib.File.new_for_commandline_arg (GLib.Environment.get_home_dir ()),
+                                  Marlin.ViewMode mode = Marlin.ViewMode.PREFERRED);
+    public abstract GLib.File get_current_location ();
+    public abstract bool get_frozen ();
+    public abstract void refresh_view ();
+    public abstract void go_to_parent ();
+}
 
=== added file 'libwidgets/Chrome/Viewable.vala'
--- libwidgets/Chrome/Viewable.vala	1970-01-01 00:00:00 +0000
+++ libwidgets/Chrome/Viewable.vala	2015-11-14 13:22:20 +0000
@@ -0,0 +1,32 @@
+/***
+    Copyright (C) 2015 elementary Developers
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+    PURPOSE. See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program. If not, see <http://www.gnu.org/licenses/>.
+
+    Authors : Jeremy Wootten <[e-mail]>
+***/
+
+
+public interface Marlin.Viewable : Gtk.ApplicationWindow {
+    public abstract new void grab_focus ();
+    public abstract void file_path_change_request (GLib.File file);
+    public abstract void focus_location_request (GLib.File? loc,
+                                                 bool select_in_current_only = false,
+                                                 bool unselect_others = false);
+    public abstract void add_tab (GLib.File location = GLib.File.new_for_commandline_arg (GLib.Environment.get_home_dir ()),
+                                  Marlin.ViewMode mode = Marlin.ViewMode.PREFERRED);
+    public abstract GLib.File get_current_location ();
+    public abstract bool get_frozen ();
+    public abstract void refresh_view ();
+    public abstract void go_to_parent ();
+}
 
=== renamed file 'src/View/Chrome/XsEntry.vala' => 'libwidgets/Chrome/XsEntry.vala'
=== added directory 'libwidgets/Dialogs'
=== added file 'libwidgets/Dialogs/ChooseAppDialog.vala'
--- libwidgets/Dialogs/ChooseAppDialog.vala	1970-01-01 00:00:00 +0000
+++ libwidgets/Dialogs/ChooseAppDialog.vala	2015-11-14 13:22:20 +0000
@@ -0,0 +1,62 @@
+/***
+    Copyright (C) 2015 elementary Developers
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+    PURPOSE. See the GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program. If not, see <http://www.gnu.org/licenses/>.
+
+    Authors : Jeremy Wootten <[e-mail]>
+***/
+
+namespace PF {
+    class ChooseAppDialog {
+        Gtk.AppChooserDialog dialog;
+        Gtk.CheckButton check_default;
+        GLib.File file_to_open;
+        public ChooseAppDialog (Gtk.Window parent, GLib.File file) {
+            file_to_open = file;
+            dialog = new Gtk.AppChooserDialog (parent,
+                                               Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,
+                                               file_to_open);
+
+            dialog.set_deletable (false);
+            var app_chooser = dialog.get_widget () as Gtk.AppChooserWidget;
+            app_chooser.set_show_recommended (true);
+            check_default = new Gtk.CheckButton.with_label (_("Set as default"));
+            check_default.set_active (true);
+            check_default.show ();
+            var action_area = dialog.get_action_area () as Gtk.ButtonBox;
+            action_area.add (check_default);
+            action_area.set_child_secondary (check_default, true);
+            dialog.show ();
+        }
+
+        public AppInfo? get_app_info () {
+            AppInfo? app = null;
+            int response = dialog.run ();
+            if (response == Gtk.ResponseType.OK) {
+                app = dialog.get_app_info ();
+                if (check_default.get_active ()) {
+                    try {
+                        var info = file_to_open.query_info (FileAttribute.STANDARD_CONTENT_TYPE,
+                                                                    FileQueryInfoFlags.NONE, null);
+                        app.set_as_default_for_type (info.get_content_type ());
+                    }
+                    catch (GLib.Error error) {
+                        critical ("Could not set as default: %s", error.message);
+                    }
+                }
+            }
+            dialog.destroy ();
+            return app;
+        }
+    }
+}
 
=== added file 'libwidgets/FileUtils.vala'
--- libwidgets/FileUtils.vala	1970-01-01 00:00:00 +0000
+++ libwidgets/FileUtils.vala	2015-11-14 13:22:20 +0000
@@ -0,0 +1,149 @@
+namespace PF.FileUtils {
+    const string reserved_chars = (GLib.Uri.RESERVED_CHARS_GENERIC_DELIMITERS + GLib.Uri.RESERVED_CHARS_SUBCOMPONENT_DELIMITERS + " ");
+
+    /**
+     * Gets a properly escaped GLib.File for the given path
+     **/
+    public File? get_file_for_path (string? path) {
+        File? file = null;
+        string new_path = sanitize_path (path);
+        if (path.length > 0) {
+            file = File.new_for_commandline_arg (new_path);
+        }
+        return file;
+    }
+
+    public string get_parent_path_from_path (string path) {
+        File? file = File.new_for_commandline_arg (path);
+        string parent_path = path;
+        if (file != null) {
+            File? parent = file.get_parent ();
+            if (parent != null) {
+                parent_path = parent.get_path ();
+            } else {
+                parent_path = construct_parent_path (path);
+            }
+        }
+        return parent_path;
+    }
+
+    private string construct_parent_path (string path) {
+        if (path.length < 2) {
+            return Path.DIR_SEPARATOR_S;
+        }
+        StringBuilder sb = new StringBuilder (path);
+        if (path.has_suffix (Path.DIR_SEPARATOR_S)) {
+            sb.erase (sb.str.length - 1,-1);
+        }
+        int last_separator = sb.str.last_index_of (Path.DIR_SEPARATOR_S);
+        if (last_separator < 0) {
+            last_separator = 0;
+        }
+        sb.erase (last_separator, -1);
+        string parent_path = sb.str + Path.DIR_SEPARATOR_S;
+        return parent_path;
+    }
+
+    public bool path_has_parent (string new_path) {
+        var file = File.new_for_commandline_arg (new_path);
+        return file.get_parent () != null;
+    }
+
+    public string? escape_uri (string uri, bool allow_utf8 = true) {
+        reserved_chars.replace("#", "");
+        return Uri.escape_string ((Uri.unescape_string (uri) ?? uri), reserved_chars, allow_utf8);
+    }
+
+    /** Produce a valid unescaped path **/
+    public string sanitize_path (string? p, string? cp = null) {
+        string path = "";
+        string scheme = "";
+        string? current_path = null;
+        string? current_scheme = null;
+
+        if (p == null || p == "") {
+            return cp ?? "";
+        }
+        string? unescaped_p = Uri.unescape_string (p, null);
+        if (unescaped_p == null) {
+            unescaped_p = p;
+        }
+
+        split_protocol_from_path (unescaped_p, out scheme, out path);
+        path = path.strip ().replace ("//", "/");
+        StringBuilder sb = new StringBuilder (path);
+        if (cp != null) {
+            split_protocol_from_path (cp, out current_scheme, out current_path);
+            /* current_path is assumed already sanitized */
+                if (scheme == "" && path.has_prefix ("/./")) {
+                    sb.erase (0, 2);
+                    sb.prepend (cp);
+                    split_protocol_from_path (sb.str , out scheme, out path);
+                    sb.assign (path);
+                } else if (path.has_prefix ("/../")) {
+                    sb.erase (0, 3);
+                    sb.prepend (get_parent_path_from_path (current_path));
+                    sb.prepend (current_scheme);
+                    split_protocol_from_path (sb.str , out scheme, out path);
+                    sb.assign (path);
+                }
+        }
+
+        if (path.length > 0) {
+            if (scheme == "" && path.has_prefix ("/~/")) {
+                sb.erase (0, 2);
+                sb.prepend (Environment.get_home_dir ());
+            }
+        }
+
+        path = sb.str;
+        do {
+            path = path.replace ("//", "/");
+        } while (path.contains ("//"));
+
+        string new_path = (scheme + path).replace("////", "///");
+
+        if (new_path.length > 0) {
+            if (scheme != Marlin.ROOT_FS_URI && path != "/") {
+                new_path = new_path.replace ("///", "//");
+            }
+            new_path = new_path.replace("ssh:", "sftp:");
+        }
+
+        return new_path;
+    }
+
+    /** Splits the path into a protocol ending in '://" (unless it is file:// which is replaced by "")
+      * and a path beginning "/".
+    **/
+    public void split_protocol_from_path (string path, out string protocol, out string new_path) {
+        protocol = "";
+        new_path = path;
+
+        string[] explode_protocol = new_path.split ("://");
+        if (explode_protocol.length > 2) {
+            new_path = "";
+            return;
+        }
+        if (explode_protocol.length > 1) {
+            if (explode_protocol[0] == "mtp") {
+                string[] explode_path = explode_protocol[1].split ("]", 2);
+                protocol = (explode_protocol[0] + "://" + explode_path[0] + "]").replace ("///", "//");
+                /* If path is being manually edited there may not be "]" so explode_path[1] may be null*/
+                new_path = explode_path [1] ?? "";
+            } else {
+                protocol = explode_protocol[0] + "://";
+                new_path = explode_protocol[1];
+            }
+        } else {
+            protocol = Marlin.ROOT_FS_URI;
+        }
+
+        if (Marlin.ROOT_FS_URI.has_prefix (protocol)) {
+            protocol = "";
+        }
+        if (!new_path.has_prefix (Path.DIR_SEPARATOR_S)) {
+            new_path = Path.DIR_SEPARATOR_S + new_path;
+        }
+    }
+}
 \ No newline at end of file
 
=== renamed file 'src/View/LocationBar.vala' => 'libwidgets/LocationBar.vala'
--- src/View/LocationBar.vala	2015-11-13 18:58:58 +0000
+++ libwidgets/LocationBar.vala	2015-11-14 13:22:20 +0000
@@ -31,7 +31,7 @@
                 if (new_path != null) {
                     _path = new_path;
 
-                    if (!bread.is_focus && !win.freeze_view_changes) {
+                    if (!bread.is_focus && !win.get_frozen ()) {
                         bread.text = "";
                         bread.change_breadcrumbs (new_path);
                     }
@@ -45,26 +45,26 @@
             }
         }
 
-        Marlin.View.Window win;
+        Marlin.Viewable win;
 
         public new signal void activate (GLib.File file);
         public signal void activate_alternate (GLib.File file);
         public signal void escape ();
         public signal void search_mode_left ();
-
+        public signal void reload_request ();
         public override void get_preferred_width (out int minimum_width, out int natural_width) {
             minimum_width = -1;
             natural_width = 3000;
         }
 
-        public LocationBar (Marlin.View.Window win) {
+        public LocationBar (Marlin.Viewable win) {
             this.win = win;
             bread = new Breadcrumbs (win);
             bread.escape.connect (() => { escape(); });
             bread.path_changed.connect (on_path_changed);
 
             bread.reload.connect (() => {
-                win.win_actions.activate_action ("refresh", null);
+                win.refresh_view ();
             });
 
             bread.activate_alternate.connect ((file) => { activate_alternate(file); });
@@ -92,7 +92,8 @@
         }
 
         private void on_path_changed (File? file) {
-            if (file == null || win.freeze_view_changes)
+            if (file == null || win.get_frozen ())
+            if (file == null)
                 return;
 
             win.grab_focus ();
@@ -116,7 +117,7 @@
 
         bool autocompleted = false;
 
-        Marlin.View.Window win;
+        Marlin.Viewable win;
 
         double menu_x_root;
         double menu_y_root;
@@ -124,14 +125,14 @@
         private bool drop_data_ready = false; /* whether the drop data was received already */
         private bool drop_occurred = false; /* whether the data was dropped */
         private GLib.List<GLib.File> drop_file_list = null; /* the list of URIs in the drop data */
-        protected static FM.DndHandler dnd_handler = new FM.DndHandler ();
+        protected static Marlin.DndHandler dnd_handler = new Marlin.DndHandler ();
 
         Gdk.DragAction current_suggested_action = 0; /* No action */
         Gdk.DragAction current_actions = 0; /* No action */
 
         GOF.File? drop_target_file = null;
 
-        public Breadcrumbs (Marlin.View.Window win)
+        public Breadcrumbs (Marlin.Viewable win)
         {
             this.win = win;
             /* FIXME the string split of the path url is kinda too basic, we should use the Gile to split our uris and determine the protocol (if any) with g_uri_parse_scheme or g_file_get_uri_scheme */
@@ -230,7 +231,7 @@
                 if (parent != null && file.get_uri () != parent.get_uri ())
                     change_breadcrumbs (parent.get_uri ());
 
-                win.go_up ();
+                win.go_to_parent ();
                 grab_focus ();
             });
 
@@ -262,18 +263,15 @@
 
             search_results.file_selected.connect ((file) => {
                 win.grab_focus ();
-                win.current_tab.focus_location (file);
-
-                search_mode = false;
-                escape ();
+                win.focus_location_request (file, false, true);
             });
 
             search_results.cursor_changed.connect ((file) => {
-                win.current_tab.focus_location_if_in_current_directory (file, true);
+                win.focus_location_request (file, true, true);
             });
 
             search_results.first_match_found.connect ((file) => {
-                win.current_tab.focus_location_if_in_current_directory (file, true);
+                win.focus_location_request (file, true, true);
             });
 
             search_results.hide.connect (() => {
@@ -281,7 +279,7 @@
             });
 
             search_changed.connect ((text) => {
-                search_results.search (text, win.current_tab.location);
+                search_results.search (text, win.get_current_location ());
             });
         }
 
@@ -372,7 +370,7 @@
 
             bool at_least_one = false;
             foreach (AppInfo app_info in app_info_list) {
-                if (app_info.get_executable () != APP_NAME) {
+                if (app_info.get_executable () != Environment.get_application_name ()) {
                     at_least_one = true;
                     var menu_item = new Gtk.ImageMenuItem.with_label (app_info.get_name ());
                     menu_item.set_data ("appinfo", app_info);
 
=== renamed file 'src/View/SearchResults.vala' => 'libwidgets/SearchResults.vala'
--- src/View/SearchResults.vala	2015-05-03 06:44:42 +0000
+++ libwidgets/SearchResults.vala	2015-11-14 13:22:20 +0000
@@ -101,8 +101,6 @@
         Gtk.TreeModelFilter filter;
         Gtk.ScrolledWindow scroll;
 
-        ulong cursor_changed_handler_id;
-
         public SearchResults (Gtk.Entry entry)
         {
             Object (entry: entry,
@@ -210,7 +208,6 @@
                 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) {
@@ -218,12 +215,9 @@
                     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);
 
@@ -504,6 +498,7 @@
                 || is_grabbing)
                 return;
 
+            view.cursor_changed.connect (on_cursor_changed);
             resize_popup ();
 
             var toplevel = entry.get_toplevel ();
@@ -527,6 +522,7 @@
 
         void popdown ()
         {
+            view.cursor_changed.disconnect (on_cursor_changed);
             entry.reset_im_context ();
 
             if (is_grabbing && device != null) {
@@ -644,10 +640,9 @@
                 Gdk.beep ();
                 return;
             }
-
+            /* The order of these two lines is critical to prevent unwanted cursor-changed signals */
+            popdown ();
             file_selected (file);
-
-            popdown ();
         }
 
         File? get_file_at_iter (Gtk.TreeIter? iter)
 
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-11-03 15:58:50 +0000
+++ src/CMakeLists.txt	2015-11-14 13:22:20 +0000
@@ -51,17 +51,12 @@
 IF (WITH_UNITY AND UNITY_FOUND)
     vala_precompile (VALA_C pantheon-files
         Application.vala
-        Bookmark.vala
-        BookmarkList.vala
         ConnectServerOperation.vala
-        DndHandler.vala
-        Enums.vala
         AbstractEditableLabel.vala
         SingleLineEditableLabel.vala
         MultiLineEditableLabel.vala
         main.vala
         marlin-deep-count.vala
-        MimeActions.vala
         ProgressInfoWidget.vala
         ProgressUIHandler.vala
         TextRenderer.vala
@@ -75,21 +70,15 @@
         View/IconSpinnerRenderer.vala
         View/DirectoryNotFound.vala
         View/AbstractDirectoryView.vala
-        View/SearchResults.vala
         View/Window.vala
         View/ViewContainer.vala
         View/OverlayBar.vala
         View/PropertiesWindow.vala
         View/Browser.vala
-        View/LocationBar.vala
         View/Sidebar.vala
         View/Slot.vala
         View/Miller.vala
-        View/Chrome/TopMenu.vala
-        View/Chrome/ButtonWithMenu.vala
-        View/Chrome/ViewSwicher.vala
-        View/Chrome/XsEntry.vala
-        View/Chrome/ImgEventBox.vala
+
     PACKAGES
         gtk+-3.0
         gio-2.0
@@ -118,17 +107,12 @@
 ELSE (WITH_UNITY AND UNITY_FOUND)
     vala_precompile (VALA_C pantheon-files
         Application.vala
-        Bookmark.vala
-        BookmarkList.vala
         ConnectServerOperation.vala
-        DndHandler.vala
-        Enums.vala
         AbstractEditableLabel.vala
         SingleLineEditableLabel.vala
         MultiLineEditableLabel.vala
         main.vala
         marlin-deep-count.vala
-        MimeActions.vala
         ProgressInfoWidget.vala
         ProgressUIHandler.vala
         TextRenderer.vala
@@ -137,7 +121,6 @@
         View/IconView.vala
         View/ListView.vala
         ZeitgeistManager.vala
-        View/SearchResults.vala
         View/DiskRenderer.vala
         View/DirectoryNotFound.vala
         View/AbstractDirectoryView.vala
@@ -147,15 +130,9 @@
         View/OverlayBar.vala
         View/PropertiesWindow.vala
         View/Browser.vala
-        View/LocationBar.vala
         View/Sidebar.vala
         View/Slot.vala
         View/Miller.vala
-        View/Chrome/TopMenu.vala
-        View/Chrome/ButtonWithMenu.vala
-        View/Chrome/ViewSwicher.vala
-        View/Chrome/XsEntry.vala
-        View/Chrome/ImgEventBox.vala
     PACKAGES
         gtk+-3.0
         gio-2.0
 
=== modified file 'src/View/AbstractDirectoryView.vala'
--- src/View/AbstractDirectoryView.vala	2015-09-21 13:50:55 +0000
+++ src/View/AbstractDirectoryView.vala	2015-11-14 13:22:20 +0000
@@ -25,13 +25,6 @@
 namespace FM {
     public abstract class AbstractDirectoryView : Gtk.ScrolledWindow {
 
-        public enum TargetType {
-            STRING,
-            TEXT_URI_LIST,
-            XDND_DIRECT_SAVE0,
-            NETSCAPE_URL
-        }
-
         protected enum ClickZone {
             EXPANDER,
             HELPER,
@@ -46,15 +39,15 @@
         const int MAX_TEMPLATES = 32;
 
         const Gtk.TargetEntry [] drag_targets = {
-            {"text/plain", Gtk.TargetFlags.SAME_APP, TargetType.STRING},
-            {"text/uri-list", Gtk.TargetFlags.SAME_APP, TargetType.TEXT_URI_LIST}
+            {"text/plain", Gtk.TargetFlags.SAME_APP, Marlin.TargetType.STRING},
+            {"text/uri-list", Gtk.TargetFlags.SAME_APP, Marlin.TargetType.TEXT_URI_LIST}
         };
 
         const Gtk.TargetEntry [] drop_targets = {
-            {"text/uri-list", Gtk.TargetFlags.SAME_APP, TargetType.TEXT_URI_LIST},
-            {"text/uri-list", Gtk.TargetFlags.OTHER_APP, TargetType.TEXT_URI_LIST},
-            {"XdndDirectSave0", Gtk.TargetFlags.OTHER_APP, TargetType.XDND_DIRECT_SAVE0},
-            {"_NETSCAPE_URL", Gtk.TargetFlags.OTHER_APP, TargetType.NETSCAPE_URL}
+            {"text/uri-list", Gtk.TargetFlags.SAME_APP, Marlin.TargetType.TEXT_URI_LIST},
+            {"text/uri-list", Gtk.TargetFlags.OTHER_APP, Marlin.TargetType.TEXT_URI_LIST},
+            {"XdndDirectSave0", Gtk.TargetFlags.OTHER_APP, Marlin.TargetType.XDND_DIRECT_SAVE0},
+            {"_NETSCAPE_URL", Gtk.TargetFlags.OTHER_APP, Marlin.TargetType.NETSCAPE_URL}
         };
 
         const Gdk.DragAction file_drag_actions = (Gdk.DragAction.COPY | Gdk.DragAction.MOVE | Gdk.DragAction.LINK);
@@ -235,7 +228,7 @@
         protected Marlin.IconRenderer icon_renderer;
         protected unowned Marlin.View.Slot slot;
         protected unowned Marlin.View.Window window; /*For convenience - this can be derived from slot */
-        protected static DndHandler dnd_handler = new FM.DndHandler ();
+        protected static Marlin.DndHandler dnd_handler = new Marlin.DndHandler ();
 
         protected unowned Gtk.RecentManager recent;
 
@@ -394,9 +387,10 @@
                             Gtk.TreePath path = model.get_path (iter);
                             if (path != null) {
                                 select_path (path);
-                                if (focus_location != null && focus_location.equal (file.location))
+                                if (focus_location != null && focus_location.equal (file.location)) {
                                     /* set cursor and scroll to focus location*/
-                                    set_cursor (path, false, false, true); 
+                                    set_cursor (path, false, false, true);
+                                }
                             }
                         }
                     });
@@ -1536,19 +1530,19 @@
                     slot.reload (true); /* non-local only */
 
                     switch (info) {
-                        case TargetType.XDND_DIRECT_SAVE0:
+                        case Marlin.TargetType.XDND_DIRECT_SAVE0:
                             success = dnd_handler.handle_xdnddirectsave  (context,
                                                                           drop_target_file,
                                                                            selection_data);
                             break;
 
-                        case TargetType.NETSCAPE_URL:
+                        case Marlin.TargetType.NETSCAPE_URL:
                             success = dnd_handler.handle_netscape_url  (context,
                                                                         drop_target_file,
                                                                         selection_data);
                             break;
 
-                        case TargetType.TEXT_URI_LIST:
+                        case Marlin.TargetType.TEXT_URI_LIST:
                             if ((current_actions & file_drag_actions) != 0) {
                                 if (selected_files != null)
                                     unselect_all ();
 
=== modified file 'src/View/Miller.vala'
--- src/View/Miller.vala	2015-07-24 08:01:21 +0000
+++ src/View/Miller.vala	2015-11-14 13:22:20 +0000
@@ -428,5 +428,9 @@
         public override bool set_all_selected (bool all) {
             return ((Marlin.View.Slot)(current_slot)).set_all_selected (all);
         }
+
+        public override void set_frozen_state (bool freeze) {
+            current_slot.set_frozen_state (freeze);
+        }
     }
 }
 
=== modified file 'src/View/Sidebar.vala'
--- src/View/Sidebar.vala	2015-11-03 15:58:50 +0000
+++ src/View/Sidebar.vala	2015-11-14 13:22:20 +0000
@@ -37,7 +37,7 @@
         private const int ICON_XPAD = 6 + ROOT_INDENTATION_XPAD;
         private const int PROP_0 = 0;
 
-        private static FM.DndHandler dnd_handler = new FM.DndHandler ();
+        private static Marlin.DndHandler dnd_handler = new Marlin.DndHandler ();
 
         Gtk.TreeView tree_view;
         Gtk.CellRenderer indent_renderer;
 
=== modified file 'src/View/Slot.vala'
--- src/View/Slot.vala	2015-09-12 09:33:43 +0000
+++ src/View/Slot.vala	2015-11-14 13:22:20 +0000
@@ -351,5 +351,10 @@
                 directory.update_files ();
             }
         }
+
+        public override void set_frozen_state (bool freeze) {
+            set_view_updates_frozen (freeze);
+            frozen_changed (freeze);
+        }
     }
 }
 
=== modified file 'src/View/ViewContainer.vala'
--- src/View/ViewContainer.vala	2015-11-05 11:26:27 +0000
+++ src/View/ViewContainer.vala	2015-11-14 13:22:20 +0000
@@ -396,11 +396,16 @@
             if (aslot != null)
                 aslot.set_active_state (is_active);
         }
-
+        
+        public void set_frozen_state (bool is_frozen) {
+            var aslot = get_current_slot ();
+            if (aslot != null)
+                aslot.set_frozen_state (is_frozen);
+        }
+        
         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);
                 selected_locations = null;
@@ -417,7 +422,7 @@
             File? parent = file.get_parent ();
             if (parent != null && location.equal (file.get_parent ())) {
                 if (select_in_current_only || file.query_file_type (0) != FileType.DIRECTORY) {
-                   var list = new List<File> ();
+                    var list = new List<File> ();
                     list.prepend (file);
                     get_current_slot ().select_glib_files (list, file);
                 } else
 
=== modified file 'src/View/Window.vala'
--- src/View/Window.vala	2015-08-17 14:25:36 +0000
+++ src/View/Window.vala	2015-11-14 13:22:20 +0000
@@ -23,7 +23,7 @@
 
 namespace Marlin.View {
 
-    public class Window : Gtk.ApplicationWindow
+    public class Window : Gtk.ApplicationWindow, Marlin.Viewable
     {
         static const GLib.ActionEntry [] win_entries = {
             {"new_window", action_new_window},
@@ -54,6 +54,7 @@
         public Gtk.Builder ui;
         private unowned UndoManager undo_manager;
         public Chrome.TopMenu top_menu;
+        public Chrome.ViewSwitcher view_switcher;
         public Gtk.InfoBar info_bar;
         public Granite.Widgets.DynamicNotebook tabs;
         public Marlin.Places.Sidebar sidebar;
@@ -167,11 +168,13 @@
         }
 
         private void construct_top_menu () {
-            top_menu = new Chrome.TopMenu(this);
+            view_switcher = new Chrome.ViewSwitcher (win_actions.lookup_action ("view_mode") as SimpleAction);
+            view_switcher.mode = Preferences.settings.get_enum("default-viewmode");
+            top_menu = new Chrome.TopMenu(view_switcher, this as Marlin.Viewable);
             top_menu.set_show_close_button (true);
             top_menu.set_custom_title (new Gtk.Label (null));
         }
-
+                
         private void construct_info_bar () {
             info_bar = new Gtk.InfoBar ();
 
@@ -210,6 +213,20 @@
 
             top_menu.forward.connect (on_go_forward);
             top_menu.back.connect (on_go_back);
+            top_menu.focus_in_event.connect (() => {
+                current_tab.set_frozen_state (true);
+                return false;
+            });
+            top_menu.focus_out_event.connect (() => {
+                current_tab.set_frozen_state (false);
+                grab_focus ();
+                return true;
+            });
+            top_menu.escape.connect (() => {
+                current_tab.set_frozen_state (false);
+                grab_focus ();
+            });
+            top_menu.reload_request.connect (action_reload);
 
             undo_manager.request_menu_update.connect (undo_redo_menu_update_callback);
 
@@ -461,7 +478,7 @@
             (application as Marlin.Application).quit ();
         }
 
-        private void action_reload (GLib.SimpleAction action, GLib.Variant? param) {
+        private void action_reload () {
             /* avoid spawning reload when key kept pressed */
             if (tabs.current.working || !current_tab.ready)
                 return;
@@ -928,6 +945,7 @@
                 top_menu.set_back_menu (current_tab.get_go_back_path_list ());
                 top_menu.set_forward_menu (current_tab.get_go_forward_path_list ());
                 top_menu.view_switcher.mode = current_tab.view_mode;
+                Preferences.settings.set_enum ("default-viewmode", (int)(current_tab.view_mode));
             }
         }
 
@@ -997,5 +1015,27 @@
             application.set_accels_for_action ("win.info::HELP", {"F1"});
             application.set_accels_for_action ("win.info::ABOUT", {"F3"});
         }
+
+        public bool get_frozen () {
+            return freeze_view_changes;
+        }
+        
+        public GLib.File get_current_location () {
+            return current_tab.location;
+        }
+
+        public void refresh_view () {
+            action_reload ();
+        }
+
+        public void focus_location_request (GLib.File? loc,
+                                            bool select_in_current_only = false,
+                                            bool unselect_others = false) {
+            current_tab.focus_location (loc, select_in_current_only, unselect_others);
+        }
+
+        public void go_to_parent () {
+            go_up ();
+        }
     }
 }