From 4321a7def1f0231de70deb1ed9fe3ef8d9340d45 Mon Sep 17 00:00:00 2001
From: Brandon Jordan <brandonjordan124@gmail.com>
Date: Sun, 1 Jan 2023 18:29:50 -0500
Subject: [PATCH] Base+Userland: Add menu item icons

Base+Userland: Add menu item icons

This adds missing icons to Presenter Presentation menu.

This adds missing icon to Image Viewer View menu.

This adds a scale icon for the Image Viewer and Font Editor.

This moves the Fit Image to View icon to the 16x16 folder as it's now
used by Image Viewer and not only Pixel Paint.

This improves the fullscreen and play icons so that they fit together
better.
---
 .../fit-image-to-view.png                      | Bin
 Base/res/icons/16x16/fullscreen.png            | Bin 3016 -> 200 bytes
 Base/res/icons/16x16/play.png                  | Bin 5227 -> 153 bytes
 Base/res/icons/16x16/scale.png                 | Bin 0 -> 146 bytes
 .../Applications/FontEditor/MainWidget.cpp     |   1 +
 Userland/Applications/ImageViewer/main.cpp     |   3 ++-
 Userland/Applications/PixelPaint/IconBag.cpp   |   2 +-
 .../Applications/Presenter/PresenterWidget.cpp |   8 ++++----
 8 files changed, 8 insertions(+), 6 deletions(-)
 rename Base/res/icons/{pixelpaint => 16x16}/fit-image-to-view.png (100%)
 create mode 100644 Base/res/icons/16x16/scale.png

