From 5692fa6c3938d8e49c3ad4b5c82d0eabead1f419 Mon Sep 17 00:00:00 2001
From: Ben Wiederhake <BenWiederhake.GitHub@gmx.de>
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 b86a1c11802..27b03061aac 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
zcmZvaeQ4EX6vxlKQ#W<H8cdhbi|7N|8XA|C+d_18O%KMnT}G~9p_pN<V?`+nIW`ro
zWiyU{6fDOWZJ_2G(n)U6h7;6=&d5|cu32-anYty~Xz0_qSCHM^e(*fcd44?S`Fzj!
zJfB3%7Uqn5WE=qG;G#&()`^LcHOA&AZu#W^84!J`e1UC!a`@!pZRZo8s)`6R6A>ah
z=M+Ey7=Qo}z*$z>FI5l$W*`DYaQ}BmK?Q_?2?zn5-ISJ=j`t$UEJTb*&Ut1f5=6F`
zND;*XM77zZdKDEGCMG0w=)?;vlMpgGa_pIuP|&d>PpEdnp+}d@R~<n^k>NmMe!w(;
z?qf|$f^7VB^Sl>T7O_MmvJ<RIBFJnpsoMP(psLNzr>Xbil~qU>nM^NxB^4C5I>;-k
zSbgZ#>P}>*!pxcBJTveC(wcjpYElfG#HTq2sm|GUcqxe{dln@YBz8#PbcEMnLWkK6
zBswAkSv;{KSq~T-rIwp`BkYBgQLJ+aWOb&#287i9m`G3tA+X~fM1ci}?b(V4R+9h*
zN`77W!BGH#_b^ggUeww0b6eGs`MK=_H(TE5oK_f}x$#O*^r4q0=4F;H{G#l!yK~})
z<E^K&*M43!ID1_nFZ2DYXWQCi+d{GMU`gSYFI!)^vZ=j$=)!~>-J|bKSyEH?Yw^Xv
z;f&vEy3U+0n0KmgOvRaNYj&0A2Md}nwAA;;_kDc4G!p9gJqnj&UEk^Ty<ayko%L>Q
zFj~~RzUGIsCD;F0-w1P?<}{qF9{jLmQqzR~+`iD*dEcC?3OrtW?CI<kJ?}glemL9x
zJ!AUr)sOBtvH9(9>sG!B=UU%-y`go=_cw>uHEtz^;^`aqfA-?0*sjgXKiU!d^XPLs
zLzPv<cXFmK3LT(^pH>~MZp$3Z>gazVQa1Tu!KYKRAed2c^703~Js7R5s#$XJna&M8
znH7QDc=wH2uk}^#m5jRi1KaZIpNjVm6jjfx@6GD}>ij@)NB5<Jt7}*8`Gwy+^kjSZ
z$Gcba{~dLpc4*a+@%@eQrh@I)n#1?XZ!aEl|BPPyS2+I?6&^}70T+}-_C3FB<9~Ss
BJ4yfm

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
zcmZux4KS5i7(SPjSe6)ylv$t1UfD|4$R<)behR~~B}KIT>@l{B$|!BEwB7E|(N=0@
z!d`=k+BnL+mSv=2Q=5i3lE|HqpYnIH`S#FEL-x#f&Uw$7_dU<^KJPi-FW%d>YH1j0
z006Y0o2xIIO{cp0d^U<=V}}4x1>T;1o7s||?)>z`vlTzpD5ZoDj4?t8LdbC(1%Lp6
z0YCsi05}#kXNyum2*4O11Rw<5|2a`W2_P6?1P}y}V<*iCn+wkqLNO)?VF(e&@fcHt
z2!xo~2vG<LGa#gFWK?-dD8U3Hj39y><OokN#fTt?A%{53V?+@oki#6}5v0t6gFNJ>
z<0<_F4H7aF5Mlfglj-vTmT{RvX83c(<9R|UCWHk-gqR1W6cGY3W;UXfozDzNDH}O{
z4tt*P6jOo-h8Quvn5T#mNHEI-@f1?R@`F5Oc~3>p24l+1#A5<}gk;72fXb*a;A!|d
z%7NL+vE|HEri#pCLJ=kqVGbg|(NDAnjOYxx0V4F12#5)fFolTK00R!qPIu~#V4fg~
zAz_t+0I@u0-v$U~*N2e=6a#_)bLRn}026>PyS9V}m@*200Zq3@Rx0z@TforO*)OoN
z_wstTr8^f_$FCKQ9Ju7~6VT)z<ZAdCC%IBlQB${7Pv6XChq&-u48CvvEb#2F2V4S;
zol%_rxl<XY8Kz%YY8;FVP+PafurV#A-J$hft1RhmYpwOWL{(AU%h88p3i+gJ*>L>D
z3`?5?o!tpKhAw9{z3Tr|vEluL{r%N8))$U$T$-%Nuyhadxi~s%<9+>F01z5@lnRE1
zhr2X2H4jHbY#SLGdc8#^Jutjak$Ut&O-+rO_L~@4P;hWVr<s?R*Ai!KTd&&Vzd5gv
ztC;?*RDaOa)KpepGWmUUSeWaAtcUw1_J^+Rydjr68Y>%~KetZl8X5VP6cxd?ojyK3
z<bt!*@v5{`?Uh0yy{>MzCN(|1QP36T@M42ze3_|Jabe+uK%ul&zeFy7nwOi)4SeTw
z@%*vq&`=k(+@9`k9T&@-k-N2>zTG`Nf?Qci$<xWn$=wQLBO{QTc;<{BqpNYU-^0UW
z%`S;V0^9z`$jEryKWeCQIY-&ivG<rrv{zBKK;<Wu=p#oORppjKp{K*U!9h`eL4jak
zEDq$malW^Tivz%2{5Cr~TN$^(<wkO9ysmcQH&)3#!?8c!3tFh!($ey{xw)pi9Dt^#
zcww7ZEN+QXrlpzm_4QpzO%<40SX8@N1*o|O2QM=an}?jt%rskJVX?%-#N0^I9_1iN
z_B|JMG_f+|Zzo`P?cwW16@_|>YSjB8?H}7}t?cZmwOF}aectOgZ?bOR{%5grQ#$CY
ztE)R(6}nJW-_Wq0QjhR(a|3b0e%pglRRZ6)F|xEhUn#xIN=w%*>j%Mt!}0M>T~>C>
za}FIkv?w{Ecw*gvgGsAUk9W7Www3^=ikFeO>nC514GieCZ9Q?~L{?T7XWc41J$lqp
zw<t5SW1ju9=4SWx<>TWH<<1E8LXl`NWlSoS>Y3fK>Fw=Zvn(mw(Y+u)f9UE}qlIy+
zO{%slB#$Pvli5FgrK)h%s_v6f_DlOc>j%Sv)dnWs*Ox;}efN^|_P6$xm6aNi?J=@!
z$%yB%&er<lDzBbA@vRWvuda^XxZ`HS_9QJh|KHQUzXQ4jjbDCkXE$jO783H;Ek9jx
zRr}Zik4w4*An;~`L8YU%wsv=3Uf$vG@Xhm2JKxFq0fxD+ZCfqN{5;9J$j8tBeeywZ
zc#U!1xI`y(N4@PX_NlMdl8+@UPdTrAF}{6RFE&5I=z^$l@zgVgo42{<yX-mjA9qAe
A#sB~S

literal 0
HcmV?d00001

diff --git a/Demos/Eyes/main.cpp b/Demos/Eyes/main.cpp
index 11bcea21e98..80f16e403c0 100644
--- a/Demos/Eyes/main.cpp
+++ b/Demos/Eyes/main.cpp
@@ -26,8 +26,12 @@
 
 #include "EyesWidget.h"
 #include <LibCore/ArgsParser.h>
+#include <LibGUI/AboutDialog.h>
 #include <LibGUI/Application.h>
+#include <LibGUI/Menu.h>
+#include <LibGUI/MenuBar.h>
 #include <LibGUI/Window.h>
+#include <LibGfx/Bitmap.h>
 
 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<EyesWidget>(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();