AppMenu: handle view mode changed internally (#2731)

Co-authored-by: Jeremy Wootten <jeremywootten@gmail.com>

Author: danirabbit

src/View/Widgets/AppMenu.vala

@@ -13,6 +13,16 @@ public class Files.AppMenu : Gtk.Popover {
     private string[] undo_accels;
     private unowned UndoManager undo_manager;
 
+    private static Settings column_view_settings;
+    private static Settings icon_view_settings;
+    private static Settings list_view_settings;
+
+    static construct {
+        column_view_settings = new Settings ("io.elementary.files.column-view");
+        icon_view_settings = new Settings ("io.elementary.files.icon-view");
+        list_view_settings = new Settings ("io.elementary.files.list-view");
+    }
+
     construct {
         var app_instance = (Gtk.Application)(GLib.Application.get_default ());
 
@@ -161,14 +171,13 @@ public class Files.AppMenu : Gtk.Popover {
 
         // Connect to all view settings rather than try to connect and disconnect
         // continuously to current view mode setting.
-        var icon_view_settings = new Settings ("io.elementary.files.icon-view");
-        var list_view_settings = new Settings ("io.elementary.files.list-view");
-        var column_view_settings = new Settings ("io.elementary.files.column-view");
         icon_view_settings.changed["zoom-level"].connect (on_zoom_setting_changed);
         list_view_settings.changed["zoom-level"].connect (on_zoom_setting_changed);
         column_view_settings.changed["zoom-level"].connect (on_zoom_setting_changed);
 
         var app_settings = new Settings ("io.elementary.files.preferences");
+        app_settings.changed["default-viewmode"].connect (on_zoom_setting_changed);
+
         // Initialize and connect dateformat buttons
         switch (app_settings.get_enum ("date-format")) {
             case DateFormatMode.ISO:
@@ -228,7 +237,20 @@ public class Files.AppMenu : Gtk.Popover {
         );
     }
 
-    public void on_zoom_setting_changed (Settings settings, string key) {
+    private void on_zoom_setting_changed () {
+        Settings settings = null;
+        switch (app_settings.get_string ("default-viewmode")) {
+            case "icon":
+                settings = icon_view_settings;
+                break;
+            case "list":
+                settings = list_view_settings;
+                break;
+            case "miller_columns":
+                settings = column_view_settings;
+                break;
+        }
+
         if (settings == null) {
             critical ("Zoom string from settinggs: Null settings");
             zoom_default_button.label = "";

src/View/Window.vala

@@ -286,28 +286,6 @@ public class Files.View.Window : Hdy.ApplicationWindow {
         get_action ("folders-before-files").set_state (prefs.sort_directories_first);
         get_action ("restore-tabs-on-startup").set_state (app_settings.get_boolean ("restore-tabs"));
 
-        /*/
-        /* Connect and abstract signals to local ones
-        /*/
-        view_switcher.action.activate.connect ((id) => {
-            switch ((ViewMode)(id.get_uint32 ())) {
-                case ViewMode.ICON:
-                    app_menu.on_zoom_setting_changed (Files.icon_view_settings, "zoom-level");
-                    break;
-                case ViewMode.LIST:
-                    app_menu.on_zoom_setting_changed (Files.list_view_settings, "zoom-level");
-                    break;
-                case ViewMode.MILLER_COLUMNS:
-                    app_menu.on_zoom_setting_changed (Files.column_view_settings, "zoom-level");
-                    break;
-                case ViewMode.PREFERRED:
-                case ViewMode.CURRENT:
-                case ViewMode.INVALID:
-                    assert_not_reached (); //The switcher should not generate these modes
-            }
-        });
-
-
         button_forward.slow_press.connect (() => {
             get_action_group ("win").activate_action ("forward", new Variant.int32 (1));
         });