diff --git a/Base/res/icons/pixelpaint/fit-image-to-view.png b/Base/res/icons/16x16/fit-image-to-view.png
similarity index 100%
rename from Base/res/icons/pixelpaint/fit-image-to-view.png
rename to Base/res/icons/16x16/fit-image-to-view.png
diff --git a/Base/res/icons/16x16/fullscreen.png b/Base/res/icons/16x16/fullscreen.png
index 6d73e89b5a0bf29e19b62a9977ac4537df595d14..1a26e81fc9141d56797c757e5b7b87e3f23684be 100644
GIT binary patch
delta 172
zcmX>heu8m=N`1eli(^Q|t>h2!Pru2_8b4r&xZ3rK`@g>JoZtUXK0jVzsw~YE#C?hR
z61RDSg!2T`#S#uZiZ@IS^D<~2NaqNfy|5}Er%|#=Zia!~rnET>?@W}AvMU~#I)g*i
zXvzh)izoiEZk+hkz~o`KR!tz!vP8ebOC{$k7BF*U9(yem!KA3FHF1F?lR3jQ4-Qqa
el2V1e3@O@554ydRa~K#H7(8A5T-G@yGywpVXG35B

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~h6<f`ms%M>MhI|Z8xtBTx$+|-gpg^Jvqyke^gTP3i$
zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;=6Z&@$p!`n3g(u2sVRv@Nycf3$vO%~
z21bVZhKBlv=DLRFRz}8FhL#FYpk$|DQ<Rcs73AUuwXP^7%~mO+q@=(~U%$M(T(8_%
zFTW^V-_X+1Qs2Nx-^fU}C?!p|xH7LKu|hYmSQ%!5OKNd)QD#9&W`3Rm$i&2?{L&Iz
zB_*h_6}bg)WAlokA(fn;t6z~=pl_&W0P+>syD7<Vbp@qGIbh3ElJ!$_Qgc)DN{aOj
z^$g)^3o`Oc@{2R_aTpDkMzNqGx4_pIZU<Jk<mSSyC@yg=E5Wb2IHa;5RX-@TIKQ+g
zIn}i+HLpY&=I!E=pj1S7Vzmradr)c`Tysfg8V<c685B>YR%GH(3X*{<EwFMfN=+=u
zFAB-e&w(YM09Yt07#ZssDrop7CTHe>!c`OG3#gV<m&B4(TP09Z(ls>FH8u<}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^&<X=rL`kd|t$Ymj7Yq-&CvVy2svY?iERnQW9|VvuBPn3!Uu
zqyUO<EB~U*)Vz{JP!6+IGK307fYMz~DMZlR$iTqBK;IBVLgga~$Rngf^D;|pm5h`W
zKq&?is=)<`$*HzVW~Qdbrcm*K%!<^U2$#&<)V$)%{5)GFLo;NVNK_e6aR$n6Rvwwf
zCHX~_(9$M2wGhh6$y5O6FssC5h!>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<En`D$`p=*+6WT9)3YHFfuW|3x;
zYHVO+nVOsm3uJg8LGr6HD8HH*TA3Kb@+*0P1dYPvjKsY3)D&AKeG0r|l9p;_WMOEa
zYnWtUqHAJmWTtCrW^ATwl5A#Vm}-=2X<%rI!#kM856!)kOfVG?h<H%ifF~5(!IqL*
zl!=rMkkcC62@2p;M;-eJraI!vSV;Jzr8?S1lYUW3niZtj(FZpGkV+&7-vttuZlF90
zuC=YOWh-LSVNhzCRSLmM#K<DaBrPc^NjJ$dF-h0N(!^NTA~nfS*Tlj&DJj`J(ZbTg
z2$ZTprsY#wiGa!ya4;aX)a(>&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{<C-If`YVYk?Fqo4mo^#*!FuvjvaIAx+`}WEVg}Qd)DTlai@0DZctm>
M)78&qol`;+0FCz39smFU

diff --git a/Base/res/icons/16x16/play.png b/Base/res/icons/16x16/play.png
index 706a08485d4406186993b58ede196f37f254a609..7a16ee88081efc77efde4328bbe6159d98e213fb 100644
GIT binary patch
delta 137
zcmaE@F_UqEL_G%^0|SHn=l_We3=9dLE{-7;w~`YUsC|fk`fa`vv&+}k|G_C7CmPh}
z%Qy2Xo>rK_XyCKS@dcZLw97<Bm)&gh8C`a=r8vBN7_&!WNt+I{Ls5n4W8;PeZZT{E
ssoG}D9@jc@7$T)6@+K@WXJGiS`Iycw*(b6L3=9mOu6{1-oR|`t0IxAITmS$7

literal 5227
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

diff --git a/Base/res/icons/16x16/scale.png b/Base/res/icons/16x16/scale.png
new file mode 100644
index 0000000000000000000000000000000000000000..0bd55262884ec50960bf33e1771134c09fd715d4
GIT binary patch
literal 146
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7B0XIkLn>}1CoB;E5dZX>
zyzJ!E6O+&P|DP^*?yvqT{Xg?_&Z<Z^_!?hid$4Jy3bVruo%+KJo_=oIroQ>X_EXYj
z@)Q5AMO@EPRvj}w`A;p{_zXit$V8dcDNGDpp%XI`S^4iXFfcH9y85}Sb4q9e02Jvp
AZ~y=R

literal 0
HcmV?d00001

diff --git a/Userland/Applications/FontEditor/MainWidget.cpp b/Userland/Applications/FontEditor/MainWidget.cpp
index 9de62b3ad0..285fec9fb1 100644
--- a/Userland/Applications/FontEditor/MainWidget.cpp
+++ b/Userland/Applications/FontEditor/MainWidget.cpp
@@ -709,6 +709,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
     TRY(view_menu->try_add_action(*m_show_system_emoji_action));
     TRY(view_menu->try_add_separator());
     auto scale_menu = TRY(view_menu->try_add_submenu("&Scale"));
+    scale_menu->set_icon(TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/scale.png"sv)));
     TRY(scale_menu->try_add_action(*m_scale_five_action));
     TRY(scale_menu->try_add_action(*m_scale_ten_action));
     TRY(scale_menu->try_add_action(*m_scale_fifteen_action));
diff --git a/Userland/Applications/ImageViewer/main.cpp b/Userland/Applications/ImageViewer/main.cpp
index ffa3e6493e..e0feaa703f 100644
--- a/Userland/Applications/ImageViewer/main.cpp
+++ b/Userland/Applications/ImageViewer/main.cpp
@@ -215,7 +215,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
         window);
 
     auto fit_image_to_view_action = GUI::Action::create(
-        "Fit Image To &View", [&](auto&) {
+        "Fit Image To &View", TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/fit-image-to-view.png"sv)), [&](auto&) {
             widget->fit_content_to_view();
         });
 
@@ -314,6 +314,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
     TRY(view_menu->try_add_separator());
 
     auto scaling_mode_menu = TRY(view_menu->try_add_submenu("&Scaling Mode"));
+    scaling_mode_menu->set_icon(TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/scale.png"sv)));
 
     auto scaling_mode_group = make<GUI::ActionGroup>();
     scaling_mode_group->set_exclusive(true);
diff --git a/Userland/Applications/PixelPaint/IconBag.cpp b/Userland/Applications/PixelPaint/IconBag.cpp
index 48973cede7..2393979915 100644
--- a/Userland/Applications/PixelPaint/IconBag.cpp
+++ b/Userland/Applications/PixelPaint/IconBag.cpp
@@ -23,7 +23,7 @@ ErrorOr<IconBag> IconBag::try_create()
     icon_bag.default_colors = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/default-colors.png"sv));
     icon_bag.load_color_palette = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/load-color-palette.png"sv));
     icon_bag.save_color_palette = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/save-color-palette.png"sv));
-    icon_bag.fit_image_to_view = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/fit-image-to-view.png"sv));
+    icon_bag.fit_image_to_view = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/fit-image-to-view.png"sv));
     icon_bag.add_guide = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/add-guide.png"sv));
     icon_bag.clear_guides = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/clear-guides.png"sv));
     icon_bag.edit_flip_vertical = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/edit-flip-vertical.png"sv));
diff --git a/Userland/Applications/Presenter/PresenterWidget.cpp b/Userland/Applications/Presenter/PresenterWidget.cpp
index bfd0b8101c..35ef191a99 100644
--- a/Userland/Applications/Presenter/PresenterWidget.cpp
+++ b/Userland/Applications/Presenter/PresenterWidget.cpp
@@ -41,14 +41,14 @@ ErrorOr<void> PresenterWidget::initialize_menubar()
     TRY(file_menu.try_add_action(about_action));
 
     auto& presentation_menu = window->add_menu("&Presentation");
-    auto next_slide_action = GUI::Action::create("&Next", { KeyCode::Key_Right }, [this](auto&) {
+    auto next_slide_action = GUI::Action::create("&Next", { KeyCode::Key_Right }, TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/go-forward.png"sv)), [this](auto&) {
         if (m_current_presentation) {
             m_current_presentation->next_frame();
             outln("Switched forward to slide {} frame {}", m_current_presentation->current_slide_number(), m_current_presentation->current_frame_in_slide_number());
             update();
         }
     });
-    auto previous_slide_action = GUI::Action::create("&Previous", { KeyCode::Key_Left }, [this](auto&) {
+    auto previous_slide_action = GUI::Action::create("&Previous", { KeyCode::Key_Left }, TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/go-back.png"sv)), [this](auto&) {
         if (m_current_presentation) {
             m_current_presentation->previous_frame();
             outln("Switched backward to slide {} frame {}", m_current_presentation->current_slide_number(), m_current_presentation->current_frame_in_slide_number());
@@ -60,10 +60,10 @@ ErrorOr<void> PresenterWidget::initialize_menubar()
     m_next_slide_action = next_slide_action;
     m_previous_slide_action = previous_slide_action;
 
-    TRY(presentation_menu.try_add_action(GUI::Action::create("&Full Screen", { KeyModifier::Mod_Shift, KeyCode::Key_F5 }, { KeyCode::Key_F11 }, [this](auto&) {
+    TRY(presentation_menu.try_add_action(GUI::Action::create("&Full Screen", { KeyModifier::Mod_Shift, KeyCode::Key_F5 }, { KeyCode::Key_F11 }, TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/fullscreen.png"sv)), [this](auto&) {
         this->window()->set_fullscreen(true);
     })));
-    TRY(presentation_menu.try_add_action(GUI::Action::create("Present From First &Slide", { KeyCode::Key_F5 }, [this](auto&) {
+    TRY(presentation_menu.try_add_action(GUI::Action::create("Present From First &Slide", { KeyCode::Key_F5 }, TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/play.png"sv)), [this](auto&) {
         if (m_current_presentation)
             m_current_presentation->go_to_first_slide();
         this->window()->set_fullscreen(true);