From 9802b18dc9e47b272d4f107623096550fa5e5cb7 Mon Sep 17 00:00:00 2001
From: cage <cage@invalid>
Date: Sat, 18 Feb 2023 13:02:56 +0100
Subject: [PATCH] - [GUI] added 'up' button.

---
 data/icons/fmw_uparrow.png      | Bin 0 -> 732 bytes
 src/gui/client/icons.lisp       |   7 ++++++-
 src/gui/client/main-window.lisp |  33 ++++++++++++++++----------------
 src/package.lisp                |   3 ++-
 4 files changed, 25 insertions(+), 18 deletions(-)
 create mode 100644 data/icons/fmw_uparrow.png

diff --git a/data/icons/fmw_uparrow.png b/data/icons/fmw_uparrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c463bc1a9aa3aedd1b3c818de661a7c6b50b640
GIT binary patch
literal 732
zcmV<20wev2P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!en~_@RCwCNS50UWK@|RGH;L^*QSstI
zDWWF@MGqns3jS0?R79mW?Mdj>L+}TWq686oD)dwZg+MWgLLk+Hg&aHx3K0dxUxXr-
z9)#9xc6WSlb~o8wVzV3K<dH9%H@o}Zx9@$knGsS-tY$)pcEg#`+n9xc({S;)as}sT
z%x-sKr}*lE)zHSw!#DBh#sf&(dN29NK96@5KP3S#`9sKs#iw$1en=hJ{}+i)@kNRj
zaPs2tHk`dUGKFWaCz{tB*)xTEFD6j^gwpftI8Q@P(iS8okUdtw*8@Y?d}d!BFFzFM
zg!(|;O<((W<WYK6K=mU^bJtoVdO;w2;tm!LZpX%>JI7G_UPQwQ&T#_ocb1C3Ys(ns
z-WD<c4(0MyoMK`2g24Kdcd_KS6pgTA0rxM>pz>zCNnmvM3@%KMV=zb4!=PRfo?ON{
zy8U;j_!%TH3bvOH8wj~Ww@?<shUEGSuLbOL1uA(QC$~;mBp69zCn2y*_(J&Mli<2}
z;R6wf=2LzqED;)nm0l6Be1y#Pl8cb<87KdV6qZ3s<D8CLj}TyApgYTSbCb&j3AMnD
z7wCTzaHJirfVA}za1m{R@^ukV8X%Div!y}h>(+quGfMP91Fozi{K(4JE<!Wr_eF&0
zg9ts*SrGz`ehpZWzZ&K1oQACWV4>9XwN^mbQ4I*~B8;^_w+8IkEU<OIio<V0^hX2U
ze*rJ|Sd8pLI|0LAiRmW5D_%3#z?y+zJ?QzSp@)EMETcL(T^n}Y)}Ue3z~jL_C6%U9
z?vB?Iwh}hQ$n%Tf7vUT41=8$}(-PpMgM<M@CZc-sKmJnOPD9|Y00RJ#t#lR{Lm0gP
O0000<MNUMnLSTYrY);1j

literal 0
HcmV?d00001

diff --git a/src/gui/client/icons.lisp b/src/gui/client/icons.lisp
index a82cf88..6460585 100644
--- a/src/gui/client/icons.lisp
+++ b/src/gui/client/icons.lisp
@@ -12,6 +12,8 @@
 
 (a:define-constant +refresh+     "fmw_refresh"   :test #'string=)
 
+(a:define-constant +up+          "fmw_uparrow"   :test #'string=)
+
 (defparameter *search*      nil)
 
 (defparameter *back*        nil)
@@ -22,6 +24,8 @@
 
 (defparameter *refresh*     nil)
 
+(defparameter *up*     nil)
+
 (defun load-icon (filename)
   (let ((path (if (not (re:scan "(?i)png$" filename))
                   (res:get-data-file (fs:cat-parent-dir +icon-dir+
@@ -36,4 +40,5 @@
   (setf *back*      (load-icon +back+))
   (setf *open-iri*  (load-icon +go+))
   (setf *open-tour* (load-icon +open-tour+))
-  (setf *refresh*   (load-icon +refresh+)))
+  (setf *refresh*   (load-icon +refresh+))
+  (setf *up*        (load-icon +up+)))
diff --git a/src/gui/client/main-window.lisp b/src/gui/client/main-window.lisp
index c84de9a..c026e04 100644
--- a/src/gui/client/main-window.lisp
+++ b/src/gui/client/main-window.lisp
@@ -154,6 +154,10 @@
     :initform nil
     :initarg  :reload-button
     :accessor reload-button)
+   (up-button
+    :initform nil
+    :initarg  :up-button
+    :accessor up-button)
    (go-button
     :initform nil
     :initarg  :go-button
@@ -176,28 +180,25 @@
   (with-accessors ((iri-entry     iri-entry)
                    (back-button   back-button)
                    (reload-button reload-button)
+                   (up-button     up-button)
                    (go-button     go-button)) object
     (gui:configure object :relief :raised)
-    (setf iri-entry
-          (make-instance 'gui-mw:autocomplete-entry
-                         :master                object
-                         :autocomplete-function (autocomplete-iri-clsr object)))
-    (setf back-button (make-instance 'gui:button
-                                     :master object
-                                     :image  icons:*back*))
-    (setf reload-button (make-instance 'gui:button
-                                       :master object
-                                       :image  icons:*refresh*))
-    (setf go-button (make-instance 'gui:button
-                                   :master object
-                                   :image  icons:*open-iri*))
+    (setf iri-entry (make-instance 'gui-mw:autocomplete-entry
+                                   :master                object
+                                   :autocomplete-function (autocomplete-iri-clsr object)))
+    (setf back-button   (make-instance 'gui:button :master object :image icons:*back*))
+    (setf reload-button (make-instance 'gui:button :master object :image icons:*refresh*))
+    (setf go-button     (make-instance 'gui:button :master object :image icons:*open-iri*))
+    (setf up-button     (make-instance 'gui:button :master object :image icons:*up*))
     (gui-goodies:attach-tooltips (back-button   (_ "go back"))
+                                 (reload-button (_ "reload address"))
                                  (go-button     (_ "go to address"))
-                                 (reload-button (_ "reload address")))
-    (gui:grid back-button   0 1 :sticky :nsw :padx +minimum-padding+)
+                                 (up-button     (_ "one level up")))
+    (gui:grid back-button   0 1 :sticky :nsw)
     (gui:grid iri-entry     0 2 :sticky :we :padx +minimum-padding+)
-    (gui:grid go-button     0 3 :sticky :e :padx +minimum-padding+)
+    (gui:grid go-button     0 3 :sticky :e)
     (gui:grid reload-button 0 4 :sticky :e)
+    (gui:grid up-button     0 5 :sticky :e)
     (gui:grid-columnconfigure object 2 :weight 2)
     object))
 
diff --git a/src/package.lisp b/src/package.lisp
index 88d8555..97af4fe 100644
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -3279,7 +3279,8 @@
    :*back*
    :*open-iri*
    :*open-tour*
-   :*refresh*))
+   :*refresh*
+   :*up*))
 
 (defpackage :validation
   (:use