From 10e473bf26477b8813ecb23d8dcdc4322fa9c95a Mon Sep 17 00:00:00 2001 From: electrikmilk Date: Mon, 3 Jan 2022 22:20:01 -0500 Subject: [PATCH] Base+Browser: Add Browser icons Add some missing icons to the brower. --- Base/res/icons/16x16/close-tab.png | Bin 199 -> 2996 bytes Base/res/icons/16x16/cookie.png | Bin 0 -> 2904 bytes Base/res/icons/16x16/duplicate-tab.png | Bin 0 -> 2872 bytes Base/res/icons/16x16/fullscreen.png | Bin 0 -> 3016 bytes Base/res/icons/16x16/new-tab.png | Bin 224 -> 2906 bytes Base/res/icons/16x16/tree.png | Bin 0 -> 2911 bytes .../Applications/Browser/BrowserWindow.cpp | 6 +++--- Userland/Applications/Browser/Tab.cpp | 2 +- Userland/Libraries/LibGUI/CommonActions.cpp | 1 + .../Libraries/LibWeb/Loader/FrameLoader.cpp | 2 +- 10 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 Base/res/icons/16x16/cookie.png create mode 100644 Base/res/icons/16x16/duplicate-tab.png create mode 100644 Base/res/icons/16x16/fullscreen.png create mode 100644 Base/res/icons/16x16/tree.png diff --git a/Base/res/icons/16x16/close-tab.png b/Base/res/icons/16x16/close-tab.png index 9b6a0ae0858fabd1be4671e3587311804184baa1..a647643472364348afceb64026030f76a58e079c 100644 GIT binary patch literal 2996 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 R{%e5Rww|tjF6*2UngE{kki`H1 literal 0 HcmV?d00001 diff --git a/Base/res/icons/16x16/fullscreen.png b/Base/res/icons/16x16/fullscreen.png new file mode 100644 index 0000000000000000000000000000000000000000..6d73e89b5a0bf29e19b62a9977ac4537df595d14 GIT binary patch literal 3016 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_rKYnIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhI|Z8xtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;=6Z&@$p!`n3g(u2sVRv@Nycf3$vO%~ z21bVZhKBlv=DLRFRz}8FhL#FYpk$|DQsyD7YR%GH(3X*{!c`OG3#gVFH8u<}w6rod zvobZ)H88a@Fn}oa%}>cptAr~x(ls#DH82S=GO#i*v@$V4QJPwkn37nMNKkP~vQ=7s zQEp<1tx{%gVtT56L0-C&0z7W5obz+?i+uA_Qf-xt!LIQ2werj>E=kNwPW5!LRjSA> z(96tBu`)DBH8e;{Ow=__PBhmwNwrARO|-O3)-_JCv@|eIF)~Xshxo$R*UBY7xfGP# zK>8t>FC{-YGsOyFtGQ{4Sz3yLg>IUKahk5Fv5ASUWtwTKu6a_Tv2miAsij$}8O$~Q zMVaZDd5Jm5rh;6Rl9^&JU=`%G&2`Ze4B_fFnGKjI|8L4@AQ!PYUaei7! zd16tjV|r>{2@&~1AE)#4^U6|-N)R3>NGwXsO)W_+Dz;ThE6UGRfTv-Fl6-~4f`XjP zWN?(~m*u5Ei$!=UQ^ILaabg+54s3yBnrLpAY-W&z(PSTZXhPOT?uMq+9@C!uc>({wn{}x_IBH~cXTl@ zFm!mjIEGmCZVhteJD|YBwE2Ji%-Aa-C8gbw`fl7;rUeQ4Jz`>*6zeKv+?3q?-24fr zFe`_Hiu4Cf5!bHT*`ga%&HJ`9F!-=p*REyQYrdz{CFps|)n}icgglviKr77nhkrt9 z{zsLQPxY?s{ M)78&qol`;+0FCz39smFU literal 0 HcmV?d00001 diff --git a/Base/res/icons/16x16/new-tab.png b/Base/res/icons/16x16/new-tab.png index 48f749ef684937506680797863c7ecbdf1aacc5c..c51848aae1d37e3d28f99036d5202dfb247a4d3b 100644 GIT binary patch literal 2906 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdn`UJR*x37`TN&n2}-D90>*n zu7b>vh>{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&*t9lvd=ry1^FZOM3GxM0OR7s^Nvf?9C@JY08tEDvh8S8}8Jk&| zn&}#tS{WEXl=|kUWTsWZl^W?980s2Wh8P)InVMM{7^5gnElEsCEJ-A&I3?LCEx#x? zvBXv>GdD3kRlguFT}c5Rw^q*iIr&At`6;QkO2%MU`1)FT<`tJD<|U_ky4WgJTiHqbRoHA&I6NH#XsO-VCONlCRdFg7$dg_-7Gl$oBH zmzaZWD#%qSnJHE#=H^M}$p&e6|3Kb8?tVqp?aLLR~%`48#&$CrBG((n&M3n&*XQ1q6<&jxjl3!E_ zEp38R3!$u>Oa*Wbvr0^ccp({-K2uYapu(A0B9gcugBV+$k(!4$)k2gN=ckpFCl;kT zrl;nW5RotRaXG&@u?)ZC)6z^0l8wwvbki&?Q*=#C4GeTGERzy-lgurQO^nSG4Gq#v zVV;LO9+HoYLyQcp3=FMIOknwlJjX+WHaR0PFFiHIR!LupeD4^U8JZee7#irNnWmZO znwVP}>ROs5rRrK5BpF$lr5PtC87ATI4rZ}HbMGYQ=ar=vl^|lMAh9ShH?<_SsMuC1 zttdZNA+ew!Co>tG$MnncQlRw|JliXjfjdEgiuMssbwrhY zknl%Kb+nBpeNa;YQXJ@mD`upU0>XEJgryrOcEGi%6}B>g*mM|_nr4-PRJfB?3`6YC zr?fZ+r5muvk=jgl3N~P&AQv|f6WqcBwf5{35Y5QcycAodA|-pfFrgVA85kIJ1AIbU z85kJ;|NpOEV8Xz_pq_86USO(TV6IhUX0^=Mdbz*#3P0-=0k$gx{QUg>|Ns9u@!nMi z1_tJmAirP+hChC_RWBJB7(6^(978y+CkwPNu{G{4muzU5==km3U2X$54hf?Z`YeFF6db)aBTCIwSEc5F3;7Tt1GUx7Decwt~#lU8-t!~*n zu7b>vh>{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&*t9lvd=ry1^FZOM3GxM0OR7s^Nvf?9C@JY08tEDvh8S8}8Jk&| zn&}#tS{WEXl=|kUWTsWZl^W?980s1rhZq@I8JJiZ8losoElEsCEJ-A&I3?LCEx#x? zvBXv>GdD3kRlguFT}c5Rw^q*iIr&At`6;QkO2%MU`1)FT<`tJD<|U_ky4WgJzWv*n(8K+nJ4QeS*Dnom?s&Uq^6p}^t6|3Kb8?tVqp?aLLR~%`48#&$CrBG((n&M3n&*XQ1q6<&jxjl3!E_ zEp38R3!$u>Oa*Wbvr0^ccp({-K2uYapu(A0B9gcugBV+$k(!4$)k2gN=ckpFCl;kT zrl;nW5RotRaXG&@u?)ZC)6z^0l8wwvbki&?Q*=#C4GeTGERzy-lgurQO^nSG4Gq#v zVV;LO9-fa3tPBjTOiW<;h&;zbgEl!MF)uwe#a2mQiG1&v8K#;T8yY9-rllqu>6(}s zr0OObr<&_p7+Iz!8KxQgMZRt!Vz&!@CF z2c;XZ$C27hb_zCNp&%DG5EIuup>e8Owx9>a?%;DX}z`(##666;QYME}H zoHmPrfg#k>#W95Ada^+q6I(JnGt1#4Mset_status_tip("View source code of the current page"); m_inspect_dom_tree_action = GUI::Action::create( - "Inspect &DOM Tree", { Mod_None, Key_F12 }, [this](auto&) { + "Inspect &DOM Tree", { Mod_None, Key_F12 }, Gfx::Bitmap::try_load_from_file("/res/icons/16x16/tree.png").release_value_but_fixme_should_propagate_errors(), [this](auto&) { active_tab().show_inspector_window(Tab::InspectorTarget::Document); }, this); @@ -343,7 +343,7 @@ void BrowserWindow::build_menus() auto& debug_menu = add_menu("&Debug"); debug_menu.add_action(GUI::Action::create( - "Dump &DOM Tree", [this](auto&) { + "Dump &DOM Tree", Gfx::Bitmap::try_load_from_file("/res/icons/16x16/tree.png").release_value_but_fixme_should_propagate_errors(), [this](auto&) { active_tab().m_web_content_view->debug_request("dump-dom-tree"); }, this)); @@ -360,7 +360,7 @@ void BrowserWindow::build_menus() debug_menu.add_action(GUI::Action::create("Dump &History", { Mod_Ctrl, Key_H }, [this](auto&) { active_tab().m_history.dump(); })); - debug_menu.add_action(GUI::Action::create("Dump C&ookies", [this](auto&) { + debug_menu.add_action(GUI::Action::create("Dump C&ookies", Gfx::Bitmap::try_load_from_file("/res/icons/16x16/cookie.png").release_value_but_fixme_should_propagate_errors(), [this](auto&) { auto& tab = active_tab(); if (tab.on_dump_cookies) tab.on_dump_cookies(); diff --git a/Userland/Applications/Browser/Tab.cpp b/Userland/Applications/Browser/Tab.cpp index fbae641717..a347db0906 100644 --- a/Userland/Applications/Browser/Tab.cpp +++ b/Userland/Applications/Browser/Tab.cpp @@ -332,7 +332,7 @@ Tab::Tab(BrowserWindow& window) m_tab_context_menu->add_action(GUI::CommonActions::make_close_tab_action([this](auto&) { on_tab_close_request(*this); })); - m_tab_context_menu->add_action(GUI::Action::create("&Duplicate Tab", [this](auto&) { + m_tab_context_menu->add_action(GUI::Action::create("&Duplicate Tab", Gfx::Bitmap::try_load_from_file("/res/icons/16x16/duplicate-tab.png").release_value_but_fixme_should_propagate_errors(), [this](auto&) { on_tab_open_request(url()); })); m_tab_context_menu->add_action(GUI::Action::create("Close &Other Tabs", [this](auto&) { diff --git a/Userland/Libraries/LibGUI/CommonActions.cpp b/Userland/Libraries/LibGUI/CommonActions.cpp index 91cfba08af..8fbd5aaa1d 100644 --- a/Userland/Libraries/LibGUI/CommonActions.cpp +++ b/Userland/Libraries/LibGUI/CommonActions.cpp @@ -100,6 +100,7 @@ NonnullRefPtr make_fullscreen_action(Function callback, C { auto action = Action::create("&Fullscreen", { Mod_None, Key_F11 }, move(callback), parent); action->set_status_tip("Enter fullscreen mode"); + action->set_icon(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/fullscreen.png").release_value_but_fixme_should_propagate_errors()); return action; } diff --git a/Userland/Libraries/LibWeb/Loader/FrameLoader.cpp b/Userland/Libraries/LibWeb/Loader/FrameLoader.cpp index e0c2d559f9..025b0b160e 100644 --- a/Userland/Libraries/LibWeb/Loader/FrameLoader.cpp +++ b/Userland/Libraries/LibWeb/Loader/FrameLoader.cpp @@ -30,7 +30,7 @@ FrameLoader::FrameLoader(HTML::BrowsingContext& browsing_context) : m_browsing_context(browsing_context) { if (!s_default_favicon_bitmap) { - s_default_favicon_bitmap = Gfx::Bitmap::try_load_from_file("/res/icons/16x16/filetype-html.png").release_value_but_fixme_should_propagate_errors(); + s_default_favicon_bitmap = Gfx::Bitmap::try_load_from_file("/res/icons/16x16/app-browser.png").release_value_but_fixme_should_propagate_errors(); VERIFY(s_default_favicon_bitmap); } }