From 27109c346783a7812b39699dce20cd2bf2a0bf54 Mon Sep 17 00:00:00 2001 From: thankyouverycool <66646555+thankyouverycool@users.noreply.github.com> Date: Tue, 7 Jul 2020 07:04:06 -0400 Subject: [PATCH] Base+Help: Add new Help app icons This adds a new 32x32 Help application icon, a new open book icon, copies the current book icon as Help's 16x16 icon, and updates the Help application file to reflect these changes. --- Applications/Help/main.cpp | 7 ++++--- Base/res/apps/Help.af | 4 ++-- Base/res/icons/16x16/app-help.png | Bin 0 -> 399 bytes Base/res/icons/16x16/book-open.png | Bin 0 -> 271 bytes Base/res/icons/32x32/app-help.png | Bin 0 -> 1489 bytes 5 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 Base/res/icons/16x16/app-help.png create mode 100755 Base/res/icons/16x16/book-open.png create mode 100755 Base/res/icons/32x32/app-help.png diff --git a/Applications/Help/main.cpp b/Applications/Help/main.cpp index 9a2a7a1cb4..ba7098fc1c 100644 --- a/Applications/Help/main.cpp +++ b/Applications/Help/main.cpp @@ -75,7 +75,10 @@ int main(int argc, char* argv[]) unveil(nullptr, nullptr); + auto app_icon = GUI::Icon::default_icon("app-help"); + auto window = GUI::Window::construct(); + window->set_icon(app_icon.bitmap_for_size(16)); window->set_title("Help"); window->set_rect(300, 200, 570, 500); @@ -189,7 +192,7 @@ int main(int argc, char* argv[]) auto& app_menu = menubar->add_menu("Help"); app_menu.add_action(GUI::Action::create("About", [&](const GUI::Action&) { - GUI::AboutDialog::show("Help", Gfx::Bitmap::load_from_file("/res/icons/16x16/book.png"), window); + GUI::AboutDialog::show("Help", app_icon.bitmap_for_size(32), window); })); app_menu.add_separator(); app_menu.add_action(GUI::CommonActions::make_quit_action([](auto&) { @@ -205,7 +208,5 @@ int main(int argc, char* argv[]) window->set_focused_widget(&tree_view); window->show(); - window->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/book.png")); - return app->exec(); } diff --git a/Base/res/apps/Help.af b/Base/res/apps/Help.af index 6f71baa998..1555aa6815 100644 --- a/Base/res/apps/Help.af +++ b/Base/res/apps/Help.af @@ -4,5 +4,5 @@ Executable=/bin/Help Category=Utilities [Icons] -16x16=/res/icons/16x16/book.png -32x32= +16x16=/res/icons/16x16/app-help.png +32x32=/res/icons/32x32/app-help.png diff --git a/Base/res/icons/16x16/app-help.png b/Base/res/icons/16x16/app-help.png new file mode 100644 index 0000000000000000000000000000000000000000..3d4abff783777e2ea779fc69a05e426d04700735 GIT binary patch literal 399 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7!#rIaLo7~joviKc;wW;w zzWlqLT|;5_S%rvPwrbJSqZ+T2)>#z4 zGraS+oS7>ycnuqdx!A*SLWUpc_gFM)G?t$p)+OQWv4~r z%CPjh|4kNs+^Sz%Z1&eanP~3!KEisZW2oV=FZ1`TyeJqucg2fWF0Suq_rCYMV$l~G zdR1caVKtNX8tz`hRjYo@zNqKWuuyQXqWnwq_y5x3n>#;Ritb`^VPIfj@O1TaS?83{ F1OVy(u`&Pv literal 0 HcmV?d00001 diff --git a/Base/res/icons/16x16/book-open.png b/Base/res/icons/16x16/book-open.png new file mode 100755 index 0000000000000000000000000000000000000000..6248e0ba293620f7fa9772152309170cf2d28705 GIT binary patch literal 271 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7u6epRhFF~5J6V^H$xxs* z-rSa-tu>4Hq!ot+U&Fz|#<>?cM7Vlcgsz<0$#ADtSY+dF-|fG}r?vQRow;xN^_gNC zic0N*DpPMnS)X!YE|~nC`&fz{r{KyD0U0vaOLiC@b8wM5q@#Ui=1x<`-Va(+Hz=$Z z3zd3WEwEfcDI!}rF>1x!!232FLf$4d4wZ?(B|r_%T{t6*bC374Q<8$ry|V9T0N4Ic ajP{*gx%x}Eb}=w8FnGH9xvXgB<=H*Q&aVXbzq7XS2)MQODStwJ$Uie3VNj%!$0${%Ofx?Vf(aN+8SyhFR9 zZ=?lY*6Qe(efKM8-X-=Z*N_i8^8&qADBM`Iz#;SWnUDRFYHM?s^9u>@f08CQbLam1 zw$JB%p380jJao$ZrIWeXwHGkkw%bZp6uvy$vDN2ys9a%ZUH6R1jr%vIiOv(Q@&Dk$ zQE}+jTI=7XdBy=1xlg@n{0q(r6*N6>X(+BZ_o(vF{p^3&)!QUF_N>~(qlYdPXkW|KZgsBLlYcQ7K1m_DGsHZkO7h@~r;ar+=D^eDj4= z)Tekw88nnTo#Fhx_e0orpUd_??g#L^ov5)n+~(k$mzPhPd^q~;EsvD-G@k{P0TZU) zRQ&cVZPMI%US0CtE$_MKMdVfPS|)t^n`B&I+p5GP55=a{mrh7*HagMsy8hQg_RjA& z?{6!(-}iUU-5W& z{_j6^efrtd>|o>BX)$hDrwg4N1Tr-CHZgzy->EEgg@$ zepOhz^I_7iQ&X$=E8B}&aIJlBTKxXdPoA6qS?dz@R)_A)xNpA1=8yQZsndcu*5q2d z9sVu7@!G>R2Zg&u4|XPAd#ukWaXb2)|C-HwHRmgjJlK6i=$!4;MBn*>pBA+=F*;>B z{fCYK7}|Mg=w%ITyi)7s7XI&aCFubS{#pyjrkLZ&zQ) z{ll{)YTm87&e48YCvwx0)eg(&NV`5RU8FIu_zAD9mz4mM(>cLjjcc=RD7HDf_Z$Ab zAb4zx>j^LRn|#Xt@;+Vf1vcIZ*te3~M)88?^Hmb2Gb$oE#WsHy?%TReh|$b$|GbUe zc`Eh(#>E&aqo3t{NUvMwr|NGkYu3+a2_uF7Z5Wk$|~XY3uxS&RqOuVz0Ph z!B*vqf8C=)LccCpwQl!sv$fuZyPh3-`0K@*Lfb>u92txFMa0F+yUtu%>dmMjIkUUi z$wOy*%JPj7eFZ1K=iXQ`$^18eOOqzUkBc0U)6YLyIcvIP><{jDvB8&Fx z^{Mo3vqke<*4dfQ@0p_@eJQB&*#kkb6`wAgv;9-}J@4L~Pki$EYn7AVr}OAb9D2L= z!2FmW((Cl^OZ<+QGJomT-FyMDv3GOb*Q{FgN@dfBNr4;Bt$6V0c3#$tkV_frFRJfs z%qtH1@#^RFO%FP+3(ubTI@kD>rc$}DCHsBPHJlgwo?E`F(X-rBb8m@X0fX><&g2c3 zX76rQ>prnbQvAW14HeF@K|fAiN~#MFyqd~Vuyr@z3}Mwot$)B;M8k|E(}oQ<`d#UENyNqCelX&w76C;_DmNZ`U$lczrKBpdl!- z`?*f2r%R8ajnU_%cX9vI=BN2xKfdq=L&%=J&Wv^1uLZSZU3v_4W)~`Un_uDmv2gi% zZ^pfkFBw+(pS0|>O?mkxe*Tr>M-8rG{