Merge branch 'main' into danirabbit/abstractdirectoryview-newsubglibmenu

Author: jeremypw

libcore/Interfaces/SidebarInterface.vala

@@ -40,8 +40,6 @@ public interface Files.SidebarInterface : Gtk.Widget {
         public signal bool request_focus ();
         public signal void sync_needed ();
         public signal void path_change_request (string uri, Files.OpenFlag flag);
-        public abstract void add_favorite_uri (string uri, string custom_name = "");
-        public abstract bool has_favorite_uri (string uri);
         public abstract void sync_uri (string uri);
         public abstract void reload ();
         public abstract void on_free_space_change ();

libcore/Preferences.vala

@@ -26,8 +26,6 @@ namespace Files {
         };
 
         public bool show_hidden_files {get; set; default = false;}
-        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 confirm_trash {set; get; default = true;}
         public bool remember_history { get; set; default = true; }

src/Application.vala

@@ -265,11 +265,6 @@ public class Files.Application : Gtk.Application {
         var prefs = Files.Preferences.get_default ();
         Files.app_settings.bind ("show-hiddenfiles", prefs, "show-hidden-files", GLib.SettingsBindFlags.DEFAULT);
 
-        Files.app_settings.bind ("show-remote-thumbnails",
-                                   prefs, "show-remote-thumbnails", GLib.SettingsBindFlags.DEFAULT);
-        Files.app_settings.bind ("show-local-thumbnails",
-                                   prefs, "show-local-thumbnails", GLib.SettingsBindFlags.DEFAULT);
-
         Files.app_settings.bind ("show-file-preview",
                                    prefs, "show-file-preview", GLib.SettingsBindFlags.DEFAULT);
 

src/View/AbstractDirectoryView.vala

@@ -453,12 +453,12 @@ namespace Files {
 
             var prefs = (Files.Preferences.get_default ());
             prefs.notify["show-hidden-files"].connect (on_show_hidden_files_changed);
-            prefs.notify["show-remote-thumbnails"].connect (on_show_thumbnails_changed);
-            prefs.notify["show-local-thumbnails"].connect (on_show_thumbnails_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 (app_settings.get_boolean ("sort-directories-first"));
@@ -1204,7 +1204,7 @@ namespace Files {
                 location = slot.directory.file.get_target_location ();
             }
 
-            window.bookmark_uri (location.get_uri ());
+            BookmarkList.get_instance ().insert_uri_at_end (location.get_uri (), "");
         }
 
         /** Background actions */
@@ -1462,11 +1462,10 @@ namespace Files {
         }
 
         private void set_should_thumbnail () {
-            var prefs = Files.Preferences.get_default ();
             if (slot.directory.is_network) {
-                should_thumbnail = slot.directory.can_open_files && prefs.show_remote_thumbnails;
+                should_thumbnail = slot.directory.can_open_files && app_settings.get_boolean ("show-remote-thumbnails");
             } else {
-                should_thumbnail = prefs.show_local_thumbnails;
+                should_thumbnail = app_settings.get_boolean ("show-local-thumbnails");
             }
         }
 
@@ -2056,6 +2055,9 @@ namespace Files {
                 ));
             }
 
+            var bookmark_action = (SimpleAction) common_actions.lookup_action ("bookmark");
+            var bookmark_list = BookmarkList.get_instance ();
+
             if (get_selected_files () != null) { // Add selection actions
                 var cut_menuitem = new Gtk.MenuItem ();
                 cut_menuitem.add (new Granite.AccelLabel (
@@ -2211,10 +2213,12 @@ namespace Files {
                         menu.add (rename_menuitem);
                     }
 
-                    /* Do  not offer to bookmark if location is already bookmarked */
-                    if (common_actions.get_action_enabled ("bookmark") &&
-                        window.can_bookmark_uri (selected_files.data.uri)) {
+                    var already_bookmarked = bookmark_list.contains (
+                        new Bookmark.from_uri (selected_files.data.uri, "")
+                    );
 
+                    /* Do  not offer to bookmark if location is already bookmarked */
+                    if (common_actions.get_action_enabled ("bookmark") && !already_bookmarked) {
                         menu.add (bookmark_menuitem);
                     }
 
@@ -2271,9 +2275,12 @@ namespace Files {
                         menu.add (new SortSubMenuItem ());
                     }
 
+                    var already_bookmarked = bookmark_list.contains (
+                        new Bookmark.from_uri (slot.directory.file.uri, "")
+                    );
+
                     /* Do  not offer to bookmark if location is already bookmarked */
-                    if (common_actions.get_action_enabled ("bookmark") &&
-                        window.can_bookmark_uri (slot.directory.file.uri)) {
+                    if (common_actions.get_action_enabled ("bookmark") && !already_bookmarked) {
 
                         menu.add (bookmark_menuitem);
                     }
@@ -2313,40 +2320,51 @@ namespace Files {
 
         private class SortSubMenuItem : Gtk.MenuItem {
             construct {
-                var name_radioitem = new Gtk.CheckMenuItem.with_label (_("Name"));
-                name_radioitem.action_name = "background.sort-by";
-                name_radioitem.action_target = "name";
-                name_radioitem.draw_as_radio = true;
-
-                var size_radioitem = new Gtk.CheckMenuItem.with_label (_("Size"));
-                size_radioitem.action_name = "background.sort-by";
-                size_radioitem.action_target = "size";
-                size_radioitem.draw_as_radio = true;
-
-                var type_radioitem = new Gtk.CheckMenuItem.with_label (_("Type"));
-                type_radioitem.action_name = "background.sort-by";
-                type_radioitem.action_target = "type";
-                type_radioitem.draw_as_radio = true;
-
-                var date_radioitem = new Gtk.CheckMenuItem.with_label (_("Date"));
-                date_radioitem.action_name = "background.sort-by";
-                date_radioitem.action_target = "modified";
-                date_radioitem.draw_as_radio = true;
-
-                var reversed_checkitem = new Gtk.CheckMenuItem.with_label (_("Reversed Order"));
-                reversed_checkitem.action_name = "background.reverse";
-
-                var folders_first_checkitem = new Gtk.CheckMenuItem.with_label (_("Folders Before Files"));
-                folders_first_checkitem.action_name = "win.sort-directories-first";
-
-                submenu = new Gtk.Menu ();
-                submenu.add (name_radioitem);
-                submenu.add (size_radioitem);
-                submenu.add (type_radioitem);
-                submenu.add (date_radioitem);
-                submenu.add (new Gtk.SeparatorMenuItem ());
-                submenu.add (reversed_checkitem);
-                submenu.add (folders_first_checkitem);
+                var name_item = new MenuItem (
+                    _("Name"),
+                    Action.print_detailed_name ("background.sort-by", new Variant.string ("name"))
+                );
+
+                var size_item = new MenuItem (
+                    _("Size"),
+                    Action.print_detailed_name ("background.sort-by", new Variant.string ("size"))
+                );
+
+                var type_item = new MenuItem (
+                    _("Type"),
+                    Action.print_detailed_name ("background.sort-by", new Variant.string ("type"))
+                );
+
+                var date_item = new MenuItem (
+                    _("Date"),
+                    Action.print_detailed_name ("background.sort-by", new Variant.string ("modified"))
+                );
+
+                var reversed_item = new MenuItem (
+                    _("Reversed Order"),
+                    "background.reverse"
+                );
+
+                var folders_first_item = new MenuItem (
+                    _("Folders Before Files"),
+                    "win.sort-directories-first"
+                );
+
+                var radio_section = new Menu ();
+                radio_section.append_item (name_item);
+                radio_section.append_item (size_item);
+                radio_section.append_item (type_item);
+                radio_section.append_item (date_item);
+
+                var check_section = new Menu ();
+                check_section.append_item (reversed_item);
+                check_section.append_item (folders_first_item);
+
+                var menu_model = new Menu ();
+                menu_model.append_section (null, radio_section);
+                menu_model.append_section (null, check_section);
+
+                submenu = new Gtk.Menu.from_model (menu_model);
 
                 label = _("Sort by");
             }

src/View/Sidebar/BookmarkListBox.vala

@@ -45,6 +45,10 @@ public class Sidebar.BookmarkListBox : Gtk.Box, Sidebar.SidebarListInterface {
             refresh ();
         });
 
+        bookmark_list.contents_changed.connect (() => {
+            refresh ();
+        });
+
         list_box.row_activated.connect ((row) => {
             if (row is BookmarkRow) {
                 ((BookmarkRow) row).activated ();
@@ -58,7 +62,7 @@ public class Sidebar.BookmarkListBox : Gtk.Box, Sidebar.SidebarListInterface {
         });
     }
 
-    public BookmarkRow? add_bookmark (string label,
+    private BookmarkRow? add_bookmark (string label,
                                                string uri,
                                                Icon gicon,
                                                bool pinned = false,

src/View/Sidebar/SidebarWindow.vala

@@ -230,14 +230,6 @@ public class Sidebar.SidebarWindow : Gtk.Box, Files.SidebarInterface {
         });
     }
 
-    public void add_favorite_uri (string uri, string custom_name = "") {
-        bookmark_listbox.add_favorite (uri, custom_name);
-    }
-
-    public bool has_favorite_uri (string uri) {
-        return bookmark_listbox.has_uri (uri);
-    }
-
     public void on_free_space_change () {
         /* We cannot be sure which devices will experience a freespace change so refresh all */
         device_listbox.refresh_info ();

src/View/Window.vala

@@ -739,14 +739,6 @@ public class Files.View.Window : Hdy.ApplicationWindow {
         }
     }
 
-    public void bookmark_uri (string uri, string custom_name = "") {
-        sidebar.add_favorite_uri (uri, custom_name);
-    }
-
-    public bool can_bookmark_uri (string uri) {
-        return !sidebar.has_favorite_uri (uri);
-    }
-
     private void move_content_to_new_window (ViewContainer view_container) {
         add_window (view_container.location, view_container.view_mode);
         remove_content (view_container);
@@ -799,12 +791,13 @@ public class Files.View.Window : Hdy.ApplicationWindow {
     }
 
     private void action_bookmark (GLib.SimpleAction action, GLib.Variant? param) {
+        var bookmark_list = BookmarkList.get_instance ();
         /* Note: Duplicate bookmarks will not be created by BookmarkList */
         unowned var selected_files = current_container.view.get_selected_files ();
         if (selected_files == null) {
-            sidebar.add_favorite_uri (current_container.location.get_uri ());
+            bookmark_list.insert_uri_at_end (current_container.location.get_uri (), "");
         } else if (selected_files.first ().next == null) {
-            sidebar.add_favorite_uri (selected_files.first ().data.uri);
+            bookmark_list.insert_uri_at_end (selected_files.first ().data.uri, "");
         } // Ignore if more than one item selected
     }