From 8c32b42bdfe9dba55b97733dfd42dd121e42fec5 Mon Sep 17 00:00:00 2001 From: electrikmilk Date: Sat, 12 Feb 2022 19:08:48 -0500 Subject: [PATCH] Base+PixelPaint: Add more icons --- Base/res/icons/16x16/bottom-layer.png | Bin 5005 -> 3276 bytes Base/res/icons/16x16/move-to-back.png | Bin 143 -> 3345 bytes Base/res/icons/16x16/move-to-front.png | Bin 143 -> 3281 bytes Base/res/icons/16x16/new-layer.png | Bin 4442 -> 4517 bytes Base/res/icons/16x16/top-layer.png | Bin 4794 -> 3291 bytes Base/res/icons/16x16/zoom-reset.png | Bin 127 -> 2980 bytes .../icons/pixelpaint/active-layer-down.png | Bin 3407 -> 3341 bytes Base/res/icons/pixelpaint/active-layer-up.png | Bin 3345 -> 3342 bytes Base/res/icons/pixelpaint/add-guide.png | Bin 0 -> 3100 bytes Base/res/icons/pixelpaint/clear-guides.png | Bin 0 -> 3099 bytes Base/res/icons/pixelpaint/close-image.png | Bin 0 -> 3445 bytes Base/res/icons/pixelpaint/crop.png | Bin 0 -> 682 bytes Base/res/icons/pixelpaint/default-colors.png | Bin 2989 -> 3007 bytes Base/res/icons/pixelpaint/guides.png | Bin 682 -> 3157 bytes .../icons/pixelpaint/load-color-palette.png | Bin 0 -> 3139 bytes .../pixelpaint/merge-active-layer-down.png | Bin 0 -> 3292 bytes .../pixelpaint/merge-active-layer-up.png | Bin 0 -> 3264 bytes Base/res/icons/pixelpaint/merge-visible.png | Bin 0 -> 3238 bytes Base/res/icons/pixelpaint/next-layer.png | Bin 3127 -> 3195 bytes Base/res/icons/pixelpaint/previous-layer.png | Bin 2971 -> 3037 bytes .../icons/pixelpaint/save-color-palette.png | Bin 0 -> 3113 bytes Base/res/icons/pixelpaint/swap-colors.png | Bin 2994 -> 3070 bytes Userland/Applications/PixelPaint/IconBag.cpp | 7 +++++++ Userland/Applications/PixelPaint/IconBag.h | 7 +++++++ .../Applications/PixelPaint/MainWidget.cpp | 14 +++++++------- 25 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 Base/res/icons/pixelpaint/add-guide.png create mode 100644 Base/res/icons/pixelpaint/clear-guides.png create mode 100644 Base/res/icons/pixelpaint/close-image.png create mode 100644 Base/res/icons/pixelpaint/crop.png create mode 100644 Base/res/icons/pixelpaint/load-color-palette.png create mode 100644 Base/res/icons/pixelpaint/merge-active-layer-down.png create mode 100644 Base/res/icons/pixelpaint/merge-active-layer-up.png create mode 100644 Base/res/icons/pixelpaint/merge-visible.png create mode 100644 Base/res/icons/pixelpaint/save-color-palette.png diff --git a/Base/res/icons/16x16/bottom-layer.png b/Base/res/icons/16x16/bottom-layer.png index f8b540b48efb85adec8cae85f4798dd887d842ee..bcd05b1228311a31976b81d189d8097d5c45dd3f 100644 GIT binary patch literal 3276 zcmcInONbmr7@mO9BxWVzK@l-c$4BB?(_Q`UCX;2elYKyDvu;-0pkS)2s%M(abhq8T zyR-2k5+w>bDT*R$2oe&a2QLaiqXZ!k5ygulYEFts5Xm9Ai2gl~-dWw3(F`;FsQT)E z)%X8@%?lIbBYm6h-c%?Q`o>1flW^aX{WjbT*R5CnByigpjUGq}g>X2oNZl4^q-ZL9(qYq0AE+`%&tLfsjcgZa9;cL@>7P zMI*|^21zGU5HqPsA_*7e%&QiV(Hs}e#PybPMkQY74IZQkU~!IxKvgO^d`Yp5MvhL> zJ+oj@$G0WX$<%zrrAeNIGco0RW&qdX$!L|WZzmZGDagq8!@(Z2G-}z1YA!+8&I_JSX*D zshL#_B)YDmxh}PlYjB1%!ZETK){#wRL$j!1Xc`xV1-(OIJ&Y?MgP5zm<6}cZ6LIMI zb(k380grtuOpfdpI)kE+QNsaCz$=m^V@U*WTZ7XXuj@1IK~sS`Axk*BcIFSPGQTkW zXyC(cD58*&%W0XqA4(mVWazr8cg83DCa+JIeF$*UHpJ+iIk0#pt9)5HJEMLA1fA~` zrv3b>&QskNS{dvR+IE3vROU?V4EsxPVQo=wi=C@+2-XS&Z^M$%OXo<;2dfa_HKdTV zocRfvUDz{5W&_q~X?X??oh56+8hHrq+ktM7_lJL1$=mwF|Jo5U-sF^Wx{YNJ zT3%KplTK~fO{#g7*|l^ZGc8Nk4AVdas|=a8rXZpjP)uCY)oqMTMb&qcY=v>HVri%>5O%vOkX)ax}EYEXI+tU!EhKrb|$;gG4h`0t#9LBj!agVH) zg>84GmE+Pv_8dyVsn!sjbhF3&lnpQWIh_Yk<6=04|M2*!BXEL0K2{!_vW~s;(&fJM z!shZ@{Xbn1?mfEk+w*@sQrqzU_oJnaJ3gJibL-ZLi$9Ovzy9cJ>%M$?-?@PYgG;9_ z)JiWO!3xY~bhX3LX>(+_=Jlb*kH=Hfj^&yGxd_(1tpKUCEh eKl$vVb=&tIJM+!(FJbn7V{FfO`Muo-pZyDHJ1PVK literal 5005 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 diff --git a/Base/res/icons/16x16/move-to-back.png b/Base/res/icons/16x16/move-to-back.png index a7556652f3035dc5b9b27d0e1fe670ca33f70451..d2a8998ba3deb2f3234054930461613ec4c906be 100644 GIT binary patch literal 3345 zcmcgvTWl0n7+z=~h!7>bC`O$O#?XYbbD!B6*+S_;+sKyEE}_VSo;l}CJL&GsFf(np zeIiJLk{BLT5|!XBzWBhCc)WxAEN6ufM9=W@<> z{@eNf|3CY3e_!|NmFre!GMUxAJ%s_dKb-tlEQjlpxBkR%dm!l98)Y&Nu1$VRGH)J# zB$HXy=9Y%yq2dmU_?0ZCzRj}LN&x6gX4B?sfXOI}Ihzf;UY@`C`5B&bX`bJs6~$uE z#YWtosgMm$^_9rfC^0F&xr5tOwLn0H#h9yB%3fqu^L$ON1<%Q_z;iW7Jeub_6NTJR zv7hVmL&h0d2@z2gIm65{ie+1IFxkk-qAUp#d<`TSmaJHk$u&MaC=97%4HULF)WKVx zABp3@5`>9~iR^@u^}}I7GEGwuWkHq^AW$^v#kh*RXnj*cfkh;AgV^;wE|G|Be=N@P zU~JusN|1{6qDG`3W5m=d3m={NYl~ODOs#r|nbBe80 zQgjq=8wZOTzRih_N|ON-23X{eg@kPz2aW5ShDGrJn+eS#mIFLp9E|v}AC36)1RN=AP<0!ElKdfNb zG`E6>nGkrxH9f_m)$2tu_6X}O$=oZh{3R;D@e_03@(%+n;9}9j;>3lqAIqj zHrE$?GL{f3Szk{t>JyNW?t~>`3ER3Zqa4oV5X-3)nYLykM^|W$*{UNF+LX34bRolW zxm9Xn6$Od5EvvRoOl0efA{8?U<*1|~lZd*SBf74tjOS+bcKKyLEcz6pt+bB!c6IfK zzT=i*qMLavbO|@my_IVW@?1g+3oHSzaFT|3UTO>uC5$eQ)dvk3DugIV$+a=R_b&4@ z)4M$vc0=a5gjQC~)Ilh6V3MwBiq;tKcdM*CRB$1{QQZ)|b!PAEnWW|=iEQ<_5m0lo zQIZDP{>D?;_4@jW5eC6pfZBCfM4q4|gM0gR& zBg|)hgvS>)o@l0`5ZQoY4n$EMJ%?;VAxH*x>$ZXoBAZR;=QJKNGR?O8Grkd8GJ?Hf z1}#hA@82Dfso0jVi4{fd4XBu7x<*w4_;Kf6+*vvPb6<$>jkBA3WtNB?2=l73F97Zbh0#kx!C7siq*U^qmaHWBxu!=n!x>w`tC}(#nsOL zdyj2R)V8oYt3)xjUGV%W0}^=m<*+MTV)$2&+1j5!--9CP{{@Xq##wF1vS= z#fZvG(G-!%oE(y%XCadsHqt3G49R3vwaKDoIgV|Zj*2MJZA2YaL^d=-#8i!lFwR6G z-6`u{_M&BV&A)oEgoUG8L$(}aAtbdSI2$LA>A4(U(vv;&pf-kZZojhe&|x_9f7Dy( zEahJL;MI$34sojrSFB^W*#5=AftR%Jx^J|-f9~DykH7K5;qx8iOE>VU9tVZO7T0EOJhAV}wJp8N0yh0++Z6Zhu6;l4{_OUev(rEBArGlb zKYZ_x*E1V_eS3>L{phF999i+yve!o2hjzXA_2r)rlzzW`wEeN0zg?WZ^z^x@rETjn z(>vJnr!H&W>5or+_0IL{7Y<$cX3yidR$fwW{PM|}{ne|>JC3|%>-faTVDhJ>cUxcK J@~07*qoM6N<$f;(|7!2kdN diff --git a/Base/res/icons/16x16/move-to-front.png b/Base/res/icons/16x16/move-to-front.png index 17e33bbf0c7f72ffca52bd28355d6d86ebc9745e..d49f071deb9e8829787efe79a5329ee0f59018f6 100644 GIT binary patch literal 3281 zcmcInU5wOJ6dn?@$nv8Jnk**9+9fLDowm1~c3K(MWru|&3@*zOm-wK!_ulR_%(SKL z&d%~;P!mIfi2+_D7>rR8c`znKLj(~Y)SyNKiQxef9(>?I6G(h8(FZ)8>2_yzmt9dN zGyS>uyXSo8-1Bqi;P8$uE4v@*&gF6|hqjhS;QnCpyT1#rkNtL=z-?Kubx)MbEnl7d zmgJ5d?}3L)?&w%NR@rV*zn&+|w|Tx<4*;FZZRl$Tgzn|BVDoX;D~UJHejy4jD~T@@ zDsm+l;8l0){*dq5zhji{-%Cv<_H7h4G%XNN=P?nQ^_mx1&63!XYr%6eEQvx367MaE z{fR6)>#B03Hy*L7_l3~G7l}ZMm zQ*6DSp`&Y&54dirvfgG@W`JCDc{@xjlI*vqIiVQxMmT{0iG=ms($Q8Rev5Q zWYe=;5xdSj3X_>xP~LRsfhIE)bjS=ThK}x3pC%){qy)#G`zuToQq5-gTL!GDkHFs)?AaYDiOf0hx|!Bb{>7 zRvg<@v^HB z=R+6roYXp{Caf4pv~7@MQxn-bXGkMlK}DtjH7e^`k?J}~7KItT1Afg9D?S6CtDWOR z0|UdM@3=LX*up&?x>Ok1vPnn>MIi|d3z&daBuU1SsHB5qNnF<^+Jgp$Iw4C+a!u#= zEHFPaz1wqPH?Sxq!DY3m?t)SWl=MPDEu`baZj;x>$}TuKY7@~rXZFmVNh)8G&em2p zf&iUL3)3#XFMX=HLMwwULfamC=0!4H5BC-vYB1}|Ww^d?LY)%_LCwa(Abvohhj(qA` zS|#2%hsGs|cW;iaF)SB#8}f&!NYnHJWPo8Ht$+!oMUyC6wwIme%vnF~xjEGL8a(U> zuYiOE+Aj~IlIVnfT_8bFb7?Ebq=v`RmX>9(5c|SRy_(l;3^KSQ4m!1D6omg#--1!M zxbpeWl)2~IBqgVcb~%v#UMbq|<+d*elig``Yiq8Wu-G_+_H98o$oj*-tK@C{{(tQV zN!(;1m9?vWXn9GIjMCb&iHv7eX5-v_%qSKMnr`TbC@MpSsbNGkXlvLu?1HH%2389j zS}v}+3(4YC^aqGdUbZJ3UR7=_Zn98E?xv_!24C@F$1L z{iDS`F)qW-d^KBGL-}`RR@2Kd-;qQ}5k*`kTS) vhn#n>oa{Z(Q@Zf%mshVg&%JlxftxQL{_xC8E8a=|bPR3YQT}Mt%dh?gYp*VG delta 114 zcmV-&0FD3A8IJ*wBx_blL_t(I%gvHI4!|%7L!YZ2(Z}SDWKIQqsPBn1N~sy#?D_#TVAtrTvFsyFR`79W{=z05csE UCI<+g`2YX_07*qoM6N<$f`cF}s{jB1 diff --git a/Base/res/icons/16x16/new-layer.png b/Base/res/icons/16x16/new-layer.png index f96544ba7454556a0df0c044ff7ca4fd7da41fed..9b3b758a1fac1d94ff054f525137ac54eb21ee13 100644 GIT binary patch delta 643 zcmcbmv{ZS51Sba@0|SHn=l_Wl6(tz6Hd@Iu^BUP}ju7+&nQcCDF_z(PVQd%LNV>i$u$$Br`KzBeSF=U6Um9RNW*q z3kzNIM9Wlj(=|M;18Mnjz@Iz12(0}9Gur( ziE$?}rp{F+!g-S~@QX~AW)V|KF)%POOEompO-nX0)HO&ovD8g6HcZtuH8LfJN9Jde?}=Xm}yt>A7c_WLioU<>OkhG+Xachohr9I#AJ4~UV;{Qc|9 zwi_EY%XkwQJUJRS>F68#Hax1Gww^Ki%hnxlJ1?_t(2T26K0W=)RmK2graKw2k^7i9 zeH563gTv$P?Uqb@^-9`e($mw+>g>P#(>d_`_Ptwy^GZJ21^xJ(o^`vglu2J{!X?QK SJXJv7GI+ZBxvXKvrUphvx+aOqK!qmB z#y}HIla0*Hlgv_5OeV*0$go13CBPpt`5lkw zUdrSk9_`6W0&Vro_U}}IL1qx(6XFV_|NsB5USMLq!Vkz+FECXvFxMzBwX(9ZUhWSR zv|bV5?(SY*Uf$c=3sl*ob04IKr6kBNn1SKXpZycdWPtn#PZ!4!j_b(+EKH1Hs%&h6 z;^O_A*915A0JYS6-(JO%R&#gfC5}TLrcE7=e-ccYR#)D>7+1%5q~ibM|Nom4j!pmn vU)J&2jvWmWOgudQ{&N~ToRXDfS;)X3H``{Z#6sQ>pd}2Ru6{1-oD!M;4 zYzl(-q}WO=K1r;C20>`+gN1@ZL8R?NK`WLj6-(7u5fQ3XM9%p#EF1LQ5zcd2(``EAZ9=JaA)9)B=Ys3BnaV~f72KKuv_uBks zc(~+^O(YZL$1M`n^4JM%ny=SFK<9Ehch^Hqrf9<1wBq?i{)Z3F@|@=s`Tbg1EQh^x z((6AI(a}SLW8}~jF&%#QE^cSt0s%FeV6I-P`mt3n@(sBbJhNee=Ngb?s>pXUh1^7W znClH9${BeH5m6L5!^~3$%eLZTvV)UFSrR1p8b~rMS+OLOOFuj)j2zb*DeX(u!CR4^ zOp?$NgxT5I{H&4>qKY7yrYVTBAj=34D4z2ZTt|MqttFvEV-k5`;srj(Bw{<5PKrDj z+w`IqW@7y~jTFR8sN+zO@*?x90dz=)3#X%ML%Bl)TBSAWCoy293=4rOmoxa1Vr#Vw z9VdHdz@pT*CDHNNTu6lx8VA!6p?haQ3C}cCYKxy4u2FhkKXlV6D6emG676jE6eTG}Mak7$^xJSyEcs{dsJ99lEL*aUM9mV#CbSIvbZ~;(!7`HMFzasF6H{upqzy$L zE@szL!A%>iCxqA11rog zPLKN@?1s#9j9ga3)KMsPV3MwBik6NKdv#i!D0vXzxM_&qK6BvK8CLmNI$Ql-3o>9Ds17giVbrr6m@3cL>h@!fB0ojH^kc<^ww-sy<*=#w#r16kyN-N?1nel08$t3nG z6dISn--$bfnBV|16|;a;Rg)p7OdGj6^U^g{Yy(sOx))2M)@1!j)%U~`ExW#(4Y}g#g;5Ht#YspOD{zZK&vTk+d^MBYT zft@Ov8^15xHOP$hf;8=F$5=F_L!Zr;Uzn#Qy*$v1gG$=!o~`m;NKf4b&nN}yngKJ z`j5GFcUOi!?|AlY?&h04*Un$>d|~TnCpK>X;^NI$E?k@#fAq)wL+_rxai-(wN0S{} zjycD2?>{iVX5rPf2QQZ&9&~SX9Y1`*yn1%cj^EbN+@+pt)-Sp5<}V*P=XBnbf9-wx z#Pux)uV~|EHeLSY_^H!hzp?+hIeYxX^qRLm{CVn~mpaHo`J2v{yZR=M%$z&5ZGKO% x=dp!v^XI-if4~3zVg6Hc{mBiRi+iqY8ala9ePYwmuh`#@fxUyJlRZy8{|Ei_H+BF3 literal 4794 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 To6oL_bM(yQZ0nO}UVQamVi(2{ delta 97 zcmZ1?UOz!4+Rf9&F~s6@a)QLC20^d?%LD8q+5V&_0Kp-}kMko6)oRW;70W7{r5j9q zv)hjhYo1a^lfq`3?kzv*x2_WObMk{${UL#!t%Me3jD?87L@o0%9{BzXAR7#XHmnx|P<8Y?MOT`qfj^ipZO z+t781>H6)v?=&@EH=eLjPtA3dPTQu;$DHn$eU@QPao=HvLWziDfX|F@)=xW3#aM|woU;633CliCh+OIk~T$^;HJ&q+LJW2nhD$lrW*(*JB<$R!j P89ZJ6T-G@yFg5`IpQz8a delta 539 zcmeB`IxjUro1a0Qfq_AtQHyh;KLZ0#@J1_nW?n;GL&Fe5b1NegDx0&C|@&EGDzFXic8asS z8`gPDDv8M^CaH<37P?7^NoKkxY37!?iN*$&x|T^smZ`=j#;GYuX_N1>i*XwogculF znHX3ZSxn-{oNU4QQ^nLI)!ZV{!c^Bd*&Jx4xuLPHrA3O7ZnBw4nwh1AL5gXT5vJZQ z;+zV$6XEMg93hiWae3$x<6b3&;*y}$G^>=!0xXJ?6S&vaC%8Ua0Swkfo-U3d7QJgH z8VWT9@VLa!xqtJ<=^pn9yH6T^$g5yUU$A^*U+bZodLg$9Z*TaU?UoJ-N`4%la=T?$7#RXUA|O_vW1BG6T(Zty5IZO1D~EDBCOA(Y9{8BctB)#V$!Fl^I=* z6wGrLPOPio)M!|>%bt(nwZi>3g-;LtpKI7WUGuq}P8HvwJ#pf059VI{BO&^-ETBs# fR?+71_6nw&6AscdTKq2ooy*|q>gTe~DWM4f=K-^0 diff --git a/Base/res/icons/pixelpaint/active-layer-up.png b/Base/res/icons/pixelpaint/active-layer-up.png index 8edb7689b537d7ff2f79758721bcd04ee132454d..5caf3bfeb8777d7db07b84d3cc6c69fce2f70175 100644 GIT binary patch delta 640 zcmbOz)h9JUf|G-dfq_B(^Z&$&isDS%7dBeSGxHkh8d!!H8e17yTA3P6PGeR;6Pe5$ zpptB0X_RJ?W}$0hWN4^sl4O#mo0ODdq-$HBL4)G)b~dOg2w4Qc@@` zaV;ycD$hvGvsE%OFaml7)i?cYc9S!>v?sse_~}ZFABZ(kY_c!6hYB%noV=6!M*W0> zD+a)Tf8y!l7-G@8bh4ozv!Q_N{r*dWoWEQau?DK#VT{`C&3N3S@1WrWhHBw;8w9sx z%=Z1Qd4soY>&ZnmnOxP+?E7suOO0?8&0 z9E!I;%rFm-=XCLuVg2LH><}8dCcS!ndi`(b-Ls$G0ivA~{VyLq{dg~<-M#X7>F41L zF>!MkH^k~zHO-5=zmJhQ+0k}IUQ~WKH^a-H56>O%QN8MWS|s4^7C(Q9V>z@0cPMbGbH6;5p(8CO#u6{1- IoR|`t0DM~53jhEB delta 481 zcmeB^nkY3vf|G@rfq~)e-A6$a6~&o&f;U>pGxHki8XANc8Cn^eSQ!~iPGeR;6Pe5$ zpps%?nP{16oT!^@VU(16^TY zXk}txWn?&sBXhC^=TDU+12e-!69aQyW6Lz4-qh4YT}y*BpaYVP%~MPhQ<73Fu;}d~ z&bd%KVLqS45ibiP%mVHlvLCYWD6XFV_|Ns9F zB#ZT>C)um*7hux`a+pej{DK)6$|j$+0P?IoT^vI=t|tq$FtI6!1vMB=nIdtJM^ROk z)xepP;{Xqv8Y^1}o0GU2bJC^_h7uA+9J?DBjhNL~gLxQ)ckp&DQvJ9FXbgj=tDnm{ Irv%0(08Jl#y#N3J diff --git a/Base/res/icons/pixelpaint/add-guide.png b/Base/res/icons/pixelpaint/add-guide.png new file mode 100644 index 0000000000000000000000000000000000000000..c120416c4890e402950cc16b7d06879967bd89b7 GIT binary patch literal 3100 zcmcImTWl0n7#^q^DWISR2?3c5F#%+D&fIo(2bKz5=p}A#+KL5z;LJH^+DUh3hMC!R zTd$A+FF>3Iiy$mgBX(QNlcW2J| z&VTvN_y6ZS*WJ~&uz6WC$8ifg+Vef|yD0wLej9wRymSS_&pf|{TiFFa%tuav^nvskK9@&V0p8(JzpCPOUZEjHk|IpOycCk5W2IpI;gfC_#q z8+6*o0@gd$)knsLNR|pM8~F_t6AYACg!xLT=!Rw`Csgg4@Ei|I0$+thLpfnn?2zv- zbn~rVz<47iiv%IW8`%`2Sg}+alXbj;6j_qt-wEf38`hZu&ZG+VB{_xStg1jt5}aQSidE;7NUX?8%#A|8$_dsV^dc`D^rkVL zOiywE>=p`%k11m*l@b?Wv}G95s1q_JI_w+unbgBVuN)AzWf;O-)yO7{de~JyXR#dM z$>PYdr&$}%OiGGXoN1u(Oak@I)_~#23;H~-*pN?mgGF9ZQ!>B0fQjSAysn9}s4ro8 z9I>1bOG%U!QI-4Ttf{6=JuM>LM5qQWc+{~+6R0901<+NfVyea@C`g&&2+s(n#I(Jj zgkcw)5*}cZ?+yrjvbScdSM&mK4AH68C<+C$!wn;`O!SqaFbpSH0RuR~1Ti5i=+&P1Q6pV_B-G z%ar15He=b$YFK+XaG?HiaiY~YDhd`Uk#!ppMWjkv6*ZK}h*sLrAjnMG(kx7=mKOMU zzfCX$A>p{fa)MkR?2mOsw=89+b7S&?JO=gv)u_nb))re)5~_%pNbA&tuPalS_&lA zC!<1r*qLG@XGdAh?8qPkvaX}r8Z7keXaomr(*Q6$i@K1e4c~KzSui019|st^HVeX> zUg zz%;FCc0zJO64a|KBDGqt8B7}~ zOf<5FhHQcq1!o$XnV8O$?dN|_hs>yg88$xFMk18yX`?J~Cg@Q@X-;=a+{|r~;wwq5?MT;lq}qGF#^u(yMysc`IaTkOtq$QBH{r;b;SgcAZ5dfx z6DdhsBDFOnS_Hw7r0E2~I70;bd@UO9Mh}s=msDw(a8qjx!SyeGOs<~rl3ZSy3$+`- z)${|eufKK0?gx&dwqu_!zGXh* zj&!b=gZA$`xnwZ^D*a;D3x_YSYdd`~wUldr<%&t3ee(QE-~3V@yYKsX<7>PAcxKQ0 zt3O^d*m`L1qPb0{-`J76ykuE<<(+en@9%x;%TM-f{qg5B%m3cI&0Sajj`XK&;4~~+uC!zPn;b-)3)HxuX`^2)9E+e8EyOS!8fIS@%_DH MOIQBw%{%w}3z3}mVE_OC literal 0 HcmV?d00001 diff --git a/Base/res/icons/pixelpaint/clear-guides.png b/Base/res/icons/pixelpaint/clear-guides.png new file mode 100644 index 0000000000000000000000000000000000000000..e4ac353fb5bd572b802a5868e1687a457e36def8 GIT binary patch literal 3099 zcmcImYitx%6y6%-Q6yq8)`-z@2#FGA=efHx6ILGGLN~h5l&YKlFV!$5|@r6GGqY-~W42mWyXoTRo`xsi%(nfHz^Sbxk z^Z4#}&bh-KD_6{FzN0yjNX*K&=Q`mzn_bhV!u{^wFClo$@Y{RBL}KO~b~Pn-?7TgZ zXg=k1bw}NW2Tkmil8AT~O;$=iNGB4D7FT?P*V2fyXrJR|`CmW$nCBdlfL}a4hE!1jVXxf<;=SCF({Y$jY&--|t0U*zb*_ zI-VY70MIQIVjE-nQYytJ!l-Q!!l(l>rgYdf%~V>DQl=!;L<=5q?4ejx5hMkqtD=gTGDe94l?jT_gu(=y zwilET?1EE5eN^<_KAwyB)@=2PUI2!{JGJUXpc@INi24b>6|)^x$b zsw^0mWfMXvqEv5aTNOBv|EM@pEAxsludtl5CGd(UX;si99rUC#nqX!0w53^y5G~Df zY`;xV11=$!VOd_T4|X%&6$fgA83mGG5@mL;&-Y9)e|h>L*8zwXo@0!up}HFC7r>fM zrPNe?yu+!`Vt38~bi$e=;9hk_b*5+Z3@c|W-OP3;1lA4JtIcY6u35*Krri#!hbe$m0zEfoh{QZI`!%lL8aglO>UAZ4VKtVu)>ke;!C?Ftoi3T%fl zoIxb5X?6^93=-t4EJ$iKUv*Pe8~OU*K&o#c?niDPg{~)FLpW5%k_|lw9K=Y_G+h-e zUB?0;L_w6KDN$*IGb6(pv;6$;;ou2bFu}$%Zp1_xA2vb*X9N#MaxHd&tFrF;*qe}b zldG{;q~>^C;(BhA$c`knvLjwuk!s($8kWmhj#j(2IackNEDxcLo6s^QXd=|Mt&Cx7 z&_B}9L~KohCL*N;s->_5<5a>>=WE`0*V;r_EvdpV;-uCXg5w{1jgOx25g%Tu3%MJ> z(e%zar*$~iewWWJ?b5fr@#4W5hnCE4JNeA~Dd%4MvFGJ|&+gp6V*l=qFWk_%WWnst zwzrOa`((?(yADh%&zH9@w0lo{`STYi7k~0x-WuN1^tQA6hw1xvwK$)yId)!J^_98e z%=ee396pSd{BfH+}usvWHJKKlM{`=z*6sWB7nQGynN7dHu{;_gL7`vTfGZ%?tKU zySU?@=698rzvzzl4qW))&6`$DJz{&Yh}MWkWAMZSQoJBSDn>;~j3Ooi35i?^zS)aKTc{|T-8tU--v599 z|Ni6c1GP0(Ba6ou`+UBU)pH_s_+H}uh7G~jTTh$^_;#H&r^)g8hTq`*ihNIP9ETt7 z)nkorV|1cwrh@#bq=nHwU)ju*1z;<32?fPYKUwIMwzG;MlJfB zr8cTxS`&jyTcME&r*yYc*;#e?Ekw4s zt|ilSM@NUhBj7jfIL%6uL^B-CaTG>SPN(656lFLQa}pxRfwpeBx@i!eM4*^$ZivKW zGgc(6yja7@dJ6lDP63N%{fuW-8mPiN&T6w0Y2_-UQ355A;W`-0=CRmO(P$ptr`TjN zk9OS3cFZViTc2nr)@dQS4moC<4N+w~);KXo%yH|`1=kEz*IxS{DPRLJR z#8h>2(UclDZrJA6fZ)Ck|ds`coamU zs;U}dP;Pz1gl%3}dFwMtrkW7T$nS>?0E;*Y2ownLkYY=DL;+C^QY^=d928jw3S3Uw zJX^<*5Bk-kA5O^N5x}Y~~CQLhOs@Ug& z!tv^GxYjl`J%J~xkb!I+5_MG-M0SuQywH#_6Koamk}*WG*}+CHt`lvUL6O6Cf}vUO znw@XD%>0Gv1%{4y1KaHdmz<_rk4qhl6^|(L^^|I05c{)FO-o=W{34YVqsuj&xq}4LD*TB2=ENdF*UaX z*r+^?Jv@LEqWh!ofc8t1he0V2fSia+It~GrmvqI4=Xa zgu62GS=YiAV8jt_Tr_#*=12jS3vdEU0fpyrUIqZpP_C3>VUTA9O;C7&@5`J%>&I0$ z2bxAZvJ1k?0yej~umZe>s&@U@X(-cwCcuIwWLa7?hPzr8i6yk%B!Q+U5Y=Nw_)C@)X(zc|L z1qVq?Bt3*rr`}`!WQFrW?-q7-qW4lVW zj)5bd+qZAm&ij_X5MHt2-Mj95cIY0AAh^;?=-Lmbw6Y+=N`0nh+5eFuQ z7qqQ2zUp1Py{X~g%iZO(W>WiiJ~VsHwq?r>RuJ!xn=iHk1pnHCex2&o(u0_=!0=YL!dA)II$5pKpw)$+jdapV4W^vaqA0FAy{Jw3G{Qlm94}_~8`>Ol!W1sduqCMaB{HNC+ zn9!Qq)N@0R_TuTTns?SToGWWNI_=Akmei|XH(k%pIN*|US?A`*SDxPU^j@WSgnDxA cpi|d={!vfQ_#EX>4Tx04R}tkv&MmP!xqvQ%j4qDA+;7AwzYtAS&XhRVYG*P%E_RVDkD4O&XFE z7e~Rh;NZ_<)xpJCR|i)?5c~mgb8}L3krMAq3N2!MaCsl+y>qzlK0s(znQHco1FB{j z>10C8=2pevD?$h$Le(!bQ=gNh6g=10J$!t>i}Nh+dw;G-zF;!IClb#x-LQx^h^IF# zo%23%l$GT?@j3CBK@Ac=a$RxxjdRIifoDdIOnRO;N-UPTSm|O`HdNv%;#gkQC|}6B zoaem7S*_MtyHEbYa6wyH<~r3dl32tNB#2N@M+H?_h|{i-Vj@lF2@n5}95vi~zx1pw+PL?_=9;odEu4;7aTGYfWJ0lk`SM ziyZ-d+rY(jM^pBI%N=0wNtX@Tk^EFbu?W1M(KqFQfm@(=&7E8O9H$RJhGvzz0S*p< z(Gq2^d%Qc;J-2`FwCDE&;wEx!JGMSg00006VoOIv0RI600RN!9r;`8x010qNS#tmY zE+YT{E+YYWr9XB6000McNliru

