From 1aeca7b486d2419d4f4395aaa7c23b19a0e93e05 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 1 Feb 2023 16:41:49 +0400 Subject: [PATCH] Add create-from-choose-peer button icons. --- .../Resources/icons/info/edit/create_channel.png | Bin 0 -> 694 bytes .../icons/info/edit/create_channel@2x.png | Bin 0 -> 1284 bytes .../icons/info/edit/create_channel@3x.png | Bin 0 -> 1860 bytes .../Resources/icons/info/edit/create_group.png | Bin 0 -> 717 bytes .../icons/info/edit/create_group@2x.png | Bin 0 -> 1358 bytes .../icons/info/edit/create_group@3x.png | Bin 0 -> 2009 bytes .../SourceFiles/boxes/peers/choose_peer_box.cpp | 11 ++++++----- .../SourceFiles/chat_helpers/chat_helpers.style | 3 +++ 8 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 Telegram/Resources/icons/info/edit/create_channel.png create mode 100644 Telegram/Resources/icons/info/edit/create_channel@2x.png create mode 100644 Telegram/Resources/icons/info/edit/create_channel@3x.png create mode 100644 Telegram/Resources/icons/info/edit/create_group.png create mode 100644 Telegram/Resources/icons/info/edit/create_group@2x.png create mode 100644 Telegram/Resources/icons/info/edit/create_group@3x.png diff --git a/Telegram/Resources/icons/info/edit/create_channel.png b/Telegram/Resources/icons/info/edit/create_channel.png new file mode 100644 index 0000000000000000000000000000000000000000..dd2a9b1d80987cc85dc2610bbc608c26733f1d6a GIT binary patch literal 694 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDq2jfl0yB#WBP} z@NS6jiiL?H`;PhVOc7HNQ_+69UT4abDXpw!lRY+y1a1=OYMr#Uw^c)I(Ue{lZS$jE zW?dqliW@ggm_Osp$>r0nlhfACI+}a$=Ne-3+ z)-!z=e*CTDYyaF=Xeh&XJa4qbo%`bXjKWt>J^l2M&)zuxyFZ(`F624=tl4)lLt$b1!MCe5r=B{P z@FB0i__8|K@Jv;4>~)z=K3xFT6H#QLe*5?B zOZu5(ChaEv?s!p&Rqg)!t3$Lz^0wbD+b!#}G2+hq@6~(f1!%AYt4(ec=yh{GGoO(s zL~pwDy|C4+&iykt{F>>*=5;!4^WldZ!d5HZVrF>FcDnPM*s?3Hzux=I!^X_f>ZF)) zXYYT;b=P0t%@h9@Al99_`R0p~UF=KxcRVnk;I;JG=bt53y>5%;J%9FF+B5iHzSQcp Sbp0Ptn(=h?b6Mw<&;$T4mmlu{ literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/info/edit/create_channel@2x.png b/Telegram/Resources/icons/info/edit/create_channel@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..1b6d4789c76e399f5906f37beb9be88e08934405 GIT binary patch literal 1284 zcmV+f1^fDmP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NGZb?KzR9Fe^SW75vQ5fbpC=rE7 zB(IPnj~FnZ6b6VWL?R|+AO>DVQsgmVA}LZLue_OILU|NI$}3{x9p(MF-?eVLZSA%9 zIs4e>cI%!s*sb;b&-L$r{rg|r$jC4Z5%@16U~Fvc;Nb8NZMD0*`{UyyDJe-QpUlk6 za&vR%=H}Md*QchYva+(UXBo=(_VzwMKbxAGWXOoK1_T7`?(RY%e+&!^n46o63w@_3 z=ukmH!Q7HxCMG7s!^6Pu z@9!}e_ku_HxkF)LVMj+t#2bXf)6!FE7MoYilbqn&Ju$4klDgD3Tg$TU*=c=xAZ|pop(4At9l; zxtYkjy1Lrg*-^T%RIAn1)zxuvahTuS+~nlsjE#*6*(8wP4qaSaL`Fs;$Q)l;SsCoj z&(BXzP7)A19vvMe^Nfs)-rio0nK@ZpTtw2GoSZPJvO(z_f+Z4g<`V_1zP=uzlCY}b zl}Si4Nqv2N2!QaFRa8_YCnxXh?39<6GX=E)rS>5qfBZElhRe%KAUFyXE^Db`a-(bj zCr>7W{y=twN=iynQ&T%TJN0K+Of%adoG%P98NK4{SEg5!(#jbQRaI4?pr)oKF)=YFCPq&trPb07p`ej(h>T`M+Ja0f?GUO6>MxX_d620}8Ft#Cx3{;` z(^Kf?f7+BWrJWYqAxKS3OyHT8mKGEgq@5Baxfl*1sn5^PO-)Uwr>7O{^R@JvQ5eyU zMhlfHE5X1nD9vG;B z`?asHFH=M-5ak;hQC)_994 literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/info/edit/create_channel@3x.png b/Telegram/Resources/icons/info/edit/create_channel@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..bb05933d5f42d9c530f00ad3798dce988463694a GIT binary patch literal 1860 zcmV-K2fO%*P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS>u1Q2eRA>e5T3bk!OB60IiKb!hTZgh=S*ig?)_h8Z?`{N&%a;x`q!*kv%WPmYu3N!U$sjA=^oHMpnE{~fbM~n z>;V@SmxBinu3NWmMS*m7c7F5b&D`AF*x1?AWo=($Z(op1pYS;@-V` z=g*(FjEf^8B7lnhVq;^q1Qrkw(ACxT-{ABA6B853$;pegBqk(`DQJETk&<7o^mBqU^H zWQ42-@$%)%(9lq3?50hd>g(&NwXUvC41|=FX24djUY(np`}5~dvKz#W8#f#r9C*8I zZEd@|yO|6o&7hT+RH3y2=H}-1@Zm!q5+X!mVxpvRSy@>mxp(hgNf|KhsA22Yt$?v+ z%^Ko>*tv5jJt8V@*|LQmLBPR{jg445JkwML9@G)R9dU1Tbd)$e@%HUo zdi3=4eD&%TJxUN8H*Wm$@g%ybSTmP@XzJC2mlg87; zv|2)C#*p3A)YKqg-oJl;DPq^s`9&po;A}a4`ZRKC{;*m)Yb>Z)WyaV@%MKOH76N8L zM{1@@2^g}npr9bUENNzq1qV_BR$X0ua_!o+%LNj%Qwi9E2M?GKE;z1TyS8$Gm6w-eK{7lU85tJ1eSPih z>`;O?PtRg|;i|Twp@FY#T9EGO=s;=RBohS-rbGExiJIXOAhW&8H+tPNY2_Ynk8joY?u+k&1_4}wcks;eRoS0Nuieq@H?8o{6> zF4^_Mg$o31&z?ObgW5el1fV7m$aPQ{CILx85SaQNGtiEDeOXx35aNzTStCwAG9@f5Oi~zgRasd{Vjz(8q@|@9 z3*!!z#5Ql0NhFMXT0t0dJ3T#3!XQwdpj-#1c|kz|wW4gH zpvuf9#Eeg$KCv-AeE7ic9Ak~xhh)u>BS(w{c+Rd}yYNW|$%8;dxqJ66_MX9)5~{Z! zyjl}zP+qbEUByscRO;tT+3i$c?(U6ZHKUUCk`0!zp zWCbDxVQRu^M;1;UiNIP#Af_Bdv+ z6fu*ku}WOOtR$=?i*eM-$>CO-#7qLlD_q(s;zt6Fn1KU_j7I8YAiy5;^72R~Dk@4+ z#_E{-2aT{EZ=$<*?AadYX`&I zhiSnXO^Z#Azz2FF88ffhDrjWo0|NtcsE{scT)-3hd`Hl8m^vI;K!|My7)a`ol;DG; yM~@!iT}x1jE~a}x_kivJ-2=J@bPudx5Bv=tGyp%!Q1pZV0000y6n!Y-vOu9)cs$DQTbRqw6W%}U$$ec$ThdBx{GSJ$0?|0PJ{|Ni%u30tGOk3K5e zx#s%og#j-fJ$htq^RS>|V?@Q?xUErd3oLfs&082?VQu|eYP!?Hi1pWtcFvJVHk!Hk z;)`d`o;4Uq@Bnp}?M^k4yjZOC;b)D%zrTB{gTjX&KR5z3MEZ_DuG`PwJNs-~g8Rz| zgV|^2oqz7`;t-)DcA&kTy+U26Gem3Z!Gs;VcMEf{xSxH$@?^>^AGHhqddn}r%rN0% zxfdHBFRXea-E4N}7iWjX7f(GcQk(qn^G}TnFH2T5D9QD=Z@HPXD`wr{15ckm&Dz?u zh5xfh!smxGcgExy&AjveyS~2u?YClwHDq_aEwgU>Tetsg+UgLkpEdKmmdXk5-M4R2 z>f=vUd*igGIw|iIEkF6RsMqcBzkmNuG=ATj@6lHC{_UF@Fg+n(GI&R`S@o$F++8*&Dl#Cdqg#QEz_!JpE2z%%SMV qS`U<(=O0)9udW{UvUpkjrpMwnJpUWKFEYx2l9H#ZpUXO@geCxhU_68X literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/info/edit/create_group@2x.png b/Telegram/Resources/icons/info/edit/create_group@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..cdd6b4a2403e68dc6371e1ffb4fbb06585d7d1b2 GIT binary patch literal 1358 zcmV-U1+n^xP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NGxJg7oR9Fe^S4k+fZxlCW%v8q6 z6pEBg8A23gAyO6=7KRO$NJ>PKaYwQ+M2Qk2Qx-zV0-~wc` zCnqQC=;-|4e?w1CucoHv>FMd0vbD0Z;_K_H7N4}`STQg#7#bRiiHQOD@$qqFWCTIF zySsC7afy$Q_weul|Nj0yDJf}ud|ZyfpJLkD+9)nFGc%r^oI!a1PRO^_UnxeemQ(<8tBlY$5>+0$# zc;qhq-rnA3Wo0q!F9_5GnTU>#mQ2wY4>X8yg!5iMqiSu@QPhA|D^0=jUfgi;9XQ&3*!)tx$~6Y;JD;Bv9D6ySoF1 zm6@4ILQ+Jg6tEu*%J1;-ut+K~^55UzDFtb1X-I)cnYY^7+D%PO*rJax9f)sfX$b)YGg&d$z?3h<_^tn5#8exZsPu(!7dCaRb@LW0VO3r;AK zrjZ3Y4-Jx?osDK@9WO7hsi`TFE-x>en3%8#^9FpVpo*DEL|j}PspRD3h(vO?=vW>n z*Vosxv$MFiwzjs&E`FDmmK+=$gyt~)FmE72Fi^!Tf;T58C*W^xZWfBL|&g zZ*MO`L`6m6RQ7-gB($=!(%9HogvS=)Bp7-MRovCpMVSKg_4PG0G*nSV31@L}5emh{ z#fmbNOK@;-X=!PDdwWk$PknuTYHF(L!o>8$ykYN&Ky2iC11C_tP^+!2Rdnck985pV z8+7>G+#ISHb)zCvdfz+aue30bDk>^usz}TsnO4*Y`-o6@csMG9japb(fDQ}{L}wB6 z<>jTnzkh#!A6vW|Lqb9rEFvy1FL8n39fz6~iqL>~Pa;!z&|yJ(cz8HDIY~B!NG)q? zYluZfr?{P-o`#x@jSV-yB8E8_iLtSFFu18a_`rwR3ZGFD@?d#)T=sV3}bEmA}8g(0eiclP)teGsCl= zEZ|6dA&IU3*<*a*GOntsqU3CBY^dlvHMBj3B(4!SgkXp>^4Y<}#6$`ezOg<_1iPO^ zh|M4ibW%n}1~Zisot>RP;>}K95dT%%+9=KL>H@8$2CF#_yj_UL+R=1xLGlHR2!0%qFX->koxQ=7+X`~5W<75 zX2iD%L>jvEtHKBdDV{M{AXLEABa-=1fhbA_Qaui7tY{*jiGU^o|6l}u12tfuRmwoZ Q>;M1&07*qoM6N<$g5M`mmH+?% literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/info/edit/create_group@3x.png b/Telegram/Resources/icons/info/edit/create_group@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..e6b65c1ae62922fabf8b5ed9f74a04e25ec95f45 GIT binary patch literal 2009 zcmV;~2PXK5P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91NT34%1ONa40RR91NB{r;0FW_8?*IS?LrFwIRA>e5nrTQ@O%%s7D{V8= zii-9Ui}oT~h*p9i+XG9Y0{alC_`z1_Lq)VgAEKQK+EX#mAS8(vHCs?aqimynp@pJ- z@BO{+#A&>bcb$eQLD zJ9g~l%a?!I|9<@Vaq!^5&Ye5gw5E>dZ`iQm;lqdRS5$61wEX;h7GnYI+O?~0-MTfWwZEBpSC=kb(v@aC9I)WvV4byT z)24Ih&gG=($aU-1>6qF@@7uRebp7z*!_1j84f@ruUw`xF&4P!Bjg2+nYiwxf(4nH` z$B!R}3>o4?m1WD82^UV1ckYBMU`)B4<50?>Lx(zc?5M!;@$ooxCyaS{dEL8r@71dp z;IOc;ckkYD2n~$v>fytOj~h2`{P^*3wQSk)$&)AFzI`*WRBDJNiQ&=Jm8`aH+p=#J z`_-#g?RX<1A~tT^`0CXwnMe`r4z7)^UAx*bR;oWaIa%hLHf@?)S$p>E5%#F4C|`D7 zk?)d(1>)=1uhnvGun*NVpFe+Y)ToiKX67EE6VWm*F3tkRseJ$bT>u7R&6+h9-pV#l zpFXYTyLt0w0J3;XqVB?l3v~(o`}b$F$>{s{?^mr_HEh_hPMtb2#7=qm@S%)C%$_}4 zXRj<>T3V{4n~%QTG~walqMYSIJAeMX4CUtLcInc^BBWWfX8ZT=7tD(nFK|K@OyJEk zXU-_mWo2anNa5&A!pTZj&ZWWXM8fXJ-p?>C&Z^QE9r4Zt%H^8TS|( z8Y+Su64BAof_(h=vCuPS%n+I@gncMY3o(EGe69-BsdHIiuA3<-DPpjR6DPXm-?3wd zu=nWEL)fofyQcb`Yy@#&ums@1WYThkzL!p&I#q7WUxQ2b?c28%F5u0ZH>y81HPxS( zI*S%9Qed8T*P83CNJM+_;zc$0m@#9fPoM5r4*{%Szn-vIHL<$%Ll94@rjyu$D?xaL zQF;O=MvWRJ24lPT?c3LhtfZtQ;d=J$nZ-Tax^+v9k~H|0wtf3{5rwPti+2G?Pfr)o z?4k)1CK#AWz*etbEqI7|^X6Ib>_7$h`SYjlU@S12ScIa30^h!U+ZRx&9;BC)l<2x< zWMm8+IM5=rL4yWUr%sitPvN(0*~=#ff8-Z1SK6(GCNW9>tQ6KZrr#rdGcg+RjL$5qB%9uiWMsi(o91mM~-~{ z{5i2UVSxcRWy%z}h3wXrnVH$MXHSC=HMDZ&N{a-J917qnE&W+pS%KG1PM$oe#GN~L z&a4v_#Z_+Fw5hnbm=F$aP=%QF?AfzRmMkH^G_&iYM8>>Z%Q7s@y?gg^dUY;$^o0u- zl*B7nuDIglz!)~LUr~bw4YKSySr}V`4dPbTy?fk^wcD_|K zupdcjZNUYV8H^J1sJhn`}XY#M93_8@?*NjjT@^gj;DZ0=LQcR%*&S^6H(pw z7`7l4&|k}}S+h(EX=6ANid+Qv!cN|#jT_18UYMGk5}GJ?@7_HpepR&Y)2EMo3_u7U zF=WU@{GEld<#g}m_S0EnVxrjP=+UF5^~l)YSs2rC^zm;>KQd8KzzKm}gSB1|iIIRA!WXS+NspxRs-qbcEfsFxeGC zxSi5Do?WECcyqU@v0e{{UCA-!W0dds>cKP=q@1f*OOU38p`zh~YSk`4cDpKXxDt-X z7rahOXH60#MvPGZb|JQMs|TJ?1(rO;E4md@jd)@@zF*?L1Dm5oixz<~dR(3bJPUXh r@GRh2z_Wm70nY-S1w0GXZVUVacj3@*;JlOD00000NkvXXu0mjfoaNSR literal 0 HcmV?d00001 diff --git a/Telegram/SourceFiles/boxes/peers/choose_peer_box.cpp b/Telegram/SourceFiles/boxes/peers/choose_peer_box.cpp index 9e78da945..3ca1c0800 100644 --- a/Telegram/SourceFiles/boxes/peers/choose_peer_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/choose_peer_box.cpp @@ -27,6 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/wrap/vertical_layout.h" #include "window/window_session_controller.h" #include "styles/style_boxes.h" +#include "styles/style_chat_helpers.h" #include "styles/style_settings.h" namespace { @@ -367,7 +368,7 @@ void ChoosePeerBoxController::prepareRestrictions() { { skip, 0, skip, st::membersMarginTop }); Settings::AddDivider(raw); } - const auto make = [&](tr::phrase<> text) { + const auto make = [&](tr::phrase<> text, const style::icon &st) { auto button = raw->add( object_ptr( raw, @@ -376,12 +377,12 @@ void ChoosePeerBoxController::prepareRestrictions() { { 0, st::membersMarginTop, 0, 0 }); const auto icon = Ui::CreateChild( button, - st::inviteViaLinkIcon, + st, QPoint()); button->heightValue( ) | rpl::start_with_next([=](int height) { icon->moveToLeft( - st::inviteViaLinkIconPosition.x(), + st::choosePeerCreateIconLeft, (height - st::inviteViaLinkIcon.height()) / 2); }, icon->lifetime()); @@ -399,9 +400,9 @@ void ChoosePeerBoxController::prepareRestrictions() { return button; }; if (_query.type == RequestPeerQuery::Type::Group) { - make(tr::lng_request_group_create); + make(tr::lng_request_group_create, st::choosePeerGroupIcon); } else if (_query.type == RequestPeerQuery::Type::Broadcast) { - make(tr::lng_request_channel_create); + make(tr::lng_request_channel_create, st::choosePeerChannelIcon); } if (raw->count() > 0) { diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style index 593072776..338276c45 100644 --- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style +++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style @@ -419,3 +419,6 @@ reactPanelScroll: ScrollArea(emojiScroll) { emojiSuggestionsFadeLeft: icon {{ "fade_horizontal-flip_horizontal", boxBg }}; emojiSuggestionsFadeRight: icon {{ "fade_horizontal", boxBg }}; +choosePeerGroupIcon: icon {{ "info/edit/create_group", lightButtonFg }}; +choosePeerChannelIcon: icon {{ "info/edit/create_channel", lightButtonFg }}; +choosePeerCreateIconLeft: 25px;