From 2a96ff70ef028929608b2b8b768ca0f6c52e088d Mon Sep 17 00:00:00 2001 From: cage Date: Sun, 5 Feb 2023 14:57:31 +0100 Subject: [PATCH] - [GUI] added a few icons. --- LICENSES.org | 4 ++-- data/icons/fmw_back.png | Bin 0 -> 3310 bytes data/icons/fmw_go.png | Bin 0 -> 2458 bytes data/icons/fmw_open_tour.png | Bin 0 -> 1932 bytes data/icons/fmw_refresh.png | Bin 0 -> 1664 bytes data/icons/{search.png => fmw_search.png} | Bin src/gui/client/icons.lisp | 28 ++++++++++++++++++---- src/package.lisp | 7 ++++-- 8 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 data/icons/fmw_back.png create mode 100644 data/icons/fmw_go.png create mode 100644 data/icons/fmw_open_tour.png create mode 100644 data/icons/fmw_refresh.png rename data/icons/{search.png => fmw_search.png} (100%) 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 0000000000000000000000000000000000000000..c67eb3b916a2161c4eccc6b63eccccc2dc5e333e GIT binary patch literal 3310 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%0Dax9WlYY#q2>Gfjgzc<(6{=w7C zG0oekKeNv<#VpRjMls)O#~ZJTnn~8jhLB>hBF0elrr8kbwuW4b?mb?w9-}n=5z6IV zy3e6c1#m;{&q6-vWQ~xxcVqG6l*^BpX6<_X_6l{4h5L|rl)jPv8{sV;+ry2kN literal 0 HcmV?d00001 diff --git a/data/icons/fmw_go.png b/data/icons/fmw_go.png new file mode 100644 index 0000000000000000000000000000000000000000..7b800f1b2281266f64f3a5b5be97b5018f2ad114 GIT binary patch literal 2458 zcmV;L31#+)P)cs$Ij@e%-Bu}Vv$n7CTT5Z z3WW{<0*E9^L0CcpOOnkd+4tVJ=fAt_BqVguj(2kQ?%tdGf8ROhJLmkD!<`*`@y4bX z3{GBRK&mq>jxKTF>{}Li9uO?;uwbc8y_*;Rk}jHexNdrl+aF@lrVsWAl56?GX;)A; zC5-zf_9NdBVVnp$^*IpF!%1H;nlF^#@I^07E%Hv_)rG6*w*J2o;7VTJvm`0!H$1%{ zh_zohj}oaIhUI`_#t<|72y6d@FPw|cfpTajkJ|CgD3b1ns!qV0EtBwvmIBCX;IW=< zPc+$K`Y#9w-c5i0U6IGL?wPuKQCF3~7}sSa%?pU>20DX_(4QzlQr8hyWhBVQbG?8& z|4B?O`y;$k1*+YTpw+h$TbtZSMtipRYBE`c&s{|qo5!G(M<@^Y~=oyrI&SJ^byK(e#^?Y&m z;;h)Qw+@dMiJ=5I?+@yix(dA8H$PE}ngS8gWFA6F0Ys@4f!O^BB}<`_ycE+yToYh$ z{irT|8iL%0!T5BX^RLFmp2tZSz0kO$$Z{OVS7+wn&?i%BrJ9G&##;7Y8lmnX-?MaA z@qzDuX%@WM0ufDUjrI z$j$u~C9nswdUme6woJJ+WiE_YE!6Oa!tWPS?^olO}+-D6g7ni%X^N79T<=F&7#lP|=5C&w6k| zJDl0?lKP{lELn%n!3UsHwDPjs(9!=CL@{RjcA{e&O5Oi}Del1Xd*6ZJC|b&}ZjAt6 z^5U-bpPy9uMKQM!_Z9I_$a|J&)szuaD-ll2AnzN9L>~dg$zqg$Kdy%!rb@^|W$~}^ zr&C0h;uK0$(~>HctZuh~v)8{vBpTt#p$LT*Azbx%Ja+u;k28W~5pclaTr_!XF{#=B z{gJ>dB? z#Rc)ebqN46Be#NxeJTvI{cJ7AhZ%0142$g8;4Uk8<(DD<=da^Ae51Vl24eTh+B z_a-ztOC&%RekMXdOGhAKN;a@&#VNcB86{Kp!y)?2CTQwS)KH0gUvh!NF7h$4{V+(RB;vqR6oEu@B##fB1r zaCAy&Zt4Nwwspa@KoTOe$cP=Mp(D7!)&&maw$BrZn4q&~o; z+D724c8n3-n}Lh8O3RfuDAdcqSqUOW1Wd~&L7${_1!ua}BAB41cx|*s#6uFVVD9HO zp)10pGs3`0(Fze!RJ3(HXOCQ-8#+WR+t{^%L^-Yozf8Yk1gDemh${1*oY(D0=oq9f z`f`I0l8_upfFn2hqJ@}Twi_C0;9A&3cg)0~qERFi^vBB(ij~_WQlJ(DDqtyX=Q=m0 zz-dP444hmyNJE+>levi!l|IMz4G9vhK7xQ{#Y3li13VIHA!b!>w}lrXL4*~9YMvIg zRD9xp*7iu?Qz38l{REBY-y_d!(HovY&zRJhm}p77>`ay5)Q{nz=om~zd|B@ntVycIj$bcAq|83J7F z^k1&z%wO?cBfEy8ke>#(hMB6%M4|>`JqJ)x+y-y%hnQFWQ@q}Cg35?PY2L?F33<34 znMqyLL1pVC0o+89x*OkmXg%`HUFZw8;lj^;^G(7GW_C-g4^W#yNFTg;I20_X%PlN{ zsaxrMr&P|m8mj=qkWhd8JaXg?j4y14Q@VuN3F;pwfexfZdJnh8eg^4@!+MCpyF4xRyA((`+xI{tA^xokY-F$)tzWQivx|XU|c%P_B8xRsjUIL47B&|#O&&CfS2A_ z#{V1#-+c+oG6YyY2Kx`Z)*zQw&g2CCN!eRLA?56?9A_6_3f%6l7JGmiiecDg6w_}E zX|5R2s4}5u&t3}dMrHXl)ol#S-0J0hmap6=g1zfHYyxiQ)8gQ6x=TQI6Cm6^fL zhW%U7OuON*yvO0ESr6OzTa7&D#FW~2B58^We0}Zc_2VO?+Q{&fk!g{W4Xr{}PM2Iz z`XC!RI<2f*T)N4?24-7v!R$hrz7KO|I1#gMLL{(ZMu0p4vys6Ol0d&BlAt-bYV`Ect<@H=@q{VWG_jwqlk4d^H9zx5UE|4D#LM=UE1ni%bE`QHKz Y0ApyNRt<{907*qoM6N<$f(4wKp8x;= literal 0 HcmV?d00001 diff --git a/data/icons/fmw_open_tour.png b/data/icons/fmw_open_tour.png new file mode 100644 index 0000000000000000000000000000000000000000..24dc1dded3c462a6c68c0197d84272cc410f3c72 GIT binary patch literal 1932 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 KMNUMnLSTZocMvN8 literal 0 HcmV?d00001 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