From 01a6b432f3906901177d35055657f667da1430bb Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 31 Mar 2025 22:52:23 +0500 Subject: [PATCH] Improve some confcall graphics. --- Telegram/Resources/icons/calls/call_group.png | Bin 0 -> 721 bytes Telegram/Resources/icons/calls/call_group@2x.png | Bin 0 -> 1399 bytes Telegram/Resources/icons/calls/call_group@3x.png | Bin 0 -> 2055 bytes .../Resources/icons/calls/calls_add_people.png | Bin 0 -> 529 bytes .../icons/calls/calls_add_people@2x.png | Bin 0 -> 956 bytes .../icons/calls/calls_add_people@3x.png | Bin 0 -> 1368 bytes Telegram/Resources/langs/lang.strings | 2 +- Telegram/SourceFiles/calls/calls.style | 15 +++++---------- .../history/view/media/history_view_call.cpp | 4 +++- Telegram/SourceFiles/ui/chat/chat.style | 4 ++++ Telegram/SourceFiles/ui/chat/chat_style.cpp | 6 ++++++ Telegram/SourceFiles/ui/chat/chat_style.h | 1 + 12 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 Telegram/Resources/icons/calls/call_group.png create mode 100644 Telegram/Resources/icons/calls/call_group@2x.png create mode 100644 Telegram/Resources/icons/calls/call_group@3x.png create mode 100644 Telegram/Resources/icons/calls/calls_add_people.png create mode 100644 Telegram/Resources/icons/calls/calls_add_people@2x.png create mode 100644 Telegram/Resources/icons/calls/calls_add_people@3x.png diff --git a/Telegram/Resources/icons/calls/call_group.png b/Telegram/Resources/icons/calls/call_group.png new file mode 100644 index 0000000000000000000000000000000000000000..d60c581b1f0651dd8c433cb419244c0cb202110c GIT binary patch literal 721 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1SIp4_|F3=#^NA%Cx&(BWL^R}E~ycoX}-P; zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz07S-^~7gA{7|~gl3}1KaD5q(kI=PymRYnO-g;Ze2GYOYqI=51GAY%1luG{|#lkPILD znyS733M{@<*@|_$vIS?dH8alRNtx*3QZT_oMQyU@^2;A9Y*Hq9Ej60i!?5`NG%r=A znO;i|-FZ;O)q3b}ox8*ioB8M2*Ia)sYBKqx%i6HygepZDzQ-r0omQQG`skfgPmS(z z8O2P!o2M_=Hte6XY$RQcV)ZZ%V*oo z7iKWI?Y6kFFLL!&j(|po4{xt84bl3)L+^v*+AwXU=FR^?6>0*wByUN6WMyLHx{>WO zVb0~3EH%$R-^?)Cr>5a5vi)|im&~i%2?hZQ@yT7sA8X8>1~ut4}`p zwTgFhg@ufhpyk|i*FPLhGJL_}VkyB@qCJ)q>|>FVdQ&MBb@0O^}8!Tz zkd88P zF~}g5W3~kbsn(IJHu@?9CIz9r0S$eYGpYu8DhwO%?+@6ks=)vtlMGPb9#ILR5&)o9 z2?VIA9Jsw#3Ht98Q>pf)-X1J)_FVt~)a6*DS1{?Tk0-EptC8mEBA;v=SCi;9-Q;{~ z1l&l>s4vdbu}7ZhDY#YtmrV?jg~77o!mX2j4b6^w?r}kOcj2FkHH5NLhFaTnPfp@3 zm!1AxKC{7Fo-DH*T0GCnq0&-`lHASeTs+4-3;bGLwtMVhs(A z0V_Nn@95}gYipZDCXvjIjqeMEbOr-^LxwUpH(yy!y_1kgTs}@KduNG8Wcv^&y;g>4!%L`g@J+Zs?wsPttD1as4Zx1Z4Cy4 z)yze(N=i&7@x>%EIdHPIswyLpS6W(aBJS%W0d=g$Kdr8aM7kgG7?&k1s*=x_N+e!` z8P^{@I zq|s<;X=x!LA&7oDo$l-FtGY|tudS`E`k^wd-rim`8huVG9YCQ_D{ojY*=#mEUnCMG zP$+~%@J}?u^9;uAa~2jBP$-oBLZL{b(}lUiVtUn%U41nyfxyoGkV2v8IO%8bnaO01 zjeRe8OKNXzjkXyb8L8Qq&bhkkqt=7)UEbIj?&-k}=4EE8#WxWy%R4;d?e`UPIPgf4 zsj)E&q6AI%_ZRd-<%3e`w;O;7B(9<(fMuvrWNPcV`}RXhk(SRj9*-wR>=xa*vtRzF zzm6u~G|qd_J-%N=zfeq>_e>wvJT$TJq*-QC{pIhj=)Stx6lb;nSS z&x6|9oC99b6?!{%#3*aHzub3ccM?<-Q7C(38=IStr@e*4;a!MmqtnJ**xv3ZPf$}D zN2(RKE{sIe;o;#6&joIF)ew*XN7dqU-5xuc`S|&16}{fvbcdCe_2Fkq%gW+@ zj2+s1~h6|ICvmqR6D-E|1m~IK#cv%PDVi#B9Fn*wN>megmm+oH~cY+1lEIin0oM<>jYdP*6rufWwCm zzc%M4mK`@7X1JzgbhOSSX<^)Yv4Ob& zIkV;0bO}eJE&cA+i~+pTbnKa%oh1;T#j!#y9+GOU)~=TX&!R5!tNT^d6zF@T6Fthy x%bm%AVRBtfr`%R_pm?8j^8fMjC2jI{E;%*~#TFdRw!=eI^4c^h0{sn@Uc$NSF literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/calls/call_group@3x.png b/Telegram/Resources/icons/calls/call_group@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..67f363752b4c3639041f07f246f93d1e86258c31 GIT binary patch literal 2055 zcmb7Fdpy&B7vD^g`z^{XO(JcWOA?aWFpS7TNf*ELXo^je%_C{$vhYh7V?*XTS#wME z3y-m#dv|GY)2}-R7|5#u=uiv>WD4lAAaGI`NcvX@K-vI-K#(FZ z2m(m(ueTzp|9HcTApg~W1#XRf)CYlN@Mxs7-yQH`0nQEUq0z;wW*Tpqh+WXBVfPOC zx}5g8hx*OW9cn5^Q>Cpr!zzD=!bQ#~lnc^t%}APZ+)b$7ZVC78)_B&tkoJ+c5W8IX zdU+yzW5JQs&#N22)0HhreKZ?fd>^BW_90ChH^WT z#UKfZxIUj2%Nt%=Pt&u%-I2Qc^5x6JWtcPCl9g#!98P>+Mw#JAD$6?mc(U%= z02BShTE4%)&g$^t!%j{YtwwCfyc{?VhZ|ln%=`ir;$IWQ!G9rcEa{b}CMoZ`-j?Lv%e>6H@Fu-WG*_$FC#_PK6SFW{?DzBM z_VTi7eMtEdvYs-R#D0Ju)nMy^Jd(o?g>X!z& zudakwwzajTs2kT39J_n64{O2CF{wPNzrTN!#^_y!NF*98ab=~pj(z4)S!BNBM@3;3 zmIYhC1azFE`FJfu-!YX@8mNiu1jfdy?abK6&UDKl5-^_yDoRR9Rg+rWE}`%W%aPaJ zeR&ZWx)lQPxFJQq%QR$@VIO10TJYQz>d5zL{sh$Dc;^rNbf;^EemC|#pHB!L5Rb5V zG+*Ht0k`q}((kn~%ahpHu+7bHi|5BKUc;tE?ATOW znvShPB}XneIQUx(YU(MQZ60bx!t@XvZ;x?q#l-MjI@F_Pdcz_jv_@X|ta4kNbkd%8 zEbd&H8!oSoK9v%!Qtp|T2$zX3E-oHDG|geNmE&kMS`Uv0d?LcN4jY0|S5s5d&>*W8 zwY2QJw@<-2mlA*}N9UMb=xKiTFtfhin&QyO-`rf8CJxF}9((5y`BwsA_BiR=!V_cf z+ENvnHZxLgl14B|Aa_#X;d?*1*w|Qyl2fZd)=kpx(iH}S5iRDUcgDrVJx}wQF&(DU z>9~;^y>r>C3~g=gto{^cR8-WC?TMDVEy>QMN}8X>8gD#V7|2CHAnBI=c|X_1BRTN% z(vJA*k1wNUvluB%&VKb3^zP#-9N1h!iRZP|nZAO=I}L~vl%vxDdd<{u$UB?oaaL=) zx!Dk9IP=`RSZr6?&v3+v9&vYDY+pY2=}u*Do6dnz#eo9564*ab#O291 zzSGKj$J!62gXrA7DSnY+K0KY;Qw=Oa>K?KZRM3-nmdP>9ns@i|n$eK_z0NA~FtvG& z!XJ2TWMot&XT6WpYGz{cuJ_7=ue`URyWD@17YGCe(8T^a%|}TG8Wmg#t1}o+^N0J( z7RO$MKzN*z-dDtR(}S9&?L%t~xDh7wMZ{F6R6aa?DMj5(SO0k+R4ux~m#J`3=7yKM zyHI4Ha%oPRv?A<~*Mzn9lS9s0$=mNm5=R4Gl+~t?e>{_i+D=YR9wdy^*H|ApGM_e; zmzP%-JrExz70c|{mkzaA0Oug6= z|Ez1J?ScHkuYdN|e3=euf?N%q#eC9ftRd1>XORd50`Sz=c;;GwXCsNas)_YN{fsaj z@rf=Kx(nJrO#IsW%Erdcnn&ISN% zu50@5!Vl=nY~9=w$Ng7ARb`cHkknDaCt0_!r|mU=uvi{gvP5>fqQV4&GlRAF9f_}d zOj)fQ9Syi@s5;(>)!`=6%gST(p zu!}d>bLsRngOUqw_(x54$TeAV81DM@qq5-xguBT@`PsnMN`4M%W*P2)p1yJ)KmY#F zihQUrz*PlV=^-S(n(z^Npu0EU{!PhW+RR+u{=Olcz<8?{W~YnJ&;cyEG4X1>pKf1p ziKcHK80_a~U3;u37{@s`*?{v849qJP?+?1caEPsCd{8y*l7R0ST8!5=$1F1h8e|D6 z@$Q>pmt?MXR>PqG8(~vcB1k!O61XFhb&2w7W>S*OF@t9Fj*U~Y?77{>cK_!kn^oJC Y!Ki&0U26|H|LX{&QC`TJla~_z4Y|t1B>(^b literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/calls/calls_add_people.png b/Telegram/Resources/icons/calls/calls_add_people.png new file mode 100644 index 0000000000000000000000000000000000000000..4e07a92f475276ac0016cb0fdd9620628c2530b5 GIT binary patch literal 529 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgftlHDXF~maf z?WEmZhXMrJ_@zZve60?8Pd=m@w8Z;^Yz^c61IO$tIS(Fk6VOST>XsvvbE#86DI&6B zWl$uGm`hLFn{!oSGoR#$Ow*nFYX1K-HHm7@C$#^iGH=p}o+iq2ux$6+vfVc4|Ff>v zIQ6vXr^~}#d3w{U4?VKb3*8u@Bk;t1+wHd@kxFmBR;|9u6@4_xuuDnIM6SP3@`d@F z{r8!y9U2etU48!9GF8oCrMbuY>#HAItg)YcHe&LZ-+%j~9i)96w?3~dS-eO?j*s1D zZsshVr`11Sf0erBa3EidrSa9>Jooln@4rt{$(*%pl~&Aw5-VB0b{&m}H@2PSo4?|O z-@LiZiUoDOZi~ZKhpxVQ`Q?+}|I#)`>P^4t<773rFHz!qSJhrSsouWh%5ef$4_qqU z8=!Hg+t_vU&6c&BIo_Ok{yAvnl+K3sqMba!59aCE&h(LMj9MEOmVS!=@Pwv1`x7;G z|6f?YcV+%PRHjdwu_{~4CF5HlNcIw^5??KVw>FVdQ&MBb@07V_q A7XSbN literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/calls/calls_add_people@2x.png b/Telegram/Resources/icons/calls/calls_add_people@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..bf55e663c391e5d259b779cef68cbd23a7959eac GIT binary patch literal 956 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 S{YV+8RP%K8b6Mw<&;$VCt6zBl literal 0 HcmV?d00001 diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index 3b4a0ef79e..1957187894 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -4757,7 +4757,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_group_call_invite" = "Invite Members"; "lng_group_call_invite_conf" = "Add People"; "lng_group_call_invited_status" = "invited"; -"lng_group_call_blockchain_only_status" = "syncing..."; +"lng_group_call_blockchain_only_status" = "listening"; "lng_group_call_muted_by_me_status" = "muted for you"; "lng_group_call_invite_title" = "Invite members"; "lng_group_call_invite_button" = "Invite"; diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style index 9c8e600509..89fc1a1da0 100644 --- a/Telegram/SourceFiles/calls/calls.style +++ b/Telegram/SourceFiles/calls/calls.style @@ -132,7 +132,6 @@ callHangup: CallButton(callAnswer) { } bg: callHangupBg; outerBg: callHangupBg; - label: callButtonLabel; } callCancel: CallButton(callAnswer) { button: IconButton(callButton) { @@ -143,7 +142,6 @@ callCancel: CallButton(callAnswer) { } bg: callIconBgActive; outerBg: callIconBgActive; - label: callButtonLabel; } callMicrophoneMute: CallButton(callAnswer) { button: IconButton(callButton) { @@ -154,7 +152,6 @@ callMicrophoneMute: CallButton(callAnswer) { } bg: callIconBg; outerBg: callMuteRipple; - label: callButtonLabel; cornerButtonPosition: point(40px, 4px); cornerButtonBorder: 2px; } @@ -185,15 +182,14 @@ callCameraUnmute: CallButton(callMicrophoneUnmute) { } callAddPeople: CallButton(callAnswer) { button: IconButton(callButton) { - icon: icon {{ "settings/group", callIconFgActive }}; - iconPosition: point(-1px, 24px); + icon: icon {{ "calls/calls_add_people", callIconFg }}; + iconPosition: point(-1px, 22px); ripple: RippleAnimation(defaultRippleAnimation) { - color: callIconActiveRipple; + color: callMuteRipple; } } - bg: callIconBgActive; - outerBg: callIconBgActive; - label: callButtonLabel; + bg: callIconBg; + outerBg: callMuteRipple; } callCornerButtonInner: IconButton { width: 20px; @@ -930,7 +926,6 @@ groupCallHangup: CallButton(callHangup) { button: groupCallHangupInner; bg: groupCallLeaveBg; outerBg: groupCallLeaveBg; - label: callButtonLabel; } groupCallSettingsSmall: CallButton(groupCallSettings) { button: IconButton(groupCallSettingsInner) { diff --git a/Telegram/SourceFiles/history/view/media/history_view_call.cpp b/Telegram/SourceFiles/history/view/media/history_view_call.cpp index 730975957f..d136b733d4 100644 --- a/Telegram/SourceFiles/history/view/media/history_view_call.cpp +++ b/Telegram/SourceFiles/history/view/media/history_view_call.cpp @@ -116,7 +116,9 @@ void Call::draw(Painter &p, const PaintContext &context) const { p.setPen(stm->mediaFg); p.drawTextLeft(statusleft, statustop, paintw, _status); - const auto &icon = _video + const auto &icon = _conference + ? stm->historyCallGroupIcon + : _video ? stm->historyCallCameraIcon : stm->historyCallIcon; icon.paint(p, paintw - st::historyCallIconPosition.x() - icon.width(), st::historyCallIconPosition.y() - topMinus, paintw); diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style index 3a44fffc2b..f285966d14 100644 --- a/Telegram/SourceFiles/ui/chat/chat.style +++ b/Telegram/SourceFiles/ui/chat/chat.style @@ -437,6 +437,10 @@ historyCallCameraInIcon: icon {{ "calls/call_camera_active", msgFileInBg }}; historyCallCameraInIconSelected: icon {{ "calls/call_camera_active", msgFileInBgSelected }}; historyCallCameraOutIcon: icon {{ "calls/call_camera_active", msgFileOutBg }}; historyCallCameraOutIconSelected: icon {{ "calls/call_camera_active", msgFileOutBgSelected }}; +historyCallGroupInIcon: icon {{ "calls/call_group", msgFileInBg }}; +historyCallGroupInIconSelected: icon {{ "calls/call_group", msgFileInBgSelected }}; +historyCallGroupOutIcon: icon {{ "calls/call_group", msgFileOutBg }}; +historyCallGroupOutIconSelected: icon {{ "calls/call_group", msgFileOutBgSelected }}; historyCallIconPosition: point(12px, 10px); historyCallLeft: 16px; historyCallTop: 9px; diff --git a/Telegram/SourceFiles/ui/chat/chat_style.cpp b/Telegram/SourceFiles/ui/chat/chat_style.cpp index 784d9e434e..7929c9ce0d 100644 --- a/Telegram/SourceFiles/ui/chat/chat_style.cpp +++ b/Telegram/SourceFiles/ui/chat/chat_style.cpp @@ -387,6 +387,12 @@ ChatStyle::ChatStyle(rpl::producer colorIndices) { st::historyCallCameraInIconSelected, st::historyCallCameraOutIcon, st::historyCallCameraOutIconSelected); + make( + &MessageStyle::historyCallGroupIcon, + st::historyCallGroupInIcon, + st::historyCallGroupInIconSelected, + st::historyCallGroupOutIcon, + st::historyCallGroupOutIconSelected); make( &MessageStyle::historyFilePlay, st::historyFileInPlay, diff --git a/Telegram/SourceFiles/ui/chat/chat_style.h b/Telegram/SourceFiles/ui/chat/chat_style.h index 8205d23049..0d47d16611 100644 --- a/Telegram/SourceFiles/ui/chat/chat_style.h +++ b/Telegram/SourceFiles/ui/chat/chat_style.h @@ -76,6 +76,7 @@ struct MessageStyle { style::icon historyCallArrowMissed = { Qt::Uninitialized }; style::icon historyCallIcon = { Qt::Uninitialized }; style::icon historyCallCameraIcon = { Qt::Uninitialized }; + style::icon historyCallGroupIcon = { Qt::Uninitialized }; style::icon historyFilePlay = { Qt::Uninitialized }; style::icon historyFileWaiting = { Qt::Uninitialized }; style::icon historyFileDownload = { Qt::Uninitialized };