Added bookmark button class

Author: beef331

src/bookmarks.py

@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from gi.repository import Gio, GLib, GObject
+from gi.repository import Gio, GLib, GObject, Gtk
 
 from . import logger
 from . import utils
@@ -79,3 +79,32 @@ def toggle_bookmark(self, button, path):
         else:
             self._add_bookmark(path)
         self._save_bookmarks()
+
+class PortfolioBookmarkButton(Gtk.Button):
+    __gtype_name__ = "PortfolioBookmarkButton"
+
+
+    def __init__(self, bookmarks):
+        Gtk.Button.__init__(self)
+        self.connect("clicked", self._on_bookmark_toggle)
+        self._bookmarks = bookmarks
+        self.props.icon_name = "bookmark-filled-symbolic"
+
+    def _change_icon(self):
+        if self._bookmarks.is_bookmarked(self._path):
+            self.props.icon_name = "bookmark-filled-symbolic"
+        else:
+            self.props.icon_name = "bookmark-outline-symbolic"
+
+    def _on_bookmark_toggle(self, button):
+        self._bookmarks.toggle_bookmark(button, self._path)
+        self._change_icon()
+
+    @property
+    def path(self):
+        self._path
+
+    @path.setter
+    def path(self, path):
+        self._path = path
+        self._change_icon()

src/window.py

@@ -43,7 +43,7 @@
 from .files import PortfolioFiles
 from .menu import PortfolioMenu
 from .settings import PortfolioSettings
-from .bookmarks import PortfolioBookmarks
+from .bookmarks import PortfolioBookmarks, PortfolioBookmarkButton
 from .trash import default_trash
 
 
@@ -62,7 +62,7 @@ class PortfolioWindow(Adw.ApplicationWindow):
     paste = Gtk.Template.Child()
     select_all = Gtk.Template.Child()
     select_none = Gtk.Template.Child()
-    bookmark = Gtk.Template.Child()
+    bookmark_box = Gtk.Template.Child()
     new_folder = Gtk.Template.Child()
     delete_trash = Gtk.Template.Child()
     restore_trash = Gtk.Template.Child()
@@ -150,7 +150,7 @@ def _setup(self):
         self.select_all.connect("clicked", self._on_select_all)
         self.select_none.connect("clicked", self._on_select_none)
         self.new_folder.connect("clicked", self._on_new_folder)
-        self.bookmark.connect("clicked", self._on_bookmark_toggle)
+
         self.close_button.connect("clicked", self._on_button_closed)
         self.go_top_button.connect("clicked", self._go_to_top)
         self.stop_button.connect("clicked", self._on_stop_clicked)
@@ -185,6 +185,10 @@ def _setup(self):
         self.files.sort_order = self._settings.sort_order
         self.content_inner_box.append(self.files)
         self._bookmarks = PortfolioBookmarks()
+
+        self._bookmark_button = PortfolioBookmarkButton(self._bookmarks)
+        self.bookmark_box.append(self._bookmark_button)
+
         places = PortfolioPlaces(self._bookmarks)
         places.connect("updated", self._on_places_updated)
         places.connect("removing", self._on_places_removing)
@@ -227,11 +231,8 @@ def _populate(self, directory):
         self._worker.connect("finished", self._on_load_finished)
         self._worker.connect("failed", self._on_load_failed)
         self._worker.start()
+        self._bookmark_button.path = directory
 
-        if self._bookmarks.is_bookmarked(directory):
-            self.bookmark.props.icon_name = "bookmark-filled-symbolic"
-        else:
-            self.bookmark.props.icon_name = "bookmark-outline-symbolic"
 
     def _paste(self, Worker, to_paste):
         directory = self._history[self._index]
@@ -867,14 +868,6 @@ def _on_new_folder(self, button):
         directory = self._history[self._index]
         self.files.add_new_folder_row(directory)
 
-    def _on_bookmark_toggle(self, button):
-        path = self._history[self._index]
-        self._bookmarks.toggle_bookmark(button, path)
-        if self._bookmarks.is_bookmarked(path):
-            self.bookmark.props.icon_name = "bookmark-filled-symbolic"
-        else:
-            self.bookmark.props.icon_name = "bookmark-outline-symbolic"
-
     def _on_restore_trash_clicked(self, button):
         selection = self.files.get_selection()
         paths = [default_trash.get_orig_path(path) for path, ref in selection]

src/window.ui

@@ -361,17 +361,10 @@
                                           <object class="GtkBox" id="navigation_tools">
                                             <property name="halign">end</property>
                                               <child>
-                                              <object class="GtkButton" id="bookmark">
-                                                <property name="sensitive">1</property>
-                                                <property name="receives-default">1</property>
+                                              <object class="GtkBox" id="bookmark_box">
                                                 <child>
-                                                  <object class="GtkImage">
-                                                    <property name="icon-name">bookmark-outline-symbolic</property>
-                                                  </object>
+                                                  <placeholder/>
                                                 </child>
-                                                <style>
-                                                  <class name="tool-button"/>
-                                                </style>
                                               </object>
                                             </child>
                                             <child>