From 34c5d33eb0842bbff858cb1657fd028df0824f43 Mon Sep 17 00:00:00 2001 From: electrikmilk Date: Tue, 11 Jan 2022 21:50:45 -0500 Subject: [PATCH] Base+Userland: Add various icons Add new icons to menus, add existing icons that could be used in menus. --- Base/res/icons/16x16/code.png | Bin 0 -> 2065 bytes Base/res/icons/16x16/inspect.png | Bin 0 -> 1981 bytes Userland/Applications/Browser/BrowserWindow.cpp | 6 +++--- Userland/Applications/FileManager/main.cpp | 2 +- Userland/Applications/ImageViewer/main.cpp | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 Base/res/icons/16x16/code.png create mode 100644 Base/res/icons/16x16/inspect.png diff --git a/Base/res/icons/16x16/code.png b/Base/res/icons/16x16/code.png new file mode 100644 index 0000000000000000000000000000000000000000..1918fbb6cdd068c942c3e62fd04c598ed88e5035 GIT binary patch literal 2065 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdn`UJR*x37`TN&n2}-D90>*n zcBRaah>{3jAFJg2T)o7U{G?R9irfMQ5U{bYC`e4sPAySLN=?tqvsHS(d%u!GW{Ry+ zxT&v!Z-H}aMy5wqQEG6NUr2IQcCuxPlD(aRO@&oOZb5EpNuokUZcbjYRfVk**j%f; zVk?lazLEl1NlCV?k|W4Mg$UmO1?T*tR0VTAL)~Np0|NzfOTE;TM583*w8Uf`1tS9^ zLw!R-eM56yLvt%5V=F^T1t?ImQ?MyYNwW%aaf4b{l#*tvlu=SrV5P5LUS6(OZmgGI zl&)`RX=$l%V5Dzkq+67drdwQ@SCUwvn^&w1Gr=XbIJqdZpd>RtPXT0NVp4u-iLH_n z)YyvL0=Thx#n6yS&d=4aNG#Ad)H4A23hdpKWVpJ5(xM!&kGF7t6Oq&;Z_uvxR#aRS6v)ZS&*t9lv;wQlT6Z#j0|Iy4mp{2 z3J?~=AbtEcf)lBgM<&Pxl~8+wQwyQ2oJ<99y0l762IV(frDRY-OHEON3TI-85#mA= zVr+RvY98L?2T@j>pH@X~qzqwTY-J435ac-?8nnq7iFxU%DYi=bO5}To zxZDA8CpPb(QU+tIX_n~F(p4KRj(qqfB^(->?;Zqle1Gx6p~WYGxKbf-tXS8q>!0n zs}yePYv5bpoSKp8QB{;0T;&&%T$P<{nWAKGr(jcIRgqhen_7~nP?4LHS8P>bs{}UJ zDzDfIB&@Hb09I0xZL8!6vQQzyH$cHTzbI9~T+dK9*}%X+!Q4_WH6_s~$v7=BSx3Rh zz{pVF&`{sdT-VUt%E;Kt&{6>klz9|8>y;bp zKhp88yV>qrKIT=SLT%@R_NvxE5l51Ni9w;$}A|!%+FH*nV6WAUs__T zqy#m#BDVl;Y+f-mq>}S<^(zt!^bPe4K)wQdHzgUauAsCi2W)vtvVLk#YHn&?NwL16 zo*`UqK}LQ_esM-V4x{1HC>B)Y7Wn$Y?ZE1m++4U7#U-v~CHPerhg24%>IbD3=a&{G zr@EG<=9MUeyj@`BT$Gwvl3x^(pPvJZs{ojj6^xAa3>7qd6O%LZK%US<(vs?uSdwb1 z1d2CZLnB>d!w^GDD`PV&Q!`xyQ!4`lh*IDDl+3hBxKbls14CUy!w@4wD>Ib3SVC< z&%EN2#JuEGPZwLIirfOd%*+(4WXsePQ-fqPUE@?s16`9;Q%hY-O9KO4OA|u_15?v9 zOH(sTn0}Z1kdv;%n)z-7ON;{3Fd z^2DN4$Mn>^5+V|~J}&1MCzj!NJaNeh;wre~ab*aIGEyB64cg?4#Ju#>6k8>IC6IT( zaSMqUee^g3%OMquumlj~;s#=Z3vp0^Zl{2#DN^%NY?X?X?Cmr&UL-OwFjNHigt#&= zF#P}jpMilv)@ou%-rhC`zgiUQVwsCDbtuV24m{l*O&Hf`RtY4hgI zo40JQ4p1phb?%%)vz<~n?4;(yr@ZjOYhmRaR za`foY6DN+JIB{aZqO%eV3=B*qL4Lsu3}utgS}-s$)Oor%hDcnFJ$GBE$$*FD!iJTP zmPWY>9_9G@?|*&9a+8R=+vm)@%NfYQ;HCMf@7A&-qD0OBWb6rx~o0HPYzha$8UZ>*?y}vd$@?2>|Dko^t>I literal 0 HcmV?d00001 diff --git a/Userland/Applications/Browser/BrowserWindow.cpp b/Userland/Applications/Browser/BrowserWindow.cpp index 366d817a48..32e95e7127 100644 --- a/Userland/Applications/Browser/BrowserWindow.cpp +++ b/Userland/Applications/Browser/BrowserWindow.cpp @@ -197,7 +197,7 @@ void BrowserWindow::build_menus() }); m_view_source_action = GUI::Action::create( - "View &Source", { Mod_Ctrl, Key_U }, [this](auto&) { + "View &Source", { Mod_Ctrl, Key_U }, Gfx::Bitmap::try_load_from_file("/res/icons/16x16/code.png").release_value_but_fixme_should_propagate_errors(), [this](auto&) { active_tab().m_web_content_view->get_source(); }, this); @@ -211,7 +211,7 @@ void BrowserWindow::build_menus() m_inspect_dom_tree_action->set_status_tip("Open inspector window for this page"); m_inspect_dom_node_action = GUI::Action::create( - "&Inspect Element", [this](auto&) { + "&Inspect Element", Gfx::Bitmap::try_load_from_file("/res/icons/16x16/inspect.png").release_value_but_fixme_should_propagate_errors(), [this](auto&) { active_tab().show_inspector_window(Tab::InspectorTarget::HoveredElement); }, this); @@ -222,7 +222,7 @@ void BrowserWindow::build_menus() inspect_menu.add_action(*m_inspect_dom_tree_action); auto js_console_action = GUI::Action::create( - "Open &JS Console", { Mod_Ctrl, Key_I }, [this](auto&) { + "Open &JS Console", { Mod_Ctrl, Key_I }, Gfx::Bitmap::try_load_from_file("/res/icons/16x16/filetype-javascript.png").release_value_but_fixme_should_propagate_errors(), [this](auto&) { active_tab().show_console_window(); }, this); diff --git a/Userland/Applications/FileManager/main.cpp b/Userland/Applications/FileManager/main.cpp index 76767218c4..41f6ee5fbe 100644 --- a/Userland/Applications/FileManager/main.cpp +++ b/Userland/Applications/FileManager/main.cpp @@ -970,7 +970,7 @@ ErrorOr run_in_windowed_mode(String const& initial_location, String const& TRY(view_menu->try_add_separator()); TRY(view_menu->try_add_action(action_show_dotfiles)); - auto go_to_location_action = GUI::Action::create("Go to &Location...", { Mod_Ctrl, Key_L }, [&](auto&) { + auto go_to_location_action = GUI::Action::create("Go to &Location...", { Mod_Ctrl, Key_L }, Gfx::Bitmap::try_load_from_file("/res/icons/16x16/go-to.png").release_value_but_fixme_should_propagate_errors(), [&](auto&) { toolbar_container.set_visible(true); location_toolbar.set_visible(true); breadcrumb_toolbar.set_visible(false); diff --git a/Userland/Applications/ImageViewer/main.cpp b/Userland/Applications/ImageViewer/main.cpp index f1c44cbb8b..125035befb 100644 --- a/Userland/Applications/ImageViewer/main.cpp +++ b/Userland/Applications/ImageViewer/main.cpp @@ -157,17 +157,17 @@ ErrorOr serenity_main(Main::Arguments arguments) widget->rotate(Gfx::RotationDirection::Clockwise); }); - auto vertical_flip_action = GUI::Action::create("Flip &Vertically", { Mod_None, Key_V }, + auto vertical_flip_action = GUI::Action::create("Flip &Vertically", { Mod_None, Key_V }, TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/edit-flip-vertical.png")), [&](auto&) { widget->flip(Gfx::Orientation::Vertical); }); - auto horizontal_flip_action = GUI::Action::create("Flip &Horizontally", { Mod_None, Key_H }, + auto horizontal_flip_action = GUI::Action::create("Flip &Horizontally", { Mod_None, Key_H }, TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/edit-flip-horizontal.png")), [&](auto&) { widget->flip(Gfx::Orientation::Horizontal); }); - auto desktop_wallpaper_action = GUI::Action::create("Set as Desktop &Wallpaper", + auto desktop_wallpaper_action = GUI::Action::create("Set as Desktop &Wallpaper", TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/app-display-settings.png")), [&](auto&) { auto could_set_wallpaper = GUI::Desktop::the().set_wallpaper(widget->path()); if (!could_set_wallpaper) {