Merge main

Author: danirabbit

data/schemas/io.elementary.files.gschema.xml

@@ -60,6 +60,11 @@
       <summary>Single click selects folders</summary>
       <description>If set to true, single clicking a folder will select it instead of opening it</description>
     </key>
+    <key type="b" name="sort-directories-first">
+      <default>true</default>
+      <summary>Show folders first</summary>
+      <description>If set to true, then folders are shown before files in the list.</description>
+    </key>
     <key name="date-format" enum="dateformatmode">
       <default>'informal'</default>
       <summary>Date Format</summary>

libcore/Preferences.vala

@@ -28,7 +28,6 @@ namespace Files {
         public bool show_hidden_files {get; set; default = false;}
         public bool show_file_preview {set; get; default = true;}
         public bool confirm_trash {set; get; default = true;}
-        public bool sort_directories_first { get; set; default = true; }
         public bool remember_history { get; set; default = true; }
 
         public DateFormatMode date_format {set; get; default = DateFormatMode.ISO;}

src/Application.vala

@@ -274,7 +274,5 @@ public class Files.Application : Gtk.Application {
                                        Files.Preferences.get_default (), "clock-format", GLib.SettingsBindFlags.GET);
         gnome_privacy_settings.bind ("remember-recent-files",
                                      Files.Preferences.get_default (), "remember-history", GLib.SettingsBindFlags.GET);
-        gtk_file_chooser_settings.bind ("sort-directories-first",
-                                        prefs, "sort-directories-first", GLib.SettingsBindFlags.DEFAULT);
     }
 }

src/View/AbstractDirectoryView.vala

