From 064c7efa00c43fffac1f10d3fd74198c960a3c4f Mon Sep 17 00:00:00 2001
From: cage <cage@invalid>
Date: Sun, 14 May 2023 17:33:31 +0200
Subject: [PATCH] - [GUI] added show bookmarks command.

---
 etc/gui.conf                             |  4 +++-
 src/gui/client/client-configuration.lisp | 19 ++++++++++++++++++-
 src/gui/client/main-window.lisp          | 13 +++++++++++--
 src/package.lisp                         |  4 +++-
 4 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/etc/gui.conf b/etc/gui.conf
index 37a8faa..1b17424 100644
--- a/etc/gui.conf
+++ b/etc/gui.conf
@@ -205,4 +205,6 @@ keybinding.back                     = "BackSpace"
 
 keybinding.up                       = "U"
 
-keybinding.bookmark                 = "Control-d"
+keybinding.bookmark.toggle          = "Control-d"
+
+keybinding.bookmark.show            = "Control-b"
diff --git a/src/gui/client/client-configuration.lisp b/src/gui/client/client-configuration.lisp
index 7f81fef..12ae738 100644
--- a/src/gui/client/client-configuration.lisp
+++ b/src/gui/client/client-configuration.lisp
@@ -40,7 +40,10 @@
                            next
                            shuffle
                            manage
-                           up)
+                           up
+                           bookmark
+                           toggle
+                           show)
 
 (defun load-config-file (&optional (virtual-filepath +client-conf-filename+)
                            (perform-missing-value-check nil))
@@ -291,3 +294,17 @@
                           +key-keybinding+
                           +key-tour+
                           +key-manage+)
+
+(swconf:gen-simple-access (keybinding-bookmark-toggle
+                           :transform-value-fn (lambda (a) (keybinding->tk-event a))
+                           :configuration-tree *client-configuration*)
+                          +key-keybinding+
+                          +key-bookmark+
+                          +key-toggle+)
+
+(swconf:gen-simple-access (keybinding-bookmark-show
+                           :transform-value-fn (lambda (a) (keybinding->tk-event a))
+                           :configuration-tree *client-configuration*)
+                          +key-keybinding+
+                          +key-bookmark+
+                          +key-show+)
diff --git a/src/gui/client/main-window.lisp b/src/gui/client/main-window.lisp
index e9fc66b..fb723bb 100644
--- a/src/gui/client/main-window.lisp
+++ b/src/gui/client/main-window.lisp
@@ -230,7 +230,10 @@
                          (_ "About")
                          #'menu:help-about
                          :accelerator (client-configuration:get-keybinding :about))
-    (gui:make-menubutton bookmarks (_ "Show") (menu:show-bookmarks-clsr main-window))
+    (gui:make-menubutton bookmarks
+                         (_ "Show")
+                         (menu:show-bookmarks-clsr main-window)
+                         :accelerator (client-configuration:config-keybinding-bookmark-show))
     (gui:make-menubutton bookmarks (_ "Manage") (menu:manage-bookmarks-clsr main-window))
     (gui:make-menubutton tour
                          (_ "Manage")
@@ -1328,10 +1331,16 @@
               (funcall (up-iri-clsr main-window)))
             :exclusive t)
   (gui:bind (gui:root-toplevel)
-            (client-configuration:get-keybinding :bookmark)
+            (client-configuration:config-keybinding-bookmark-toggle)
             (lambda (e)
               (declare (ignore e))
               (funcall (toggle-bookmark-iri-clsr main-window)))
+            :exclusive t)
+  (gui:bind (gui:root-toplevel)
+            (client-configuration:config-keybinding-bookmark-show)
+            (lambda (e)
+              (declare (ignore e))
+              (funcall (menu:show-bookmarks-clsr main-window)))
             :exclusive t))
 
 (defun init-main-window ()
diff --git a/src/package.lisp b/src/package.lisp
index 5b00e69..cac2563 100644
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -3291,7 +3291,9 @@
    :config-keybinding-tour-shuffle
    :config-keybinding-tour-manage
    :config-keybinding-tour-next
-   :config-gemtext-padding))
+   :config-gemtext-padding
+   :config-keybinding-bookmark-toggle
+   :config-keybinding-bookmark-show))
 
 (defpackage :client-os-utils
   (:use