Merge branch 'main' into danirabbit/preferences-rmthumbnails

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 ();

src/View/AbstractDirectoryView.vala

@@ -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 */
@@ -2055,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 (
@@ -2210,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);
                     }
 
@@ -2270,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);
                     }

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
     }