@@ -76,8 +76,7 @@ namespace Files {
             {"new", on_background_action_new, "s"},
             {"create-from", on_background_action_create_from, "s"},
             {"sort-by", on_background_action_sort_by_changed, "s", "'name'"},
-            {"reverse", on_background_action_reverse_changed, null, "false"},
-            {"folders-first", on_background_action_folders_first_changed, null, "true"}
+            {"reverse", on_background_action_reverse_changed, null, "false"}
         };
 
         const GLib.ActionEntry [] COMMON_ENTRIES = {
@@ -454,15 +453,15 @@ namespace Files {
 
             var prefs = (Files.Preferences.get_default ());
             prefs.notify["show-hidden-files"].connect (on_show_hidden_files_changed);
-            prefs.notify["sort-directories-first"].connect (on_sort_directories_first_changed);
             prefs.notify["date-format"].connect (on_dateformat_changed);
 
             app_settings.bind ("singleclick-select", this, "singleclick_select", SettingsBindFlags.DEFAULT);
 
             app_settings.changed["show-remote-thumbnails"].connect (on_show_thumbnails_changed);
             app_settings.changed["show-local-thumbnails"].connect (on_show_thumbnails_changed);
+            app_settings.changed["sort-directories-first"].connect (on_sort_directories_first_changed);
 
-            model.set_should_sort_directories_first (Files.Preferences.get_default ().sort_directories_first);
+            model.set_should_sort_directories_first (app_settings.get_boolean ("sort-directories-first"));
             model.row_deleted.connect (on_row_deleted);
             /* Sort order of model is set after loading */
             model.sort_column_changed.connect (on_sort_column_changed);
@@ -1237,11 +1236,6 @@ namespace Files {
             set_sort (null, true);
         }
 
-        private void on_background_action_folders_first_changed (GLib.SimpleAction action, GLib.Variant? val) {
-            var prefs = Files.Preferences.get_default ();
-            prefs.sort_directories_first = !prefs.sort_directories_first;
-        }
-
         private void set_sort (string? col_name, bool reverse) {
             int sort_column_id;
             Gtk.SortType sort_order;
@@ -1480,9 +1474,8 @@ namespace Files {
             slot.reload ();
         }
 
-        private void on_sort_directories_first_changed (GLib.Object prefs, GLib.ParamSpec pspec) {
-            var sort_directories_first = ((Files.Preferences) prefs).sort_directories_first;
-            model.set_should_sort_directories_first (sort_directories_first);
+        private void on_sort_directories_first_changed (Settings settings, string key) {
+            model.set_should_sort_directories_first (settings.get_boolean (key));
         }
 
         private void directory_hidden_changed (Directory dir, bool show) {
@@ -2343,7 +2336,7 @@ namespace Files {
                 reversed_checkitem.action_name = "background.reverse";
 
                 var folders_first_checkitem = new Gtk.CheckMenuItem.with_label (_("Folders Before Files"));
-                folders_first_checkitem.action_name = "background.folders-first";
+                folders_first_checkitem.action_name = "win.sort-directories-first";
 
                 submenu = new Gtk.Menu ();
                 submenu.add (name_radioitem);
@@ -2574,8 +2567,6 @@ namespace Files {
                 action_set_state (background_actions, "sort-by", val);
                 val = new GLib.Variant.boolean (sort_order == Gtk.SortType.DESCENDING);
                 action_set_state (background_actions, "reverse", val);
-                val = new GLib.Variant.boolean (Files.Preferences.get_default ().sort_directories_first);
-                action_set_state (background_actions, "folders-first", val);
             } else {
                 warning ("Update menu actions sort: The model is unsorted - this should not happen");
             }

src/View/Widgets/AppMenu.vala

@@ -94,7 +94,7 @@ public class Files.AppMenu : Gtk.Popover {
         };
 
         var folders_before_files = new Granite.SwitchModelButton (_("Sort Folders before Files")) {
-            action_name = "win.folders-before-files"
+            action_name = "win.sort-directories-first"
         };
 
         var restore_tabs = new Granite.SwitchModelButton (_("Restore Tabs from Last Time")) {

src/View/Window.vala

@@ -66,7 +66,6 @@ public class Files.View.Window : Hdy.ApplicationWindow {
         {"zoom", action_zoom, "s"},
         {"view-mode", action_view_mode, "u", "0" },
         {"tabhistory-restore", action_tabhistory_restore, "s" },
-        {"folders-before-files", null, null, "true", change_state_folders_before_files},
         {"forward", action_forward, "i"},
         {"back", action_back, "i"},
         {"focus-sidebar", action_focus_sidebar}
@@ -113,10 +112,11 @@ public class Files.View.Window : Hdy.ApplicationWindow {
         var app_settings = new Settings ("io.elementary.files.preferences");
         add_action (app_settings.create_action ("restore-tabs"));
         add_action (app_settings.create_action ("show-file-preview"));
+        add_action (app_settings.create_action ("show-hiddenfiles"));
         add_action (app_settings.create_action ("show-local-thumbnails"));
         add_action (app_settings.create_action ("show-remote-thumbnails"));
-        add_action (app_settings.create_action ("show-hiddenfiles"));
         add_action (app_settings.create_action ("singleclick-select"));
+        add_action (app_settings.create_action ("sort-directories-first"));
 
         add_action_entries (WIN_ENTRIES, this);
         undo_actions_set_insensitive ();
@@ -272,10 +272,6 @@ public class Files.View.Window : Hdy.ApplicationWindow {
 
         add (grid);
 
-        /** Apply preferences */
-        var prefs = Files.Preferences.get_default (); // Bound to settings schema by Application
-        get_action ("folders-before-files").set_state (prefs.sort_directories_first);
-
         button_forward.slow_press.connect (() => {
             get_action_group ("win").activate_action ("forward", new Variant.int32 (1));
         });
@@ -1027,12 +1023,6 @@ public class Files.View.Window : Hdy.ApplicationWindow {
         doing_undo_redo = false;
     }
 
-    public void change_state_folders_before_files (GLib.SimpleAction action) {
-        bool state = !action.state.get_boolean ();
-        action.set_state (new GLib.Variant.boolean (state));
-        Files.Preferences.get_default ().sort_directories_first = state;
-    }
-
     private void connect_to_server () {
         var dialog = new PF.ConnectServerDialog ((Gtk.Window) this);
         string server_uri = "";