Merge branch 'main' into danirabbit/abstractdirectoryview-bookmarklist

Author: danirabbit

libcore/Preferences.vala

@@ -29,9 +29,7 @@ namespace Files {
         public bool show_remote_thumbnails {set; get; default = true;}
         public bool show_local_thumbnails {set; get; default = true;}
         public bool show_file_preview {set; get; default = true;}
-        public bool singleclick_select {set; get; default = false;}
         public bool confirm_trash {set; get; default = true;}
-        public bool force_icon_size {set; get; default = true;}
         public bool sort_directories_first { get; set; default = true; }
         public bool remember_history { get; set; default = true; }
 

src/Application.vala

@@ -263,10 +263,6 @@ public class Files.Application : Gtk.Application {
     private void init_schemas () {
         /* Bind settings with GOFPreferences */
         var prefs = Files.Preferences.get_default ();
-        if (app_settings.settings_schema.has_key ("singleclick-select")) {
-            app_settings.bind ("singleclick-select", prefs, "singleclick-select", GLib.SettingsBindFlags.DEFAULT);
-        }
-
         Files.app_settings.bind ("show-hiddenfiles", prefs, "show-hidden-files", GLib.SettingsBindFlags.DEFAULT);
 
         Files.app_settings.bind ("show-remote-thumbnails",

src/View/AbstractDirectoryView.vala

@@ -286,6 +286,8 @@ namespace Files {
         public signal void path_change_request (GLib.File location, Files.OpenFlag flag, bool new_root);
         public signal void selection_changed (GLib.List<Files.File> gof_file);
 
+        private static Settings app_settings;
+
         //TODO Rewrite in Object (), construct {} style
         protected AbstractDirectoryView (View.Slot _slot) {
             slot = _slot;
@@ -411,6 +413,10 @@ namespace Files {
             connect_directory_handlers (slot.directory);
         }
 
+        static construct {
+            app_settings = new Settings ("io.elementary.files.preferences");
+        }
+
         ~AbstractDirectoryView () {
             debug ("ADV destruct"); // Cannot reference slot here as it is already invalid
         }
@@ -452,9 +458,8 @@ namespace Files {
             prefs.notify["show-local-thumbnails"].connect (on_show_thumbnails_changed);
             prefs.notify["sort-directories-first"].connect (on_sort_directories_first_changed);
             prefs.notify["date-format"].connect (on_dateformat_changed);
-            prefs.bind_property (
-                "singleclick-select", this, "singleclick_select", BindingFlags.DEFAULT | BindingFlags.SYNC_CREATE
-            );
+
+            app_settings.bind ("singleclick-select", this, "singleclick_select", SettingsBindFlags.DEFAULT);
 
             model.set_should_sort_directories_first (Files.Preferences.get_default ().sort_directories_first);
             model.row_deleted.connect (on_row_deleted);
@@ -1458,7 +1463,6 @@ namespace Files {
                 }
             }
 
-            var app_settings = new Settings ("io.elementary.files.preferences");
             app_settings.set_boolean ("show-hiddenfiles", show);
         }
 

src/View/Window.vala

@@ -71,7 +71,6 @@ public class Files.View.Window : Hdy.ApplicationWindow {
         {"go-to", action_go_to, "s"},
         {"zoom", action_zoom, "s"},
         {"view-mode", action_view_mode, "u", "0" },
-        {"singleclick-select", null, null, "false", change_state_single_click_select},
         {"tabhistory-restore", action_tabhistory_restore, "s" },
         {"folders-before-files", null, null, "true", change_state_folders_before_files},
         {"forward", action_forward, "i"},
@@ -123,6 +122,7 @@ public class Files.View.Window : Hdy.ApplicationWindow {
         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_entries (WIN_ENTRIES, this);
         undo_actions_set_insensitive ();
@@ -280,9 +280,6 @@ public class Files.View.Window : Hdy.ApplicationWindow {
 
         /** Apply preferences */
         var prefs = Files.Preferences.get_default (); // Bound to settings schema by Application
-        get_action ("show-local-thumbnails").set_state (prefs.show_local_thumbnails);
-        get_action ("show-remote-thumbnails").set_state (prefs.show_remote_thumbnails);
-        get_action ("singleclick-select").set_state (prefs.singleclick_select);
         get_action ("folders-before-files").set_state (prefs.sort_directories_first);
 
         button_forward.slow_press.connect (() => {
@@ -1038,12 +1035,6 @@ public class Files.View.Window : Hdy.ApplicationWindow {
         doing_undo_redo = false;
     }
 
-    public void change_state_single_click_select (GLib.SimpleAction action) {
-        bool state = !action.state.get_boolean ();
-        action.set_state (new GLib.Variant.boolean (state));
-        Files.Preferences.get_default ().singleclick_select = state;
-    }
-
     public void change_state_folders_before_files (GLib.SimpleAction action) {
         bool state = !action.state.get_boolean ();
         action.set_state (new GLib.Variant.boolean (state));