From 9e0e28dc450d0891963d788c37070377cd92bd81 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Sat, 7 Jan 2023 08:16:35 +0300 Subject: [PATCH] Improved style of box for editing of linked chat. --- Telegram/Resources/animations/discussion.tgs | Bin 0 -> 13254 bytes Telegram/Resources/langs/lang.strings | 4 +- .../Resources/qrc/telegram/animations.qrc | 1 + .../boxes/peers/edit_linked_chat_box.cpp | 131 +++++++++--------- .../boxes/peers/edit_linked_chat_box.h | 4 +- 5 files changed, 69 insertions(+), 71 deletions(-) create mode 100644 Telegram/Resources/animations/discussion.tgs diff --git a/Telegram/Resources/animations/discussion.tgs b/Telegram/Resources/animations/discussion.tgs new file mode 100644 index 0000000000000000000000000000000000000000..b513b9457af8516820cd1b3aecbd21eb250ba54e GIT binary patch literal 13254 zcmV;%Gdav3iwFP!000021MPiVuN*g$=3f!ca~8qioqlc1E(UPhi*EOmAqa9yzHG~u zAZgrdH2mK;z92IzZ*|YAQ|Bmq#;Q}9Sxhp>U|bmS#eW_?|McnMD{3BofB5RbE3b?) z56#1mA0NI7x_S8J!^2nn@t!{@@gM(w_{x)M9)7N$zx~QTd!;G9`pdU}{p){y^WEQH zefy8^xPdos-pDUsfBN+HGr!^c|2+J{S04WP{?`w$G(Yg}^&f9PmK*J}zx?(_y7Kvt zhp%jH`8#eEZFJfBW|97wFlikMhjF_^1DQc#nTx%a8xX|NhxLd>CB$J_n_p zZ47A@tZnp5e&qG=5gsQ0zufsWyhEfL`A_p*{P2D0=7=VrK0kc50kMAgRr)X*kSPOl zbwFQZ+%G&x@Zt5xx4(Us;mnSTN;jBtxbXk@PaZ{xFPn!y&^z?_eS3%MRT&4`B&R3@ z8PoSN0PYvATV1a46+HU!jCW~etsT8D>GoCfrZZc~#E;ibZ!T+!v{9LATmGV!`lQ_W zj*`Z!WNl8)Mn9nGhg~$)(lGU2DDRW2dPqm(_@yp3#3a!=^7`c4@6iDhc`1ixLrK{b z%8g&-Mo@`TYP?a_xu$me)BdH<^!{yW*YN+1=tuHQ_iszfrm|RX zh#O(8rnflD^lS3L)Shm*d;I_MOrHlo{rvjF+p>FrxgLJ{$o%xn=hE%p3irv4Pd`7j zY}GNgjO_dGnO-)6Pz|~#|AL0(y9@a0;_wOHBX!t55tPxP3CdIM{Y*uZ2R}o*I@Jp= zg<#+JUP6BSw2R$$dE?-I<|RShcTy=CUJokAZO6(BCxhbwc%=|0qR}g^`jzB z4UhSs4_|%$_&;y4h-4%FKd(Rk{DOFO{LIVc$Jg&Zy_Hoci{|r#Jl_`v%&93dV;Nqc z28-Jpot-s4IB)UQx*Ux&!NopPbPezl{!`><@0yWO^5u8`6glzk|H_BRk=o0@fByLX zUvGEx^D|ccNaE>PA-6-o>6ZOEIk1(abKU>+ugPPdUQaGb$G`jd`nOL%zW?~^!=Eqf zrT_i${r`NBq0|vhNA%;nDdlCC*-g?SIr}vGU%$M2H=@|fBDPa2w_TOnX_wTtb5h%- zD@*O{Rm^cJw9R#dc34DcN2^-Fa-qylk+(Xtgvi#UIuWv!*tDFS?nuXb5;mHNoOUdt zd4G$3E1|V=-Zz2wD3ROaUa{EYrdV0^O7k9aW2wAd3nQT%9dEkMP--XniXxe%iX90p zzNGV3*x|d&VF{UxmhBFiT;4iR5LrY)YUX?^$xMbh&ry?j)rby52|qLqx9E-UUD!lc zQ7EpWc@@nN&7l>|rZuU_>=MpyRygM?3+F^r!K|+%m`zwhFgv}7RQA~T(gIRB#IZzf zNxFbQZb`P=aAq3@_VI?TUTy3lvD|je1P}Sg!W`R-y|q|2VVAMo&F(6XuPTrEhmkE{ z(kzfuEGDo~o@E?MSe`brG8}Dq8DVwtr5wv87Q8&Qyl_~1DnEp8#=%ymB7pBiBJ+4y zG;Y|mCno7CkynZQp=>=Ok##GP?M{j8hZ6bk*n3_SxlCiH{b&w&Q8f5Z&u(5X=l$(F zz3pMxk+*-mef92#cQ1TTH;AMD3}+KITiPp&WM@Apk6LreM-@e(Cl99I%A>N&w=$@1 z`6s`Iy7xF`pjE@~?P6H`J?7jO^$#6psPX3vtMM$S$+63s@@!`Q%-ne6V7RtQ|0)Mr zT9JnvlqH#1QkJ(cHu_ni@Uj8pZhN!b+mxHF9NY6qv%mRP60sO{Ea6x%q##XXotvnF zZ1UyaroFi-cQ@sBZ$BSR{V|mALrQ3sy~t5bMHnjZu5v|k%gy$l+}f0Tojl+9M6e$OJ3MKur0iA+u`FcO+i+FeM5ye@}oQ`qOZ95A%_TqpVE z5o+AEl!@o3evMTUcR(eHGb+hIA)#Fw$)#?DDs|bkjoMu1PcJP+7!{YbWTs8^HH5aW zFPBrnVA*GQ<0Eeq=~@aH%v(00EKWzw)wHkE-ZCQWkP3g!upT+D*eZj5X0fNvbE5Go zVAm$LG_m_$OHVsxlG{z2`=5O4VG!|=m3FzB_H6gcxjKXf-wz@+_$Ss>9|7$3#AW2 z=|Y4I%*-5HAB1DkB`UYbMQ(+=15v^zv6mrG@G6O{Eb~^M@&Qk2?x~#bckQIiv^8=} z9=UVk-Ed5%a&lfG2l`FnEJ9l67wRIOPSGHCa7;U8QNj>Tnlk=L4Q}8oG(Tg3mA2uG z@mSqSGlpT?cE++XvomIRe3JXLQG6`qcVLnRNxZt!=G9dZXfC-P$s!;rSm~qg1b%|S0CrS)hOdz^&IO!d0n-0 z(&EQ9-2^5TYWP&~ICA%`IA2x3Cat_HRsuG9OnnJC@;qnKD{W-zc+9c%xjdappPkIP z69=x?47oR-QMurYn<3ZP3Stdx;0|@Nj3_W=0ww~keQ_02gdZMHA-XP5ozqY!& znTB4-AKt(D)5yny(?zojgam)?#r8p z+TS;?g?PUYS_uA6^coNT)IRvr>kpIXtnQwB-#+*L#~(kv{XBV;pL}_4(1t}~muXmD zITN1n=JEO0hl6osr@Hzti<&oGG~W4*7`H%AY*?TtZjqQpy+BXm5;+aYEzpy^NJ6Ae zi>$UKNK1B+d=a+me}pWCRX(k>o)yX>CP#*|*TYh=H~wsB!+ z+KuC~&a^wng`H{lj>|gJZXOqQrrka+>r4*ItQnmaT6>F-xZ6Z7?T%Z7$lX3N)19++ zlI$m2NevfoW*`)Pm7S$3HoyG(0y^xc1J;KqDPleV7D4i=SE_o0!?&4Mh*% zWqy!l+a^o9fOL&k9n);?@))FR|SXMN;0B zCsSbSDmOVv7WM+B$bs0O$Feaf+{VW6yp&Sok|MX77^{h~ni#8zv6>jGiLsg(tBJ9i z75l_Qcyqr0OiIRQVW-(87 zRvZlSf6bMwnvGYpE-hbRfcCabJ1KM|GBu4f9dk%nYi zM0r>{_e*KpHC@wqxifgV(SCe(!_3F+n+67+t&uW8D;F}dl9Rk3E9Yw*iVt#yX=%J~ zJiih)R<=kTZh$NmTwLn3N84t7SRCwlIRTQ8pA<}VUS}EUv6dJUz?`2YJD&!E zO~H3(PdJF$ep?enZeo4)fg2atU(94@(aUOn+ni6mOpp7p8!Qyo4whwO%GXMK+OX&>uhCa|jk(c#?2X9Q;kKmfzNcMqc#oBMLe_ZVaYy#A_y)m&)`nT(yeTLoz%eQDKlhY0=2)@I2wt)kU5&Lx*0@*!w?$Xfg0u_7 zUAN8d#bXI5f0k;(F{|tj8Mt2g=nCYFYglXaJvbS}LU*JpIIT9@#^LA!IlYyXM6B=9 zK*_v>M;~RNA+c(RrbOeu@<8L4GEnWll#!Y*X7So*upgy5rsIU)^BXDEneN2zB=aCh zt~6lCW`>#p&Ly#@p%=Z5WNl*`Kz_NBh8_D+xfWXft zA2HUxuJgo}ckry!CX^kdA{B%#prW4Kc=NiyxQgMn-_vZ&+u z(ewq8R^kXZge*(yr9Wk>63Y$A zEtD<76Kdl?@rinIPes4S+!gQgw99;55BnTMNjuzUR7Td0rI=@|p^=JWmXj`H2Q zO=%&F;58I<4Fz38LDx{wH57CW1zkfy*HF+k6!iW>LEY3?lu*#?gn#-)M2l}DJTJr7 zZ41@*0=(R;gRRw6MZXQK-y%kGNAes`H!2~seLKpWyR7_8QS!TgXUgBSu@X#TzpZ|A zrI&RD0}WH-+Ar(EXZTeB)4lH7%uNYNw|?DiXU^Vq>b3zxw;`s#@$1q}=dP>cJ)FD# zKG`4m-MH{FDUaAH6^gIjD(zk4Gk=uQj--q&2$Mvr;Cx5lbNqy?k`dfVDFPLhF{of= zGpdPK{5J%b6i_x&F-d)J>Q^Ihz&~?E5|m>E3h)oP#=x%&~--s-(R50I?#j&V@vsNlw30VvrOQEDBu&{$u48Gt2bt3A5QAZu(QN>V4A=HU1 zC8LyYh>~vr1UppeaMC*0P^}Nh97gKxNke80c8l~>n&;> zraL1{D@eD5p@;)zGWC2J#b^RHfHhr7Q3BQs3OZtAFT za;z@rmuZ%qsNARpVASWd<5Vt{h`R3c-p=R|qmXR_oabITY*Gdhh_S#T_cL1oiNxYT z3aOXUu$tF(WF_jT5LWr?+;lEqo{fr# zdOf}iT7$7u;?r>L_=E`nu`C;=)@r{7C4kmAwSkJgNW{q^0Vj)un=BG-vPi7SBB3UW z1ez=oXQJ;YPHmYGlVt)-mWeO95C&#I-F|S1zDk^0UL?5n!Vn*`NQ94FCXC9ZB{~z9 zi35y_!~v#d;sEm^ae#}5sa@KRU4+KnE^=vi{4!JyX^JP6dQ87unA)L|OcbWh(jl1C z$WwYhMYgj|tb*%W!P5H1E1%23g~Ga#WGmaNh9{Okk`XJgdB8EWBIjx*VPX>rhh1)4 zP|f0;h}C%%YJ)!SQ5epnK3tH>Z`zuXIvH(7Em!$j*5+F7+UGp6>5H1!^yN%!e(Do@uEY9?P3n0yc%Q-;=Zn_fyVi5E zS92-<8mgPa3mSYh@QE57le5IrLG=rOSN)YQx0r1B}p9CHLfEYIY$|M zT?XXzj8_g|ds`aC5T!VbEI^J7&)>n4Ob9Z`1Dq;zr8mD;&IR(M$U2|Qnv9#9LDmsPY8HJMG$^75Q)_NCC?P$lJ|vBt%eOC_qCK*I)j zer6Z3Nt5zkbX1>0LFg(7@@zWRS+lRjClLC~Ds3s=CnQfmS}{`7gCxmf z!`qd`#-oyi8G8&bBRHI-Vnt;0gkOpPNHeSS0;Zi8Rc=uTPp0}&j--|Hx1oGIdCemn zn@M3q4O$OuQyVu&c&1l2JS`Rf?I^;tIm7#bR8!$OaI%Bg5DL3{{*Hk4?25S*#moc7 z5FJl;-Xwhtjg8zpnFd}SyvK3#Hq9FBsN{+HPEt{GDY~yK{*hLET37s|toXF9_(xjt zd0p{Kt@sOkvg>L;d$phIB3?;;@dk5Ji1%urUSgjfK**0Psc%H;QK0>EC$+_o8;@F; z<%Eg1B#-Y_Y7lVS-cs49q=Y5!leuvOFXrW>jw`9pB=tW*+*_;Y3fCfy``y+nS5 z=uXCqwY42?4&#lSuvwxEMy??(R*YuZ*vsAaX1TX1H@l)wyB}%xH{T_~1H(fE?P3;CEZm7cFY;E)sXvYpRb1+V*w9pq=EH zsd!(pk=1Uuv|7+b-2~+WU=0kLG~tT%qECEJpSTlB%#}SRHeVbnViA1Y_HmGr$#@k2 zWXkqvmI9ME!4bakYw6H?`;#~O%>4uc0U6U*U^kUfiw7_TS+EQ?#bR#+dL0ruSSnze z))Yhpl><=roEYMoC7vt(0k+%|vHkCR)k8hYe2Kh6b8aO+D*ontb|?<}zK(x53DYU@(3$e*ge?bxc?DFd8dp+8TM zg-@PWmW%C_*)kbCnL)@@9Y8RBv}hwZ%-}YtowL$urg1Wum87?!?ios0ooa#d!-UtL zl~8uPQ0j{*ovEDTC0!R3F|8z4+;r=Se9`H!j{z>mINzH#E4VYgX){Tv$b%_??b~T1 z6iKU3+31Q@M@}ZGZ3p{ikRuV`Gg?82)irRP1ek5u6wg)?xLMSuH~BKPdu)iUv-T8b zZDKSIrY*(@vnSS+izr5r4|U5kfJfr1w&wI$5-UiugfLIQ3sgo(38P5-rC!HM^C)#? z&FmzSoYR#wAbx>-^Kyy~{FfvfZAsz?Z4pc@RWbQTm@;&^Je{z-P$IJ=yO>nI+T5E@ zr-HL(i?c4YTcehV;5AEf=olh=skH(rm8bYGhl$XEDdp>&VtJyHX)1M-4cxYEHGE>0M9hycRQ>Q?u@__p!V7Rozvmd@P;vTvw4;HLI)W zg!04(C^kHii%S(GKIpA7dbS{O>btAbfr7*VtnO!OGEw3sj>F~Lx)mk`i9NA|5wv5< zd3JhTmYv-LJANsw<3Yu8UAJ;=eZzZOPFul?<8m$M)hvXBe+NK)#%GqMyn7(ft0eyF zh-$CRCZZOF9VE8iQE^$L7cMT#n;{vTi#rom)V{U4>{?xRtuDJ(mtCvNuGMAN>auHf z*}JSRYiL&UkEdwUgf%)SaY$br z35zI6J8kNexv}ZYrl#Atuetpuut^fq@dKPT)xz(b+|AV=RsFgDdP^&w# z?zbiE>xV0DNf5%6l=nbj^#bU3rGRD|3h1BH*LX|2_%D8o{55zJVr|MD{%gn|n@~w- zmLXmDsv+-O{+j8iI{M+SA%9(WraIO;`!&0vVP>YP*eNUger@x(xsCNaD z1`+$w`&rk-1|c)X#fIw1_dV6{MJ_e>$h1k%{Fm3LRhMjuP}2ahX@FVodd0x`vE-1U zL@G%J76Ggz15m^lz!3yv*%tPrM8_aDz&B*kCA`c8!NGRO2uIRWE)|Z6BoymX5btqB zG)ZU~S!K%c{dlBWA*&i3K-KR#j?~5jY_kTfe^Rg&2*@# zMP17<%X*gKU5aXaDRw2zMijE7!p_ldc)QgIqeS3N+iidz znYv8oN6U+Z=R$V$61yrwj8iAmI9g)cHb4Sa2Q+9x;(}IMz@Mt?d@(U5Rog!Pu>s2&R0+pT}EpJ2_ zxDY7QVuq)Vn#qe1lLUcJM$BqgG>DN0UYqHc(#CNm@koP&qhDX(c0ROj$lPTNxrVa? zVaGSQPQi{HnPSOPz!XcsHd7?>^0tVfkEiU()~dvd#fxTrg$3=Nu=d!uVxE|q|MG&s zS#5Jc9YUn6Zwp)lTof2h!9?dZKXrV?>##gbQYx{%F-r1-BHsn{u3!v@z!(ntpzY8H z{q^fV-hO;R{U8^23K|1;EoMe=W=OoQ@j_=GCAjim>cYuz;Da8r1K!%4ag_a z6hJtafazjW!E-absiC|{Du5^!6|+L#!oh8#a^v`A&wMT1>?yelQ71tnK%Zi#ir z&lLDM%Uc&pq_pV4zgL7g;305NjI9-}Y9<|XY3XA~BuFnofLSuXkj1qv`DzME8}iBq zhcr!bT`f_HcHJOONWm$aE$Vj#osv(-=i`uHDj`Q)GJAI{H@9OM z+P7m}deGqQo~^_KW61Y*5I_|7c8=Co^>yQLcDa4y+yRYT1z+Zla}FHp$nk)j;oL|z zYe^y2BuT=hT;N{HA!Ji_E7Q~Uq3%iAv~x8R8Vz>s?WY{KNRn0U{I)_ODIKA0T3=Oe zWAQbL?`|*I44^ZS?%Abj4U$tso~MMCzIBw)wzq}=UFKR!=(;>wLg-#u&n+Rkl<-1` z+FT)ot}Ch|gr)%DSOLsRd_z~6d{hrbETccB8WmSSuP6|&@QEd(OA3amR2Sb8CW zB}bfl<&~cn9(?t~k$`8lvxH&`( zI2=$W5%pZLQ%kVA&qZ)YDWAAN6|>PPn}L6T8Nc<@U;`Jpu`aiNJW}|;h>(oy#FxKo ztbn+{33WpHK8WTGkEsFlg)a3EP?6V(wl9&uBvK@p z1lFODg8(Cl_>_DKEB+>z>&zn_41TeY{Sq^4zoeP9U((FFFKK4omo&5f8O-cS#isl- znBAk7a(K3b9WCSdY&WO_RivKKNM{boo`8~j^7+z2!RcKoj~Jqk+fp8$XD!c_^0+vN z9h|8thtjaP8@7i{(pg)zJKRr_^L4PeK4!{;ehv{Y^qd*w!v7p-pQm4;s9cWC+s0!@vFE|WaXE- zoWSQp1w*p5NDz&g>mulR&LIUJQIAp7y|=4*rxIWK)pv`{GUQzEQ=LWFfsiLmYo5!T-U zVK1>eAA`8(nvM6<*Zo%C9dXwItL+~5fi`HbmM$j!`K=lgKbH^|}i@*{>))PXMJSF9Py)VQ2CpFsqBBfPOJ3J!fqsb0|I8FA36f(19AK z4%DIdG+zm#Cs%D7wJvZbbJ418S6d8hY30k>TCiU<(=WL`e#en;FH^yI=dNfEu=?R7vvrdi6FDU>!@fAe3xb_&wQg-xJGw*mS!>_40N+ zmW?GN1#)#BBMo@!lRy|k&*z4wtGmNcE~ z%l({$sc2(EPD$Q^@ok;7lqI_&C?oL}DwJeJr@UmpMy0dV<*G0g!3b8hR#}&< zTCXAj=Lf;~J)bHP?gVwhy6WW14#Dz?T>Y7r+UC9l{byw;NvcJgYHW>dg7Q)W%p!N% zNN$8=3=nR3@i6j2=$up8qEvb#nZ9I7s;Bz#pAT>Day!9B37r&T=3g`porCn^}(c3Pf}yB#PL{G^c??M0)m2;y3m9*7p@QljY$Ft0I?IVGgr*C zE&yF8_Q4b2G)J*IrUI2rn6u|9Oy|m$t$-V^!B5wiD}z+|(74DSQkc<~?0VjJ_D|Ni zN5Ly!-7jC+m9L%-U%8d9o(f;Nm9L%-U-^}<9+|H$34>XA>k)YC+&G|hvhHTG_6I_( zo8X-&7YD+?)_Hm~VRc#%-0B0or4R7DFu-+=&YmNny@e)(+5pd&jv3|jqOtR7d@Fz4 zmOsu%xvUv-6iJ(HhMdg+ADzh}JPPF!0m{oGUD^_)nzf@SmFoqX)5PGzLbyP;qL4WO zUdJ4dV5E#ekGN;g0Gsn*=t(MvdbT$G%|E{W`o&+q{pP#Bef#yk0F-H9%)(WpprN?D zNX9L+Gu~~Mh@|Q@H9Tmpon5lx5bJ$BeaPCjJtRPG#0l_NNO{S~4hxVt7@c9)5&Q7P z7ai))y=+rnFdo?Stpmc3h%{FTCg>*2v#rs9>u!jZV@ov73_T6wHV;F%et!G<%^-y9 z+EvyrUgO({3$~%nGO^43wg&MDrL!-m3BN!kFfiC18z|n)SFIi_pV{45)Q6neTuaxe zSe;nuNur9S)D|*HKuwhEqJfkrHr*rjiF%`##B$)l=FrQ!q!$aNiiKxFW>Ya+ePmlM zHSp))0>CJ&1P8I!7bLHS6(y9=K-rFbB2w-kL8D6K)Qi9F%e(gr3x}{sJwdm~B6rhW zDb(U~#{`Ss8a>@W_cB*QP;c=FRs{705!9_71qi=?^T(?n-i2f2OX;ZCX@O=o+>m%v zuua5HVCVN+6BApBv2jkJuk*A;2`7&|7l;ja2(rLWu}lcS67CiHKu{sBI+t2&mWsca zbm-+VqCyq24VhTQk7i)9vZd>I3SnzuWs4kv@8FO*GcQOYEN5aiZm(!ut!NM6_?Sz(JLg)Nd2 zwn#?UBKcs8q=PMz4Ce1BnRJ;vuw~M~mPrEh7gePWXp-EoT$x!Xr(x^vb}lBap;HPdFP zY|?|qB2A4&aYfFSt7(DuG{8FpD|$xxJZ}aPj~i)4Z0ONY@4I#)Rl6ta#$P>&s;#7B z8kes9uFi#&8h+oEU)Dxj+=Plmbj!CHbHiC9d(*MC^X78n>1HW}{3?FoTmoTl)OX|K z$)vmmvTdk{PfB~&_$+R11Ury2mWpS9RA@FPs_1(KHA7a(UUaAxjl13Px#i4Z;^BmJ^6A5X)gbUr*&E)o`cfV!S zW1ekxyr}~o*UW6hs~$O+KC}@K<4ed5MM@jgu59|3HvMb$mz(WR=PpfuId1=QE{8=c z3)8zS;r}Ug|C1`sU8IB0E6ZPM$kb}UEs_5D{?}hw6ZrJ%!~0MCFX03H_F2gJ@$HZQ z{iZzi;T1g`WG7^tH(obrB ziU2C`M+zh6%xs{f#;PRdDa8Wr3Y397F5+T|E#3&g5GfwYukmcs*nlGt*vcsRN4Ran zu$Ig%c!TuH8)rzKJnOAW`@B^X6|e6NT0J+b=VtZXT;{nsTJktO%e{J^>=|>fIA^u6 z@Z#J%E>t~N+WNpVrJkNu0Ln-z7{T9CHoC?FoF^8xB~~3-4%LHeJl#FK5!ekY1=qc! zMc8Z@$+I%kIg-cG?AkRaNS@K*=_-0w(X)!4g+$Lm_MMH*NGC|14WU&1?ZnQ0fwPVI zG6=CkzGJSeM=)}ji%i9)3r%;IWs3pJv21ZEud?M{WQ(0zl`U8$CHeO0cX` zQPHUm`@IBlGf)%Z%fc3(lr>U|I*vrdVb54a49#qeD4p5_c3)Bbs254>5Hg$ja_cNR z&6y^+pQQn(e5^mPhlVA zsd#j=rk6j#^dgDnV(aJ{>KnH$jHU}rH9iZol{@W?O?#)av3A^Vb~V|uCyX!Cz9I;$ zrB9t%W@;0-Q7)_o)BUe;KfA`=N$v$% zSCj234=U-j6DXhIGZ-w%EvMkqcV z@3W4yYB86u{Wvx9-3k6DT~ru<)w2&?mzr#2ln$wUjnLwaO0Gnr6l;NHj4RoL$^m9O zt5DPw+yqLtle|7;RWrxgkw;5hz_<|$GM2K)(hJCpl+4DglOT7KU~HkP0=d#`EIEZ9 z*@F&%-i7Njk_?p>SM;X5cJS8Drg2DgOj7Rvl8E<&6a~?`hO-r&iBJOBmJpv5gsYrz zAOJF9u%)V(ISmhb<7#~c{u=q!hFUoVH(N-+8FewNTzL;%S^NuwaMgEEwF>tP7?vhM z=C1EACU?kRj5JeT=oTw<7a~UFW#2^44B_S}>v)gnM!HXZCC+CyO9rlC?rbb_`fOR;%~{1dz* zrwT?h<+FGSpBXt%<-Hl%-}CUJRMJqHA5&Ofbc!x%cO2Zb_qxDP*6N(Aoxw4uR~j+} zxTo&qFtjgY#bOf*T^@b2|LduKzthhi_uyCS1Mt;X25y>iQh2_c1gTj$DGA0Zz#x3( zC1dT%ODiv3V6IJh$vn<&l*~4)I8w@`yQI*?KZOGF7&qWUb29 z$|ZZbBu%-5PT-R41=q;BmIdyMOZ0vYF<#Z4X}9vn${#cQk*EBj&yXTdltIGEAS;9H zXAsg84zc+J4xv<_@j|>$Me6{Ekao)JSUkq-SBeZkmp7aux&mu(>wW|iST1ctC}$qo44xUm5*~cM z+4I&8p$6gA#x@dh&1~sZ*nUf?F%cKqZyP|K7sSH$(G8h$pwo11^)I>NjA(yWzSlYU-Q&6z083@0l#s!(W5BrnpRQf>&f&)kW_VS;Jb8%}v+@+{r+q2UN` z+54pS%T>+zLQ_j<8dzf8DYARbEm`B??=c>JRx8}41@6}Rj<0eaCItourS5N6oSddn zFzNYn^qS+c^7I$L)6>YE{Cs(O&9!+BUhvySD!hr`ZVEH`#8Khjj9@yMmbUqUbCQ9c74w5Iw>0817*J{ zyG{eQ=#+EeH63eZ)Mw48X3VHQJ`ST!qsPJ-Vs%XmTN(9PGOEiHMs<(Fs8ckV0m%O$ zPF>T}R%U(n%o--lN{_>=)2K)~CA4BqlUrH!nX{@Lv#Lvv!>ZFLD1U|myk;1!tomG8 zRZm#eKMt!-qnrFWKHxR8cFnB4uguz;^R%5rH@U}&ZZgy8CUZ>k;vB_-ZZ^K;O3jds z?>gJNdy{;}J&7*QB>OQ;vmf&$`7w`jAH$*C$Gzz{lu>bKFotremm)EJWHWeXM7e{{ zH+$aNQI6$`*S1Mkxl%`qoKt#uB|6E}@J2-)`&TwWt5T)9{naLu3Nm+X%e^bsDAWH{ zd!aUbUYZcqtNa(yXsdW4#P<{8`w8*Ql=yiX2_b#>M&m;1iDf!PyXmUfMbE|$h zdb!fuDJBnW`cI7aiTzJEJKwk6Ba+e~H_XSTPz`}!gA3U!XC2~BZS?&sP+x*h{a;D_y%+W1_$mG{qav%OZT`I-iH>q1*E50=(y3HC};eD#-a|N7Ve z`sTa8^UFTI{qeuM5?%UXzsY0RfWUuqMC{$$>N%|WdLS76Tt5fH(34^Of0PI=ot7*D E06JnP%K!iX literal 0 HcmV?d00001 diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index f8e7033d4..efb3b7334 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -1332,8 +1332,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_manage_discussion_group_add" = "Add a group"; "lng_manage_linked_channel" = "Linked channel"; "lng_manage_linked_channel_restore" = "Restore linked channel"; -"lng_manage_discussion_group_about" = "Select a group chat for discussion that will be displayed in your channel."; -"lng_manage_discussion_group_about_chosen" = "A link to {group} is shown to all subscribers in the bottom panel."; +"lng_manage_discussion_group_about" = "Select a group chat that will host comments from your channel."; +"lng_manage_discussion_group_about_chosen" = "{group} is selected as the group that hosts comments for your channel."; "lng_manage_discussion_group_create" = "Create a new group"; "lng_manage_discussion_group_unlink" = "Unlink group"; "lng_manage_discussion_group_posted" = "Everything you post in the channel is forwarded to this group."; diff --git a/Telegram/Resources/qrc/telegram/animations.qrc b/Telegram/Resources/qrc/telegram/animations.qrc index 5fcb2dd18..06a600c00 100644 --- a/Telegram/Resources/qrc/telegram/animations.qrc +++ b/Telegram/Resources/qrc/telegram/animations.qrc @@ -9,5 +9,6 @@ ../../animations/cloud_password/hint.tgs ../../animations/cloud_password/email.tgs ../../animations/ttl.tgs + ../../animations/discussion.tgs diff --git a/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp index 7f4484c47..31eb7336d 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.cpp @@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "lang/lang_keys.h" #include "data/data_channel.h" #include "data/data_chat.h" +#include "settings/settings_common.h" #include "data/data_changes.h" #include "ui/widgets/labels.h" #include "ui/widgets/buttons.h" @@ -25,6 +26,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_layers.h" #include "styles/style_boxes.h" #include "styles/style_info.h" +#include "styles/style_settings.h" namespace { @@ -208,47 +210,24 @@ void Controller::choose(not_null chat) { Ui::LayerOption::KeepOther); } -object_ptr SetupAbout( - not_null parent, +[[nodiscard]] rpl::producer About( not_null channel, ChannelData *chat) { - auto about = object_ptr( - parent, - QString(), - st::linkedChatAbout); - about->setMarkedText([&] { - if (!channel->isBroadcast()) { - return tr::lng_manage_linked_channel_about( - tr::now, - lt_channel, - Ui::Text::Bold(chat->name()), - Ui::Text::WithEntities); - } else if (chat != nullptr) { - return tr::lng_manage_discussion_group_about_chosen( - tr::now, - lt_group, - Ui::Text::Bold(chat->name()), - Ui::Text::WithEntities); - } - return tr::lng_manage_discussion_group_about( - tr::now, + if (!channel->isBroadcast()) { + return tr::lng_manage_linked_channel_about( + lt_channel, + rpl::single(Ui::Text::Bold(chat->name())), Ui::Text::WithEntities); - }()); - return about; + } else if (chat != nullptr) { + return tr::lng_manage_discussion_group_about_chosen( + lt_group, + rpl::single(Ui::Text::Bold(chat->name())), + Ui::Text::WithEntities); + } + return tr::lng_manage_discussion_group_about(Ui::Text::WithEntities); } -object_ptr SetupFooter( - not_null parent, - not_null channel) { - return object_ptr( - parent, - (channel->isBroadcast() - ? tr::lng_manage_discussion_group_posted - : tr::lng_manage_linked_channel_posted)(), - st::linkedChatAbout); -} - -object_ptr SetupCreateGroup( +[[nodiscard]] object_ptr SetupCreateGroup( not_null parent, not_null navigation, not_null channel, @@ -273,23 +252,7 @@ object_ptr SetupCreateGroup( return result; } -object_ptr SetupUnlink( - not_null parent, - not_null channel, - Fn callback) { - auto result = object_ptr( - parent, - (channel->isBroadcast() - ? tr::lng_manage_discussion_group_unlink - : tr::lng_manage_linked_channel_unlink)() | Ui::Text::ToUpper(), - st::infoUnlinkChatButton); - result->addClickHandler([=] { - callback(nullptr); - }); - return result; -} - -object_ptr EditLinkedChatBox( +[[nodiscard]] object_ptr EditLinkedChatBox( not_null navigation, not_null channel, ChannelData *chat, @@ -298,27 +261,61 @@ object_ptr EditLinkedChatBox( Fn callback) { Expects((channel->isBroadcast() && canEdit) || (chat != nullptr)); - const auto init = [=](not_null box) { + class ListBox final : public PeerListBox { + public: + ListBox( + QWidget *parent, + std::unique_ptr controller, + Fn)> init) + : PeerListBox( + parent, + std::move(controller), + [=](not_null) { init(this); }) { + } + + void showFinished() override { + _showFinished.fire({}); + } + + rpl::producer<> showFinishes() const { + return _showFinished.events(); + } + + private: + rpl::event_stream<> _showFinished; + + }; + + const auto init = [=](not_null box) { auto above = object_ptr(box); - above->add( - SetupAbout(above, channel, chat), - st::linkedChatAboutPadding); + Settings::AddDividerTextWithLottie( + above, + box->showFinishes(), + About(channel, chat), + u"discussion"_q); if (!chat) { - above->add(SetupCreateGroup( - above, - navigation, - channel, - callback)); + above->add( + SetupCreateGroup(above, navigation, channel, callback)); } box->peerListSetAboveWidget(std::move(above)); auto below = object_ptr(box); if (chat && canEdit) { - below->add(SetupUnlink(below, channel, callback)); + Settings::AddButton( + below, + (channel->isBroadcast() + ? tr::lng_manage_discussion_group_unlink + : tr::lng_manage_linked_channel_unlink)(), + st::infoUnlinkChatButton, + { &st::settingsIconMinus, Settings::kIconRed } + )->addClickHandler([=] { callback(nullptr); }); + Settings::AddSkip(below); } - below->add( - SetupFooter(below, channel), - st::linkedChatAboutPadding); + Settings::AddDividerText( + below, + (channel->isBroadcast() + ? tr::lng_manage_discussion_group_posted + : tr::lng_manage_linked_channel_posted)()); box->peerListSetBelowWidget(std::move(below)); box->setTitle(channel->isBroadcast() @@ -339,7 +336,7 @@ object_ptr EditLinkedChatBox( std::move(chats), std::move(callback), std::move(showHistoryCallback)); - return Box(std::move(controller), init); + return Box(std::move(controller), init); } } // namespace diff --git a/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.h b/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.h index ce7c50703..788f57757 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.h +++ b/Telegram/SourceFiles/boxes/peers/edit_linked_chat_box.h @@ -17,14 +17,14 @@ namespace Window { class SessionNavigation; } // namespace Window -object_ptr EditLinkedChatBox( +[[nodiscard]] object_ptr EditLinkedChatBox( not_null navigation, not_null channel, not_null chat, bool canEdit, Fn callback); -object_ptr EditLinkedChatBox( +[[nodiscard]] object_ptr EditLinkedChatBox( not_null navigation, not_null channel, std::vector> &&chats,