From 4dded3d09c6ac845bbdae4a4b06c91fbbd53c004 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 3 Aug 2016 13:32:44 +0100 Subject: [PATCH] Stable version 0.10: video player graphics updated. --- .../Resources/icons/media_fullscreen_from.png | Bin 405 -> 223 bytes .../icons/media_fullscreen_from@2x.png | Bin 1847 -> 399 bytes .../Resources/icons/media_fullscreen_to.png | Bin 388 -> 225 bytes .../icons/media_fullscreen_to@2x.png | Bin 1749 -> 396 bytes Telegram/Resources/icons/media_pause.png | Bin 98 -> 14780 bytes Telegram/Resources/icons/media_pause@2x.png | Bin 133 -> 14834 bytes Telegram/Resources/icons/media_play.png | Bin 281 -> 337 bytes Telegram/Resources/icons/media_play@2x.png | Bin 375 -> 381 bytes .../media/view/media_clip_controller.cpp | 6 +++--- .../SourceFiles/media/view/mediaview.style | 11 ++++++----- 10 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Telegram/Resources/icons/media_fullscreen_from.png b/Telegram/Resources/icons/media_fullscreen_from.png index 6d241d992ee22bf7b8ed463ec966277bc2c0aa73..7b3ae509d1722d1bca92ceaed9d96a5955e31105 100644 GIT binary patch literal 223 zcmV<503iQ~P)s@CDa{B~Q$&8(*LCpeAI;OiEp@ELp^atfckeP@Ztc~_+NeDG>- ZsRNn>N4N1zFU9}>002ovPDHLkV1mCnV#)vj literal 405 zcmV;G0c!q0H7$UZG5oe%_xa5ma z9LL5B{538cHhh#sMBtn|A+BrOh4dA=%ynqlgeKK^jR-+~}BlHKMG-$t0WLgXW07@NNYeYoU zTF0*Q15@ab2%ZLFtwp6&75W372A-(gC3IvyEj)$Kp-=Pa;W7MGbO;;#9bbxOt$2tr zrUuOquSE9)XY1oPqvgXBeP1p-^J66wZj8yTDG$DFTfY?#>2i-}@bcj?{7=w79mMvJ znWhPxa{vJF+q_yqy!Wv0d-eQfS&r9a6~8;A6~8lIICZ{o>Kt%uEg)j^pvut>l~S;- zYtv%hdl<*@4p%lu#hr67&vVma!!R_1O7iDFKjK_7K#7>002ovPDHLkV1nB{ul4`{ literal 1847 zcmV-72gvw|P)YMcUsARK8-ew?Oh zXxhO`YMO?sssOm%ZaO+T=u?RI0aSXf(IV`^%O(a}+Y!65Q!j6V!{LoF5ym6esK zs!BKWf?io zcJE}zHL{oz`Fl>Mlb)U)a=9EYUc4ZkPVZA;_wVxZa_-)}OJ83fZnvA-+FDE|6QU?m zUS5tUikM6$*4NiBMuCco3OYMGv0ANcZf-I?JF@6+olY|~HANzkDDeE{%a`fy z?#AcyasB#rj7DS8wM0>*qM`y-RnJ#}JS0iNX0z!^Y;A3!sw!{az9kxsA_xMtwY7A0 zb>a1T>FDSvFh1|xJOn{Nk|ZQa+E3s-lu#6fR4N64&1R#mtqnmCP!xsn@o@|W16^HR zJbd_&*49=G2E#sscmJQwW=SLxWV6|eQ9#o)ve_&EvMl5AcqlI~M^#lMNy20@(cj-s zdwYA)u-O}yzkmPc)2B~FqtSy2oRty>8DY2EX>V_*v9S?R6uEZo+CI-8gjg)b?CdPx zzkk0N1&YCFG~#l(aJgJZekPSl5ekJE8yjPCa+3M^`NIjERteaz#z_$hg?Rq_Im5%l z1cSlCWAtxEGMQv$Wd*Mj`^$ifZcBA)~#D)G8uBY9MjX& ztgf!Iv$Lc36K6)?Pp6ckC@0DV`MUqcjT^|ajKN^w<;$0>t*z;u-I*&;ESv;EIIuMS z6Y^DOeSJOk_4OEyMr2uLYHEr|Btj;WxtI`=Wtp2E0qsHTLmX?-?$K$|%#n<%oG|_1EM26?%T@VD4$z(x4 zEm$lTt*NPr`}gnD(a}L^X{lbT=bP-Ko*?;gfk1%Aj~^2V1c3i~+{VU6Y&P483FQA2 zMIjc85s5_h*Ftu?oz~V?WchTFRZ&sF(9n?ndvkM>xw*Mh%~=ehC?ct<`Y4r35ex=d zU0ua$wbI<&e5#3m{rbiD_&CeU%V%Wje(1-jq9`O12@;6}u~-aMRmo&Bw6?Z#<;oRA zQ9SZq$j4>=oGy0nED6A#M3zV-c>Ve{nM{Vk!9nbHJ7%+452?d4?(WI=hT&P)P`-YO(V~(cQYSvBAW|1Xin+nwpwp6VNn`TrT&=F=y3Z z6n)xau~1f4MrmoOo)?Y-P1E!v_`Fe6f#&9B9z1w}*XyOezFs%#I5=wVIPKmjAW&9T zMngjb0|NsL3=GiH(sHcH{vRkH;BvVb92~^w^HEn zJ9qGSJoNST?eqNZ7qz=Ry|S{x!omWIqR`mbNL^jsiR%5cfIKiTfYa&3>2ww~9typi z$z=HO;R8>fK4p7*8?V<(Z*MQPwY3G$pBMHjBKP$4U@#a88jgcJzr4ImAP``9c$krq z5pua4s;VN2B5iGLT)ldgl9CciN=h#51(;k}S*aUa>_b8x*=&|TAi&Vj5Hm9~dZzvO z@gt%rqN*xYRaN>2xsxQo6A@5VwV>nK3r*7qg+hG&`W3(5&#PCjh{a<1{b)4G%*+gu zBw@8$>FVktkw{!zCJu+gn9XJ!4o6V}*=&}%xjCLad&cbStllQ>MmnA5-Me=fjYckA zy2RGj7U^{QBJ4+MYHE5Ei9`@Z5wqEhrfKZ#>=2K~Sy))${rmTfjEpcgHbx{8DVo$Y zO(U615)OyaG>u>|$lTlrvVttjSglr6Rb^vigP%WtGC4WP=;$bK z-n`M9oj*ZQ6xP<(n4g~~8jb3omCh6Lj~_qS+1Vi+4ik^ZF`Lb7Z*LQe#aLWi3jxG!>_>oh*Iz?aKGdfyzel;=a{;Ce&$i22lqarLWPFsZ)P9~ zGfNksyHiA#W_#1$1gPrp^0wgr@)~Nb?ZY1g&*2;3F+91%`<=&G{6_!E7?jzEImS00000NkvXXu0mjfiOFR= literal 388 zcmV-~0ek+5P) zL8`(q6ouhSiX~D4g5U-eK`6LTU4;;E4Hk<--GL6pVZpg#`QPMKTB~i+2JZBH2{~6p z1mB6Gh$KnK^SpJW3m_tBt(}n0fGg4q5E0@y=J9y^29#1Lr8Z?0Zq{Hc>EfkBneRzvDs|gflowh{WW~Q-=nogL{Lh-5eb5z75Ib> zheIuVI2=|kQXmop0mZl?yRld-y!WLB{0g7X=T0s22Fl^CRdxoR&nL^}vQ}Ylr0E4|nqrLU ihqV1cZ=?jXde>4h8Q#U0RRLQ=EoYq zjT$_J07N8iOCF%KRGf1#j-zOdloGUU3jm5U9%F>Q??q!YO|$tlLL1>#Y<0lX7Dwhdo(qJ6Xg%}hUm}mo1(9S zo9*M3q2+KRvv)6pzT5GSp_BH@26+&BE8xI~lpr@w? zuh)y!Y6U=1l%j1)ecrHa5|kRih>{r1&gR?3TcQ$ zB1}$Bl1`_QWf`~Ijmcy}5QKtlRWt(o5sSrGU0p>{6dVo*cDtQp$Bq@8O8=VxfOtGk zFc?G>MSMOVb#-+B1qmoTW@UugY{ubmV6|HH$y_L;gLzj*Ok$hOMq^_m_wL=Judk1@XV2=-3U%Ni0hNfzsZ*yI7#N_px0m|*`Xj%k@yW)c zq7ks$?KCwtarf?BdV70mX=%y&?mYNer}f$r{ZZr{Fr$n$?AuP6$kP>6+v1r$Z0si}z*Cr%(ql3uYCMJZfBF%j{2 zJox>7{C+=PuQw-ofMhbs+}s>bo;)FuNYK;M!}aUe^|eAnMIumJTT5qWCmkIf8TYf1 zUs+ip5C||lJk0p`IEtc>NF*>A479hmbMD+ZeN4#$a#acVlR|E{J1_FdWRh>+zA-d3 z#LJg2_4ht~`h?MF1fZs-29L*69s&74Q50lZ&bartiMqD7Mj#MiWMqUFFJ2IdMD%CT zXq1_m8U6pIOPBC^y-3<@E~XbhiqL)!N25{J*Vm66pGu_&1Of~V4ILt{As&zO;ll?+ zQKYJ>iZf@my=kpPd$NBN&2gzg-;81U_5f?=fm&-**M+cpqopg0|=>j5=2wtxjlgY%) z%nTbF8^mHUU5KJ6q*5tDp^z@{Ac{Gi5Fb5y^w{BWu)Msihfwp52JN@Y<>Kben+yyL zaN)uQnwy(3o6Sg)gw<-rY&KI{TZ=5qghC;E zse&M={7EbQG8&Dl$Kz2SK76Q7PEM+cL_*DmbULjL4i2hqZEgB^K@jxopzTsG$>;Oo zbUI0;QpmE*yLa!{+1beuSzTRCcXu~^eSNgHwqi1wvN}W*Me6G6^h2wI$YjtN%r`g)tA{L8PtQwVkuw^tFX>Dyq6h&+{8?RoyVt#&JZ%wj^C|4xP r(zLr=E_^;8r%#{8X0w&UWZw7(pQ$nDq_{7y00000NkvXXu0mjfJbXW) diff --git a/Telegram/Resources/icons/media_pause.png b/Telegram/Resources/icons/media_pause.png index 2ae4e1ebb69de0bc1e2f3a32d31a558481f4c75c..f4291828dcb0b59ca919aa14399dde201d47b5ba 100644 GIT binary patch literal 14780 zcmeI3J8UCG7{}*8LPt;v1QH0EmG2NBu=ioFA1m8Y;s>#WLzMVLQgNHzv9pTz!S4F( zL=-$K1QbMo5Tc+#qB`*?DL?`wBr2LK5Cts=2~oi{7iQLvU4OAhcj(Gl#a@5&&Hwvm ze&5Vwn|*V8>$%mH$5s$RtF6uY4!J)_J`Z2Kk9;3}a-&6V_j{ZB0YVQvL_ZhMM;||m zQ1Nf8vls5QpVti6&giClfHNc8BfSwSuZ=w2IKrWDfP0oxN&WTpHz~m~E2$UNw$%1& z_|V!s@$v4-R>wFwGD>D@t-4YkX(WJ+LtPlzeJ9XHl~fd0Bfn|0m=dBc;ZY^EP7?}y z?QNmv`dCmi`LrQt6`@ed$ZAO`=AIQ4NzRK>PLxY&IjfPsoFq)HRCR^?D*I+v+o?Av z>4;TH9fqN&iQ;fL%nY*`*Y6Q|sU%8@s3>XDBOM$&p*~7G!KHDKX`DI^4BzrX%XI`A zS3htEVI`HKiDuViUbZ(&??*#34H5UTjh!$cI(eba zJ9I-gICPh!oVk}KCN*idXSo-S*R~g?4#LJYf?$Glp)%+kdsy7TfjjUG+_*-ja%s`* zL#rDXXD$-;EFC)@SxaQpGnPe5VO*gynX6Xwu^zg9$94PF@haP%A{1&hx~kNSDm>NJ z4a=cqpDv3~7S}wEi0gWYt8`7Kr9xU!I&wi%a+)MRBgvX1C4!85f*5Vrw7SQM7{#=d z?T|$+DVn4vVFNzIE#8TUAn&jA@ygR8ne6GhfK9 zH&t0~ESYjn7Jx*uSAbW~E)vtxD|ldiL? z934TLZqQ@7YS5jH&9XSx8V?J~tp8iUar}gQd5+;Bc37vvI8@YYd62;EhC|)Q>pikx zZuig{N1m6$6s)~5U!&=&Jzvu@J)t$S9?01As19U_pKFUVkNfY@y7mWA|AHcsOO)yN zM4EI%={{SUbVF&Zyy944RheW1%?TC#H!?oocF7YDuI5!WtCmIB3>Dkf2>18u7CGMn zx-#X$L<1cQh5NBkAwZ&Jkuc$y2*(9XJex$@YTQbme8@wWID6_kx8r8};cotjXLL8C zf>=BW0KzsoE;b+F<+uP4w#jj^`2a7+1%R+kj*HC)csVWrgl%$MY(ButaRDG~ljCCZ z0bY&^0AZUP7n=|8a$Eoi+vK>|e1MnZ0zlX%$HnFYyc`z*!ZtZBHXq>SxBw8g$#Jpy z058V{fUr%Di_HgkIW7Q%ZE{>}KETUy0U&IX<6`pxUXBX@VVfKmn-B1ETmT5$HaRXfAK>M<01&pxak2RTFUJLduuYDO%?EfnE&zmWGI6cM z?=fPByu3IhZz^reZ4dK<UHR>LD1JWpe&>T9mCH99rx)I9XY9vUFaK2dtoZM@ v&HR_|zVpgk^?E7$)%#EWa}PpiXZNDhTN}HtZLEDt0-{!9tA2gs>g)dj-u3v@ delta 68 zcmdl}oHRkjPSexHF~p)b`Op9V|LfUw8YWH@bmnOfVpChQNTn&z*^O7yH08>Khv^&) XZKCWd{TCP-8Gyjk)z4*}Q$iB}nsgX} diff --git a/Telegram/Resources/icons/media_pause@2x.png b/Telegram/Resources/icons/media_pause@2x.png index ffba955adad7822958388d65b21a4c71af6e3481..24a8b16f04367301ebbad5b35fa49504002b3039 100644 GIT binary patch literal 14834 zcmeI3Pi)&%9LL`npwVg5Bn}`>mM5ekNNgugnpjRomb5eyDWywAJ2aSMzqHm8+q2yz z?F5?OGPoddfdNN^*d&I8II#mT0SAs83W9FZGzkPkATE<81m)TJW9QfOX+t|ctNHVL zzxVz9e*XO4d-Wx+&CNcwZ{m>&gwVd~Ol6*Y^5k`B&;8{6-OWSqlaB|SnI#XQy$=Sj zUFe8FdHHjmGmQfO zT&5=0oHAZ9XVzVObbYq2ub`D#ppAWv>$Y2#r*sQ^7*`?RgJFT^!YTgA z0$&Oea*MS&u57!Q%OtZ2T}r38$$V1Eou7B~x3Gz*K zjixeRneL|}R)JsfeMb?5PN$RXq?5M0Oyv2zAf|*=DnVu>yfw?$x(UlW*b6dM9JD!uxegN1qQ*{iOO zr%sbwIXLd_eX|)gXCzYK*|B!qHFuB&o}MgR3cU`g$cr0_Ey>403lZ{ z2dgTR%y5Tlnr>PF*~e4?%A%e}5phNHaWPnv32`!!O4X%FB_%7O^tdP~q8JO(n+amn zY{P7>#bV?VV!BQiHBrmyc#POg7=!E~L-V!UiV~k2i(}|Y({|gMUo_j=G8P^62Qm(K3sqDM`aL zlyq87S1OVym!|WQG?hIfXT>RbdRofnGLscqR)t`@5TB4B=jf5DoI;@nI>ri@BB4xxM8cS(FYGli_G}VvtKKMi@*xjh!tkkU z+m0LVhr9VDx}&=p6~tmm01&##aMAeyFT(|Z&`pMm&IfoIE&zmXGF)^%z{_v}Aas-A zqVoY>h6@0pn+zA75AZTv00`Y=xafR;AOY~5W2~5 z(fI%`!v%oQO@@ok2Y4AS0EBKbTy#Fb%Wwf8bd%wt^8sFl3jm>;3>Tdb@G@Kg2;F43 z=zM^e;Q~PDCc{PN1H23u075qzE;=9JWw-zky2)_S`2a7&1%S{^hKtSzco{ALgl;li zbUwh#Z~-86lZtC1`W+*-$d4C0vfq61>uECgOtn&~cYpl-2WkHo;-2!e-~IIEKW`i;S=TQuyme*c`t#rZ zyl8*3dHno^kBtvDk2g2gZ(NT&nB35qEkl1{j(Tm>F>|IR%t*D?Tsr>mdKI;Vst05J$C#{d8T diff --git a/Telegram/Resources/icons/media_play.png b/Telegram/Resources/icons/media_play.png index 018ef78e96366e19500683c384501efd5bcd8c4c..4b845b51936ddfef10138f4119bf0537f637806a 100644 GIT binary patch literal 337 zcmV-X0j~auP)E3#73YtR-cFt==JE3L)`N^L)jt zUd9im+>f1|*`Hk3#csC)5wS~CO403hqvP>NLI`5BO}=CiRaFJswxRJ>lt>6cQc40q>~_xQGq&3;ubp8S5XUj^Vc+jJilTsF7`zd8 zU579X`D=eVo%m~iy*6vpwl2Ac;kh{XdKtzs6NcnPz?6KEEjN3aayB_@bx&}26ZBA>;9?QdZB53l}U zn3+dH2qZ}YBI3_=T>yY#7!U*j55rf-aiFeiIF7@|bnChz&vP@FZk}gEQDg=K0HqYV zu7l@!d`!3RJIbLHnX;c f5QyWLhrIIuPCk#_;6oj+00000NkvXXu0mjf12S~i diff --git a/Telegram/Resources/icons/media_play@2x.png b/Telegram/Resources/icons/media_play@2x.png index 44805a939c74bdca7447dc57fa813ffe0108a18e..74911abe630998c024db916522521762e6aee8c9 100644 GIT binary patch literal 381 zcmV-@0fPRCP)2sw7E!x;kH=x~P|tLqxR@7oWV=NUy&;QRf8i0~mxa~y|=i1vN|{lS(IJOh;caH125JJ$p bu4HpRVee^s;{J=I00000NkvXXu0mjf?x?2! literal 375 zcmV--0f_#IP)sl|k+<1LpM@T6Yl6cc`}SGlF`(OQ4!?+pMH5$n3D zX`0k~ZjnF9eSP;BV{T7LZW(|u{FKiH-2+QEl0pbvLp;WazVEqe4_#4o&T&=i5CYd{ zg!21ljN$t5I_FST)$4`MiiHrkmMWBMsE0a|>TC(otvV@}!*uKPEDPYRbGVKqIv;7B VNc6w!cEkVx002ovPDHLkV1gn^tc3so diff --git a/Telegram/SourceFiles/media/view/media_clip_controller.cpp b/Telegram/SourceFiles/media/view/media_clip_controller.cpp index 8b5708e88..796aee8cc 100644 --- a/Telegram/SourceFiles/media/view/media_clip_controller.cpp +++ b/Telegram/SourceFiles/media/view/media_clip_controller.cpp @@ -186,10 +186,10 @@ void Controller::resizeEvent(QResizeEvent *e) { _playPauseResume->moveToLeft(st::mediaviewPlayPauseLeft, playTop); int fullScreenTop = (height() - _fullScreenToggle->height()) / 2; - _fullScreenToggle->moveToRight(st::mediaviewPlayPauseLeft, fullScreenTop); + _fullScreenToggle->moveToRight(st::mediaviewFullScreenLeft, fullScreenTop); - _volumeController->moveToRight(st::mediaviewPlayPauseLeft + _fullScreenToggle->width() + st::mediaviewVolumeLeft, (height() - _volumeController->height()) / 2); - _playback->resize(width() - st::mediaviewPlayPauseLeft - _playPauseResume->width() - playTop - fullScreenTop - _volumeController->width() - st::mediaviewVolumeLeft - _fullScreenToggle->width() - st::mediaviewPlayPauseLeft, st::mediaviewSeekSize.height()); + _volumeController->moveToRight(st::mediaviewFullScreenLeft + _fullScreenToggle->width() + st::mediaviewVolumeLeft, (height() - _volumeController->height()) / 2); + _playback->resize(width() - st::mediaviewPlayPauseLeft - _playPauseResume->width() - playTop - fullScreenTop - _volumeController->width() - st::mediaviewVolumeLeft - _fullScreenToggle->width() - st::mediaviewFullScreenLeft, st::mediaviewSeekSize.height()); _playback->moveToLeft(st::mediaviewPlayPauseLeft + _playPauseResume->width() + playTop, st::mediaviewPlaybackTop); _playedAlready->moveToLeft(st::mediaviewPlayPauseLeft + _playPauseResume->width() + playTop, st::mediaviewPlayProgressTop); diff --git a/Telegram/SourceFiles/media/view/mediaview.style b/Telegram/SourceFiles/media/view/mediaview.style index 4f8938ac7..ef83075fc 100644 --- a/Telegram/SourceFiles/media/view/mediaview.style +++ b/Telegram/SourceFiles/media/view/mediaview.style @@ -40,7 +40,7 @@ mediaviewPlayButton: IconButton { overOpacity: mediaviewActiveOpacity; icon: icon { - { "media_play", #ffffff, point(0px, 0px) }, + { "media_play", #ffffff, point(3px, 0px) }, }; iconPosition: point(3px, 1px); downIconPosition: point(3px, 1px); @@ -51,14 +51,15 @@ mediaviewPauseIcon: icon { { "media_pause", #ffffff, point(1px, 1px) } }; mediaviewPlayPauseLeft: 17px; +mediaviewFullScreenLeft: 17px; mediaviewVolumeLeft: 15px; mediaviewFullScreenButton: IconButton(mediaviewPlayButton) { icon: icon { { "media_fullscreen_to", #ffffff, point(0px, 0px) }, }; - iconPosition: point(0px, 0px); - downIconPosition: point(0px, 0px); + iconPosition: point(0px, 1px); + downIconPosition: point(0px, 1px); } mediaviewFullScreenOutIcon: icon { { "media_fullscreen_from", #ffffff, point(0px, 0px) }, @@ -70,12 +71,12 @@ mediaviewPlaybackWidth: 3px; mediaviewPlaybackTop: 28px; mediaviewSeekSize: size(11px, 11px); -mediaviewVolumeSize: size(44px, 18px); +mediaviewVolumeSize: size(44px, 20px); mediaviewVolumeIcon: icon { { "media_volume", mediaviewPlaybackInactive, point(0px, 0px) }, }; mediaviewVolumeOnIcon: icon { { "media_volume", mediaviewPlaybackActive, point(0px, 0px) }, }; -mediaviewVolumeIconTop: 6px; +mediaviewVolumeIconTop: 8px; mediaviewControllerRadius: 25px;