diff --git a/LICENSES.org b/LICENSES.org index 08ec531..dfe5e81 100644 --- a/LICENSES.org +++ b/LICENSES.org @@ -545,8 +545,8 @@ use or other dealings in these Data Files or Software without prior written authorization of the copyright holder. -- data/icons/search.png - https://commons.wikimedia.org/wiki/File:Farm-Fresh_magnifier.png +- data/icons/fmw_*.png FatCow Web Hosting [CC BY 3.0 us (https://creativecommons.org/licenses/by/3.0/us/deed.en)], via Wikimedia Commons + https://commons.wikimedia.org/wiki/Farm-Fresh_web_icons diff --git a/data/icons/fmw_back.png b/data/icons/fmw_back.png new file mode 100644 index 0000000..c67eb3b Binary files /dev/null and b/data/icons/fmw_back.png differ diff --git a/data/icons/fmw_go.png b/data/icons/fmw_go.png new file mode 100644 index 0000000..7b800f1 Binary files /dev/null and b/data/icons/fmw_go.png differ diff --git a/data/icons/fmw_open_tour.png b/data/icons/fmw_open_tour.png new file mode 100644 index 0000000..24dc1dd Binary files /dev/null and b/data/icons/fmw_open_tour.png differ diff --git a/data/icons/fmw_refresh.png b/data/icons/fmw_refresh.png new file mode 100644 index 0000000..fdf20e2 Binary files /dev/null and b/data/icons/fmw_refresh.png differ diff --git a/data/icons/search.png b/data/icons/fmw_search.png similarity index 100% rename from data/icons/search.png rename to data/icons/fmw_search.png diff --git a/src/gui/client/icons.lisp b/src/gui/client/icons.lisp index ceb3eeb..ae6fa62 100644 --- a/src/gui/client/icons.lisp +++ b/src/gui/client/icons.lisp @@ -1,10 +1,26 @@ (in-package :icons) -(a:define-constant +icon-dir+ "/icons/" :test #'string=) +(a:define-constant +icon-dir+ "/icons/" :test #'string=) -(a:define-constant +icon-search+ "search" :test #'string=) +(a:define-constant +search+ "fmw_search" :test #'string=) -(defparameter *icon-search* nil) +(a:define-constant +back+ "fmw_back" :test #'string=) + +(a:define-constant +go+ "fmw_go" :test #'string=) + +(a:define-constant +open-tour+ "fmw_open_tour" :test #'string=) + +(a:define-constant +refresh+ "fmw_refresh" :test #'string=) + +(defparameter *icon-search* nil) + +(defparameter *icon-back* nil) + +(defparameter *icon-go* nil) + +(defparameter *icon-open-tour* nil) + +(defparameter *icon-refresh* nil) (defun load-icon (filename) (let ((path (if (not (re:scan "(?i)png$" filename)) @@ -16,4 +32,8 @@ (gui:make-image data))))) (defun load-icons () - (setf *icon-search* (load-icon +icon-search+))) + (setf *icon-search* (load-icon +search+)) + (setf *icon-back* (load-icon +back+)) + (setf *icon-search* (load-icon +go+)) + (setf *icon-search* (load-icon +open-tour+)) + (setf *icon-search* (load-icon +refresh+))) diff --git a/src/package.lisp b/src/package.lisp index f7fe268..a8073a4 100644 --- a/src/package.lisp +++ b/src/package.lisp @@ -3268,8 +3268,11 @@ (:gui-utils :nodgui.utils)) (:export :+icon-dir+ - :load-icon - :load-icons)) + :*icon-search* + :*icon-back* + :*icon-go* + :*icon-open-tour* + :*icon-refresh*)) (defpackage :client-menu-command (:use