206%QgI^Rxf}02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{004qXL_t(I%dL~q4S*mF1rNhUtk9u4LWg37&V*ko#$qsd zf3&3Gnn&WIaVIgs)*nO!5#b9Pi)1rv0IGUx9Q6oQJ@qm`Ddlk~ssXtB&kE7hs5W|0 z?tI$F^KBo?3jge2KP&68f&fV3hCuDeI78x%-WFycYj8ChA3Pf0d3 zNli7@HA}HD)HN|QOwqMSGO^T6v@|wIF-kGENHsB?%+8{vl4xdZY>{G+tZQJHnx>nS zY+|BoX_%I%Yie$sXl`PWYG{;byg8J`o7vSoHPzC<+{i>X323ISNs_stu7zomrLJjm zYLaoXg>j0RvAL2$afxeLiB)+gp}MXTC%VD=*ru-#K06 zi_V&?EdCqLE(seT;FKp UWAcvW0MIQAp00i_>zopr0N@9mmjD0& delta 483 zcmdllzE*sK1SbnK0|Ud`yN`l4Dq1k}8tNJvgculFnHX3ZnoLe(RzMS(%p9PSYHVPZ zoS0^+YhYoJsB28&@k1&aC0b&H?wPsg+)?Ya$1tEky)yRu8EO(s;-5xp`os^ znYmG-sYNnSf0~j)afxeLiB)+mF0~wR&u!{gW%q2m7!9e;~ z*^zrd%E8mcF@)oKazGOko2au&Jf(=rHuKJ|oFcdrCZZ%Mmv*1_mw$22WQ%mvv4FO#p#li^c!| diff --git a/Base/res/icons/pixelpaint/guides.png b/Base/res/icons/pixelpaint/guides.png index 9e62d16e90205a20920cbac2be190851db03f08f..a0f817444e298255cf87982ec6d52a682428b71a 100644 GIT binary patch literal 3157 zcmc&$U1%Id9KRwJTdfrIL8Rbz3q`@Xo&C7|BG;Pc5)LzW87fL=+UXh~Tr}2P%S!ND=9S;Dd9jYj%Sj`J3-i#uf6}FECsA7KhbF8c09$q z!R&g%7uQcM(e-oGVe;`~(!|gO0ezkkY1r?DsXJ`Sxm*{PL)p9l6RUN7P$e=J`zPr$xDb>MSQ|@M2 z>?+D&FsKjodX#h&)o~mJYl@~JK%jIj%*YUh>5-9y7Efss#90u9l8{KeXeDdPU~J(< zKd!`vX~`6DrVL4}sC6v7%7KhlxOgS$<;odVc#rpan5BSKD{S12vMB9FV?U& zR1N9slIpm+={8J+8!pBLv>ma)U#p-R!Wy7+sOB2Z7AT}LBN^Ed%&6-}NuNLzf~hw>1~!OtYRRMQMKV?sv)MCIx?_rBhR!9Fl+|)_ zS>#=BrI@rpJI0DCp5^+P9o9FNPlo|etjUtdn1a&k52gN4?NcL^;BrlNW{lgsH~n>5>9 zKnt;hE{9Owq^1g38u{6PBz&?1@!v(&Dr3!$!d0GZav&xNfis0CX;b!-s4rC&CS{RC z;9@!N8RL~kyM6|c1hUba3(9a;EqWRonqfc4TG7;uq}*i+a!o+x@~dGbEpON zdPB^|HOK$l9lB!{>=1a78&#r=r;YI>*pvsGbFDH#%Cqj@(YIsP?d}BlAHtM(uA=QI zH+H1ry;X2IBWg6iQ@Gppp55jlTrylZ&~`fFcF}Z2Rtss-tsZfrm*g~Tx<`(t;BqR4 z)x{WIs;e~*p>`9vIA49uUV}^bV6HW}WWV^y;+1_LNq2p4@8G=^_u`a$@fUmgk4qQN zzWLd`>j!N*p-fJn{(iDno4fkP%$`qwoq6G_C%?QcedeV6(zU(6FI>3WUp`BwAKBAA z`p!>ZoOt0x#?4_%O{?C_HRfc1XKV3 delta 659 zcmV;E0&M-&7^(%3BYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmP!xqvQ%j4qDA+;7 zAwzYtAS&XhRVYG*P%E_RVDkD4O&XFE7e~Rh;NZ_<)xpJCR|i)?5c~mgb8}L3krMAq z3N2!MaCsl+y>qzlK0s(znQHco1FB{j>10C8=2pevD?$h$LVwjSGgF_Fq!c{Y*FAiE zzl-xM?|Xl)NWNe)z$X&VGTpF$iJn=d4m_ZE^KXP4h`HgeQVS#5x zjZAu;I7%#*x>)IARyI`PDdJdO)hJ)cx}4{{#aXS^S-VgE!f-)bS>`&`Fp^lr5+sOF zP)7w-ScucEk$++$P3H*@|B&OC$fc000!EGn)SyCk{NR7^d$wkAa>7jtCxF0-cL;VCIwbMn{Vs0e#!R#dSwh_JGSBVDL$o4cU?WR6?-` zyr0oG<$!@(pm)ukTl*ZR4?u=ymAU~A4uR1UWv_d@JAc$Yw}0=n=l28RCUR{%wmwe) z000JJOGiWi{{a60|De66lK=n!32;bRa{vG?BLDy{BLR4&KXw2B00(qQO+^Rg2n7ul z4P&68f&fV t3hCuDeI78x%-WFycYj8ChA3g11e4YgQzH|5M$7w^7w-ogW4F4D2Ya6co>W(Dn>zrkC2Ac*?TN4>Cr~8>D}$l zeDiyJ^ZkA^o4Pue&#SGgjYJ~zI@*)nYmd)jI(VQ5y-2s+YRh8ugRuCA1V7!9mgFIt-4HXMX>_OLbeABk5z#`D? zAwNNrU`ttKozSf1m6;-(v3cOIe3T2aDgqGdXfXeZYmY}m@<}ZHgw_nt-~aZG9go!9BY&Z7oAs6D-VG?FTB^%H0#uxaU z!Eyo*7yG7BWosSLc74EIpVrOiZI404F#VArKt;6zsU_soGOwc5SsA(ciR3VUf z$TOS@R7TL1 zaR?!!NQNRvKmdx&SE9MsHA(%0%tWg}REStake3Y(3M7n}NTQ0z89k;*jIP9Ex}*by zq!>*F`>hc(BqR`2Sb`?Ti-UcE?lMEAK}8_N&#`>)U7qisX8ywTO3Ne^3p5odro?Iw z>0gA_m@JEOdA!Ta<4j-DBm!SsL|r7txeT?W~xJSjBDh` znC1|{M7WA-NDP88ok51gF*@X843=cbk#WpH(&tOj*q3{V1ihq4!-Sh!Wr$q=g2(Xc zNnXOsE4E1Oy5wp)GWOu|U_{x7TamKl{z$qrWeAx3|?7xScB& zZaiAIPu|+}=DZ9rgqtF_%)NeVKfCSz_a0xmD6#AyTClF>(5^ijK3c7VdVJ-EDg% zM!>{Bzz`pZl1icxV`A_Dn)pIOVhm9UqA{omqW)uoF=7Z!5E4^o@3B3!r4=<^?)EYB zo9{Kh@B8Ln5*qcmk1NqU2nX47sf z&RZQ@JlwOTD~q;lLaITpT1hpPG$Npg14xyM1>4t3NxCdoBhTS5LsMl)uqjEmgbJzN zbT`%Nc$iY+96&6~Qi>YK2IO_YglGlDvpmOeGu$B8z35&)C}{33?2*36qXZswAjr%f#c_$34#z! zUlEGHGAB?N&RhY-C2Im`I1@o#t<}RYaJ;PJ6l(P8uGvQMLY$+PrXjNI(As68>(wPV z1p}O<36*%ja)1@HoT%}<#>;?}G?uME(}bS}3}8K&2OOW}WKB{vfvl|qJBDQrO$s%T zW;$LGlC86fFozk}&Xu*L(^{wP2hc{iGnJ%?sd39PG($-koS5K&DN7;{Io1RT-qeB2 zLM-aMth2IITc2`Je@LrveI>~Z2N4<3erRGsfTAFh%;8K4@TSNERZ$Q?lECQ-Zzxhi zsYzSsStQS4po`tAP`)aB>NK+v-G-3(y3Wmv;q`B%~Z^-LHe`QeNNu6LB zF1%Lf`zDzmn_h2QWH)%43dyCFP3#%%6(4lH!>cN||h>~U|oga6`1ds z!65W-OO8Z%3Ms@)WWEmvu5LV%R6#(zLP|OzifGCSpeq6bJQQSE7odW8wdVY|#*d|% z&)q?eJ%GJBdb!Ypr2S&gPtvC66e;Ms1q+pPj2WKkfcbN!sJy2tv0M}GPPtoaJ@{qJ|jdX*kKm5H) zUeWLT(~c1GCZd#9Yb-6K<%LDkuhy2;Fc(#smE-p@j6|%mDhpI>CICme4Nwh*bVUOz z3a4U2)KOD8#06_oS*EEgswn~k$vQAhkp((wV*ra1V#zpW5mzUxEVW`Hb9GddrP%&+iY!k<>kH z+n2^RUzb0URA(-nZnxZYP|7vWmQJmCsm;o4-FasIQ2SfcR=hVn`u)Xk8h5;M-y7$? z-2d8F&iY-aVxRnWBTb+ zHYG1zoFQy`?)aR$n$I8FxbVB;*@tJX`}(oW-NQ>8pZV~MJ8nDc4=vwz;oPEa&py5= z_V|X}{3lK>TlUW3<7f7Kdgj!+*=^ykE%NHV zJK$l5ogE5>GJOVdi&0EnlSRwL5}+fIH67&=CRUudr(sf-BWkHq^Ado-q1h|YGzr8LY#eCw~rNDL_E|iE(cO*#i zK(=Z{vD6Uj_%%;~&xA5A2~t!Ht*QViY2ZpDUZJ9#5`h(1kvV}6SgC;pM`bb%cuTRx zVgv05J)^*=W?M_NpB*nTVSxGWh(}n@C}?c26Z3-sHshKFEC+aFaVhTxuAg`3a6)5x zmMa3=nnPhYGYiVf_8ib~rU5M(-5$e%>t$WHP!FH}IyX*Mq7t_yNGj4C^@-`woJxIJAQy2!qTZE4^*SJO%08hlqIN+60)QqRkAc>s)~YQloG1z za>A69`udbhM#8WP*H@E_x&&l2_QOyWrdly2hT;hoqlBrdC_%A_6a|}ck?O>f<+`+o zJR9;H7n-GptSCq{O<6Tfq9ZfTC{i(#K#mkcIuYY)g2dyh%6M)@Z?{`;y^Kr2=fHMm zJl);h@41#;fQj|YVV+I6f%RQnZII`}&@g}rScSu6O!87~a43xH!bo*clc7$Cf)rkB z^PA_HpP7Exv0*pB?l8EF3e`aC%3Swt62enOwHye4uN2kyRMnU3!riHKYok?7SZEwV`!=8(H2TB8tK?Pv?tkqF zVcaxA%BVM%PH1^yk@Rb|r3>d8Rc3ALKE{a3bWs-}=d1*hpxYpwLLSB`(=Oys|9I)O1Tllt4ODOBIm`Z45CrMno8AB9WS8Risua3RkzKf^0fS0+GrPoKC~X z#>p678fR5H|bZ*b&*x^mIkH~J>0Pal8l>&xdZ#P$#OJ^jv}OB>tH2cJ)&-#>ii zfs^0tfA^H|>ua~3JM!7v2XfiA;g08?*))9Rh6^8kf9Ii|eVu!!#NR&HvF*p*yKedt bO}DLn?^EyiYg4`9e~fg`hSagH;q89`&I>n& literal 0 HcmV?d00001 diff --git a/Base/res/icons/pixelpaint/merge-visible.png b/Base/res/icons/pixelpaint/merge-visible.png new file mode 100644 index 0000000000000000000000000000000000000000..f108bcb1392e6f72f10928fc3dfe0519753e5f9b GIT binary patch literal 3238 zcmc&%Z-^9S7~crZG)a-863l7LC~$WE&+H7hC+DrYEADx%E8TsnciwqtZ@Ar=ac1sr z?*t1$un&Qz^ufdo$q!0}7zULHp`=*RACR&>L|^JdX&BK56? z>m$Qsh)XSBK|ln5C%(Bpk`oy^%s{ zusA^Vxjv!PG|ym;<0w^26B7xBXd%3Y5;%cpdHAXfuj+!R^BNU@Xi(^zmR`zjh}FSc zmL3j6PiNWj@$vMyn0EaN%WIm(asn#|3?P_b!U<8Gae`GX2{{sA-}XY=b*M-pGThNH zO9R=a6*Vsr>jbf?MOS&NFg2HgJ&T&m>5#rNCA!-K$UMusO&MCSmP6NB9ZB5JyHL-5F zehtCa*)>!ltmjl3+KNTJ-~=IZFe&7+G*C_3wyCRF5r~K}gLzqHBqU3Wh9ttMswqpn z$XkRbt@Sw0*$P?1wHPPErs78K$BzmL_qGrdblh^P(atyuhnSYDwGT z+mPp|+AcL>Wr9S*5G2FE8e=HL1XhG+GA1uG8s-!!gB3-RfYp@VKDX-nMb`wMi|ylu zzPITZ*y$e4S}Yj;L;mZw?e4{N{TFtay&j@*GY9SXM=--CK085W@!3MRQaNG*7J4% z0Xh*ErmbXq{8Y86Mh5E$H%-7%C=-*8hwTorFgLF^#f}dXaMm3Hya@|jD;!5Y>8*f= z=a53|O!NaZc4zWf)B{5s;`ThKN)wXf5MAl83xZ67KHE$F9Z0 z$f*!$Tr7R}=EyQ+plB$JltGXIGN&+_s3ArZ6it9!m2n0l>aTmzv3~sL=3v(uBYsc+J{q8^Q2vOW5 zA*Ht(OE0v%s7MBJZCQsZNtNm8+{Xx(h{kEqy@-`zc<46J(Nu#`Orom1Moh`T-3=F4 z?OA16mZ3&X(8P+tm=^Rz1KJovBpGusPB_fB$!bV#Qe^LJO9R<i(#Z>n&$q+Fg3uInOOP_1a`laQX0O*N*PpccAvlz|kk> z<0G|0d-mv;S6{oa^US?3jNE+n9KBB}q`o_GsTY@x68+fU0Xi}vq&FqQv)|K9wm4e#u*ZeDog*e}=7WPL^Uv94Rk zjcxf)Pv1AR{gbmFf4ljTqs&`+a_Q|8R~}mQ!_7;#UcbG4`N{{bZrSwS*WXBwkA8W2 z)AMg$-(>ALcbWXc literal 0 HcmV?d00001 diff --git a/Base/res/icons/pixelpaint/next-layer.png b/Base/res/icons/pixelpaint/next-layer.png index 2f6dc0ed4ad88bdafa4becff90c93d76de75288b..608b8c15dda3b1d01e9c674fa74ba26db148c592 100644 GIT binary patch delta 542 zcmdlk@mpeo1Sba@0|SHn=l_Wt6)l)~jdTqxLkx|r49u+zEhncjE1-!?W)4s>Gqy-I zOis4cwM?~0)-|y(HPf|7F*eanvrJ7hHcm@5OG+`B%+8{vYnW_mX=<2apqrd(XsVlR zX_Bg&WNwtKo0@25o|a~wWNu)Prle4jTj1+!! zWDX9|$!|D*x)S4PVoi-#Cc=r6Uvb^2Uww1pBw+B)^>lFzvFKeIA;!zUgDUef;P$&t3Kp3xy) z*eb{R->wMaEh zF-S7iH8(a((={C0m&2T9_Cl>YACF zr0H5(7#Qg$TN;=cq$OFJq@|`PDOBVZ`1)G;Pj=*X*gTJAA+w8#k#U-VX{xTJxv4SG z(6mI|BvXq-T~o7E6XT>*6H8O$BqfF764$a4tMZK0JX<9r10y3{15~H?v)N6~;1Zk6 z!67>N4aZMcVjNAZsqxB0IC1hTt{bHnWkXtl!OIii6XFV_|Ns9FAy1?RN&;C-B|(0{ z3=CzH&sqR^#-1*YAsp9}Iarz6E-YAi!i6K4xhG;Pm&UTKLLL>mt(uH4Peg6aQg#0K i|G&K=%M9*G3=GUWWL*wMR=x&mXYh3Ob6Mw<&;$TY!-%5* diff --git a/Base/res/icons/pixelpaint/previous-layer.png b/Base/res/icons/pixelpaint/previous-layer.png index e57ab2fe9a86ccf81f4ee57b87469973a31310d6..050e88bde951c0855ea7cebdf4b46be434d9d551 100644 GIT binary patch delta 529 zcmbO&eph^g1Sba@0|SHn=l_Wt6)l)~jdTqxLkx|r49u;JEGDNhE1-!?W)4s>G)*x# zPE9k`HB2>4)-^FmG}N^)Ni)+;OtUafNii}@OiWIl%+8{vlA4;92$VL`wKPdI*0nG* zvCy?NN-@(lH%?14GPf``Ni<2?9LnOu>|&Z^Y+`9(scULznxt!zVwt9Ek(g|uYmsK0 zoNStuY7R7CNujvJwXDRdJR>#FR>{b~2Y;qR6=wv^RpRUBXlUP&Z zm5FfTWFM{@^;7MZ-vEZ_Tu&Fr5R2ZWlLGk;EATkKUGn0R2@@f5E$mEljKXIM*ZH;~SmDV%U%>6CXC>jf-$Z&@X}xhQ11M19x&8TQ1; y>9?@pL_hQRl>7^EH<~-xZMgPymGtI6Vm@ed_QNX`>tLWu89ZJ6T-G@yGywpvPOQ!V delta 462 zcmcaBK3jZ(1SbPf0UN zPP0tXO-xBK(ltpjG|){nPchInF*h?ePBTtUO)^cJ%+8{vl4O`>mXu^@u4`hNW~rNI zVv?epXl7}yo0ejcYGIO+Y;KZlyg8J`huOv4EF~!sD3fAjZVXgyoTi&(nrNh(YMEk@ zW@v1gW|(ZIq)=SqT2^9Jo{^eot7K$gWTb0=>e`R2c9TzWicQX97oF_K@za$UcM@xA zyfP6^ob1DOqnt0_`Zq8{c>;VwT!Hle|NkN6iPS(zAd9Ia$S;_Ip=|P53n0(b)5S4_ z<9ad&D^uH=(A8l^Pk`!$of>u~bY9pHrXaXgz$0ZXgV5@*PNNnh(*qnEbeb5L82D9W V7HM71{s=UH!PC{xWt~$(697M_hqnL# diff --git a/Base/res/icons/pixelpaint/save-color-palette.png b/Base/res/icons/pixelpaint/save-color-palette.png new file mode 100644 index 0000000000000000000000000000000000000000..ca658ad84f676f905ba1eeeaa68ea1de53a9573c GIT binary patch literal 3113 zcmcImTWB0r7~a+|DfgO_G?c&F#9k?lh-cAsrQ|c|RBBsC#YcFIMw~@Q9XHGW_TKwE=a4LapOS}p zznd1E-hBbxvv2nx-ZzE~!gp-vwpC1~phP3YRZ2xSG%H!Ys@G)i@vy*iRgq{c%Xh^F zxuJYN*X;$A)6ycq5JFBf(v%>{%Gd~R;Up-Dg2*lnh?*&7Owr)#Kb{#3h;0t!cGk_Y zuPk4PBHt8*iHV8yL?-P8qk?D{h5#i&k^qwc;iMa(3UI@<4GlRO;=u7E$8)(@BeJ~l zD9bZvYf+T^M6Davkz$w$732$I8pcso1qn{%{PCbzHBPWVi?l@DC}gr?BI_5t$O{YJ z9IBJ)%M37d^ZCTatiF^=iHR`kDYG!@fXpf#4o>=17@(my9$?y2W^S%+L=#2>^b(#6 zSkAemm4k(JeV9@i54f^yqP~@acTI4q55q8`d*Nt%$ z^(8ciBAVr6DgjXf8F5fF%#3O(Du9X!VNEpe5yzfPL?r;(WekeCsYoVUHdB;QnV<;G zD@?FydqD}YEI1`JN(J8?<+&ucX17=L0%n+bm#KP@&zpU27$FzazFd}PA*3CLnAp~2 ziP#iaqKJX4K@}iuXh71TXs8ClRFxa+a~>X#=@zfA6(8|1({afv#L&jNL4ht>GLR)1 z1B4VAh)BhfMl!Nd$Ao!vPvEfnN5z?1W3LF)NU*5b5KDkaY6i$q*MX&KGO#pVwPXts zBC9+X=Q~!zTtab$WqGkaI27})I9?mnBv$-T5aWA&et4ewOVjtd4ue?YxtK9ERQIs{ z#b8wxC8N~G`<)6c4&@w%PFQn2krgY~zf!&NKH zM7S0Lj`>LmUmtd6N#w#HtErtRPzKgjSX&bdJv*8}0qq)P2rr;6ggM>!+%gSj1mL3p zv93*nFw5J4SK<;5bCJg(-!D42no^k&enSt%0sq|n{3ONXA_~e zZE1!r1A9ksMyB z%W5}ZN7D;OMvk&$?Js?~u0j3a3(stAn}+SVQU3F$Rs6x84_gjzC^&j+Q&V=8e9QV? zf90XhZMXd{Oii`xBhI%YU);HC?_JX!V@p!&9vOK0_71Cq0=wDyeT(wVf?$#y0<^M_{*;0qrf`-R?C*nhrbGTyna$^9r|-+$E)V% zAJo3K)#s;|-+23lueX$^9(`zapls~yIlE~6fs^I48#!zL+ouX=j&*6zZ~pPziQ_*% zUcPzg#L2~}zyHC%Zhhmg8`gaA(Z!|ZWvNf)O)JhE(_7Mg&D~Ay%}=~j=sdr+bFsMS a`*q-zQ*Cb^SrH%R`+9cgUfc1&WB&q$pYxmm literal 0 HcmV?d00001 diff --git a/Base/res/icons/pixelpaint/swap-colors.png b/Base/res/icons/pixelpaint/swap-colors.png index 5f84a4fb71c2864b2751a2be708b545e4187891c..e264ac3f573498a464f44c4ca3cd44856096c1b5 100644 GIT binary patch delta 562 zcmdla{!e^@1Sba@0|SHn=l_Wt6)l)~jdTqxLkumg3=OPIEheWiE1-!?W)4s>w=hmI zG&f7uHAziM(KSg)Gu2HrH#5>TNlQyfGcZUrN;NZ^%+8{vVs4OVnrfV6p=*(9oD3vP z5_K(;jSX~D(hO6Ql9H254O3D#hq8DxyQWzH4Kz$K&^1jn1R9iNn5dg*n3kw(Y+z(! znrM(@X_9E5q)=SqT2^9Jo{^eot7K$g1avE^b3d}$O+LjbHaUx3bh01EPgi0bO021I zN`&1w*^BE|eO$-1slX83=jq}YV$r*FvLP3fp@8fC>AE%z;hTigtkyqRYtsFAcmB$|YA!WnNGP|h*R{Aae}?2FB_);4OJB3v zqEk60u^m!zxc^<*qtg7Qv1O@vAZ^ubB$I gE54n!<%{)xhJ>lE>B|K_f)WRVr>mdKI;Vst01SM-?*IS* delta 484 zcmew-zDaz71SbnK0|Ud`yN`l4Dq1k}8tNJvgculF8CzNznoUk)RzMS(%p9O%VQ6TX zYGh)lYnfz{tZQOwo}`;-Vw9$voSbB6Y-wR>W^8FXnVm&T#ULr!)G|3WN!P+4%~aRY z(!@;HBF)f1*D}%AFfGv{HOdbwV!;7Q*3e;yXa&;j-M{X zxRXdjXczM;VILxa&x?V8UF;xVJZpo3ua&_ zn|#&+$n*4caSY+OZhFp<_kaV3%SBBtF%gET4Xl5%vzRx}iF2wm3Xsz=uDx(qj$hGD zfpfP-#Ggc;e_^bA3Z@?M8HdE)v9#!i&i-@m2g59N{@WM%&&#y{O=a+O^>bP0l+XkK DyycAm diff --git a/Userland/Applications/PixelPaint/IconBag.cpp b/Userland/Applications/PixelPaint/IconBag.cpp index 88017b99e04..bbd1a2ab60e 100644 --- a/Userland/Applications/PixelPaint/IconBag.cpp +++ b/Userland/Applications/PixelPaint/IconBag.cpp @@ -15,12 +15,18 @@ ErrorOr IconBag::try_create() icon_bag.filetype_pixelpaint = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/filetype-pixelpaint.png")); icon_bag.new_clipboard = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/new-clipboard.png")); icon_bag.file_export = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/file-export.png")); + icon_bag.close_image = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/close-tab.png")); icon_bag.edit_copy = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/edit-copy.png")); icon_bag.clear_selection = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/clear-selection.png")); icon_bag.swap_colors = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/swap-colors.png")); icon_bag.default_colors = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/default-colors.png")); + icon_bag.load_color_palette = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/load-color-palette.png")); + icon_bag.save_color_palette = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/save-color-palette.png")); + icon_bag.add_guide = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/add-guide.png")); + icon_bag.clear_guides = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/clear-guides.png")); icon_bag.edit_flip_vertical = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/edit-flip-vertical.png")); icon_bag.edit_flip_horizontal = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/edit-flip-horizontal.png")); + icon_bag.crop = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/crop.png")); icon_bag.new_layer = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/new-layer.png")); icon_bag.previous_layer = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/previous-layer.png")); icon_bag.next_layer = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/next-layer.png")); @@ -29,6 +35,7 @@ ErrorOr IconBag::try_create() icon_bag.active_layer_up = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/active-layer-up.png")); icon_bag.active_layer_down = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/active-layer-down.png")); icon_bag.delete_layer = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/delete.png")); + icon_bag.merge_visible = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/merge-visible.png")); icon_bag.filter = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/filter.png")); return icon_bag; diff --git a/Userland/Applications/PixelPaint/IconBag.h b/Userland/Applications/PixelPaint/IconBag.h index eab38790738..0eaf1244222 100644 --- a/Userland/Applications/PixelPaint/IconBag.h +++ b/Userland/Applications/PixelPaint/IconBag.h @@ -16,12 +16,18 @@ struct IconBag final { RefPtr filetype_pixelpaint { nullptr }; RefPtr new_clipboard { nullptr }; RefPtr file_export { nullptr }; + RefPtr close_image { nullptr }; RefPtr edit_copy { nullptr }; RefPtr clear_selection { nullptr }; RefPtr swap_colors { nullptr }; RefPtr default_colors { nullptr }; + RefPtr load_color_palette { nullptr }; + RefPtr save_color_palette { nullptr }; + RefPtr add_guide { nullptr }; + RefPtr clear_guides { nullptr }; RefPtr edit_flip_vertical { nullptr }; RefPtr edit_flip_horizontal { nullptr }; + RefPtr crop { nullptr }; RefPtr new_layer { nullptr }; RefPtr previous_layer { nullptr }; RefPtr next_layer { nullptr }; @@ -30,6 +36,7 @@ struct IconBag final { RefPtr active_layer_up { nullptr }; RefPtr active_layer_down { nullptr }; RefPtr delete_layer { nullptr }; + RefPtr merge_visible { nullptr }; RefPtr filter { nullptr }; }; } diff --git a/Userland/Applications/PixelPaint/MainWidget.cpp b/Userland/Applications/PixelPaint/MainWidget.cpp index d1509c03260..e1c99f85ec3 100644 --- a/Userland/Applications/PixelPaint/MainWidget.cpp +++ b/Userland/Applications/PixelPaint/MainWidget.cpp @@ -191,7 +191,7 @@ void MainWidget::initialize_menubar(GUI::Window& window) file_menu.add_separator(); - m_close_image_action = GUI::Action::create("&Close Image", { Mod_Ctrl, Key_W }, [&](auto&) { + m_close_image_action = GUI::Action::create("&Close Image", { Mod_Ctrl, Key_W }, g_icon_bag.close_image, [&](auto&) { auto* active_widget = m_tab_widget->active_widget(); VERIFY(active_widget); m_tab_widget->on_tab_close_click(*active_widget); @@ -305,7 +305,7 @@ void MainWidget::initialize_menubar(GUI::Window& window) editor->set_secondary_color(Color::White); })); m_edit_menu->add_action(GUI::Action::create( - "&Load Color Palette", [&](auto&) { + "&Load Color Palette", g_icon_bag.load_color_palette, [&](auto&) { auto response = FileSystemAccessClient::Client::the().try_open_file(&window, "Load Color Palette"); if (response.is_error()) return; @@ -319,7 +319,7 @@ void MainWidget::initialize_menubar(GUI::Window& window) m_palette_widget->display_color_list(result.value()); })); m_edit_menu->add_action(GUI::Action::create( - "Sa&ve Color Palette", [&](auto&) { + "Sa&ve Color Palette", g_icon_bag.save_color_palette, [&](auto&) { auto response = FileSystemAccessClient::Client::the().try_save_file(&window, "untitled", "palette"); if (response.is_error()) return; @@ -352,7 +352,7 @@ void MainWidget::initialize_menubar(GUI::Window& window) }); m_add_guide_action = GUI::Action::create( - "&Add Guide", [&](auto&) { + "&Add Guide", g_icon_bag.add_guide, [&](auto&) { auto dialog = PixelPaint::EditGuideDialog::construct(&window); if (dialog->exec() != GUI::Dialog::ExecOK) return; @@ -388,7 +388,7 @@ void MainWidget::initialize_menubar(GUI::Window& window) m_view_menu->add_action(*m_show_guides_action); m_view_menu->add_action(GUI::Action::create( - "&Clear Guides", [&](auto&) { + "&Clear Guides", g_icon_bag.clear_guides, [&](auto&) { auto* editor = current_image_editor(); VERIFY(editor); editor->clear_guides(); @@ -462,7 +462,7 @@ void MainWidget::initialize_menubar(GUI::Window& window) })); m_image_menu->add_separator(); m_image_menu->add_action(GUI::Action::create( - "&Crop To Selection", [&](auto&) { + "&Crop To Selection", g_icon_bag.crop, [&](auto&) { auto* editor = current_image_editor(); VERIFY(editor); // FIXME: disable this action if there is no selection @@ -584,7 +584,7 @@ void MainWidget::initialize_menubar(GUI::Window& window) })); m_layer_menu->add_action(GUI::Action::create( - "&Merge Visible", { Mod_Ctrl, Key_M }, [&](auto&) { + "&Merge Visible", { Mod_Ctrl, Key_M }, g_icon_bag.merge_visible, [&](auto&) { auto* editor = current_image_editor(); VERIFY(editor); editor->image().merge_visible_layers();