Merge lp:~jeremywootten/pantheon-files/fix-1592068-viewmode-buttons-do-not-update into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

* Fix bug #1592068: "View buttons don't update".

This branch ensures that the viewmode switch is updated when required and also that it is made insensitive when appropriate (that is when the view is showing an error message or when a connect server dialog is showing).

The opportunity is taken to reduce the extent to which the widget "ViewContainer" directly calls functions in its controller "Window". It is made more modular by introducing a new signal to which Window listens, causing the topmenu to update. Further work is required in this area which will be the subject of a further branch.

[Adam Bieńkowski (donadigo)]

I can confirm that this is much more cleaner solution and it fixes the problems with navigation buttons and view mode switcher as well.

Only one thing: update_view_method is no longer needed as this is done already in update_top_menu, even the compiler points this out, we should remove it.

review: Needs Fixing (code / testing)

[Jeremy Wootten (jeremywootten)]

r2199 overwritten with redundant function removed.

[Adam Bieńkowski (donadigo)]

Looks great now! Thanks, approve.

review: Approve (code / testing)

=== modified file 'src/View/ViewContainer.vala'
--- src/View/ViewContainer.vala	2016-06-04 18:58:03 +0000
+++ src/View/ViewContainer.vala	2016-06-17 14:06:30 +0000
@@ -28,7 +28,7 @@
     public class ViewContainer : Gtk.Overlay {
 
         public Gtk.Widget? content_item;
-        public bool can_show_folder = true;
+        public bool can_show_folder = false;
         public string label = "";
         public Marlin.View.Window window;
         public GOF.AbstractSlot? view = null;
@@ -58,6 +58,18 @@
             }
         }
 
+        public bool can_go_back {
+            get {
+                return browser.get_can_go_back ();
+            }
+        }
+
+        public bool can_go_forward {
+            get {
+                return browser.get_can_go_forward ();
+            }
+        }
+
         public OverlayBar overlay_statusbar;
         private Browser browser;
         private GLib.List<GLib.File>? selected_locations = null;
@@ -66,6 +78,7 @@
         public signal void loading (bool is_loading);
         /* To maintain compatibility with existing plugins */
         public signal void path_changed (File file);
+        public signal void active ();
 
         /* Initial location now set by Window.make_tab after connecting signals */
         public ViewContainer (Marlin.View.Window win) {
@@ -264,10 +277,12 @@
         }
 
         private void directory_is_loading (GLib.File loc) {
-            loading (true);
             overlay_statusbar.cancel ();
             overlay_statusbar.halign = Gtk.Align.END;
             refresh_slot_info (loc);
+
+            can_show_folder = false;
+            loading (true);
         }
 
         public void plugin_directory_loaded () {
@@ -284,7 +299,7 @@
             plugins.directory_loaded ((void*) data);
         }
 
-        public void refresh_slot_info (GLib.File loc) {
+        private void refresh_slot_info (GLib.File loc) {
             update_tab_name (loc);
             window.loading_uri (loc.get_uri ());
             window.update_labels (loc.get_parse_name (), tab_name);
@@ -327,12 +342,10 @@
         }
 
         public void directory_done_loading (GOF.AbstractSlot slot) {
-            loading (false);
-            can_show_folder = true;
+            can_show_folder = slot.directory.can_load;
 
             /* First deal with all cases where directory could not be loaded */
-            if (!slot.directory.can_load) {
-                can_show_folder = false;
+            if (!can_show_folder) {
                 if (!slot.directory.file.exists) {
                     if (slot.can_create)
                         content = new DirectoryNotFound (slot.directory, this);
@@ -369,16 +382,13 @@
                 content = view.get_content_box ();
                 /* Only record valid folders (will also log Zeitgeist event) */
                 browser.record_uri (slot.uri); /* will ignore null changes i.e reloading*/
-                window.set_can_go_forward (browser.get_can_go_forward ());
                 plugin_directory_loaded ();
             } else {
                 /* Save previous uri but do not record current one */
                 browser.record_uri (null);
-                /* Inactivate the forward button but do not lose existing forward stack */
-                window.set_can_go_forward (false);
             }
-            window.set_can_go_back (browser.get_can_go_back ());
-            window.update_top_menu ();
+
+            loading (false); /* Will cause topmenu to update */
             overlay_statusbar.update_hovered (null); /* Prevent empty statusbar showing */
         }
 
@@ -403,6 +413,7 @@
             if (aslot != null) {
                 /* Since async loading it may not have been determined whether slot is loadable */
                 aslot.set_active_state (is_active);
+                active ();
             }
         }
         

=== modified file 'src/View/Window.vala'
--- src/View/Window.vala	2016-06-09 08:48:35 +0000
+++ src/View/Window.vala	2016-06-17 14:06:30 +0000
@@ -63,12 +63,6 @@
         public ViewContainer? current_tab = null;
         public uint window_number;
 
-        public void set_can_go_forward (bool can) {
-           top_menu.set_can_go_forward (can);
-        }
-        public void set_can_go_back (bool can) {
-           top_menu.set_can_go_back (can);
-        }
         public bool is_first_window {get; private set;}
         private bool tabs_restored = false;
         private bool freeze_view_changes = false;
@@ -449,7 +443,6 @@
         public void add_tab (File location = File.new_for_commandline_arg (Environment.get_home_dir ()),
                              Marlin.ViewMode mode = Marlin.ViewMode.PREFERRED) {
             mode = real_mode (mode);
-            update_view_mode (mode);
 
             var content = new View.ViewContainer (this);
             var tab = new Granite.Widgets.Tab ("", null, content);
@@ -460,6 +453,11 @@
 
             content.loading.connect ((is_loading) => {
                 tab.working = is_loading;
+                update_top_menu ();
+            });
+
+            content.active.connect (() => {
+                update_top_menu ();
             });
 
             content.update_tab_name (location);
@@ -831,13 +829,6 @@
             }
         }
 
-        private void update_view_mode (Marlin.ViewMode mode) { /* Called via update topmenu */
-            GLib.SimpleAction action = get_action ("view_mode");
-            action.set_state (mode_strings [(int)mode]);
-            view_switcher.mode = mode;
-            Preferences.settings.set_enum ("default-viewmode", mode);
-        }
-
         public void quit () {
             top_menu.destroy (); /* stop unwanted signals if quit while pathbar in focus */
 
@@ -1011,15 +1002,22 @@
             }
         }
 
-        public void update_top_menu () {
-            if (freeze_view_changes)
+        private void update_top_menu () {
+            if (freeze_view_changes || current_tab == null)
                 return;
 
-            if (current_tab != null) {
-                top_menu.set_back_menu (current_tab.get_go_back_path_list ());
-                top_menu.set_forward_menu (current_tab.get_go_forward_path_list ());
-                update_view_mode (current_tab.view_mode);
-            }
+            /* Update browser buttons */
+            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.set_can_go_back (current_tab.can_go_back);
+            top_menu.set_can_go_forward (current_tab.can_show_folder && current_tab.can_go_forward);
+
+            /* Update viewmode switch, action state and settings */
+            var mode = current_tab.view_mode;
+            view_switcher.mode = mode;
+            view_switcher.sensitive = current_tab.can_show_folder;
+            get_action ("view_mode").set_state (mode_strings [(int)mode]);
+            Preferences.settings.set_enum ("default-viewmode", mode);
         }
 
         public void update_labels (string new_path, string tab_name) {