From 4bfed6a5ede4595301285c0d6fc89ea461cfdde2 Mon Sep 17 00:00:00 2001 From: electrikmilk Date: Sun, 6 Feb 2022 21:33:20 -0500 Subject: [PATCH] Base+Browser: Add Browser Icons Add or insert some missing browser icons. --- Base/res/icons/16x16/clear-cache.png | Bin 0 -> 3289 bytes Base/res/icons/16x16/history.png | Bin 0 -> 3326 bytes Base/res/icons/16x16/layers.png | Bin 0 -> 3044 bytes Base/res/icons/16x16/spoof.png | Bin 0 -> 3065 bytes Base/res/icons/16x16/trash-can.png | Bin 0 -> 3186 bytes Userland/Applications/Browser/BrowserWindow.cpp | 13 +++++++------ Userland/Applications/Browser/IconBag.cpp | 7 +++++++ Userland/Applications/Browser/IconBag.h | 7 +++++++ 8 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 Base/res/icons/16x16/clear-cache.png create mode 100644 Base/res/icons/16x16/history.png create mode 100644 Base/res/icons/16x16/layers.png create mode 100644 Base/res/icons/16x16/spoof.png create mode 100644 Base/res/icons/16x16/trash-can.png diff --git a/Base/res/icons/16x16/clear-cache.png b/Base/res/icons/16x16/clear-cache.png new file mode 100644 index 0000000000000000000000000000000000000000..a69ce4889de94dfa771fb6116ec939ad690e62c2 GIT binary patch literal 3289 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 QgE}Y-p00i_>zopr0LH<4e*gdg literal 0 HcmV?d00001 diff --git a/Base/res/icons/16x16/layers.png b/Base/res/icons/16x16/layers.png new file mode 100644 index 0000000000000000000000000000000000000000..acfc7ca5210bf1cce526e2a21b69584d1e7581db GIT binary patch literal 3044 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_rL#nIRD+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$|DQsyD72bec{Tn8k?I7S6y7{b~$Vk_~P}jgD#L&db z$jHjbOxM8F%D@1k)Hk&xF(t7i5m~X3u7O#Ik%5(gnU$#tisJl~%(O~^N>h@p((;RP z6H9EBGIJBtQ}qk-(!sX*`dWGB6_+IDC8v72*eX@z7U*SWrdXvICncFBnI`Ebo1_@( znxrPD>LwanSm+v?n4}sRCYmHBrx?NXyW}UAf|3z_6lR)#QD%B(USbZisUTOSWTsdpB^j9{ zB_&(xCYhzC=$a&^8tPi47@F!@CL5TUSR|X7nV6(1DIn~1&d8-tHfl87m`6q zIW8UBUO8QFVdnYY1#nK?z(pcBX%*asJ#3;>7H!0b`0+a(xQ_WHg%?y%Ev3Un;`9X8< zB=){cY%bZ8z^?b zwY3$tGJ)817?hf3m4Z}1kXDjI?9ZpPMgXN7u*Z>_S9S_EV4)xvHxLut7z8y8?Gz9# z&eXgVTcsi;d%GL^otzmM7~XrjIEGmCE}iV?#q22H8sGVVF-h#5bHE3tdkU*xb+dfm z+4e+i-JH<82dpfrDesm1n!LmB`|g_i?n_T&jYh_b|MFK|w|hR4iRCeM<}fmz8M)u{ zQsB!L^F2{Qe7ShkLsExvXsd^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$|DQsyD72bec{Tn8k?I7S6y7{b~$Vk_~P}jgD#L&db z$jHjbOxM8F%D@1k)Hk&xF(t7i5m~X3u7O#Ik)f5LnU$$2isJl~%(O~^N>h@p((;RP z6H9EBGIJBtQ}qk-(!sX*`dWGB6_+IDC8v72*eX@z7U*SWrdXvJB^wweTBhozSr}RB znxrPB=vo-18S5scq$HXcC8ea9C7QwXyW}UAf|3sz_#ffG39iMD!X>6Qq zWUiZRU}&mql4fS1n`CaBtZS5LY-W~ZoM@hGWC`;;R>zxK85qMd9C?n125oXiVqSV` zimj5q68YXSGPX>yG&V8QH8wUg*ELBsx6ngT2z9Fp@PJs#N5=9)S_ZrrL>~_T!qAff}G4`a30ey%S(Y)Y49AZP?E2JD6en^ zTS{tCCQ>>;wgv741uEJ{Fx3%Pd_uw>In~iTn)E@f3P^FF53cx;N(uhcc1Y*-+P->c03R3+*T1gJEKcCVX0hDgQ9!F|k*(un7g@Rn%KumCB5Y#ZVQ$Vyh zQ}a@6m5P+??XJFlJ)MDpk;T)+F~p*G>SRMdW=9^^`QgiX{gjjQUf-eid@Z{NE6^z~1jcR$}f&>R!&%FeJRoUfp$?%?y&d)uY@)Mm~6a{tY{ zOJ*+=KW8puJYs85zW3An{_T!g`|lQPt`Rqut}){+tSsu**_Aqacx6uM{^xU%IdrPVvp)=mOAAYyCmz`eYMgtz`njxgN@xNA DF#h;d literal 0 HcmV?d00001 diff --git a/Base/res/icons/16x16/trash-can.png b/Base/res/icons/16x16/trash-can.png new file mode 100644 index 0000000000000000000000000000000000000000..4294d792e813655292e74b25b062b5d883370e0a GIT binary patch literal 3186 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_th|%#etZ2wxwokg&dz0$52&wylyQ$U=n(-v9;Y{GwC^b3H@dWCH^O1#?Ti)RaV{B;&NiWE}+~ z10zFyLqmN-b6rDoDGe1uOWMX1cerbuV zk`mO|irfOYv3bSNkV?+a)vrh_&^OdG0Qm~+-IQdwx`NW89I)jn$@-}|sky0nCB^!N zdWLYd6}bhzzHsGOjm^!4t1d2aEi1vVx;Uh=AXPsowK%`DC^^-&EH$r08RmoHlAu&X z&|tL;ReMls8eDThMt(_taYjClK!8i51Vu?^8V(CVGAK$@D>88?1zt7K$gWTb0gsB2&nVrXJz zWMpMzrfXnoWnchN>YG}Un37nMh^pAoFvP&X%Gkup*Z@UweoAIqB|)Vr$yRCkMY)M3 zwn~|~iRr2O1$pUU+kAbkJoAc667!N%JzZ>-Dsl_-GBZ=Gl2c8Sjm?csbW@U3EOkv% z(@b?OO$<|X4b0OLO_B@@(~=TRVftP2lS@I#3Zx&B$x`x@GgGYK@nL0ZX=Y?;W{{|B zVQgWcn`~&3tea?@oT6)Jm}Zz_kYs9Po|XzT&A%u!Ju@#c2ia7Rt5Pyktdf$9Op=n4 zEp?O3Qd4wI5>pLzEm90kbuE((%uFnj&CExlq}nREr{<*=WhN^GxjQL91(g&)NyEy&C^I#$BoUMuZIuk6f)Su}ol^=CG&eFZ zFfhCn8)5?duBB?VC8vI09bxF9h()mF*O)YRA%Djtwok(v|Xl9`*D zSDcxjXRBmrhAb0_Dg!F{K-t;KBeS?9zo-&gFa@U;LRmSP3g8@Um6#0iLNX{Rr=}=D zg)_0F1>!;-Vr+RvY98JM4pCN|pH@AJ=<^1BrGW?EDHnlW1PBt>v zO*Swz)ip^ov(Qa4H%`_yN;EbzOEOM0Pd2iIc^<3dO|1-!VHu7*$3ufQIU_MIJvGHv zNneS4?<6Ig8YY@pChDf88ky;uq!^g$CR!$2>ZYZdCz)BKnHwh=CE@UnWr&fXm8qeX z3B3HExp$KD^U6|-N)RzrkXV$Mn_7}uRBWr1R+OKskXTTVlbH<8WBO%zDbOkno`V%i z@)Z!}70zHwNiE7mN(accz@4B#Mf(V*I`gDN%OqnHBi$5>#6(>a0|QIlq$E=lU9%L+ zL_;GZQzL^kgTWI`1ieFCZ2(D5sF?^$tp!m=Y6*Zn6X}B*Ns!V_AKZ>XD)=CL7f8}@ z10^?*yBj8MLPu>uuzbT8;A*R+k)D; zb_$3FbZTCTtx}Paz1_swL3bD!7}j~ZIEGmC9u2$e^jpWbygZpYGM(p^ic->s4mWY!S%%T+4_U%NNL^>2>iO3uE?y|bcS5>`Vbz6J Ur_`QX=Ad4Ir>mdKI;Vst00;02od5s; literal 0 HcmV?d00001 diff --git a/Userland/Applications/Browser/BrowserWindow.cpp b/Userland/Applications/Browser/BrowserWindow.cpp index ba84ef87d9..f5866d7666 100644 --- a/Userland/Applications/Browser/BrowserWindow.cpp +++ b/Userland/Applications/Browser/BrowserWindow.cpp @@ -233,7 +233,7 @@ void BrowserWindow::build_menus() auto& settings_menu = add_menu("&Settings"); m_change_homepage_action = GUI::Action::create( - "Set Homepage URL...", [this](auto&) { + "Set Homepage URL...", g_icon_bag.go_home, [this](auto&) { auto homepage_url = Config::read_string("Browser", "Preferences", "Home", "about:blank"); if (GUI::InputBox::show(this, homepage_url, "Enter URL", "Change homepage URL") == GUI::InputBox::ExecOK) { if (URL(homepage_url).is_valid()) { @@ -284,12 +284,12 @@ void BrowserWindow::build_menus() }, this)); debug_menu.add_action(GUI::Action::create( - "Dump &Layout Tree", [this](auto&) { + "Dump &Layout Tree", g_icon_bag.layout, [this](auto&) { active_tab().m_web_content_view->debug_request("dump-layout-tree"); }, this)); debug_menu.add_action(GUI::Action::create( - "Dump &Stacking Context Tree", [this](auto&) { + "Dump &Stacking Context Tree", g_icon_bag.layers, [this](auto&) { active_tab().m_web_content_view->debug_request("dump-stacking-context-tree"); }, this)); @@ -298,7 +298,7 @@ void BrowserWindow::build_menus() active_tab().m_web_content_view->debug_request("dump-style-sheets"); }, this)); - debug_menu.add_action(GUI::Action::create("Dump &History", { Mod_Ctrl, Key_H }, [this](auto&) { + debug_menu.add_action(GUI::Action::create("Dump &History", { Mod_Ctrl, Key_H }, g_icon_bag.history, [this](auto&) { active_tab().m_history.dump(); })); debug_menu.add_action(GUI::Action::create("Dump C&ookies", g_icon_bag.cookie, [this](auto&) { @@ -316,10 +316,10 @@ void BrowserWindow::build_menus() debug_menu.add_action(line_box_borders_action); debug_menu.add_separator(); - debug_menu.add_action(GUI::Action::create("Collect &Garbage", { Mod_Ctrl | Mod_Shift, Key_G }, [this](auto&) { + debug_menu.add_action(GUI::Action::create("Collect &Garbage", { Mod_Ctrl | Mod_Shift, Key_G }, g_icon_bag.trash_can, [this](auto&) { active_tab().m_web_content_view->debug_request("collect-garbage"); })); - debug_menu.add_action(GUI::Action::create("Clear &Cache", { Mod_Ctrl | Mod_Shift, Key_C }, [this](auto&) { + debug_menu.add_action(GUI::Action::create("Clear &Cache", { Mod_Ctrl | Mod_Shift, Key_C }, g_icon_bag.clear_cache, [this](auto&) { active_tab().m_web_content_view->debug_request("clear-cache"); })); @@ -330,6 +330,7 @@ void BrowserWindow::build_menus() }); m_disable_user_agent_spoofing->set_status_tip(Web::default_user_agent); spoof_user_agent_menu.add_action(*m_disable_user_agent_spoofing); + spoof_user_agent_menu.set_icon(g_icon_bag.spoof); m_user_agent_spoof_actions.add_action(*m_disable_user_agent_spoofing); m_disable_user_agent_spoofing->set_checked(true); diff --git a/Userland/Applications/Browser/IconBag.cpp b/Userland/Applications/Browser/IconBag.cpp index d8c4b7a61c..728b80e372 100644 --- a/Userland/Applications/Browser/IconBag.cpp +++ b/Userland/Applications/Browser/IconBag.cpp @@ -18,6 +18,7 @@ ErrorOr IconBag::try_create() icon_bag.bookmark_contour = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/bookmark-contour.png")); icon_bag.bookmark_filled = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/bookmark-filled.png")); icon_bag.inspector_object = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/inspector-object.png")); + icon_bag.go_home = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/go-home.png")); icon_bag.find = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/find.png")); icon_bag.color_chooser = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/color-chooser.png")); icon_bag.delete_icon = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/delete.png")); @@ -25,8 +26,14 @@ ErrorOr IconBag::try_create() icon_bag.duplicate_tab = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/duplicate-tab.png")); icon_bag.code = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/code.png")); icon_bag.tree = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/tree.png")); + icon_bag.layout = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/layout.png")); + icon_bag.layers = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/layers.png")); icon_bag.inspect = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/inspect.png")); + icon_bag.history = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/history.png")); icon_bag.cookie = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/cookie.png")); + icon_bag.trash_can = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/trash-can.png")); + icon_bag.clear_cache = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/clear-cache.png")); + icon_bag.spoof = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/spoof.png")); return icon_bag; } diff --git a/Userland/Applications/Browser/IconBag.h b/Userland/Applications/Browser/IconBag.h index bf33803b79..864583c5f5 100644 --- a/Userland/Applications/Browser/IconBag.h +++ b/Userland/Applications/Browser/IconBag.h @@ -19,6 +19,7 @@ struct IconBag final { RefPtr bookmark_contour { nullptr }; RefPtr bookmark_filled { nullptr }; RefPtr inspector_object { nullptr }; + RefPtr go_home { nullptr }; RefPtr find { nullptr }; RefPtr color_chooser { nullptr }; RefPtr delete_icon { nullptr }; @@ -26,7 +27,13 @@ struct IconBag final { RefPtr duplicate_tab { nullptr }; RefPtr code { nullptr }; RefPtr tree { nullptr }; + RefPtr layout { nullptr }; + RefPtr layers { nullptr }; RefPtr inspect { nullptr }; + RefPtr history { nullptr }; RefPtr cookie { nullptr }; + RefPtr trash_can { nullptr }; + RefPtr clear_cache { nullptr }; + RefPtr spoof { nullptr }; }; }