From 4f718aeead6743de5224654093d318d1b17cfb29 Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 24 Mar 2020 14:49:50 +0400 Subject: [PATCH] Add filter icons to Settings -> Folders. --- .../{ => filters}/filters_type_archived.png | Bin .../filters_type_archived@2x.png | Bin .../filters_type_archived@3x.png | Bin .../icons/{ => filters}/filters_type_bots.png | Bin .../{ => filters}/filters_type_bots@2x.png | Bin .../{ => filters}/filters_type_bots@3x.png | Bin .../{ => filters}/filters_type_channels.png | Bin .../filters_type_channels@2x.png | Bin .../filters_type_channels@3x.png | Bin .../{ => filters}/filters_type_contacts.png | Bin .../filters_type_contacts@2x.png | Bin .../filters_type_contacts@3x.png | Bin .../{ => filters}/filters_type_groups.png | Bin .../{ => filters}/filters_type_groups@2x.png | Bin .../{ => filters}/filters_type_groups@3x.png | Bin .../{ => filters}/filters_type_muted.png | Bin .../{ => filters}/filters_type_muted@2x.png | Bin .../{ => filters}/filters_type_muted@3x.png | Bin .../filters_type_noncontacts.png | Bin .../filters_type_noncontacts@2x.png | Bin .../filters_type_noncontacts@3x.png | Bin .../icons/{ => filters}/filters_type_read.png | Bin .../{ => filters}/filters_type_read@2x.png | Bin .../{ => filters}/filters_type_read@3x.png | Bin .../Resources/icons/info_media_delete.png | Bin 189 -> 308 bytes .../Resources/icons/info_media_delete@2x.png | Bin 351 -> 546 bytes .../Resources/icons/info_media_delete@3x.png | Bin 485 -> 823 bytes .../Resources/icons/info_media_forward.png | Bin 213 -> 399 bytes .../Resources/icons/info_media_forward@2x.png | Bin 390 -> 767 bytes .../Resources/icons/info_media_forward@3x.png | Bin 844 -> 1109 bytes Telegram/Resources/icons/stickers_remove.png | Bin 168 -> 0 bytes .../Resources/icons/stickers_remove@2x.png | Bin 260 -> 0 bytes .../Resources/icons/stickers_remove@3x.png | Bin 439 -> 0 bytes .../chat_helpers/chat_helpers.style | 4 ++-- Telegram/SourceFiles/info/info.style | 4 ++-- Telegram/SourceFiles/settings/settings.style | 3 +++ .../SourceFiles/settings/settings_folders.cpp | 21 ++++++++++++++++-- Telegram/SourceFiles/window/window.style | 16 ++++++------- 38 files changed, 34 insertions(+), 14 deletions(-) rename Telegram/Resources/icons/{ => filters}/filters_type_archived.png (100%) rename Telegram/Resources/icons/{ => filters}/filters_type_archived@2x.png (100%) rename Telegram/Resources/icons/{ => filters}/filters_type_archived@3x.png (100%) rename Telegram/Resources/icons/{ => filters}/filters_type_bots.png (100%) rename Telegram/Resources/icons/{ => filters}/filters_type_bots@2x.png (100%) rename Telegram/Resources/icons/{ => filters}/filters_type_bots@3x.png (100%) rename Telegram/Resources/icons/{ => filters}/filters_type_channels.png (100%) rename Telegram/Resources/icons/{ => filters}/filters_type_channels@2x.png (100%) rename Telegram/Resources/icons/{ => filters}/filters_type_channels@3x.png (100%) rename Telegram/Resources/icons/{ => filters}/filters_type_contacts.png (100%) rename Telegram/Resources/icons/{ => filters}/filters_type_contacts@2x.png (100%) rename Telegram/Resources/icons/{ => filters}/filters_type_contacts@3x.png (100%) rename Telegram/Resources/icons/{ => filters}/filters_type_groups.png (100%) rename Telegram/Resources/icons/{ => filters}/filters_type_groups@2x.png (100%) rename Telegram/Resources/icons/{ => filters}/filters_type_groups@3x.png (100%) rename Telegram/Resources/icons/{ => filters}/filters_type_muted.png (100%) rename Telegram/Resources/icons/{ => filters}/filters_type_muted@2x.png (100%) rename Telegram/Resources/icons/{ => filters}/filters_type_muted@3x.png (100%) rename Telegram/Resources/icons/{ => filters}/filters_type_noncontacts.png (100%) rename Telegram/Resources/icons/{ => filters}/filters_type_noncontacts@2x.png (100%) rename Telegram/Resources/icons/{ => filters}/filters_type_noncontacts@3x.png (100%) rename Telegram/Resources/icons/{ => filters}/filters_type_read.png (100%) rename Telegram/Resources/icons/{ => filters}/filters_type_read@2x.png (100%) rename Telegram/Resources/icons/{ => filters}/filters_type_read@3x.png (100%) delete mode 100644 Telegram/Resources/icons/stickers_remove.png delete mode 100644 Telegram/Resources/icons/stickers_remove@2x.png delete mode 100644 Telegram/Resources/icons/stickers_remove@3x.png diff --git a/Telegram/Resources/icons/filters_type_archived.png b/Telegram/Resources/icons/filters/filters_type_archived.png similarity index 100% rename from Telegram/Resources/icons/filters_type_archived.png rename to Telegram/Resources/icons/filters/filters_type_archived.png diff --git a/Telegram/Resources/icons/filters_type_archived@2x.png b/Telegram/Resources/icons/filters/filters_type_archived@2x.png similarity index 100% rename from Telegram/Resources/icons/filters_type_archived@2x.png rename to Telegram/Resources/icons/filters/filters_type_archived@2x.png diff --git a/Telegram/Resources/icons/filters_type_archived@3x.png b/Telegram/Resources/icons/filters/filters_type_archived@3x.png similarity index 100% rename from Telegram/Resources/icons/filters_type_archived@3x.png rename to Telegram/Resources/icons/filters/filters_type_archived@3x.png diff --git a/Telegram/Resources/icons/filters_type_bots.png b/Telegram/Resources/icons/filters/filters_type_bots.png similarity index 100% rename from Telegram/Resources/icons/filters_type_bots.png rename to Telegram/Resources/icons/filters/filters_type_bots.png diff --git a/Telegram/Resources/icons/filters_type_bots@2x.png b/Telegram/Resources/icons/filters/filters_type_bots@2x.png similarity index 100% rename from Telegram/Resources/icons/filters_type_bots@2x.png rename to Telegram/Resources/icons/filters/filters_type_bots@2x.png diff --git a/Telegram/Resources/icons/filters_type_bots@3x.png b/Telegram/Resources/icons/filters/filters_type_bots@3x.png similarity index 100% rename from Telegram/Resources/icons/filters_type_bots@3x.png rename to Telegram/Resources/icons/filters/filters_type_bots@3x.png diff --git a/Telegram/Resources/icons/filters_type_channels.png b/Telegram/Resources/icons/filters/filters_type_channels.png similarity index 100% rename from Telegram/Resources/icons/filters_type_channels.png rename to Telegram/Resources/icons/filters/filters_type_channels.png diff --git a/Telegram/Resources/icons/filters_type_channels@2x.png b/Telegram/Resources/icons/filters/filters_type_channels@2x.png similarity index 100% rename from Telegram/Resources/icons/filters_type_channels@2x.png rename to Telegram/Resources/icons/filters/filters_type_channels@2x.png diff --git a/Telegram/Resources/icons/filters_type_channels@3x.png b/Telegram/Resources/icons/filters/filters_type_channels@3x.png similarity index 100% rename from Telegram/Resources/icons/filters_type_channels@3x.png rename to Telegram/Resources/icons/filters/filters_type_channels@3x.png diff --git a/Telegram/Resources/icons/filters_type_contacts.png b/Telegram/Resources/icons/filters/filters_type_contacts.png similarity index 100% rename from Telegram/Resources/icons/filters_type_contacts.png rename to Telegram/Resources/icons/filters/filters_type_contacts.png diff --git a/Telegram/Resources/icons/filters_type_contacts@2x.png b/Telegram/Resources/icons/filters/filters_type_contacts@2x.png similarity index 100% rename from Telegram/Resources/icons/filters_type_contacts@2x.png rename to Telegram/Resources/icons/filters/filters_type_contacts@2x.png diff --git a/Telegram/Resources/icons/filters_type_contacts@3x.png b/Telegram/Resources/icons/filters/filters_type_contacts@3x.png similarity index 100% rename from Telegram/Resources/icons/filters_type_contacts@3x.png rename to Telegram/Resources/icons/filters/filters_type_contacts@3x.png diff --git a/Telegram/Resources/icons/filters_type_groups.png b/Telegram/Resources/icons/filters/filters_type_groups.png similarity index 100% rename from Telegram/Resources/icons/filters_type_groups.png rename to Telegram/Resources/icons/filters/filters_type_groups.png diff --git a/Telegram/Resources/icons/filters_type_groups@2x.png b/Telegram/Resources/icons/filters/filters_type_groups@2x.png similarity index 100% rename from Telegram/Resources/icons/filters_type_groups@2x.png rename to Telegram/Resources/icons/filters/filters_type_groups@2x.png diff --git a/Telegram/Resources/icons/filters_type_groups@3x.png b/Telegram/Resources/icons/filters/filters_type_groups@3x.png similarity index 100% rename from Telegram/Resources/icons/filters_type_groups@3x.png rename to Telegram/Resources/icons/filters/filters_type_groups@3x.png diff --git a/Telegram/Resources/icons/filters_type_muted.png b/Telegram/Resources/icons/filters/filters_type_muted.png similarity index 100% rename from Telegram/Resources/icons/filters_type_muted.png rename to Telegram/Resources/icons/filters/filters_type_muted.png diff --git a/Telegram/Resources/icons/filters_type_muted@2x.png b/Telegram/Resources/icons/filters/filters_type_muted@2x.png similarity index 100% rename from Telegram/Resources/icons/filters_type_muted@2x.png rename to Telegram/Resources/icons/filters/filters_type_muted@2x.png diff --git a/Telegram/Resources/icons/filters_type_muted@3x.png b/Telegram/Resources/icons/filters/filters_type_muted@3x.png similarity index 100% rename from Telegram/Resources/icons/filters_type_muted@3x.png rename to Telegram/Resources/icons/filters/filters_type_muted@3x.png diff --git a/Telegram/Resources/icons/filters_type_noncontacts.png b/Telegram/Resources/icons/filters/filters_type_noncontacts.png similarity index 100% rename from Telegram/Resources/icons/filters_type_noncontacts.png rename to Telegram/Resources/icons/filters/filters_type_noncontacts.png diff --git a/Telegram/Resources/icons/filters_type_noncontacts@2x.png b/Telegram/Resources/icons/filters/filters_type_noncontacts@2x.png similarity index 100% rename from Telegram/Resources/icons/filters_type_noncontacts@2x.png rename to Telegram/Resources/icons/filters/filters_type_noncontacts@2x.png diff --git a/Telegram/Resources/icons/filters_type_noncontacts@3x.png b/Telegram/Resources/icons/filters/filters_type_noncontacts@3x.png similarity index 100% rename from Telegram/Resources/icons/filters_type_noncontacts@3x.png rename to Telegram/Resources/icons/filters/filters_type_noncontacts@3x.png diff --git a/Telegram/Resources/icons/filters_type_read.png b/Telegram/Resources/icons/filters/filters_type_read.png similarity index 100% rename from Telegram/Resources/icons/filters_type_read.png rename to Telegram/Resources/icons/filters/filters_type_read.png diff --git a/Telegram/Resources/icons/filters_type_read@2x.png b/Telegram/Resources/icons/filters/filters_type_read@2x.png similarity index 100% rename from Telegram/Resources/icons/filters_type_read@2x.png rename to Telegram/Resources/icons/filters/filters_type_read@2x.png diff --git a/Telegram/Resources/icons/filters_type_read@3x.png b/Telegram/Resources/icons/filters/filters_type_read@3x.png similarity index 100% rename from Telegram/Resources/icons/filters_type_read@3x.png rename to Telegram/Resources/icons/filters/filters_type_read@3x.png diff --git a/Telegram/Resources/icons/info_media_delete.png b/Telegram/Resources/icons/info_media_delete.png index 0898e3791014d94bf6b30dce2190bb4c1f3347c8..5702d982e45e8fcf3c80f90aa74d884d6fd4ea03 100644 GIT binary patch literal 308 zcmV-40n7f0P) zWR*oBgvy2@0xEJIMTqYqhXzMAfETXj7{bxDh?B46e?Nh|33UK`lwQh4zHaeVi;9o( zo5MwU-r}n#;LW4?Gob6>W6_vJ&bh8YkE1?=Wm#6?d7e#605x!c(z7na$Kg-Idrv>k z-+&&{)#A8Gcb3tRQtD0t2VC@M1JrksIN{JzeFj5{qWKMrJ_gOaQ94ur0000j}0T|4dDf=42&o2Svu1(bU9F zYqy}STg5(`SlE)g4AKr+ifpI%0kS8+)KNV^^N zw?C6Rn?Eg;Wx)wZqkMA>!|L^0R{$8L>wR0OAx8yx zeUkHv3dr@Aha45)^-0bvDj?Te9~dP23^gui{h^yIEq{_Pb|8YD|9e-w`|Cu9BgXCT3<3zlEWf=>n4pmjm|&4F+9@ z#SBOScf=0d)m4hyb?2|1uJP|$*>_bttM_#8F8^+{S!3E4TZKpW&T}oDGQ~2AIfHT5 zL*^xG8Rwt+;D4a}+ktz#9k0FmfBb`g15U#+Y+J&qyF>jVt!!2F?hQAxvX!lvNA9*z4LT& z45?szJKM1Dm4QIpS?v`M7%l_{1u82RvgaL$eZV#44s+)u#6^Uo(AzsW26JSMR{inr0;^zW;GY6=cZL|8l;I2e<{Sod--@LT?P z+Ucd%GJNl<_U>Aw(ZmvufKI- z_m^IN(~z^}bcDT~^Lv+-fBpzO{Mh}?k!2FYQidyU%kE}vEn0qAGov`%Tz3KIwh4>% z`UT`I#4Q!XpFFw!V(tN%S?|who#1?Ygm1m8)Ro-luekS!KA(F&-CTxmW!PFrmWkpE z-j;da*>YZHlJMO2Z3{$aY&N?ZwO>Gy{YlfDoQRhXx3XwitvTU#!-{gWftk)nB&cVmwU#gQ^l+1U96d3_^RgEm-I`)bNBRLSk>wa0^dR}hU*C!ViyUyxqW#AN0bU3pLYO0Du3xnb6CYBBX zg|yHK41!EY)^G_aI5o@&b!2kk5ZJ5*jR0(#>X-%ox&M1LO*?HGmsJ1p_0Jv`9qnOi z$-f=4^=MMy)wx^O>#6O_6}c_7Kc~P(PWyh<-uv&5=9p!_xh}-DOKhXS=2ec#EB60C z$1nW3;$zz8m6yI;Wk2}(>#i9-YWLRPvHO)~e|y&Fr_zS69yoBA7{wpCCv&03ZawQ4 zJ+=%Lh8cS;6TQsF6Mg2vY>jat;e^SZ4w==GdRVb2%Xx0 yenq(m@2TV4SIqr#{PIQ?){dS{uyA8~q3^o=P>1G*S(d<@z~JfX=d#Wzp$P!MS#b*h literal 485 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>U|i$r;uumf=j|Q;tY!xZhmRXY z_BwBx$?e6L>Ni=(=?L=~%_(d4t>a={*!pK?`pMr1*X+NzTqSRrr>3jWv*vpTb{jLC zVK87mz{5b8VJ55ae2$l5Q2H^7UFKoSK+@6kY)L$0o*6BZ5xf_ zh~hX#k|g~I!asTQFijJtX#yN+nu4Mz-)U?Yzir5MT^NReK=M2XP1Bx1_yHJXSr+tt zPax;>8FXELg!~SGA&0{Os;VN8qA0*H3>xwY5JeHfFod!!Niy%$G|d_?cLHQt#;f_I zu5H^jAc`WA)O8(ro<}Dztxu;DslQw<;QKyZvshHuHA!$BhyKX4rp1rP<73SNAnNmU zYeClM3vsN+4`2}I2jKq4fjxg>3+)8o2~<@De1aedXtC8=xLSl3`ww$002ovPDHLkV1nfpt9JkZ literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJIi4<#ArY-_uX*z|DDbcZe7RG@ z^d(KE`{<4$^{m-R!iQDXdCYAOeDrKiv+b z$|3NJfk9*G4JL_>k4f2YKOLL1$KgYns^__zVg>C#-l)9U%YS{DJ>&bmcfEfE*nKzV zQM@siS^xBN28pM?8YGm}IpUzhE?pKR_a} zU@#Cd*bS_N2#FBHVBox7@3qfWt!n#Rerc2Y?zy+^x!=z@r|tD2$zivB-iTQbP0j94nn@G)lGGZOU%9WAjo6vdB>+0bD;E4#DMe zJ?mG#5V-*8KAX)3{eGVl&l=?|00dz$ z7@%6Ma^hKIv)Mp69F_t>763u$bUG-P%dB>;KO7DakH;TDkOx2zG)+UHP~gO~#_@QB zWHKoR@g4vO0=0ZT&uZuT)9D16OhyReF+d`bfO@?StJR8g`fB5RK0`K}y$2x-;BYvg z*=)XAtKfR;^;$ZB&*y{5WFqK{#0m6zWlQa<=V!p<@xXLCC81Gt&0H?`7y!Kuy4^0% zQLop7P$+cIf$DR`Vv)B#3aG$_56?h4o#x$KDwRO5*Q+k{sth>a_r#;pK_z|fdS(s> zxQ#w~h|!1U_PW0q%Mg!r;Q+hc4$Huk8!OqMGR5-&F!jvf7Vs~|3dEBKP$-@(fC}Qt z0jMON3_vQCx_#8(!K)Gpz1xWVs1F8%jGo_Pxm;4QSd1EtM!%C!SQy!DXc#}(c{Rp< zzaRGd{bi}yY$o=RlCm}~@D%_k2u`Q-@@va#wMr2wcn$p%QKtJo7y#D1^vvD}8^7Ct z$TOg35dJ@a>k_)Q)r^{&zIYj6{^iH{zqYx_H#D#(9PPVnwc4eL?7^{n7$#z4-dpGm x11u_uS3;s!zu`#@fOJx{3}_ip7=e#3p)W>RJAVn(9X9{~002ovPDHLkV1f|?VHf}a literal 390 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVD$BLaSW-L^Y(^gU$X;`OQ2Ba z;e!)jux@Wnt_Zv7a`McU%-_4Eryt>Sxhm|@aooh$=&ptTE{3@*3%D}mSY0kjTQuigE;TXrC7ylVLI&yB8M%^SYAL91iAtIGeAVanDyDC>``>FXkg(@#DB2^ZaH;)5>&L2w(%7dq{#C!P zeyn0xeYmn_KSS@a@0=G3YU&w!kAG)PFxV&0u=rywgG66He}avjS;OHUI~e>PCo@^} u^|L>)iIdZB-JNzKKFJh^uR#Iwlkup{ZPA$1YgK^Z%i!ti=d#Wzp$P!D#FuFR diff --git a/Telegram/Resources/icons/info_media_forward@3x.png b/Telegram/Resources/icons/info_media_forward@3x.png index b623b6a862be6bb8bbc0aa7a064dc7af2445f8d1..89dbab91500036c112a654f517bd0ec5b4d00b4a 100644 GIT binary patch literal 1109 zcmV-b1giUqP)nwj-x-_$VkeY3Og{pOpuJ2M+$i~*nZ zBoT;8;yRob&_F~fXdn$l2oPyqK^lke*(PCGk0P*G9gXZzK`!2@}AcJ^yy{69TCh3e{RzmU`cs;Q|l zP|OP#7Z*@hSLX+kIzS~QCGh_KZniPjudlD6xw+YEBz1uB6q}lwGC)KN_xJbE*4E}F zl3GB~XcU%~mP9s2?D_c_Iy*bPLQ)Ip_Y-$|dfEUHExf+ILT_)c7f5OXA=KE|n8?P6 zeSCbt;Nak2k<-^KRoM9U z_Erky_?Bybe?QyX+hg_h_52hM*Yx%ECGAj5n#o8E3=FWXtu4l{q%)%7SzKRVx9yCy zy!fl2tE($i0e|dSyeUPrIs)C!F8}mN1*4Nh7ps}&h78#-QG2^|X)z#Ik_L^4~ z78ahyv5xY6eSOr<^Okplb9{UZ<>lp68^u6a6@2hAKr$B|A0MH$wUyd& z-tvgEva*udWXm$*IQWu?eGmi9&COYMiUGU{<>Bp2&k;SwkprEaoCtv?Cnr7clf)CCF%M@^sranu8f zL?YzngNrYL2tdu^4gTw=7(N8Fn>@x*uY!(_j-)<5;DB;Bc(@KfE38v8nPlDF-HbmM zvnKx-5uSsx!^Gc9xP4IZL?U5nnje*u(I0V#Ev-lgGG3S$C>*3mM@N6|jpL7{78e(t z+_K2It&wzx`M>Omdt?XFYrKKNcvyqVjX^;l2n|GtYak6o2oPyqLAe5no;HeN#Qv2} zODl-~bi~p*QOvSY2m`_|QT$na)?*)h1cWi(|ALyOUlg$r_;3E$(9qCNO>Ay%vi<%2 zpXEaOV+&MB5VF2X#~|4Y3N5aIh$F6nG!P*`q;&;pAVPph>k869gaDD&6{LX(0V1s{ bhyeNqhV9@52L<$B00000NkvXXu0mjflFAXf literal 844 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>U>5dtaSW-L^Y*r(M^+-k(U0f# zOgt`%SnUwGaxJOb&r*|3)$vM1u*J1^9~RhNzr$jFeOZ)~%$%r_pcSqjD_yzR9~YgU z9dmEdlfCa(-2ZtvR=@rI@y~77#f^>~(1_B0!?;bIp@>O=B;vV5^1lu4EP@P=cdc7_ z{q-A7;loC8kJqhV|1w%F<_lvZQ^maY)vL9C$z?Mh;}91Y|KfX%iJ{^3E(>ex#qT$X zF)+9-7A)E+Q#*SrLvl-rmGAv@T?Pi8c4rwGnG5Do+zbry@$nuiLSNaIld} z&wnZ}29&U~v)izJyE+5Vj4!`y-@JLl(ZI^Ua5qmpIy#yufsx_B>(|;z8)q;?Ffd%m z+b-DY!g2s;bK2(4vuAx7H!v_fc>0u8T3WiBbHdrQkN^JJeOBC%Z6Xx`)NRv{YVoJ= z{Q2`7?S~r~TaIznvHhs?&g$>)fA-_YjX!_>{HV*{J7xYNAGPFFS64;G#(w>Kk7>rH z7`=3@sa=IK$G=zq{{`KNH7Ju@Fa|Hao|Z^+*?zMf&SVc))Y zzkmKIX00l|Wtz?X*Q-cwU1ZkQs4C6#OfO2TI@}ijFV_CQ;Th|Lw{Lyz&m=LH?2gUJ z&o|!oiNBlo!u#(Vcke!Z>y*8Y+JWcKm)FfZ$0WhScH{niaPTuf`2Ab@WXhy{m%SPu z7IcJYx!%uEJ&?eyVtOMu;HIRefk&QFi>KsvGc#5 ztb5?>S>D?2tqiSBjr)=>iJq`dG_C!WsbtAGL70IgV(0#g8^WF)s?w4J<`M=^S3j3^ HP66AL=?`^KjLw z7VDDj&FiXzBl_v z2gbFN0ylY?ow``q7NBqX<-(sC)3@;L;jb~=^i@$sUWUO!>e+}%Y40n{u;6_)!vTxF(4VWcBDB9t2A`W^-6yo+QuDk0xn~6qUH|*6I-p5swe1bA zv*88bW%pFgy1s1tg&J1X6H1O^oSQr*xHjnsrA$=lW{FgR2;GS^XV65|WaSX|5d^_8*tJy%rq5hS? zbf@i%{0~*DWW?nZo-o+DpTA(t5w=iVa|tW!-@88MhYi%sE;`|l?_|CuxAvP_+g z+=lz_W1X5G|6(Y&-v0HvX4WjV<;S)iF+JXYds@Vg>k7wzZd6@oX|?v!lpp_{#U;d+ z^?g6j?DlIxe3!r>?SGHmX0)z6eCSGI;;Rh?r4ci%bbMsRmho{1x8oFktZT#L++!p5 zu;|ct^?QeWFISWcb-(`lD)xBvj}og&AZO{$in$v8mql)G<1Kqts~LMean`ceF^mCT z51$s@^x2jh9pbgN`njW5XKG|p?DdSby?U8zkM3HxQOA2q(6POr9XRi`ul&rC^YG<@ UZ%Ld!zzAXRboFyt=akR{04eUu4gdfE diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style index c21ae2aff3..b691e5a60a 100644 --- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style +++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style @@ -41,8 +41,8 @@ stickersRemove: IconButton(defaultIconButton) { width: 40px; height: 40px; - icon: icon {{ "stickers_remove", menuIconFg }}; - iconOver: icon {{ "stickers_remove", menuIconFgOver }}; + icon: icon {{ "info_media_delete", menuIconFg }}; + iconOver: icon {{ "info_media_delete", menuIconFgOver }}; rippleAreaSize: 40px; rippleAreaPosition: point(0px, 0px); diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style index 673fd58624..2d0b70a921 100644 --- a/Telegram/SourceFiles/info/info.style +++ b/Telegram/SourceFiles/info/info.style @@ -169,7 +169,7 @@ infoTopBarForward: IconButton(infoTopBarBack) { width: 46px; icon: icon {{ "info_media_forward", boxTitleCloseFg }}; iconOver: icon {{ "info_media_forward", boxTitleCloseFgOver }}; - iconPosition: point(6px, -1px); + iconPosition: point(10px, -1px); rippleAreaPosition: point(1px, 6px); } infoTopBarDelete: IconButton(infoTopBarForward) { @@ -245,7 +245,7 @@ infoLayerTopBarForward: IconButton(infoLayerTopBarBack) { width: 45px; icon: icon {{ "info_media_forward", boxTitleCloseFg }}; iconOver: icon {{ "info_media_forward", boxTitleCloseFgOver }}; - iconPosition: point(6px, -1px); + iconPosition: point(11px, -1px); rippleAreaPosition: point(1px, 6px); } infoLayerTopBarDelete: IconButton(infoLayerTopBarForward) { diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style index fb45aaaf5d..99b55bc5bb 100644 --- a/Telegram/SourceFiles/settings/settings.style +++ b/Telegram/SourceFiles/settings/settings.style @@ -217,6 +217,9 @@ settingsAccentColorSize: 24px; settingsAccentColorSkip: 4px; settingsAccentColorLine: 3px; +settingsFilterIconSkip: 68px; +settingsFilterIconLeft: 17px; + dictionariesSectionButton: SettingsButton(settingsUpdateToggle) { font: font(14px semibold); } diff --git a/Telegram/SourceFiles/settings/settings_folders.cpp b/Telegram/SourceFiles/settings/settings_folders.cpp index 66e0013787..a45467266c 100644 --- a/Telegram/SourceFiles/settings/settings_folders.cpp +++ b/Telegram/SourceFiles/settings/settings_folders.cpp @@ -23,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/text/text_utilities.h" #include "ui/wrap/slide_wrap.h" #include "ui/painter.h" +#include "ui/filter_icons.h" #include "settings/settings_common.h" #include "lang/lang_keys.h" #include "apiwrap.h" @@ -88,6 +89,7 @@ private: Ui::Text::String _title; QString _status; + Ui::FilterIcon _icon = Ui::FilterIcon(); State _state = State::Normal; @@ -192,6 +194,7 @@ void FilterRowButton::updateData(const Data::ChatFilter &filter) { _title.setText(st::contactsNameStyle, filter.title()); _status = ComputeCountString(_session, filter, true); + _icon = Ui::ComputeFilterIcon(filter); update(); } @@ -213,6 +216,7 @@ void FilterRowButton::setup( _title.setText(st::contactsNameStyle, filter.title()); _status = status; + _icon = Ui::ComputeFilterIcon(filter); setState(_state, true); @@ -250,8 +254,9 @@ rpl::producer<> FilterRowButton::addRequests() const { void FilterRowButton::paintEvent(QPaintEvent *e) { auto p = Painter(this); + const auto over = isOver() || isDown(); if (_state == State::Normal) { - if (isOver() || isDown()) { + if (over) { p.fillRect(e->rect(), st::windowBgOver); } RippleButton::paintRipple(p, 0, 0); @@ -259,7 +264,9 @@ void FilterRowButton::paintEvent(QPaintEvent *e) { p.setOpacity(st::stickersRowDisabledOpacity); } - const auto left = st::settingsSubsectionTitlePadding.left(); + const auto left = (_state == State::Suggested) + ? st::settingsSubsectionTitlePadding.left() + : st::settingsFilterIconSkip; const auto buttonsLeft = std::min( _add.x(), std::min(_remove.x(), _restore.x())); @@ -280,6 +287,16 @@ void FilterRowButton::paintEvent(QPaintEvent *e) { st::contactsPadding.top() + st::contactsStatusTop, width(), _status); + + if (_state != State::Suggested) { + const auto icon = Ui::LookupFilterIcon(_icon).normal; + icon->paint( + p, + st::settingsFilterIconLeft, + (height() - icon->height()) / 2, + width(), + (over ? st::menuIconFgOver : st::menuIconFg)->c); + } } [[nodiscard]] Fn SetupFoldersContent( diff --git a/Telegram/SourceFiles/window/window.style b/Telegram/SourceFiles/window/window.style index 75b0e2fc10..748a215f2a 100644 --- a/Telegram/SourceFiles/window/window.style +++ b/Telegram/SourceFiles/window/window.style @@ -293,14 +293,14 @@ windwoFilterIconPanelPosition: point(-2px, -1px); windowFilterIconSingle: size(44px, 42px); windowFilterIconPadding: margins(10px, 36px, 10px, 8px); windowFilterIconHeaderPosition: point(18px, 14px); -windowFilterTypeContacts: icon {{ "filters_type_contacts", historyPeerUserpicFg }}; -windowFilterTypeNonContacts: icon {{ "filters_type_noncontacts", historyPeerUserpicFg }}; -windowFilterTypeGroups: icon {{ "filters_type_groups", historyPeerUserpicFg }}; -windowFilterTypeChannels: icon {{ "filters_type_channels", historyPeerUserpicFg }}; -windowFilterTypeBots: icon {{ "filters_type_bots", historyPeerUserpicFg }}; -windowFilterTypeNoMuted: icon {{ "filters_type_muted", historyPeerUserpicFg }}; -windowFilterTypeNoArchived: icon {{ "filters_type_archived", historyPeerUserpicFg }}; -windowFilterTypeNoRead: icon {{ "filters_type_read", historyPeerUserpicFg }}; +windowFilterTypeContacts: icon {{ "filters/filters_type_contacts", historyPeerUserpicFg }}; +windowFilterTypeNonContacts: icon {{ "filters/filters_type_noncontacts", historyPeerUserpicFg }}; +windowFilterTypeGroups: icon {{ "filters/filters_type_groups", historyPeerUserpicFg }}; +windowFilterTypeChannels: icon {{ "filters/filters_type_channels", historyPeerUserpicFg }}; +windowFilterTypeBots: icon {{ "filters/filters_type_bots", historyPeerUserpicFg }}; +windowFilterTypeNoMuted: icon {{ "filters/filters_type_muted", historyPeerUserpicFg }}; +windowFilterTypeNoArchived: icon {{ "filters/filters_type_archived", historyPeerUserpicFg }}; +windowFilterTypeNoRead: icon {{ "filters/filters_type_read", historyPeerUserpicFg }}; windowFilterChatsSectionSubtitle: FlatLabel(defaultFlatLabel) { style: TextStyle(defaultTextStyle) { font: searchedBarFont;