From 5692fa6c3938d8e49c3ad4b5c82d0eabead1f419 Mon Sep 17 00:00:00 2001 From: Ben Wiederhake Date: Sun, 26 Jul 2020 23:14:33 +0200 Subject: [PATCH] Eyes: Introduce and use icons The icons are made using a screenshot which was then scaled down. The 16x16 icon needed some light post-processing to look good. --- Base/res/apps/Eyes.af | 4 ++++ Base/res/icons/16x16/app-eyes.png | Bin 0 -> 1205 bytes Base/res/icons/32x32/app-eyes.png | Bin 0 -> 1751 bytes Demos/Eyes/main.cpp | 16 ++++++++++++++++ 4 files changed, 20 insertions(+) create mode 100644 Base/res/icons/16x16/app-eyes.png create mode 100644 Base/res/icons/32x32/app-eyes.png diff --git a/Base/res/apps/Eyes.af b/Base/res/apps/Eyes.af index b86a1c1180..27b03061aa 100644 --- a/Base/res/apps/Eyes.af +++ b/Base/res/apps/Eyes.af @@ -2,3 +2,7 @@ Name=Eyes Executable=/bin/Eyes Category=Demos + +[Icons] +16x16=/res/icons/16x16/app-eyes.png +32x32=/res/icons/32x32/app-eyes.png diff --git a/Base/res/icons/16x16/app-eyes.png b/Base/res/icons/16x16/app-eyes.png new file mode 100644 index 0000000000000000000000000000000000000000..ed3b272e09d053bdb350a85aa9b0e94e003c0801 GIT binary patch literal 1205 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!to83KGlTp1V`{)6#IWMm%-DMK?R$l+YGn2F>IT}Fe#TI*OS3hg+YY@L)(80>;G@tc6-vKZMnIVJUw$& zRQ^wzbUQb9o2Ta_6_x+Fxwkz%x2dT7_w>B2qViuw<@W#E+iq{0v~5!Eq+HKjPZdv< zZU47Tx;-g(TdwCMPnBGiN&hG1-p=*h=BYACCHH@>=WS1wZ7QDsJypQ^Z{J3<&2!r} zWD9dAO@iAwDK{5l?KV$Okj*M8|NmpS{{R1Nw{K6{wk>zkB+uMjmH+=I-M*c>ZJXz$ zNh<&U=ia{Uxow-u|Nox1Z>#+Ouks(m_5Zj1zdh;pw%l!#JSXL<pR;TRCY`F2vSt+dTjOR{>j(5poQu zA;*AjI)lppN!xDcPTJ;~J4wYemqFz=T39o9ZbJ@khTLtp(R6rD+V($p(rwS&Z7QCV z7*ujmy$ebslm2hZy*vpc#^_mll=zH7&>WfyqLCRqH?uV55sFMN4z|AC+$z96F?RwivTmW91& zK5+N<9sYNBS^r6fH+0>ye89Ma`Ch~MD>roP&pl;}xbnJmWr!A&&Z0X@`yTIF*Kxwp zh41jg0EXv5=eOT}yLQQ<7`^;PrT~k_l@0r@S-pK!Igi11f%)vSbw5h1L>KUX5P8bS zX}{)rHltkQaRZ*@`#EMt5FNG>+UXT;{Gsi*8-jX*Ncq)g?#n?t@53< X?2VDulU$R{ph)m^^>bP0l+XkKc?3I3 literal 0 HcmV?d00001 diff --git a/Base/res/icons/32x32/app-eyes.png b/Base/res/icons/32x32/app-eyes.png new file mode 100644 index 0000000000000000000000000000000000000000..7b3e9da2644799f9ef560be66e0d73da7e508a35 GIT binary patch literal 1751 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANOK3;{kNt_%ze|H1e_nEKD~ zpW#0U+`fH#+qP|!CQZuC&Gq#3R8dj6&A_mYfngE@LoNe@Cj)~D0|Ntw(Cym{+qN-G zn#7Qs%i!tBpn^@&ZHC+17`9Dfn3T(q>&f7$!l1%{q3u70_5ZhRyFF>rw%puFo}RfX zD*q=+f-EkdwSkhQTeZ;a{K@7ZMU~g+BPY7Qm$vNr;4Y_ zw*T8E-JX=YE!T6Br%JBMr2mt0Z|8b$^HiCnlKVf`^R}nTHWknRo+@Ddw{N4_=DBSf zvW2;mCc*8Tl$#5&cAKXs$YvFl|Nk*u|NsBC+qWle+m<_Nl4owN%K!h9Zr{$`w#{?W zB$faFb8p}F+_p{S|9{Whw^jcCSNV_O`v2Sh-=1`PTkf_=o|AG_a{o{Ie>?Z~HqUL7 zR3`n;{eRo@_BNGm|2_ZTR=Ewv=Qd>fa&srat(-I|7h>zSZJz)CtAMS?2ssAS zkYhkMok8XQq;0ozCvEf0ouuNK%b;=_Evy+lw;=~NL+-ZQXgWM6ZTp`)>9%L?HWklF z3@W*(-UX$RN&mOy-k#*SEmvidCqu3ZM*J|K#t*~)Z49?3F>K3anB>XupJCf=hDqBP zawjo(GHmfX+KyZd+CJFWYvow@kj!|!K*KHKw;dH>h?DT_4pTLt1<1;m{?xP340 zW77X08W$SM>Tr3>cL$jX&lYKT#RN|I{#`#{-t2G&9Wn2{j9JNf0eZ(-ZEZuNW+9T*t6ZKC5cn_0{D zvOanCY}q^xGozXF=U-=hSz>kHj=O%pg8lX_TTVpiEITc-YtNo5t5>a3`4Aa6rKhqq zDana-)$3QU1e`Qhe%o>SY0#_JuNhbE-nHw>zkmPYpGiweF|2BDYYRDb>J(SQdv9-V zquAcwUe5=c7A;zI;r(}Urs*qxJbs*9SzMg_Y(G0wBU5R4`E}+!8ag^YR-Zn9E?&2O zJ>!R;H4N)KRDw2a-yY7eW75av%a{MCv2$8DVP?G`U%Rc=gx6oI3U|hEGT*s#=fbU9 zrw$xoV7Pg+Ugtq~clVu=A9Lr*zI*p>#>|8#JW`z8x}8CR#R7( zl$BML>U~sV#W*3TtE8g+aN-$z2D8~`UkDxAA}n-@<6VKp1ruJ)r;ksoYsz!5ym<3w z$;OQrC4M;1XLxt++_{dUNu10g;^LQY-}X*TRTb-Q%`nL-Im#IHv26F;1cM&|`}giO zm3z++$5>QfZ~s!uOnzl{cDB%jyzReDKUm4$(-HpfrK_vk%V2-#VZkcve-D3t_#p7W zy{@iq$&w{1y7zRNzgO4@Ze6_iF^k2GTerNd5B&ONb-*z<_pN7f@#o1umn~Z+th`zO z?c29Ta{bF~ywA)00b=f)42%JAS;>A!_Y4|9)Oi zwm;2FKQRcdzpia=X7*1kB{A{fh7iH-qmO>FdruQw&k(Wpn%H3*K0dxzt5>fsN=P|f+z4}+LKvL9Yli159u^fiHdw#acPwx3~ c|Cj$);i`3cQWJ}}NPx1br>mdKI;Vst0Cz-9#sB~S literal 0 HcmV?d00001 diff --git a/Demos/Eyes/main.cpp b/Demos/Eyes/main.cpp index 11bcea21e9..80f16e403c 100644 --- a/Demos/Eyes/main.cpp +++ b/Demos/Eyes/main.cpp @@ -26,8 +26,12 @@ #include "EyesWidget.h" #include +#include #include +#include +#include #include +#include int main(int argc, char* argv[]) { @@ -76,10 +80,22 @@ int main(int argc, char* argv[]) auto window = GUI::Window::construct(); window->set_title("Eyes"); + window->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-eyes.png")); window->set_rect(350, 270, 75 * (full_rows > 0 ? max_in_row : extra_columns), 100 * (full_rows + (extra_columns > 0 ? 1 : 0))); window->set_has_alpha_channel(true); auto& eyes = window->set_main_widget(num_eyes, full_rows, extra_columns); + + auto menubar = GUI::MenuBar::construct(); + auto& app_menu = menubar->add_menu("Eyes Demo"); + app_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })); + + auto& help_menu = menubar->add_menu("Help"); + help_menu.add_action(GUI::Action::create("About", [&](auto&) { + GUI::AboutDialog::show("Mouse Demo", Gfx::Bitmap::load_from_file("/res/icons/32x32/app-eyes.png"), window); + })); + + app->set_menubar(move(menubar)); window->show(); eyes.track_cursor_globally();