From 3da053333980910758c20ae40e5c524b4040df47 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 24 Nov 2016 22:28:23 +0300 Subject: [PATCH] Intro redesign done. --- Telegram/Resources/colors.palette | 6 +- .../icons/intro_country_dropdown.png | Bin 0 -> 159 bytes .../icons/intro_country_dropdown@2x.png | Bin 0 -> 203 bytes Telegram/Resources/icons/intro_left.png | Bin 0 -> 8888 bytes Telegram/Resources/icons/intro_left@2x.png | Bin 0 -> 18723 bytes Telegram/Resources/icons/intro_logo.png | Bin 3708 -> 0 bytes Telegram/Resources/icons/intro_logo@2x.png | Bin 7793 -> 0 bytes .../Resources/icons/intro_plane_inner.png | Bin 0 -> 1905 bytes .../Resources/icons/intro_plane_inner@2x.png | Bin 0 -> 4463 bytes .../Resources/icons/intro_plane_outer.png | Bin 0 -> 1020 bytes .../Resources/icons/intro_plane_outer@2x.png | Bin 0 -> 2303 bytes Telegram/Resources/icons/intro_plane_top.png | Bin 0 -> 2963 bytes .../Resources/icons/intro_plane_top@2x.png | Bin 0 -> 6642 bytes .../Resources/icons/intro_plane_trace.png | Bin 0 -> 2642 bytes .../Resources/icons/intro_plane_trace@2x.png | Bin 0 -> 6081 bytes Telegram/Resources/icons/intro_right.png | Bin 0 -> 9048 bytes Telegram/Resources/icons/intro_right@2x.png | Bin 0 -> 17307 bytes Telegram/Resources/langs/lang.strings | 10 +- Telegram/Resources/sample.tdesktop-theme | 6 +- Telegram/SourceFiles/app.cpp | 2 +- Telegram/SourceFiles/boxes/addcontactbox.cpp | 11 +- Telegram/SourceFiles/boxes/boxes.style | 5 +- Telegram/SourceFiles/boxes/photocropbox.cpp | 24 +- Telegram/SourceFiles/boxes/photocropbox.h | 1 + Telegram/SourceFiles/boxes/stickers_box.cpp | 47 +- Telegram/SourceFiles/boxes/stickers_box.h | 7 +- Telegram/SourceFiles/facades.cpp | 4 +- Telegram/SourceFiles/intro/intro.style | 184 ++-- Telegram/SourceFiles/intro/introcode.cpp | 360 ++++---- Telegram/SourceFiles/intro/introcode.h | 60 +- Telegram/SourceFiles/intro/introphone.cpp | 235 +++-- Telegram/SourceFiles/intro/introphone.h | 55 +- Telegram/SourceFiles/intro/intropwdcheck.cpp | 256 ++---- Telegram/SourceFiles/intro/intropwdcheck.h | 63 +- Telegram/SourceFiles/intro/introsignup.cpp | 267 ++---- Telegram/SourceFiles/intro/introsignup.h | 58 +- Telegram/SourceFiles/intro/introstart.cpp | 63 +- Telegram/SourceFiles/intro/introstart.h | 23 +- Telegram/SourceFiles/intro/introwidget.cpp | 816 +++++++++++++----- Telegram/SourceFiles/intro/introwidget.h | 298 ++++--- Telegram/SourceFiles/localstorage.h | 5 +- Telegram/SourceFiles/mainwidget.cpp | 2 +- Telegram/SourceFiles/mainwindow.cpp | 27 +- Telegram/SourceFiles/mainwindow.h | 10 +- .../SourceFiles/mtproto/connection_http.h | 5 +- Telegram/SourceFiles/mtproto/facade.cpp | 2 +- Telegram/SourceFiles/passcodewidget.cpp | 12 +- Telegram/SourceFiles/passcodewidget.h | 4 +- .../settings/settings_privacy_widget.cpp | 2 +- Telegram/SourceFiles/stickers/stickers.style | 1 - Telegram/SourceFiles/ui/abstract_button.cpp | 3 +- Telegram/SourceFiles/ui/animation.h | 18 + .../ui/buttons/peer_avatar_button.cpp | 5 +- .../ui/buttons/peer_avatar_button.h | 3 +- Telegram/SourceFiles/ui/countryinput.cpp | 52 +- Telegram/SourceFiles/ui/countryinput.h | 12 +- .../ui/effects/slide_animation.cpp | 67 ++ .../SourceFiles/ui/effects/slide_animation.h | 66 ++ .../ui/effects/widget_fade_wrap.cpp | 1 + Telegram/SourceFiles/ui/twidget.cpp | 21 +- Telegram/SourceFiles/ui/twidget.h | 1 + Telegram/SourceFiles/ui/widgets/buttons.cpp | 1 + .../SourceFiles/ui/widgets/input_fields.cpp | 456 +++++----- .../SourceFiles/ui/widgets/input_fields.h | 127 +-- Telegram/SourceFiles/ui/widgets/labels.cpp | 117 +++ Telegram/SourceFiles/ui/widgets/labels.h | 33 + Telegram/SourceFiles/ui/widgets/scroll_area.h | 2 +- Telegram/SourceFiles/window/section_widget.h | 2 +- ...imation.cpp => window_slide_animation.cpp} | 2 +- ...e_animation.h => window_slide_animation.h} | 0 Telegram/gyp/Telegram.gyp | 6 +- 71 files changed, 2150 insertions(+), 1776 deletions(-) create mode 100644 Telegram/Resources/icons/intro_country_dropdown.png create mode 100644 Telegram/Resources/icons/intro_country_dropdown@2x.png create mode 100644 Telegram/Resources/icons/intro_left.png create mode 100644 Telegram/Resources/icons/intro_left@2x.png delete mode 100644 Telegram/Resources/icons/intro_logo.png delete mode 100644 Telegram/Resources/icons/intro_logo@2x.png create mode 100644 Telegram/Resources/icons/intro_plane_inner.png create mode 100644 Telegram/Resources/icons/intro_plane_inner@2x.png create mode 100644 Telegram/Resources/icons/intro_plane_outer.png create mode 100644 Telegram/Resources/icons/intro_plane_outer@2x.png create mode 100644 Telegram/Resources/icons/intro_plane_top.png create mode 100644 Telegram/Resources/icons/intro_plane_top@2x.png create mode 100644 Telegram/Resources/icons/intro_plane_trace.png create mode 100644 Telegram/Resources/icons/intro_plane_trace@2x.png create mode 100644 Telegram/Resources/icons/intro_right.png create mode 100644 Telegram/Resources/icons/intro_right@2x.png create mode 100644 Telegram/SourceFiles/ui/effects/slide_animation.cpp create mode 100644 Telegram/SourceFiles/ui/effects/slide_animation.h rename Telegram/SourceFiles/window/{slide_animation.cpp => window_slide_animation.cpp} (98%) rename Telegram/SourceFiles/window/{slide_animation.h => window_slide_animation.h} (100%) diff --git a/Telegram/Resources/colors.palette b/Telegram/Resources/colors.palette index 033868bc1..9a1c2db92 100644 --- a/Telegram/Resources/colors.palette +++ b/Telegram/Resources/colors.palette @@ -125,8 +125,10 @@ notificationSampleTextFg: #d7d7d7 | windowSubTextFg; notificationSampleNameFg: #939393 | windowSubTextFg; // intro -introHeaderFg: windowFg; -introErrorFg: windowFg; +introBg: windowBg; +introTitleFg: windowBoldFg; +introDescriptionFg: windowSubTextFg; +introErrorFg: windowSubTextFg; // dialogs dialogsMenuIconFg: menuIconFg; diff --git a/Telegram/Resources/icons/intro_country_dropdown.png b/Telegram/Resources/icons/intro_country_dropdown.png new file mode 100644 index 0000000000000000000000000000000000000000..e65ed5a5a9e20429e2dfd49e18b7eeb609c2b4dc GIT binary patch literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CB!3HGHK9Tzfq|!WH9780g*7jfIJfOhi(toKi zMx$W!kBOly*Z0(2*Hfg=V`QA*C%MwlXq4Im#W)mDz>Xc zWe58gs>XMn-B|nO{ljpjoz3xz-qICfo3=ERKJ&j8HU0ewRztz*>Qbi;eFfUc;OXk; Jvd$@?2>?l4JAMEF literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/intro_country_dropdown@2x.png b/Telegram/Resources/icons/intro_country_dropdown@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..712294a4b21900fcf9a648b1d6643be69d18089c GIT binary patch literal 203 zcmV;+05t!JP)k;>5>*hXmq2&_jap7;r}>;`|}FoOAQ-Z3l)`-l@5QS%m-q002ovPDHLk FV1jkFQ;7fo literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/intro_left.png b/Telegram/Resources/icons/intro_left.png new file mode 100644 index 0000000000000000000000000000000000000000..4a8dcf3c0f164da2d5eb8d3b112bb193ba33c9c4 GIT binary patch literal 8888 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 literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/intro_left@2x.png b/Telegram/Resources/icons/intro_left@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..6e7ffbcdf822926055eeaf70dff027d5b664ce4b GIT binary patch literal 18723 zcmchvIKZs-N9O#Y#m+Mz%{;Me!mT8Tlao zIZe48f3a-H^&%rXNT#ZIM#m#=y3gH3r(;!oZuZ%;1rybSTlY}h38%Y5C)payb#PQy zOCagC!BJ1$InVr&ZD*8pPHPG!9So#8w_{5Hm(1Dz&UfuGK$xKSu7D(<4E7N)0vOl5F8C@@f`lH$Cg zVk!l*85b89Qyv)uJ^kz3+nxpns%#Ue#KnAOzs{D_O)k?X~r3ip$)4OHai z=if2OJ!@;rd-7WULm987qusgh-^+O}&xBT2%UfDoTYSs89K3W^QE@AoeD+s6lKI?V z)o{b(L&?XLl$3_YT2jo1Yl8}w_Or7KbY@@D@6@ohwe9k=wz3NLTc0$o{`~m@$)d(g zcrQ&Rt*hkH@85ga#GSI<%=N3~ehX=e5ejKZIZGX{uK&yTundP{W8zah5>-%W7 zUlHD0yEgk?Xli=8V9UUE&OkO3a*l7 zX2aw*=Bp^j zD_KLghq9iym^$sdzIrC*^{T}in-+@g{%4{$l9Q7)H8l^aT~btRzy9nc85_;^AETqZ ztwnScT3TAVPB-U=>+C{YF4&TcY)D3i-CSJB_nRDIl0t%m8Ey5`+FsbUz0!3myxPRv zwHgu>goP86EyKlS_w;In)=at&iG@8FQtI88@SuUaB==z$^Si}U(!Zf-{f1#_I)u3fv9 zWmvdXzxZcJZ9vL<$b$&VJm}C0BqI;N{YSJ?~;RHa57Vq%J*roz%2-`}R)02X52dK`SdBSY&qXzE`fi zFnI4EKuYXutW_ zq%%C(a-WE$eLr7#QpRj>DRu9!FY%(cjAt4nkF-?ytVzz!4i4VdH}zr4efOKHwXN;O z;)E_EBjeyySD`_Lw}g6vwCzP-tN~pSFY@jGUAVci{QiPn%B?>?Rn*l_zTTx8aWLR^ zVWFt=&6^kOLNLQ8b$BZyxUa0t4H*<#?V6gJvMb-bO}-`X<}dYa#}9FF9j7gn-RARv zjsnk3jlDC!u{Qh7Cb75I*n7T?C7e5`E+#NA>+XbjGI=2RmhFL#Jw-uraqOG{bo#j_ zOcD|j!xJ5u=1Wsu)%Epf7um59{j0+HbxOBhW;%QJEOx-k-@ikxFV*bQ6j0YFL-;GB zzjSsMIShxrx)95C=+G9=@(Kr8J1;LUMrP({nL#B*Mazfk(_1I}tNeFZe9yaL(~-f1 zY5)3CjpdZ2B-gQHyU5AOOI#$9EI%~!eP1}-^lEAbC&vS9ow+cSqwG!TowV{~ZZ9=k(diK##$+O%p#%a`kh>q6=lC%q+dkU#;TuI9z6*DR$^6g7t_&WF9r}~TwGok#_p-AcNj?~0 zjSsE7iJxP|GuKB&v2qk%YC7^{?cngHliOH1#Lmt>(fa}ara9_iq#6+(9)3Ie*rm== z+QWDijcG=-$ir5qkG^(vFvXs9tj6j(&sTxsvNH65Bcs=9y!9pXC2#W6DJ_*PEn3rJ zL`Suf*|PNKPtEN6%}2ZUOFr%Ge0=C^czpcj@inaSy4oOy3o~a`xBHXN%*-@2H|t9= zVY`SH#*@2GcJ6vW%Mtx@g`%>z^k$~F--n0$3KmjQKYcpSY|53q{oFi-fa;zE-&I?O zfr|YXVoye8_YrMoH6cEJzoh$&z$H^>we#m|KRpv|d3WokrIl4i{BCr5#g?>p{T?Hs ztQTHsv0?UHX8X%qWlykP=n{*HK8+6eQY|KUZti+V;#&)%j?@J>hb~WasO8^1dF%HN zzBNHXLA})3=iSBE68DN)J?u6WBt~06jIn%cx#yytQg?@q80D^A+0L;8ew&vcSMWzZ ze;!=i?@3)zQ4!9)6OUN?)^+mJ^DXrB9UQ?-gLrbzg9lH){z*?yPadE1`$36*mca{y z0e7Ox_LaFm;8vZ(0G7>GgkaOvtsUm#nmo8>>ssv8$N0WBHZD#;UO|Chj`YpOa#mDO zQ2qQ<;WOBp9YUA!^xIQ>A54whmXVR6XJg}cFJwZc!71WVP7P?b*X+9jO}}9Gu}S*>vswdQtbuh=>T`n?KK=l9E!0;HKGk zd@IUGjEEYr*NA2LE1!vW-mckly`QU#lgYpZx<7B`N?AB(_Jk1_fab8ml2@gnp`o+5 z;cMkkR!(VYc68qimspe}E*Y8qi9SpF9&E#&uM1y4F!v#pZPcmY95$F=)NHYB+kFe? zpumPF$g^QN&Yd# zztI@ekF8$-w?r%(=u{%M0yaEq#9U=^uF05@U3YU+R##WgURFDIt{SBw-=V8Oa#}-C zQOES?#oOdbsi~-OC4X;boDn=W2iXw%4KN2OG>bY#4=%l7A|XDD7-bDjaY_5>cB?evb)YGwWZUJhp=O}SZ!^sS!2Xul?xYillg%bJkRD6a91%( zduopu)|l?2{|~5}beUw=!H%k9T;aVBfYR<4x=Q;&m0`c8olMNk=1tMZR_5zD@@?CA zfK*<`vtjf*`1mW`o0^;Je}0b5x9i|@=zq8G@ZrODKa}wfq=(FdWtYo6nfUc{YQLHK zh1S+8-W(;GP)EkGN_VW%sqgt)u=qZpO6>NpN^)_+^Xg@O*tX&n6cn^FRoI+oUPsl> z4^*DvFUd40g|UWba0<2!V*VTM`wzK4hg+ou#E)KtcB7hg|=kMWtvvg#( zRP?;oPMaG`3FDHLHJR4I12Lve?3?TBCfPqoIU6?IWu2%?lvJ)d!%z6LUY5Zfd>}b5 zPxF5+zVdk6Ub06AWP-I)l!tzgHrb`gD=KnJg_Lgf$xTl`$}Z(bgNFQHRp#n4bRgeO z2Ka}^zqfo38*9Q~>hPG?=XfcWLaWd6GOFK(RU@{BDsM40HGMZ%O^r1hkez)DnE6AU zD7ML&_CxlaS@cUwOB7@&kA{YZII)=deOJei0P^w4bT&3Nnxli78iA8+|hUQ-fHIQ@%{XsZ&BUTb7|dQ zU!%ISQ%}I;UCBq${t1_vUc<#^qMYb49q&{sl)U-#;oS1F{wA4`M@eaEkZz`4qw}W+ zH2acQf8j}J?1Mc2&_#;?z|;f9g~!EZx$!YKc6KrYI9Im6*1l?A=sMY{qM{NGq@8>} z!-U0*49HNqIYH)eL_{(!wq6)(A)w$JqihGqpQEEyU0sGnOM!u`d?5#R7&Cl+exhck zuZ%!1xcFB}m}~@Th2l2QQva=A`we@zx$FWb*7wcrPt!;9v%G(7jm9DwUv*9n*oDC)4Mof8te-S1kARiU>w=lW zxmBlibVi1TUf9fUyA5_IK4x)V(ULEdzmiPYsrQukT-6S{v=`4=Ogzra%K{Qh2#M1_ z-kDWEwxtsAa#KL0H5YG9%+^e|z z_0!Puav3TrD#qD*V9jUGo&_%}C|YJ`Ez#^Pkzr`ZlBQ>8$5dE}g0|JI9TgC;M3FxJ zSeFGbKm1vu-^RX2j~>~jnKJ{%y&d-PUSIqcynKdupVd7JeH(ugHwPP!B2rYHCW4eDN_pMJj;Uv+QJ!sY?pe1UzFao&Wz)2VmG}ChJIu0D`(vrCs%>nt_hmG zWHV*6vhSArz3kFBrEY%uED&IZr;kwe$2iV?f9o_P1PU1X3s%Zg z(j1W9i`I@}5h-9?LWeKceiL@{*B4GPF`X7!fl%d?s&}{k5G~3^>{Va3s)mNRQCwt1 zgr z@`#4syIlKkIYZU=s86}iuy3qR3f0!v9}*FvM;$rJ%d7RykL%)De<2Jnc!n9+Q^rDe z+xX!4co5`{c3VGvef`4T`l90Evszk@ht~}#(DDd23)ogZ5!0880VkfGlat)KIpG-p z7bq1MPY7{E+&QSFqr+`f-Wdah+|`rCbYDrOsTl#lP?zY@Ne zB_#%Na(*WN@ZW|?3xFJVFcfQ4r)#cf1 z3+4a2`E_Tmfw@IDRYR)C_;dL8>KH(0&C2{phq?kiP`(PV3%FF1pzXju<*0;&95+wJ zUBTdy0*!aKQD298@Z!xIo%ssP+2G)y=J=Z5`XY-M>n?(2^hp1kt2vjdrw&oWpRa=K zYmwt6lD6hUZ29WyYHX|fLp2X#yo7{=Xo(eIY|OqiI}nE6GXh?2_1EX1U3hziv6Zcf z$I!MyV^4@);I%2O(m;*+j%*+bdjCAU!FDoCUx~P5lkoZ)AB#81W!bTtoo?hqCbI^tz7fIADI}Ep zvCu{$;Qsw#aFF1oE2`4c($|3=I}&}1xYc3=>rz!C+tvLWCd3*_lQM@VCqu^D()jzs z9z58QbGgiFq5R=P8q62zJk`K>-ZePP3a7Y+;y6JIsC@YA((+~w=!qH~(=7rX_NN~zq;89>xw-kn3MYGeYCpeC zzU5=bj@6;tF*QsS0g^nw8l<4smZ8f}(#|vREI$Cwbdh-YDhlI!fF?xW&R^m$+d4fw zd>4RUw`>z=Uda92RdDEBgP!Pf5!@I&`DrnMXuV8eNJamDH4jyG3RLQ%rPm({lTJ2R zlX9C%Uyz;A){xPi-tbzQ(sI~82m;IBnsfNi{QRAil$37UCk$+CA>h1Qh#q_H992O< zfet^4;C&5whQ`2=+nEFeM8U1wNYghqc5u0|+}qpBDl^ww;p4?F=WE;D9`WF-# za=3u4t}V~%ONBZor=$R3QllPw+`3iu?HfxdoA`amx2z}ZwqkjEcz9Iy_3a0B3YOzu zgb+0HS$sg}4Q=xMyV_cMhrrD+$hA-p8ErRXuT@mtY?jdl=|gI==rlFI68%h491p9?o0%QNVz~#c#BfzV@@3y9G5BEIeD4HR_du2y znwX$+cX#*j^sH`bqW1Om#h^XF!+HDoGzAxigit>hv*l{4(T?gn$(byv>6laIX^BD} zd_k%6g~ASiqlZggAV{pF7cDlmK%<;Z);`O9?)Q{aUTeK?X=&k-kT8T$a`985oT`WJU{w-8)TorCr_T7TRU*vQYEyzW!!~JQ1DA?^IxEh&XN^R z50AidujT0VdEh)nXXgS+T3Y?h2X7w{g*5U}VlRf2r|Flovvb6;BUq^&?~iP+F}kav z(|%h$EpmF#Y&oyHL+7aAhj@^u#tKZ%ywRJR0v4I}wNZoV(@wS(ZiRrMKR99D5u!i5c_N0cT zwEU!P_h6n*gsk4mNWKd? zmg2X$@x8*QY|4>^nVIYG;caKmoKYU|TWC2u-|V-+fNGmwlpPVVCkukD!`>FW*Zf=! ztpX)^sItFB{Uelg#sS~8W6%XOp}=Pv@87?FKFsf5N~;p}9tH;DX;$nmI{*3eN89C- z`(-?*UbNef=L3>xh0$(-V}6!@+e+@Fe|~1;IFes~AhTc=nnvcvx98ld!=P|1uV24b zz9}Fm$ZYDf7&Z6%_eGg+-O6Z{Q7ex{f{dH@JD~POdxHU|tS;A@8EDTPxPFX=?d19V zAl3>D9Nz=U#qqYYEw7K*Co4SI{Z!UR5^FiMA`zksT!PmoyHyL`aH@dDmiVrFmVQHT znsA90{AQhL=VQl}A!BkkXB(mL?>nB_onPvD!h7Xcr4gJ1-9c6_a^ zt>KR!-^t1nfC9yJ zhOr5ciAhsg1L@u?XPU0pbzb6*YQ#n7`11Nrc#cC=lm4Wn! z!k;~Rt#aU}nQe%0?^K?`bc&JIwTU1o^abltn zJdXvr0_pgcN{GhF^Ra*0(lm0l1dnJWFhU!QB0;D(6S>we4f39Cw?4plX%n6rQ`ZN{Om2-bm6Vm~mo@|L3VSZt zfC6W!`xpfSo`u9p|LEsbF)=ae@Z~r+yl%?1Eq&>Ts|Do4VSz(;op|qFy|huVBOcj$gt~Z2Ix`x^YgRrCiTTfdxgzTXUmpJ zh}pHL8$ZHk-UHn$V^q|>Q{ca1H6c$L81wuR7uhNVVyiA;Wo1Rh834h9nE*N1N9M3V zu)$wWIa@&_&hA;q{t!+#!WFMZTtWuH{*GG4@*M+bU#lixt zeR0Xw+CspQ5;jE4$Ip$^Q&Tj4ettG$6YFn(?-6_a&*1jt7~Z=caD5&`itG6Ci$!S{ z_!$@&wm_H@Fs)#(tE&rMy7~!U(1Hp52YKIW_L6P%$*tr4N0Rz_d%vb@9f~R_J;uwc z+OZLo_4umHt&3q>w{A6qF?V(IOH)$~8eN{>rZ4-c>ttxgG3x^PC|(4{>dd(u0>Lf? zURgnrpOAmmZ9qJx-14R8x?$wIcJJ2127b8f%{N%pUj3W+w92d!5(nMhy_B2*jnlfXa8C~JIdYWV2QWVB zR<&Y7Lqi=zl^RDOZwW461H99v&O5O=uawHeY<3TXCg8yXG(>ic`B`6I0zDBto&fPB zF5?lZ)9%yVx(SM#Y3b>dEJ7xV=H^_)ccaQjXeQ#Y$oJY@P z_hdRfgjRVH&meq#u(IIgZdb|u$3;blW@a7*1Z6mxjN zTqjQGq9RALS>&{h*LuyCAMtub`p-TgfB~OE$AAN08g#OMD%v*OoL9Pf|>b$6DQtmn3yzOkxq2#h)`hq6!j;dX9FU-$B z10rWnGP~b96CV{4_@jox;p&Rqr{|IO^!Krsnp(e<8yg#2mYuz{|u zYZ0Q7$vHJM-Yn)YK%uemtz*K!wci1JZ%$IvJj{Ef*zD zovOr(M;Af4gfYsGC)f6(+#@8%z#FpddoYx!^RXv)0e4m=3C$ishp@xzp(c&k5c*kcG={U9_Z_IvN+rn6G=4RzBeHH7HuT-P5EmyE5n>Y}}p0 zE32iED!@Frod*&lq7gNhu9bHrB|ZU{AUQa8_4HT}fs)T%4i*;v^oNv_h&uX4U;o{X z^Z$KHC9Q2}x_ID2f{Yg(9bJ-}WJdTOC|-y*2xG?rxIgXHv$W(UR`tGu45@OHFgO9} z&$m1#S&%zbzIC5{L;x+M6(HWZIp^HnN>)@<GcDjJ$vfCS6UEia0I zv;c5*KHq_YK_-4(R#q19R*GocU>k0dRzqWBl;AjBJ&Owqwc-Qb{>WT(*!qEx5e~p! z5%Yjg&pHn1pW(WAfLi!WTHBTWcee;bV`yqB%S|%az9spdxntSew}dn70XN28dZW9i zhYhf`9-Lkn2oaf*qtT`p>gww=<0&3@MEb2B$S4MQ5B>U8QyN2B;{CUvd;F;KcvD#f z_fUtvY29Fz|9q3s`@zaPTTs*YprXRkzFcH?5tag>)gx5HK}cF+Y2Cwg++3siWZDwY zj8OMxgJ6OHJm+gYwP>Oy_@v&e(((zUXy3o1Ea&4+X-(@e!ZX($*N@;15vuqfApN%6md;Ry*(~FUUS=H{ zwg^N$lJ?^ch#wNQuc)Au@s(*@Aj-lkKGlc-VlT*w1jGS_wIx}TXYS^xJf8D{rtQ!l zT)=t@&`ZR9#+cL=UI%&U#@yf;Qd^!u+?Lgou-X_I0~#7s-q^NnM{mLZ5KLee(Rnx_ z*Hp1jiFuUt%><6i78BpUS4r9;s!$C35n@3+L@2MgSYK*?NLzUGZ69y%ub}N9r1Zy( z-Vi!FxL$Z-B5k<|Ex?Cysq;4Ag|m8k%$S%P3u9WOwpX6#_Ppy-AT9i_c4(J&We*4u zt?UXJQM$uC&W5;wSQ#562D9*e7{uz61czt<5UusvR5318sN!N^STZ1RiKZejs zA+I0J)(g?gHhKXNvRB$e7*VjxX`}*}iAina=+orvk}i}YA|fl;g=W~JpmW=fAF;2- zcb~-6c(0D95ijt+0%x<_rZg<*&OweZADf$V=NX?b8e)6$sK*6vtgoej=oa*~^_AW{ zLP&5hM~G;NG}|jaEXw$uoO87d8fLJAu~+xRt3M!~>TKA7v93bof4Jz_*=blUb2 zKFz+n1Wk+&o_beaPQPc*UE(%)WRNWd_>V9G97wd+vQ5fakuEFgwmk~{&iwa}Mvuwt zV%+P}6-v*6pdH=X`_OUoH1sx^&6mdmcGq$79uYsGrpX zFH+IasDGjGfbZQmV9hrUU3*@x}@i8 z8J-@$N(BaH_imsgQ~$Lu2g@%XI5g8lS(9zxHa$qXE*-s_G zir9P7VXukbx~qqmmwxGGjGcO-Y$y~#6l?|vw({!gyNO;sGU5*~3f*TIr06s#$I!1| z4{qPSO*P&7?2X0P*B5gO3yM}&JRAT1Xei0Db(p@}dZFMi%1=x2HPauzeqkzJ+6J823g;yvoEYM+@YaY`?nTRsyax0=QnZ??0G7F zEdkp;!%zM2aHx1c9V`@OIWJY!pi{p8N<7eplrUKL^fI&mEVt!cmJ+f4!u~ie&f!h& z-MbWoVATQ(rXy@;&E4uB17^uyg!qr%ld)OTM^@d~s0zXm0>?I}tI#?G3oZocBrsO| z8tb|fd_AQzXYSC+2Lk*Bf?gslptFfAfrm%QsawA-U&^Jas;ZjT2GSQS5RwxSRkBX> z(HrMbMm%dcySP6?x9q@y1Jz%?s4rSHYVxemF*hPi#taUw0Dk%S`ST1nNxfsx=?TmN zkDTw_uZanxlMngC#28_0`qNP$pivEN@D5x`!mGHK_1U65T?>M{$Z9|4a2}>~<4NzF z)YPqr2q5Gq^S>M%ygR1n1H3;}$QtAXE|1?R2FOEcLbbY&XvHBgGgLXkjKcS1Pi#n& zOK;(+gERiwt~qDI%V2G}HC2^i9X^Lj<-b!K<5pP~~gUx?_o z4X3aEm{>m5TPg|zA~a`c4f3=F-n-%R=cw|5fB(FR5S!QX%!$h zrbEyJGUHhd^FjL#p#)V=VzU99)L=I;t{qCv%cFyaC{<8c7+Ns^AWwBu1F=90c+gQB zCSta&TWMt$H19Qa>%5;oAk6y_lZpCpaGZ6d0&`?KVhFjszkY>NW zy1@1%I$A!BfAf6_!QxO%z~Xeo{tFc#Q8k9yxVKC=H^{&`nLk38fmW6A@gyEA1pOK- zoTK2E+Qi^K;nyFaG@}UA;bZw%YPN%?Y?+^*C(<7 zI9AYiCa3>>wDd)TnOj;qxhfhN8R?JQSlvxDUKGWQg>^LVsI@JBkQg{&4 z*Bj>KJRze$f8L)TsUN|-)aegG_uh?T8YfD{-B+1j`0};q(M!TL(0`QcIF3N5GD^!kb=|w)JBjJj+%)#ZY{}iJw zF`r1#DlDpg+xIgR8-xfXrN}YBsQ)jmV1s=V<+%4!UUgN~8RD~qVrdTNW%y$hKhL_i z3F_$99Xn!3xezOa-v7He?F+aM&T|RjDBfiObm-8M5UDc8p~2l&cwFu+s!dZ2w92? z`)zn`3qkx_z566h^z=1~?Kjawsej6g`54$bjb8({J8wL!xH-b;-DhnfH z`9#9yxhZ4=Yl8aW>$J z`O|UhhYjY?jn9iY^%|_3$|`4@|7dtjgo}@_#=m;`k_a5_#QBP%^5WuR#E69dXy{KP z`WwAAawdZNKP(UtVeYbqrWAw*O9j~8@t)znZB<&*>#FguFSZc+0<1}r_6t_{z$ZWx z?!lf&nMK-%h|`Q#v@I+wIIC?K@@4B?a_W-j-0Hi&sGntAx(7zNGL*Y6F91w~0?VC5 z_$sB%@#1>5S7rM_V&1S?_KMliArpo^uM-OIEeQsauG0u|6Ig{&m$nP@@NCzRo)2gp zf0l)EGP>cjx?l@o-vVoRtglQQ{>x(ohY1V{2t_0@c(o%KsD)1$BqSsdMCgFWAbIVF z4~XOHa`N+MDr+2A#%_jCwe6gm8hNkDPr`>s9{60EO$586?u*#tvGX~r7^p8oY1{rs=g5#p^aUvR^0eE2DYt<4@BO;oHz&$nn^$n9 z*}etwd#G3;RI|t)6|NYGFq_%U0e=wnvlo3A0k|lHVsl%v?^ae;IuBU*`c~AL_90UP zBL%4gq_6H=A?KkOM3u#1``ez5 z31%CSssUFSO+};aW}u1U`P@*Wlz>*(fc zQM2T81o7y|(0#|@a0c1{T!am~V*B0_5u)5JUE|z}{a~lHY%nrBoCgCJqMH1)&cr=1 zX?A(af0L%08FLAUI^Ml|cMf{-Azt2{sND+4$OGUt6kMWnmwT!o51)w0LVZ~XjR-ir zuDHiAN#f?uK~Q$R69kR`iFrYwAS$Z6&}<+V4vvm)Lt+5I>6qAQB7cbDOy(4J?=!3p zV7DgXoCbhMiN`z_G|@nmi`R=Sc8;husA3AF9$Z7axl%9paYM$el8o3OM%j9e3mH*Z zEZ@HyAn{6xS2n3vQw*VBIUNWrv_Pa7sw*12)cdiEVAY2%bh9E|HVt zsGPoX{_G=mE!WOMs8+Awr zB!cP)>4dMJ*#}W%Y|IAGa0mPg1#}#k1HASeC!hcZBE5=p6;b7SMn*)5pBi}2fh0&3 zSd`rY*^^fM|9vR95C_*b-Cr>hCm)8X` z9D$j8rD$W40p=DOXqUOw%S))ED8Vm{cN9pgo^B^2M6>7}LXZP$f$(cHbTbt_J>Pb7 zWPZTPss-q%WxMu{6H7g9!v7S6PZkg|bU(^ANzN6diT%;HYHnhOSp z(RhGFgNZB{VP$0NWvBSxlSH55dtVgsjvS{ay_{e z`PQ^VUn6j&3ydr*nd@4XH#Yv=B2FNM05d;d_xp|sVnC#l4$O*6L_`ZUgtK-!?MjS* zAr~wg8y7jOO=yvvC(+F^)66p?qoNL@$Q^=syoIPS1Tg9dG4cr_PTv*Hp4rLav+&qF zF`o7ceMdEtg7XuZxt%tbR3pB^){|bFD%^X*PA4?FEi;!09>YYz;St}{$YL3;E-Wvf z#j3jwqn(hU2;-U%BnWj2wiE1)uL`tRssnZcljQsv9YeMe%IIF$pOr{|24R|W+Ai$? z>c8&lsw)-B$9v+eIJL0WG32|F(Q_d{ymn!OJcT0?;YQBI!y+@qKp^vg4}n_ z2_C-;c?N<>t{ZCyAGl)Mlb8iZaF}1j<}vHxGt- zKk@KHOd6@ZdF1vB<~oVd5rKz2)lE{H*5Pxt?kq$xh!V}m7V{;hL|pXq<@dgqm*!W{ zCS9*vkFsLHMTx%lL+=mRCu(&Ni*i~=MG4*YEY2l%+qR#>RwvT6UELNqsawb|DEI*_ zeeR3Ytj=2Pal>}(E!|u1vt43rW^dkts zXq3LCZ3yw5IFKXxZlP5T6Z5wFb+|mfI`B%({l?Z#wEa+`RUmF=LArUOtgOreP5=>J z5VrYx&~WwJfBC#u;+CDfN`ZlVkE5e`4tS1nc34}PH?SZnW)6Z^un~vA$7xj1PTs^A z6VKNUonqRbo{A_$kJN~oaTOd@ix#MYMe6h zb__qWPN+f!x`TselEvD_#xzn=WsNA(sF?7FREZhbo zZ-fL}fRsI)(R{E+-*0bi?$wGLVgSI84oOcWeewv!H;QcM|~ zJ9g{@b1Qs2KtoQ(vp&caGKyT9tGrU0iOp@GDji${?^t0rQ`j80JF|4 zLn4m-#>g@I=36Xvq%|D6e;nsAr8&ZNF%Sm;IDA)LAe_Fq_Uz#V+;iil#5+W+p>+ct z>=4neUF0D1;N0oKjla!)RPpN8E`DrmZ1b>MzDZ!N-ad1A=dt~~BJ(vIW%U>iI)WTB zmV(YUiA0x*nvM=qHPs~?>I5k8n98rWYgY#4Ip8%VLTHyLF{Ax#k}gLfOK+p44Kw=1 zjIWA@Bl=P#ncG$`h$J!?zL%KG{I_8OY4L^?YzA;?8v#Y!5 z^XEEfhy3p<5Vkp&=$xajsY#dM{kxGWH`lQ6l{&3C`Dt)tq%Kk9z1lY zCe;m_aNTGYc8lVo9$o~KMF`H|P@57kmA@p&*k5FW?Wo-BR^~EpezB}_x+`yH{}(G1 zqu&fmXprfPvM5kGxhTqJ04Pi|laD3r|7i9`)MmtEc5KFkf(*uRs(PZ}78!o6)QIJfJW6I>jG)^UHF%iAycrq>=P zW^16RO!iu7Y0*P_GaOn(#OK>Mua!kVA`-0Eh;^WM_3!UdOpm72F8RI#=ik<}w9rGb z<#$&thJbMM=cg(nKb>|GmRcAL1W3DcW@+LLl^24fwoHCzRid~ z=f4aNPUIoKtkLcjCPM~RVEH+cHH3=*gxr~tjW%-V>SgbxGp+Nk=Lobc-Y|c69IIPjJSN4j;m>mmqKez2G{M zba7JdyHOD$j-{=dfgF;2C0CpXLlDEt$LI{(k2ofcSIjFc%yii#4hbUg6c`ecIhUZG zR)Y~jC`$9!znPccCW)X7WC6S4tLRLbCx`h3n>0oq-=>VT#Iad#rW1Tzs@0WzBh zh&RXc@k=jyL!Xzz;f+nnUsj(2b~515TrjKSe^bT}MvY%IIKeu?tGb6!(=nPBNVQm% zg$V>y;^+#&e~E9a591J5d;fExU0Y*cyivic1y32MEB7!TI;HV2S{GoeQEd>%c8wYv zo+7XfhomBXeuMHy92gCV9+43bRDlRVmWt2#2va3YkSbhk&zPKip=BA0o*(8$f43 zvSTvwS?us!UU&nVi9DrctSeQCk2JR`1sQ~bL8R)&+Fvu^^b}5Bm^rT@*5iR=FHC<^ z9x&XX!_gn)5Q2^*RKhTtucj7ikPHfFg;jLbXJzMU!})Dw8X6id6YV?6&I?xHm;nwv zZY6?PWy6(#7RjDdm?EM>hCg|d>c)4%9KQ$vHJa3x-j0<+#K{a3igMJ~|F+?PBOj~* zHubnucg}M7=uGR_rJ^R_)Ss4AC>3G|yP!JYxax@_O%VIS z1zl}8pNf|Eh@TUI`WbaWD#4#@5Ec1NpzfnUNF|93MQ_j*7CtYBD-a&yRhB?g#Dbpb+ zQUn4i`=94aKl4ob*70Zo!(=yBruJ8i>#LKwME2!w*V7&U-7y?iEhA)UZOjbOMTpq* zM@NKL;gV-1uTT)-4T5A$9UFmo1+tcX}`2D+qtF9AQ!N*oP4N72l;xPBK z`__2d0K|82hE9K4jFpl2Z6J#OsQfe|E2GI>96cs0{$;X+5G;;*;ntMIt?@S&yS(VA o`x9G;5AcZ+u7S3V@P^#I`%fa%Z>Oc=$B)QVmDCk;Keq%It^fc4 literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/intro_logo.png b/Telegram/Resources/icons/intro_logo.png deleted file mode 100644 index 4953b87d538976063b8fdf1b79ff9dfc8f19b784..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3708 zcmWkx2RK!29KVD_MhKT1;u^`i_7>TDC9CY2jEu;LD`i}+k;qortNUHo-s2*>?0xOb zBxI!T?L22Z&pGe&p8xwh|KB(5 zRW=RG+RYBuwOV7x=VqIfi)*;=Iz@e9fMvdl;p6hSPDZ*z;X&O9Efh&fN-uVB=GPI& z7r%59x6ACS>3Ssk-iM3J_u;iQNg=v1z2`|BO#L{+&!0xdzgAYaF0xNG#9Ij$Z7>j0 z1nwwoG%dP>4xK3M2Q8j7xj@7J+7WTkl5?bL-)4-vozlmVq{+b;r)RkPQ=}(qE3)=E%Cae1SiRT2ZL%X`VI7CJ1 zl9G~^p4BU+KEarejE_g{?Rj2Yp6}O%o=eWm%(xos3HQ@-K-E+NZ{ISMKWb#; zOo~pbv#em8tbBCe!GWvtaWh5Z{E+6{sqK9F>Z+rovooilAXSKBuHK!I?W5wdvilDn z+zdNiV=}{iw!fY`+@mAh{7TTO2E0D``w!32iHX;gOhQW+r-z>{D^NWyW9f;Bv`uGQ zWxd10SJjMkqmE)mM~&XTd-tKd9Ay;AjCc*#+L^1TZw%N~(bSA??K~xIevEeLNyrD! zlLEt}c*Ml$_nQu>J32Zppsx|Kva*K8#>m{Tv%V^y3ulzM0Dhr4I4L`O7rksz)YJq! zKiPjX?QyJg8ir6WF#pI#lYs@9CU;{wlj zYx754LxlQW9Fmihy*Ed0=SE#T1dE=+JxLo5^?oIM)y3Ia=>1QKwGh){=*cZQI=T@4 zo+l0r6r?Q|KXr1Ef74FSwySQiv+o}rJbvJ$GoE(7GljXbySvNAzJWntFqq%#nO^eL z)#ez>3d0gpW*F?(rZgHwI6N&bFaH(P=8nmq+|D=US76yb*ktit?uy|yX}SleBlIS5 zvE8~){JSgrmeT1eeYs8R0;PoxBwUy0idM2GOd^pyM6n@ykE{wN~zj zj~#x8D1rvijx6Vfv^k32mXNqf{l;PF&-!5cu+rZwNh2KygBsx@S~25!t4w@fZ*NBoOR0ii%ZopzbLi6|`MZd%^D-a|cj?f`Y<%PEyd}T}ID< zJP;oH5TQaHRnlf$WOI@t*#*o|M{0Z}GYayG@ zV%*J9Ju7ynKiAA_JfJ%Pa^%SHarf@FHi!d{!s%*CbWDu$lP6`{jpwN8mQXn^l_?%+ zX=dXR1{#H5v}b2$-s=NUaVe?$Mc*pDkFnsY-}vAwe{u9rIV9WV*lERI}Wue_Fh+0OY8Ju)nTM@iK8kc z#akMt38$0)*~?YuyFtCRy`67XW@KU#Sy@>rgI4g{qm{baWH~(GLuihSObJA$CS~5|%JMY>{By?Y8$!Oj7z$ z!CoyFG3Em5>gr@*V~#oD_$QbLflKlSUG(MT-YT>tuT*XWSb@j_!89~7ieL}>O;qbS zZ*Ohj=_zDZX&tjYSrrM_!mr3Zp-3>~bCj1B@sFUQqKfLaSGKZZ)z6WSDJ|s}my{F@ zSQMeBh$1G7jJRo%C4c#QWvSOu6i+LYb;%&fe`q{EK6AK~t zOidZ+=;;yS;$1ZiKLX`x<=N0lw#v%NDF6K6`vC!x0EoSX=KdN65>nC#+tMRDaTbiv zin_Xe5QSE9Z(m<~Z!h`wIJ1bql7n29JDeGUkyf`%Q^Y{O!V+92T#l^*KcdME@>Xb93yqt08PCVcKB6qWSsxx}Zaz<>h5V zOG^rzW&FiONNdiZRgFhGc36=zvVEzRc>zd)^5)Tt8h^;|=dtcyUcxi8vp1NS-mLVX zKj!BXk&=>z_2re93z%0-gx5W(n=-A>SdSb$?+yYCMnwqMqr&mxAQeYfYl=Ff@ zw?=zDzo_UcKMEKEZRnbUQmb5|fifSF)UHPJyIDE*u8DTL0innVyP`1R}8#FUg3f2f6p1v5K4O`ZFItM~^{M4J*Gg+^mV zxw=_l)K~F%eA6Czd_n@yZJJ*9@`8fyRE|oM!otGW63RJC9wmKi&m0{c14EjOOS*sq z#rE}SDHR{apPjv!bV)-zthBaMLrF=)sLcf!(OA4prIM^Hi}!dspyh)HsoP#@vf#sv z9&&js@7$iMcB5Z?RzKU*-Q9g#QBg6k;dl1f#KiIf26L{T2@C`w)N94V%jCm%Z)%%6nvb+X4 zjw+Obv?LKZIc$zDE?fwN&rs+C{+o5yo^A70GOz^b;juA=8%BPBI57Z) zrt`f<>|W>EGfdE-^L1)!GHZ!|i{A&(ji zZkAml>jHL|z@{L(QUgsp$xcrXzsF%NvX8{f?gC@#9UN5C(V^VC1zHL&?Xye*kiEP- z_hNjYzX9gN9-9m`{NhaOSM&AtZ7aC+nDUUEq})n?$spgoV^mdB%P%e_2R6zQ&y%;F z5RXQ42?{=)*!30KFEcKgvpf(t1TvM!M?!H_V#uVZlm;zDEUkvw!=9JzAdvJ z3;t=Xe~zs{upO!B-xtA+MN5s1j}K0p6U~Y62ncv6AAKa11@OALxgAow4F?lJVX!VH zn-Jy9&)q{Uq33fME=v=se|~-c=IZMD!(z;SW3Jw}QY~b?bN8eNpbYE}=&((-pe3Lt zpc-}U$;oE7BB&@$*ydP$@&n!;WBaX8kFCOgWmGTLtgIWvOa;c8sXGD!zXFLkYi)K` zJ^`|VWUgsoaKblYzZNgG&=$`sC9gQ--~jpOnGOyPK&OtSm+b8qTS6aKiEX7K+Q#7R z+`i5mku-|omKDcmfmQKDg##9)6NOlpVK&f)XQpI=!tD!nK3vE9i>r z8{OW2)aVzU9vKNwvk8;QV>16C1(af{<|*q_dR{lVZV48uny0g`x3=6HVy#88lwPs{ znW-M)%`4y!PDCP!(S zK4D=Or(>SGcxl43dPDwHLp}!cTF+bCQpKP%^z`(KD=UFTI{Obn%J6eK=H}`BdAKK& zqBSjX-S+Jum7+ky6_0O)2URQDqUxD2=BUk0SNW4UUvr%MO|uG1wb|Yh{i6FC8dqiI z$O<51V58ywEiQuaohvp6f!6KoqtYF|@ zus$7Xp#SUN#Vv91mgoo6i6^KuAwHEiKI)UfRrSwwbns)Rd)(@zir{3?a0gz174*Z0I+$az+wHAvuxx(ns6v zL)%Q3`n+d*g1m|XH@%Cnmp)w4q3f*WTlBhZW^O(=H+PPno<5OTijJS3pDIq7DxurT zm`+Pe3-M%T#$v@s(#OxQ?Af!6%*@Oyzki3L%R2x4J>1@!Q+ht;?7^gpvs{*lEGHOe ztT7_9w6w(Ga8@U{ZKU`^rm3kZl+(!d=9U%({_F@lV~fVI(b0&W9&~+UV`*a}otvAR zqr1DRi_6WIRaLs?=64g~9JGo9k?HCcdKU-@J0~X@y;_*gojaE!WJdxkRaYfIh=_{L zeS2-%?EQ-(FE3B$-o2=i5j|Mr$gnHjE#$S{2ST``qt4k`){>Hv96?(mGcz+atdPc? zJER#JocxyW$TBser2IDItH#nWcEXOG(h=|9%bh=e9u;~TG*BqR$dMZBbKSy8gn@>R zZhpQy;rYv#ig)jluc{d)(G5_wcXUuQGbiQbAT{$u;(VAA^msFShlbD(AM%@+nyO=K zBDA6TmXVV+LHi_EW@_^E&U~Kh2_xF3w zeIzV@_N=U~E*%!({X9JPwl~*|{{s0yzIgJ+UG$5N4(4B9id3DQd4K=@4R4K%;mJ`+ zptD{bsURjN=Vb2YUs_(CAFr|HxpfO(t*y0M(eW8Q;k=W@#=#NpLlcvdn;R$WFeLxN zAPr+9=4*_irlvNku_64})upcLspc?Lpb!us$;->DraJf3oHnt#THx}PE7bJ#s*)sx zKYw;csNKEWP^CZOtBbO!LB_?!jlZ=fSmpVT(ouvV=wQO3x3`y#If`D)5(OJIUgtnL zH9f7aT7uRwF^QjU^HZwOOT`HBikYHVSXgjBBPgk8X;mai>>_Qk80)jse`0}?VRz{U zc9#0LPycRCPRpyQ4v&w=Cd-|UbE%S#8+10ew$7((%PJTdAy;{5D76ZuDCHtGxvnus&FemTBpPz|cXo2%hGRZYj@x7-yR2-X583C$gN^BgE8JQs zm~GATh&HttB*u&%Yk78jpU3g=dN z{=F)_!7u=K@VY7;&h_n_e5)U-64VK=u@E-OzH(1iD?kQ)!xI4?~ zLDT!(GN*V3T~}8=21drgkw#;Zp3%`O6B84ACZsCLN=gJF+XfDwrTTh$jx{=; zcxXsYwv$6e?o76azC2u;P@=z48k>N@^o&&8dF-D39Y5KX7mqT=V8AYJ9vW@?k}b^7 zho77T$>x>v%!r7I?HqFsO|mS12qOp*RncwV-r4zxVV3fDNzM*e*V5{#cN)bx#+Ujx z`K;;<6x>eFZbVOW?(Xec$lF+)-0gd!kr^yvNAp*9UOuu`zW!KwH*M|M#CiH4pkOr(3%3 zuq<~R&Xjd4PB6K0yeteYNsS)zmdK!k;~RHe4;-YSs8~+IbJn^O+%c$5`y8)%^VY3R7>!bSwrF-PF{i zTP^s~Y9`>%tulsZJT6U6qg-W$?jD`($G@w5HWeqHuBlRcn$c>we?E zaij0&F9rkrTzSBtic+c=H#~pN6R~+&?77uSuHfex&g<8ad+iQ%cnspYnPgu*2Z}2)-C_N zmDFkNuSP~ju`pK-$$spw?Hc9P$s3-FT4S{q=?NZ_;ts_ad1GZp+7&J$!)yK$79$sFG!ND@Mb#jaD#%*cE7gz=omzPW5y(|3g26eFB|2@{;=;US*xGu^hX&`h1@)Srfe%G>UU??_Xc*0imJFp97_m6q?ZRV7dr;tar)l zEnh->JjsIx4~mJsyS?L&!_72fP#`T23_VEYjf_{nL|dV zj+x$vJ zQSrP{mWsQ3br(&d+V$|FB396X=g4?+=q>!ijCcY?Jc`RqUiXwJ#dz#2s++a>l21=h zM~>!lp-@!L4L__~Z394o{0rR_K>GRlaagZi>aX?RX!-SXaWOJ0i>|z)f?Z0Ak&~0N zol?7|9`<}7Pn49FmX@NS}A*+fQnYKQDx0Zx%L^CMenn^xhYD{E_OtF~JC_~zQ^?B_qLtCw;$qu;#Y zUtC%$DK17tMMd%O@^UZ_zp{9|M2lbV_i9VO-msRTp&=a5S|XJGUHJCy?zN|V&X4{5 zKTJfI?K<+-~ukw?=}x z{dsbn|$wnt9Npm%cTFfvQ426NAA@nXY zJdaqY!f*jl%+K}p^|uaKqO|^{9F+C>$V$ErSC^BMldn@#iGa%UAEQVCUD%oXxUOHn zUR+hxKi6g}KdXiW3@(wee7h(?0q#b^dzmcc@8s-AM;tZWnF@)FjgBUY*~FX+rgz6C zvr^js{2&xqI=YJg%i5ajE0czJx`foMTc$)&ih_#|d@-LVCaxxSyfI(h*q{J^v$*(R zMAsD~&nEBXB?P|2$`TU+Z^>F_%Ya=})6|SKdF_kS z@00sf%ZE%=QkqHNx>I8oP`+#9r`vKFb6`3E z7vIU@;Nd!QZq6lp&CD!8N<`lM|-PyCTrnk`^iqf z|KIf{c+;zbf`VIzhcPCvxtP111+#M2pI!))e*#FdHq*ff@WsW9<%*1qe6k?X>UXs# zom=|@-Y(uAK$i^{H#N~ad?{r1Rk`spS(B?Pjq{EU*wE?@vWNwVzx>E7J6%i5kJ4E^wR{G=w1DJP;6BS#ljkSh-*+GH|6xAPe>9jUiU*46 z8i$qD)pHBPH`U3nQxShakv*J!mjo;YPMV#QlMv(rT2V1viB8MWk*Bq-joB+r*4DAX z1O+a<+?%QsrFo_v2AAWGkLLl6o4uAu($dn{=n~Xb>xtdn-C-BNvuF8Y3-QdED9T5m zn)lA*jd>dp-a#BKWj6=x^8)2u3}hOV(b3bp4BBQj$%e=uo){T$uZgk?MMZp}Iq;A_ zJ|STa=o?i0Tu%}sejC>t+b%OPB@PW~#jM3MD3uM%zc!3;a&|7A`7qS^su4oO&*~6$B!RZ;4V5+2$qRF@R_R1}Dh=9sgZXyweH3ba~BYtDhogjBeUKqrixB1R}&b&F^;F3Ma zvH-vv8%qp{!-UFqz9~$^>{lehqufQXa)e$>U;hd`2)Mtu-oLcW-UVI#d$3;D(ns}7 zy9jebzp}WdCe;^9R%{tia88~(9yRj8mPuS(y#4I-Z?n(pQw5 zq_a}Aj}uzS5dVGqmNsBh2bAUQEgT;o4})T~Hc@vGz!z_lUp+qNjkZR)&q&9Z>kiOp z(+&*gi^oORJmN?tW=JAZQBi?0nrw1cRad_Rl&LEDBgK9&k5Eod4xS(0 zg$(iBfH$Br@*?~jq&mO`;n4k2r1VsmFDpuZW9#ed1CFnkvS-WG7z-`pjF5nuXH278)o;z|XVUzoh8UABpqHAMT9+Cg6?eAT zrRqT++mkP>Ky}X(5Y+f@+tj(cfYpXkh9@bnudiokWv#UWhBoe!kc_tWI6Dn?oo*d_ zHGMtWn(E3GrOiq4G>r-dU)>k%q?M3LK_lCfFReg!N5#Mp4?$X;+chz<#xomEyXF## zgZ*e3ti%+5-24}O#yA(ln&W;Mx?-XuMHFa`_G^*vh0q!^kOeU|_&O_E+wiQc>{1RRQbg zb7SAXFDzwS_QccP^mlUaj;AH2ps3sxLB?f=-{9pfy_PeWXpNNi-$JOXtGCzFQ&XQq zP?1En*Z(5+^710f%a|>emDkYt{G34dT2*y5Hk^?3tPoOr^R5IS1hdk=*y6;kP}0BA(vs8DNnMNh~a6N$2k0+S>X65yeXI zU$hQyCOT+EfDs?sp=D+-J?YeE z6C#UfZ|A;+Ud45A)-?@2_ayO8J?1~%(I8qgg*&;2qNB$%ZA zzdk3|>9Ix<0bv2k0nUoyG`|B0Qq#~x{`g^H!bfxrGvK=Ck{IHkudo02`{&{TB{nMg z3Oz`R5G^e&FsY2&N03FTsjHWe+Fk{z`KA0ZPV<=eM@L}O4S}*mHY#ErUEMI_I{P`0 zZV;Rx>zghS6Mulv4Fj}WT3JanI5@cXBOweA;3Iz$C8MwMaB_C@(v#MTgGRQnu*i|{ zP0i0wh@oV)=}EjAn~)GuRdo}52dJji7Y_)SWrM~S*)6%~2X?>6X>a~(Dh3$= zb{L#fxHS?u`M(2taQo-_z8A zyrSxUHRdIGdfS5l&}knaxKpJKFXgk|m})62Obq^yc^2R`V&hsdPnzuU$~6l^e&jw2 zdK1hl$mpfA8}aj*H}3DnbWOgu6B8&Y%6nN; zHm{7w0+4|g0>x0z1-Q+ms>5ypD`XxF%2%?@!p+owy~R(2mza+ln^bXe*ZrGw`$8|;0}(- zrg4Qc9fLr?wp$L{0f?Bl&r?bN(H4apuhWv!cX zcS1sBJBoS~oEl8lrdqB*g}IpR)C`T`P5+53EiJ)GM3gcIJ9A9!6UaGSf7JKAY+Ev% z;AF(_2gs?in}p*niHT(SM(FO}r0C6Qzu6@>A+gT^dwY9Un=>6^!htUbX~+$(Ty>S-yAY|QIfxho7mKAs%ltN-XLw_ z3`|#zEtcYcrz?tA;YpFK!F$vU3=C?jf^ma%i5B3Zn3L@ZB&DQk{5CCub_d1F%M#-U z>B$hdzkh9amj{U{DY==W81NnC0dw}hs71&bjy?h)wZxAhSVA?`5`_9})p4aYhZ!v{?d{TBKM-d|;QF z8m9kD3zVFguPG`3PFCDI_UY*O&A@LdNMg)izIycuA~E+WCcZxLHUXqev~@~OPAm{8 ztTY{COAnGVB{S1**Wq2_9Ewm_$H0JwPQW4&WG*;HEyz&t&Uo~hc3F9OB>rTnH+*<^ zds_jT3)*dE>dO}he4Y#pXyOl_Iy#>EFxfD*TJ3>xR8&-?Vr5N+^b*p(kt9@D3b{l@JP_k5W7b zigln!j#Z#zFKya)5+X@Fo(ie zsnIMotkQ*3j*lM|ffe)J9!mu(llCYBw1Cy!+TV`?hmSw;bNeAum2Y|%Y+z~Wc?b;w zKtHWdHt8A~+TRnd8NY0TlJ@fS>;!AJJ>~tS6H<_co}@nlJg~ehyTRIN0Op{xe}~Vj zt5xBUK!kxjFF#+`)RZ(+LnT?sA8vUbl3T@+C;9n|pd>@~%2*XRQa^xIhm}AC4S6!C zC}6VxowRam7lK1w@o7DkgR;QK|DU$vb5?NhC5Ba(&TcYyoe>n5de`51Q%DC#$q027 LE#)_gR^k5#d1Jx| diff --git a/Telegram/Resources/icons/intro_plane_inner.png b/Telegram/Resources/icons/intro_plane_inner.png new file mode 100644 index 0000000000000000000000000000000000000000..cbebb1110cd360fac83c556a6c2ebea06e6e9901 GIT binary patch literal 1905 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 VWI0+$01qjUzP5>01?u6m{{Whc$cg{} literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/intro_plane_outer.png b/Telegram/Resources/icons/intro_plane_outer.png new file mode 100644 index 0000000000000000000000000000000000000000..6cd6308b697f273d0833410eda5609c20c096655 GIT binary patch literal 1020 zcmeAS@N?(olHy`uVBq!ia0vp^r+~PhgAGXT{@_y1z`%Ui)5S5QV$R!}`@OGL%N+lB zerMd=OR*Q&&R(o{U{Yi{>MC_7CZ?tBz`?ur2h`NVHKS&$gr~P}(VVsFDNmEVL%`x+ z+hP`SKd*@2e&zhmJI9&h6i$iXKg+T6ht^USecv}8wN3R z$F&0o9A?g(skt_6^*7B>&erVS-rlKm=g!@L-cv9Yn${rm|uVfxagON-v$+bg|i72m=OSDV@S>t6r7d-tx9t!?bB zx8HbUL;3?=yefC9{QIkP=G?iu>gwv|6@j)+3s-;q_%XgJuef-#j*iZh?(S~seJkXE zCanMC8W|m}?LXg6_x`@x-L2iPR{e83SXIo<&i+w)-TL_bW~Wb|zM8-9XsG>xs*?2d z^gxy8&!3;2tnR<+e)Z|qbq!x1w6(V{_UP;HpZ)UX%U9p;efy_#!SR#hzPowTZ{EE5 z>D}Gk);m_{Exd5izV*|?!|g`K#=&-Ve=5w`L!Ye`m-Y4WDfxTz-o3cWA0Hn6SDO^n z;v}A&oGiQl|Fg5RKfSoPxTvC{;<)%#RS~OKU+kxd>&H#``SWK{Sy|Y_MZZ?<58QC? z_Qi`A@88R_t^cFMdTtgKbPY`0$j^_u&El-*(n n2MqxME|wN1#)X58`GCEGL;mk!nK_QYT+QI=>gTe~DWM4f`R%mG literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/intro_plane_outer@2x.png b/Telegram/Resources/icons/intro_plane_outer@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..3d7b9f56ea6d1dbe4047db0229b0270fe39ddc0b GIT binary patch literal 2303 zcmeHJ`7_&T82>s~Db+G8iq^Je$2zC9;%Xd&QDhroi->J&s^TVXiionMtHl^+4-#q} zA!u#lOz1)DYH38!Myk|VMUx1LV_*F%c4zj7=ZEKc=6Rma^Z7jQ%=;(8+f7+fTM>dF zWe<0k3lJn#08CFo9z>{LXY?RQq1VF&?u&o4!gUNQ6zRQMZ}eEtx?W?DR*_E3s>@F& zswS8tnodr_i{JfKfwjej#WqxU&XC~4PQ~<$^S7e1R7T)U2HEQC3aH_+N?(hXBMjs! z+ z#H%Ud?)rL67t=a=DhQLZ6`Gx!%PDux3}64$9md z-0bVTfG3w+)AL8LY0`uJ8Ok~-eA?%MVvd_W!I$b+=UoaDcJN+ca>-EhH=bd^9xZI7 z0)}4;*>CQTA)o^35sTAT1P?&oGN0v!!C;hCRK^O8{g?U+jjhg}U69|!45v{NgHWCi z^<+y(dX6bUp2hS%W z&g}uLJXx~RLc=ZlS=>(t)$VF=Ex<$MdpfF)y|gv8Z3CB@q{mD@4`3wXd_+feb*bo% z>qFv|-UOh3WME4aS|}2UBD&r>Nb0AO`9q0f!L_#=m4r0uzo|NAx3`Hoy0(6+oqTV5 z;%?{Fq<30AH>Dz%d(?u>FwA-pkJy!??>Hr7yapg6xhVr{W?kDCR+*A0!tT~Qnw$9x z7(X`T8SGPLR}0R1jDsO^Y4!^$`(Y~CE>Tc3g`df8zrGUSKUUo#D;MTTBoYBcYvxyO z#|^CLD;EdU+XP})cc#+oFE&?cmZXV3IP&~d>US2*tF3ysEYUr>!*`!vjzc1f#d8LKdP+MF3I`Om*B9(r^+i3qf zbsdshfrK(@7XCo`uz?6~BNmH=+gzK5#m}9OF_=>XsNY>fR8>_ib>EV)va>r{cBjn= zk*XEg78h!A@oDAC-WeO4i_r|BAG#C&LCHAh|1!wH zsQVsGr{H}{GzYA?42-LF$EF7v48r`PX)LFKO^KYGWLUh zG6IMe5n?%)CWjKXQi`nY70gA{U`BgJW+s+Z&iz&6e(Eu=U1YxJ6oe+?F zNlc$ossdc<7;x^WszU~{a{s&kIyN+X*$D@fpk{tWBc<$&y&S}!;`>vUQc#RB!3k&( co4+UhvGuoGLn;X;!N&&jaP@X+a0*HL2US*rjQ{`u literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/intro_plane_top.png b/Telegram/Resources/icons/intro_plane_top.png new file mode 100644 index 0000000000000000000000000000000000000000..aa2e2bb75366b5675ccd02b070dba6b63e880dfa GIT binary patch literal 2963 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 literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/intro_right.png b/Telegram/Resources/icons/intro_right.png new file mode 100644 index 0000000000000000000000000000000000000000..511a3989ffd5a5e952f0158a179e350d76dcfe6f GIT binary patch literal 9048 zcmXwfWmr_*_x30VNP~)WsvsgMAR+zG0@Bhg-Q8W1(y2%Y(jeVP2$IqbqI8Ee{MY>6 z>-7Vd3^V(jv)9^ptqD_*lfc0w#Y7+wI8u^giU`ClV)*|j3^e#Tq31x2Ku{y3#DtYy z)3-BR)Ron)yL6NF*A$iY;@KtN#7MG)(}qhcWPc#m3@@)SiWHCI98NZomE|fSt&FZu zWwMJ*GvF$m#0vjh7K#z>iy8XDPH3G0d-Wt_^HPi?Z*Hl5?}~r$f}iyyez%U}aG+^5 z-6QH20?nTqgF^3z3j$Smjm3x+eqz%s+`>m4-alF!Mj;GC9UmW$=`k|3vnR8&{s-Fu6>yLjd5*jWk~enP%0D<-oIE_iAsT5aWq-L{LZ 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 literal 0 HcmV?d00001 diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index 9afd94ed4..49a02ec08 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -138,7 +138,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_pinned_unpin" = "Unpin"; "lng_pinned_notify" = "Notify all members"; -"lng_intro" = "Welcome to the official [a href=\"https://telegram.org/\"]Telegram[/a] desktop app.\nIt's [b]fast[/b] and [b]secure[/b]."; +"lng_intro_about" = "Welcome to the official Telegram Desktop app.\nIt's fast and secure."; "lng_start_msgs" = "START MESSAGING"; "lng_intro_next" = "NEXT"; @@ -150,7 +150,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_phone_ph" = "Your phone number"; "lng_phone_title" = "Your Phone"; "lng_phone_desc" = "Please confirm your country code and\nenter your phone number."; -"lng_phone_notreg" = "Note: if you don't have a Telegram account yet,\nplease [b]sign up[/b] with your [a href=\"https://telegram.org/\"]iOS / Android[/a] or {signup_start}here »{signup_end}"; +"lng_phone_notreg" = "If you don't have a Telegram account yet,\nplease [b]sign up[/b] with {link_start}Android / iPhone{link_end} or {signup_start}here{signup_end}"; "lng_country_code" = "Country Code"; "lng_bad_country_code" = "Invalid Country Code"; "lng_country_ph" = "Search"; @@ -160,7 +160,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_code_ph" = "Your code"; "lng_code_desc" = "We have sent you a message with activation\ncode to your phone. Please enter it below."; -"lng_code_telegram" = "Please enter the code you've just\nreceived in your previous [b]Telegram[/b] app."; +"lng_code_telegram" = "Please enter the code you've just received\nin your previous [b]Telegram[/b] app."; "lng_code_no_telegram" = "Send code via SMS"; "lng_code_call" = "Telegram will dial your number in {minutes}:{seconds}"; "lng_code_calling" = "Requesting a call from Telegram..."; @@ -174,7 +174,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_signin_title" = "Cloud password check"; "lng_signin_desc" = "Please enter your cloud password."; -"lng_signin_recover_desc" = "Please enter the code from the e-mail."; +"lng_signin_recover_desc" = "Please enter the code from the e-mail\n{email}"; "lng_signin_password" = "Your cloud password"; "lng_signin_code" = "Code from e-mail"; "lng_signin_recover" = "Forgot password?"; @@ -196,7 +196,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org "lng_signin_reset_in_minutes" = "{count_minutes:0 minutes|# minute|# minutes}"; "lng_signin_reset_cancelled" = "Your recent attempts to reset this account have been cancelled by its active user. Please try again in 7 days."; -"lng_signup_title" = "Information and photo"; +"lng_signup_title" = "Your Info"; "lng_signup_desc" = "Please enter your name and\nupload a photo."; "lng_signup_firstname" = "First Name"; diff --git a/Telegram/Resources/sample.tdesktop-theme b/Telegram/Resources/sample.tdesktop-theme index fdcb3084b..4b410eda0 100644 --- a/Telegram/Resources/sample.tdesktop-theme +++ b/Telegram/Resources/sample.tdesktop-theme @@ -102,8 +102,10 @@ notificationSampleUserpicFg: windowBgActive; notificationSampleCloseFg: #d7d7d7; // windowSubTextFg; notificationSampleTextFg: #d7d7d7; // windowSubTextFg; notificationSampleNameFg: #939393; // windowSubTextFg; -introHeaderFg: windowFg; -introErrorFg: windowFg; +introBg: windowBg; +introTitleFg: windowBoldFg; +introDescriptionFg: windowSubTextFg; +introErrorFg: windowSubTextFg; dialogsMenuIconFg: menuIconFg; dialogsMenuIconFgOver: menuIconFgOver; dialogsBg: windowBg; diff --git a/Telegram/SourceFiles/app.cpp b/Telegram/SourceFiles/app.cpp index a7eb94ef2..dcf84deeb 100644 --- a/Telegram/SourceFiles/app.cpp +++ b/Telegram/SourceFiles/app.cpp @@ -2546,7 +2546,7 @@ namespace { QImage readImage(const QString &file, QByteArray *format, bool opaque, bool *animated, QByteArray *content) { QFile f(file); - if (!f.open(QIODevice::ReadOnly)) { + if (f.size() > MediaViewImageSizeLimit || !f.open(QIODevice::ReadOnly)) { if (animated) *animated = false; return QImage(); } diff --git a/Telegram/SourceFiles/boxes/addcontactbox.cpp b/Telegram/SourceFiles/boxes/addcontactbox.cpp index 868b29926..5904a4ef4 100644 --- a/Telegram/SourceFiles/boxes/addcontactbox.cpp +++ b/Telegram/SourceFiles/boxes/addcontactbox.cpp @@ -252,7 +252,7 @@ void AddContactBox::onRetry() { GroupInfoBox::GroupInfoBox(CreatingGroupType creating, bool fromTypeChoose) : AbstractBox() , _creating(creating) -, _photo(this, st::newGroupPhotoSize) +, _photo(this, st::newGroupPhotoSize, st::newGroupPhotoIconPosition) , _title(this, st::defaultInputField, lang(_creating == CreatingGroupChannel ? lng_dlg_new_channel_name : lng_dlg_new_group_name)) , _description(this, st::newGroupDescription, lang(lng_create_group_description)) , _next(this, lang(_creating == CreatingGroupChannel ? lng_create_group_create : lng_create_group_next), st::defaultBoxButton) @@ -276,15 +276,14 @@ GroupInfoBox::GroupInfoBox(CreatingGroupType creating, bool fromTypeChoose) : Ab connect(_next, SIGNAL(clicked()), this, SLOT(onNext())); connect(_cancel, SIGNAL(clicked()), this, SLOT(onClose())); - subscribe(FileDialog::QueryDone(), [this](const FileDialog::QueryUpdate &update) { - notifyFileQueryUpdated(update); - }); - _photo->setClickedCallback([this] { auto imgExtensions = cImgExtensions(); auto filter = qsl("Image files (*") + imgExtensions.join(qsl(" *")) + qsl(");;") + filedialogAllFilesFilter(); _setPhotoFileQueryId = FileDialog::queryReadFile(lang(lng_choose_images), filter); }); + subscribe(FileDialog::QueryDone(), [this](const FileDialog::QueryUpdate &update) { + notifyFileQueryUpdated(update); + }); prepare(); } @@ -418,7 +417,7 @@ void GroupInfoBox::notifyFileQueryUpdated(const FileDialog::QueryUpdate &update) if (img.isNull() || img.width() > 10 * img.height() || img.height() > 10 * img.width()) { return; } - PhotoCropBox *box = new PhotoCropBox(img, (_creating == CreatingGroupChannel) ? peerFromChannel(0) : peerFromChat(0)); + auto box = new PhotoCropBox(img, (_creating == CreatingGroupChannel) ? peerFromChannel(0) : peerFromChat(0)); connect(box, SIGNAL(ready(const QImage&)), this, SLOT(onPhotoReady(const QImage&))); Ui::showLayer(box, KeepOtherLayers); } diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style index 0ad1d63d1..02cfd56f4 100644 --- a/Telegram/SourceFiles/boxes/boxes.style +++ b/Telegram/SourceFiles/boxes/boxes.style @@ -401,8 +401,7 @@ sessionTerminateAllButton: LinkButton(boxLinkButton) { passcodeHeaderFont: font(19px); passcodeHeaderHeight: 80px; -passcodeInput: FlatInput(introPhone) { -} +passcodeInput: introPhone; passcodeSubmit: RoundButton(introNextButton) { width: 225px; } @@ -420,8 +419,6 @@ newGroupLinkTop: 3px; newGroupLinkFont: font(16px); newGroupPhotoSize: 76px; -newGroupPhotoBg: #4eb5f0; -newGroupPhotoBgOver: #3fa9e7; newGroupPhotoIcon: icon {{ "new_chat_photo", #ffffff }}; newGroupPhotoIconPosition: point(23px, 25px); newGroupPhotoDuration: 150; diff --git a/Telegram/SourceFiles/boxes/photocropbox.cpp b/Telegram/SourceFiles/boxes/photocropbox.cpp index fadd7ef88..e5c2ab546 100644 --- a/Telegram/SourceFiles/boxes/photocropbox.cpp +++ b/Telegram/SourceFiles/boxes/photocropbox.cpp @@ -65,6 +65,10 @@ void PhotoCropBox::init(const QImage &img, PeerData *peer) { int32 s = st::boxWideWidth - st::boxPhotoPadding.left() - st::boxPhotoPadding.right(); _thumb = App::pixmapFromImageInPlace(img.scaled(s * cIntRetinaFactor(), s * cIntRetinaFactor(), Qt::KeepAspectRatio, Qt::SmoothTransformation)); _thumb.setDevicePixelRatio(cRetinaFactor()); + _mask = QImage(_thumb.size(), QImage::Format_ARGB32_Premultiplied); + _mask.setDevicePixelRatio(cRetinaFactor()); + _fade = QImage(_thumb.size(), QImage::Format_ARGB32_Premultiplied); + _fade.setDevicePixelRatio(cRetinaFactor()); _thumbw = _thumb.width() / cIntRetinaFactor(); _thumbh = _thumb.height() / cIntRetinaFactor(); if (_thumbw > _thumbh) { @@ -238,18 +242,16 @@ void PhotoCropBox::paintEvent(QPaintEvent *e) { p.translate(_thumbx, _thumby); p.drawPixmap(0, 0, _thumb); - if (_cropy > 0) { - p.fillRect(QRect(0, 0, _cropx + _cropw, _cropy), st::photoCropFadeBg); - } - if (_cropx + _cropw < _thumbw) { - p.fillRect(QRect(_cropx + _cropw, 0, _thumbw - _cropx - _cropw, _cropy + _cropw), st::photoCropFadeBg); - } - if (_cropy + _cropw < _thumbh) { - p.fillRect(QRect(_cropx, _cropy + _cropw, _thumbw - _cropx, _thumbh - _cropy - _cropw), st::photoCropFadeBg); - } - if (_cropx > 0) { - p.fillRect(QRect(0, _cropy, _cropx, _thumbh - _cropy), st::photoCropFadeBg); + _mask.fill(Qt::white); + { + Painter p(&_mask); + p.setRenderHint(QPainter::HighQualityAntialiasing); + p.setPen(Qt::NoPen); + p.setBrush(Qt::black); + p.drawEllipse(_cropx, _cropy, _cropw, _cropw); } + style::colorizeImage(_mask, st::photoCropFadeBg->c, &_fade); + p.drawImage(0, 0, _fade); int delta = st::cropPointSize; int mdelta = -delta / 2; diff --git a/Telegram/SourceFiles/boxes/photocropbox.h b/Telegram/SourceFiles/boxes/photocropbox.h index 4e73cdf21..d6eb2a6bd 100644 --- a/Telegram/SourceFiles/boxes/photocropbox.h +++ b/Telegram/SourceFiles/boxes/photocropbox.h @@ -62,6 +62,7 @@ private: ChildWidget _cancel; QImage _img; QPixmap _thumb; + QImage _mask, _fade; PeerId _peerId; }; diff --git a/Telegram/SourceFiles/boxes/stickers_box.cpp b/Telegram/SourceFiles/boxes/stickers_box.cpp index bbe6c7530..fcf0a8509 100644 --- a/Telegram/SourceFiles/boxes/stickers_box.cpp +++ b/Telegram/SourceFiles/boxes/stickers_box.cpp @@ -34,6 +34,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "ui/widgets/buttons.h" #include "ui/widgets/scroll_area.h" #include "ui/effects/ripple_animation.h" +#include "ui/effects/slide_animation.h" #include "ui/widgets/discrete_sliders.h" namespace { @@ -338,37 +339,12 @@ void StickersBox::paintEvent(QPaintEvent *e) { _about.draw(p, st::stickersReorderPadding.top(), st::stickersReorderPadding.top(), _aboutWidth, style::al_center); } - if (!_leftCache.isNull()) { - auto slide = _a_slide.current(getms(), _slideLeft ? 0. : 1.); - if (!_a_slide.animating()) { - _leftCache = _rightCache = QPixmap(); + if (_slideAnimation) { + _slideAnimation->paintFrame(p, scrollArea()->x(), scrollArea()->y() - titleHeight(), width(), getms()); + if (!_slideAnimation->animating()) { + _slideAnimation.reset(); scrollArea()->show(); update(); - } else { - auto easeOut = anim::easeOutCirc(1., slide); - auto easeIn = anim::easeInCirc(1., slide); - auto cacheWidth = (_leftCache.width() / cIntRetinaFactor()); - auto arrivingCoord = anim::interpolate(cacheWidth, 0, easeOut); - auto departingCoord = anim::interpolate(0, cacheWidth, easeIn); - auto arrivingAlpha = easeIn; - auto departingAlpha = 1. - easeOut; - auto leftCoord = (_slideLeft ? arrivingCoord : departingCoord) * -1; - auto leftAlpha = (_slideLeft ? arrivingAlpha : departingAlpha); - auto rightCoord = (_slideLeft ? departingCoord : arrivingCoord); - auto rightAlpha = (_slideLeft ? departingAlpha : arrivingAlpha); - - auto x = scrollArea()->x(); - auto y = scrollArea()->y() - titleHeight(); - auto leftWidth = (cacheWidth + leftCoord); - if (leftWidth > 0) { - p.setOpacity(leftAlpha); - p.drawPixmap(x, y, leftWidth, _leftCache.height() / cIntRetinaFactor(), _leftCache, (_leftCache.width() - leftWidth * cIntRetinaFactor()), 0, leftWidth * cIntRetinaFactor(), _leftCache.height()); - } - auto rightWidth = cacheWidth - rightCoord; - if (rightWidth > 0) { - p.setOpacity(rightAlpha); - p.drawPixmap(x + rightCoord, y, _rightCache, 0, 0, rightWidth * cIntRetinaFactor(), _rightCache.height()); - } } } } @@ -430,14 +406,11 @@ void StickersBox::switchTab() { auto nowCache = grabContentCache(); auto nowIndex = _tab->index; - _leftCache = std_::move(wasCache); - _rightCache = std_::move(nowCache); - _slideLeft = (wasIndex > nowIndex); - if (_slideLeft) { - std_::swap_moveable(_leftCache, _rightCache); - } + _slideAnimation = std_::make_unique(); + _slideAnimation->setSnapshots(std_::move(wasCache), std_::move(nowCache)); + auto slideLeft = wasIndex > nowIndex; + _slideAnimation->start(slideLeft, [this] { update(); }, st::slideDuration); scrollArea()->hide(); - _a_slide.start([this] { update(); }, 0., 1., st::slideDuration); update(); } } @@ -602,6 +575,8 @@ void StickersBox::closePressed() { } } +StickersBox::~StickersBox() = default; + StickersBox::Inner::Inner(QWidget *parent, StickersBox::Section section) : TWidget(parent) , _section(section) , _rowHeight(st::contactsPadding.top() + st::contactsPhotoSize + st::contactsPadding.bottom()) diff --git a/Telegram/SourceFiles/boxes/stickers_box.h b/Telegram/SourceFiles/boxes/stickers_box.h index 1e60821eb..2100eea54 100644 --- a/Telegram/SourceFiles/boxes/stickers_box.h +++ b/Telegram/SourceFiles/boxes/stickers_box.h @@ -33,6 +33,7 @@ class PlainShadow; class RoundButton; class RippleAnimation; class SettingsSlider; +class SlideAnimation; } // namespace Ui class StickersBox : public ItemListBox, public RPCSender { @@ -48,6 +49,8 @@ public: StickersBox(Section section = Section::Installed); StickersBox(const Stickers::Order &archivedIds); + ~StickersBox(); + public slots: void onStickersUpdated(); @@ -111,9 +114,7 @@ private: ChildWidget _done = { nullptr }; ChildWidget _bottomShadow = { nullptr }; - FloatAnimation _a_slide; - bool _slideLeft = false; - QPixmap _leftCache, _rightCache; + std_::unique_ptr _slideAnimation; QTimer _scrollTimer; int32 _scrollDelta = 0; diff --git a/Telegram/SourceFiles/facades.cpp b/Telegram/SourceFiles/facades.cpp index 2303eb237..d2a1440cc 100644 --- a/Telegram/SourceFiles/facades.cpp +++ b/Telegram/SourceFiles/facades.cpp @@ -516,8 +516,8 @@ void start() { SandboxData->LangSystemISO = psCurrentLanguage(); if (SandboxData->LangSystemISO.isEmpty()) SandboxData->LangSystemISO = qstr("en"); - QByteArray l = LangSystemISO().toLatin1(); - for (int32 i = 0; i < languageCount; ++i) { + auto l = LangSystemISO().toLatin1(); + for (auto i = 0; i < languageCount; ++i) { if (l.at(0) == LanguageCodes[i][0] && l.at(1) == LanguageCodes[i][1]) { SandboxData->LangSystem = i; break; diff --git a/Telegram/SourceFiles/intro/intro.style b/Telegram/SourceFiles/intro/intro.style index 35f5b1676..7c59f82a1 100644 --- a/Telegram/SourceFiles/intro/intro.style +++ b/Telegram/SourceFiles/intro/intro.style @@ -21,119 +21,135 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org using "basic.style"; using "ui/widgets/widgets.style"; -countryInput { - width: pixels; - height: pixels; - top: pixels; - bgColor: color; - ptrSize: size; - textMrg: margins; - font: font; - align: align; -} +introCoverHeight: 208px; +introCoverTopBg: #0f89d0; +introCoverBottomBg: #39b0f0; +introCoverIconsFg: #5ec6ff; +introCoverMaxWidth: 880px; +introCoverIconsMinSkip: 120px; +introCoverLeft: icon {{ "intro_left", introCoverIconsFg }}; +introCoverRight: icon {{ "intro_right", introCoverIconsFg }}; +introCoverIcon: icon { + { "intro_plane_trace", #5ec6ff69 }, + { "intro_plane_inner", #c6d8e8 }, + { "intro_plane_outer", #a1bed4 }, + { "intro_plane_top", #ffffff }, +}; +introCoverIconLeft: 50px; +introCoverIconTop: 46px; -introCountry: countryInput { - width: 300px; - height: 41px; - top: 33px; - bgColor: windowBgOver; - ptrSize: size(15px, 8px); - textMrg: margins(16px, 5px, 16px, 15px); - font: defaultInputFont; - align: align(left); -} +introSettingsSkip: 10px; -introIcon: icon {{ "intro_logo", #008ed5 }}; +introPhotoSize: 76px; +introPhotoIconPosition: point(23px, 25px); +introPhotoTop: 10px; -introResetLink: LinkButton(defaultLinkButton) { - color: #d15948; - overColor: #d15948; - downColor: #db6352; -} - -introBtnTop: 288px; -introSkip: 25px; -introFinishSkip: 15px; -introPhotoSize: 98px; -introHeaderFont: font(24px); -introHeaderSkip: 14px; -introIconSkip: 50px; -introFont: font(16px); -introLink: LinkButton(defaultLinkButton) { - font: introFont; - overFont: font(16px underline); -} -introLabel: FlatLabel(defaultFlatLabel) { - font: introFont; +introCoverTitle: FlatLabel(defaultFlatLabel) { + font: font(22px semibold); + textFg: introTitleFg; align: align(center); } +introCoverTitleTop: 126px; +introCoverDescription: FlatLabel(defaultFlatLabel) { + font: font(15px); + textFg: introDescriptionFg; + align: align(center); +} +introCoverDescriptionTextStyle: TextStyle(defaultTextStyle) { + lineHeight: 24px; +} +introCoverDescriptionTop: 164px; +introTitle: FlatLabel(defaultFlatLabel) { + font: font(17px semibold); + textFg: introTitleFg; +} +introTitleTop: 11px; +introDescription: FlatLabel(defaultFlatLabel) { + font: normalFont; + textFg: introDescriptionFg; +} +introDescriptionTextStyle: TextStyle(defaultTextStyle) { + lineHeight: 20px; +} +introDescriptionTop: 44px; -introStepSize: size(400px, 200px); -introSize: size(400px, 460px); -introSlideShift: 500px; // intro hiding animation +introLink: defaultLinkButton; + +introPlaneWidth: 48px; +introPlaneHeight: 38px; +introHeight: 396px; +introStepTopMin: 86px; +introStepWidth: 380px; +introStepHeight: 256px; +introStepHeightAdd: 30px; +introStepHeightFull: 580px; introSlideDuration: 200; -introSlideDelta: 0; // between hide start and show start -introTextTop: 22px; -introTextSize: size(400px, 93px); -introCallSkip: 15px; -introPwdTextSize: size(400px, 73px); +introCoverDuration: 200; introNextButton: RoundButton(defaultActiveButton) { width: 300px; height: 56px; - textTop: 16px; - - font: font(17px); + textTop: 17px; + font: font(17px semibold); } -introPhoneTop: 8px; -introCountryCode: FlatInput(defaultFlatInput) { - width: 70px; +introStepFieldTop: 116px; +introPhoneTop: 16px; +introLinkTop: 21px; +introCountry: InputField(defaultInputField) { + textMargins: margins(3px, 7px, 3px, 6px); + font: font(16px); + width: 300px; height: 41px; - align: align(center); } -introPhone: FlatInput(defaultFlatInput) { - textMrg: margins(12px, 5px, 12px, 6px); +introCountryCode: InputField(introCountry) { + width: 64px; + height: 41px; + textAlign: align(top); +} +introPhone: InputField(introCountry) { + textMargins: margins(12px, 7px, 12px, 6px); width: 225px; height: 41px; } -introCode: FlatInput(defaultFlatInput) { - textMrg: margins(12px, 5px, 12px, 6px); - width: 106px; - height: 41px; - align: align(center); +introCode: introCountry; +introName: introCountry; +introPassword: introCountry; +introPasswordTop: 94px; +introPasswordHintTop: 146px; - phPos: point(0px, 0px); - phAlign: align(center); - phShift: 0px; +introPasswordHint: FlatLabel(introDescription) { + textFg: windowFg; } -introName: FlatInput(introPhone) { - width: 192px; -} -introPassword: FlatInput(introPhone) { - width: 300px; +introPasswordHintTextStyle: introDescriptionTextStyle; + +introResetButton: RoundButton(defaultLightButton) { + textFg: attentionButtonFg; + textFgOver: attentionButtonFgOver; + textBgOver: attentionButtonBgOver; + + ripple: RippleAnimation(defaultRippleAnimation) { + color: attentionButtonBgRipple; + } } +introResetBottom: 20px; + +introCountryIcon: icon {{ "intro_country_dropdown", menuIconFg }}; +introCountryIconPosition: point(8px, 17px); introSelectDelta: 30px; -introErrorWidth: 450px; +introErrorTop: 225px; +introErrorBelowLinkTop: 213px; introErrorDuration: 200; -introErrorTop: 15px; -introErrorHeight: 40px; -introErrorFont: font(16px); -introLabelTextStyle: TextStyle(defaultTextStyle) { - lineHeight: 30px; -} -introErrorLabelTextStyle: TextStyle(defaultTextStyle) { - lineHeight: 27px; -} - -introErrorLabel: FlatLabel(defaultFlatLabel) { - font: introErrorFont; +introError: introDescription; +introErrorCentered: FlatLabel(introError) { align: align(center); } +introErrorTextStyle: introDescriptionTextStyle; + introBackButton: IconButton(defaultIconButton) { width: 56px; height: 56px; diff --git a/Telegram/SourceFiles/intro/introcode.cpp b/Telegram/SourceFiles/intro/introcode.cpp index 88b75a2c0..7c5fb184b 100644 --- a/Telegram/SourceFiles/intro/introcode.cpp +++ b/Telegram/SourceFiles/intro/introcode.cpp @@ -26,21 +26,28 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "intro/introsignup.h" #include "intro/intropwdcheck.h" #include "ui/widgets/buttons.h" +#include "ui/widgets/labels.h" #include "styles/style_intro.h" -CodeInput::CodeInput(QWidget *parent, const style::FlatInput &st, const QString &ph) : Ui::FlatInput(parent, st, ph) { +namespace Intro { + +CodeInput::CodeInput(QWidget *parent, const style::InputField &st, const QString &ph) : Ui::MaskedInputField(parent, st, ph) { } -void CodeInput::correctValue(const QString &was, QString &now) { +void CodeInput::setDigitsCountMax(int digitsCount) { + _digitsCountMax = digitsCount; +} + +void CodeInput::correctValue(const QString &was, int wasCursor, QString &now, int &nowCursor) { QString newText; - int oldPos(cursorPosition()), newPos(-1), oldLen(now.length()), digitCount = 0; + int oldPos(nowCursor), newPos(-1), oldLen(now.length()), digitCount = 0; for (int i = 0; i < oldLen; ++i) { if (now[i].isDigit()) { ++digitCount; } } - if (digitCount > 5) digitCount = 5; - bool strict = (digitCount == 5); + accumulate_min(digitCount, _digitsCountMax); + auto strict = (digitCount == _digitsCountMax); newText.reserve(oldLen); for (int i = 0; i < oldLen; ++i) { @@ -58,177 +65,131 @@ void CodeInput::correctValue(const QString &was, QString &now) { newPos = newText.length(); } } - if (newPos < 0) { - newPos = newText.length(); + if (newPos < 0 || newPos > newText.size()) { + newPos = newText.size(); } if (newText != now) { now = newText; setText(now); updatePlaceholder(); - if (newPos != oldPos) { - setCursorPosition(newPos); - } + } + if (newPos != nowCursor) { + nowCursor = newPos; + setCursorPosition(nowCursor); } if (strict) emit codeEntered(); } -IntroCode::IntroCode(IntroWidget *parent) : IntroStep(parent) -, a_errorAlpha(0) -, _a_error(animation(this, &IntroCode::step_error)) -, _next(this, lang(lng_intro_next), st::introNextButton) -, _desc(st::introTextSize.width()) +CodeWidget::CodeWidget(QWidget *parent, Widget::Data *data) : Step(parent, data) , _noTelegramCode(this, lang(lng_code_no_telegram), st::introLink) -, _noTelegramCodeRequestId(0) , _code(this, st::introCode, lang(lng_code_ph)) , _callTimer(this) -, _callStatus(intro()->getCallStatus()) +, _callStatus(getData()->callStatus) +, _callTimeout(getData()->callTimeout) +, _callLabel(this, st::introDescription, st::introDescriptionTextStyle) , _checkRequest(this) { - setGeometry(parent->innerRect()); - - connect(_next, SIGNAL(clicked()), this, SLOT(onSubmitCode())); connect(_code, SIGNAL(changed()), this, SLOT(onInputChange())); connect(_callTimer, SIGNAL(timeout()), this, SLOT(onSendCall())); connect(_checkRequest, SIGNAL(timeout()), this, SLOT(onCheckRequest())); connect(_noTelegramCode, SIGNAL(clicked()), this, SLOT(onNoTelegramCode())); - updateDescText(); + _code->setDigitsCountMax(getData()->codeLength); + setErrorBelowLink(true); - if (!intro()->codeByTelegram()) { - if (_callStatus.type == IntroWidget::CallWaiting) { - _callTimer->start(1000); - } - } + setTitleText(App::formatPhone(getData()->phone)); + updateDescText(); } -void IntroCode::updateDescText() { - _desc.setRichText(st::introFont, lang(intro()->codeByTelegram() ? lng_code_telegram : lng_code_desc)); - if (intro()->codeByTelegram()) { +void CodeWidget::updateDescText() { + setDescriptionText(lang(getData()->codeByTelegram ? lng_code_telegram : lng_code_desc)); + if (getData()->codeByTelegram) { _noTelegramCode->show(); _callTimer->stop(); } else { _noTelegramCode->hide(); - _callStatus = intro()->getCallStatus(); - if (_callStatus.type == IntroWidget::CallWaiting && !_callTimer->isActive()) { + _callStatus = getData()->callStatus; + _callTimeout = getData()->callTimeout; + if (_callStatus == Widget::Data::CallStatus::Waiting && !_callTimer->isActive()) { _callTimer->start(1000); } } - update(); + updateCallText(); } -void IntroCode::paintEvent(QPaintEvent *e) { - bool trivial = (rect() == e->rect()); - - QPainter p(this); - if (!trivial) { - p.setClipRect(e->rect()); - } - bool codeByTelegram = intro()->codeByTelegram(); - if (trivial || e->rect().intersects(_textRect)) { - p.setFont(st::introHeaderFont->f); - p.drawText(_textRect, intro()->getPhone(), style::al_top); - p.setFont(st::introFont->f); - _desc.draw(p, _textRect.x(), _textRect.y() + _textRect.height() - 2 * st::introFont->height, _textRect.width(), style::al_top); - } - if (codeByTelegram) { - } else { - QString callText; - switch (_callStatus.type) { - case IntroWidget::CallWaiting: { - if (_callStatus.timeout >= 3600) { - callText = lng_code_call(lt_minutes, qsl("%1:%2").arg(_callStatus.timeout / 3600).arg((_callStatus.timeout / 60) % 60, 2, 10, QChar('0')), lt_seconds, qsl("%1").arg(_callStatus.timeout % 60, 2, 10, QChar('0'))); +void CodeWidget::updateCallText() { + auto text = ([this]() -> QString { + if (getData()->codeByTelegram) { + return QString(); + } + switch (_callStatus) { + case Widget::Data::CallStatus::Waiting: { + if (_callTimeout >= 3600) { + return lng_code_call(lt_minutes, qsl("%1:%2").arg(_callTimeout / 3600).arg((_callTimeout / 60) % 60, 2, 10, QChar('0')), lt_seconds, qsl("%1").arg(_callTimeout % 60, 2, 10, QChar('0'))); } else { - callText = lng_code_call(lt_minutes, QString::number(_callStatus.timeout / 60), lt_seconds, qsl("%1").arg(_callStatus.timeout % 60, 2, 10, QChar('0'))); + return lng_code_call(lt_minutes, QString::number(_callTimeout / 60), lt_seconds, qsl("%1").arg(_callTimeout % 60, 2, 10, QChar('0'))); } } break; - - case IntroWidget::CallCalling: { - callText = lang(lng_code_calling); - } break; - - case IntroWidget::CallCalled: { - callText = lang(lng_code_called); - } break; + case Widget::Data::CallStatus::Calling: return lang(lng_code_calling); + case Widget::Data::CallStatus::Called: return lang(lng_code_called); } - if (!callText.isEmpty()) { - p.drawText(QRect(_textRect.left(), _code->y() + _code->height() + st::introCallSkip, st::introTextSize.width(), st::introErrorHeight), callText, style::al_center); - } - } - if (_a_error.animating() || _error.length()) { - p.setOpacity(a_errorAlpha.current()); - p.setFont(st::introErrorFont); - p.setPen(st::introErrorFg); - p.drawText(QRect(_textRect.left(), _next->y() + _next->height() + st::introErrorTop, st::introTextSize.width(), st::introErrorHeight), _error, style::al_center); - } + return QString(); + })(); + _callLabel->setText(text); + _callLabel->setVisible(!text.isEmpty() && !animating()); } -void IntroCode::resizeEvent(QResizeEvent *e) { - if (e->oldSize().width() != width()) { - _next->move((width() - _next->width()) / 2, st::introBtnTop); - _code->move((width() - _code->width()) / 2, st::introTextTop + st::introTextSize.height() + st::introCountry.top); - } - _textRect = QRect((width() - st::introTextSize.width()) / 2, st::introTextTop, st::introTextSize.width(), st::introTextSize.height()); - _noTelegramCode->move(_textRect.left() + (st::introTextSize.width() - _noTelegramCode->width()) / 2, _code->y() + _code->height() + st::introCallSkip + (st::introErrorHeight - _noTelegramCode->height()) / 2); +void CodeWidget::resizeEvent(QResizeEvent *e) { + Step::resizeEvent(e); + _code->moveToLeft(contentLeft(), contentTop() + st::introStepFieldTop); + auto linkTop = _code->y() + _code->height() + st::introLinkTop; + _noTelegramCode->moveToLeft(contentLeft() + st::buttonRadius, linkTop); + _callLabel->moveToLeft(contentLeft() + st::buttonRadius, linkTop); } -void IntroCode::showError(const QString &error) { - if (!error.isEmpty()) _code->notaBene(); - if (!_a_error.animating() && error == _error) return; - - if (error.length()) { - _error = error; - a_errorAlpha.start(1); - } else { - a_errorAlpha.start(0); - } - _a_error.start(); +void CodeWidget::showCodeError(const QString &text) { + if (!text.isEmpty()) _code->showError(); + showError(text); } -void IntroCode::step_error(float64 ms, bool timer) { - float64 dt = ms / st::introErrorDuration; - - if (dt >= 1) { - _a_error.stop(); - a_errorAlpha.finish(); - if (!a_errorAlpha.current()) { - _error.clear(); - } - } else { - a_errorAlpha.update(dt, anim::linear); - } - if (timer) update(); -} - -void IntroCode::activate() { - IntroStep::activate(); +void CodeWidget::setInnerFocus() { _code->setFocus(); } -void IntroCode::finished() { - IntroStep::finished(); - _error.clear(); - a_errorAlpha = anim::fvalue(0); - - _sentCode.clear(); - _code->setDisabled(false); - - _callTimer->stop(); - _code->setText(QString()); - rpcClear(); -} - -void IntroCode::cancelled() { - if (_sentRequest) { - MTP::cancel(base::take(_sentRequest)); +void CodeWidget::activate() { + Step::activate(); + _code->show(); + if (getData()->codeByTelegram) { + _noTelegramCode->show(); + } else { + _callLabel->show(); } - MTP::send(MTPauth_CancelCode(MTP_string(intro()->getPhone()), MTP_string(intro()->getPhoneHash()))); + setInnerFocus(); } -void IntroCode::stopCheck() { +void CodeWidget::finished() { + Step::finished(); + _checkRequest->stop(); + _callTimer->stop(); + rpcClear(); + + cancelled(); + _sentCode.clear(); + _code->setText(QString()); + _code->setDisabled(false); +} + +void CodeWidget::cancelled() { + MTP::cancel(base::take(_sentRequest)); + MTP::cancel(base::take(_callRequestId)); + MTP::send(MTPauth_CancelCode(MTP_string(getData()->phone), MTP_string(getData()->phoneHash))); +} + +void CodeWidget::stopCheck() { _checkRequest->stop(); } -void IntroCode::onCheckRequest() { +void CodeWidget::onCheckRequest() { int32 status = MTP::state(_sentRequest); if (status < 0) { int32 leftms = -status; @@ -248,26 +209,25 @@ void IntroCode::onCheckRequest() { } } -void IntroCode::codeSubmitDone(const MTPauth_Authorization &result) { +void CodeWidget::codeSubmitDone(const MTPauth_Authorization &result) { stopCheck(); _sentRequest = 0; _code->setDisabled(false); - const auto &d(result.c_auth_authorization()); + auto &d = result.c_auth_authorization(); if (d.vuser.type() != mtpc_user || !d.vuser.c_user().is_self()) { // wtf? - showError(lang(lng_server_error)); + showCodeError(lang(lng_server_error)); return; } - cSetLoggedPhoneNumber(intro()->getPhone()); - intro()->finish(d.vuser); + cSetLoggedPhoneNumber(getData()->phone); + finish(d.vuser); } -bool IntroCode::codeSubmitFail(const RPCError &error) { +bool CodeWidget::codeSubmitFail(const RPCError &error) { if (MTP::isFloodError(error)) { stopCheck(); _sentRequest = 0; - showError(lang(lng_flood_error)); _code->setDisabled(false); - _code->setFocus(); + showCodeError(lang(lng_flood_error)); return true; } if (MTP::isDefaultHandledError(error)) return false; @@ -277,138 +237,138 @@ bool IntroCode::codeSubmitFail(const RPCError &error) { _code->setDisabled(false); const QString &err = error.type(); if (err == qstr("PHONE_NUMBER_INVALID") || err == qstr("PHONE_CODE_EXPIRED")) { // show error - intro()->onBack(); + goBack(); return true; } else if (err == qstr("PHONE_CODE_EMPTY") || err == qstr("PHONE_CODE_INVALID")) { - showError(lang(lng_bad_code)); - _code->notaBene(); + showCodeError(lang(lng_bad_code)); return true; } else if (err == qstr("PHONE_NUMBER_UNOCCUPIED")) { // success, need to signUp - intro()->setCode(_sentCode); - intro()->replaceStep(new IntroSignup(intro())); + getData()->code = _sentCode; + goReplace(new Intro::SignupWidget(parentWidget(), getData())); return true; } else if (err == qstr("SESSION_PASSWORD_NEEDED")) { - intro()->setCode(_sentCode); + getData()->code = _sentCode; _code->setDisabled(false); _checkRequest->start(1000); - _sentRequest = MTP::send(MTPaccount_GetPassword(), rpcDone(&IntroCode::gotPassword), rpcFail(&IntroCode::codeSubmitFail)); + _sentRequest = MTP::send(MTPaccount_GetPassword(), rpcDone(&CodeWidget::gotPassword), rpcFail(&CodeWidget::codeSubmitFail)); return true; } if (cDebug()) { // internal server error - showError(err + ": " + error.description()); + showCodeError(err + ": " + error.description()); } else { - showError(lang(lng_server_error)); + showCodeError(lang(lng_server_error)); } - _code->setFocus(); return false; } -void IntroCode::onInputChange() { - showError(QString()); - if (_code->text().length() == 5) onSubmitCode(); +void CodeWidget::onInputChange() { + hideError(); + if (_code->getLastText().length() == getData()->codeLength) { + submit(); + } } -void IntroCode::onSendCall() { - if (_callStatus.type == IntroWidget::CallWaiting) { - if (--_callStatus.timeout <= 0) { - _callStatus.type = IntroWidget::CallCalling; +void CodeWidget::onSendCall() { + if (_callStatus == Widget::Data::CallStatus::Waiting) { + if (--_callTimeout <= 0) { + _callStatus = Widget::Data::CallStatus::Calling; _callTimer->stop(); - MTP::send(MTPauth_ResendCode(MTP_string(intro()->getPhone()), MTP_string(intro()->getPhoneHash())), rpcDone(&IntroCode::callDone)); + _callRequestId = MTP::send(MTPauth_ResendCode(MTP_string(getData()->phone), MTP_string(getData()->phoneHash)), rpcDone(&CodeWidget::callDone)); } else { - intro()->setCallStatus(_callStatus); + getData()->callStatus = _callStatus; + getData()->callTimeout = _callTimeout; } - } - update(); -} - -void IntroCode::callDone(const MTPauth_SentCode &v) { - if (_callStatus.type == IntroWidget::CallCalling) { - _callStatus.type = IntroWidget::CallCalled; - intro()->setCallStatus(_callStatus); - update(); + updateCallText(); } } -void IntroCode::gotPassword(const MTPaccount_Password &result) { +void CodeWidget::callDone(const MTPauth_SentCode &v) { + if (v.type() == mtpc_auth_sentCode) { + fillSentCodeData(v.c_auth_sentCode().vtype); + _code->setDigitsCountMax(getData()->codeLength); + } + if (_callStatus == Widget::Data::CallStatus::Calling) { + _callStatus = Widget::Data::CallStatus::Called; + getData()->callStatus = _callStatus; + getData()->callTimeout = _callTimeout; + updateCallText(); + } +} + +void CodeWidget::gotPassword(const MTPaccount_Password &result) { stopCheck(); _sentRequest = 0; _code->setDisabled(false); switch (result.type()) { - case mtpc_account_noPassword: // should not happen + case mtpc_account_noPassword: { // should not happen _code->setFocus(); - break; + } break; case mtpc_account_password: { - const auto &d(result.c_account_password()); - intro()->setPwdSalt(qba(d.vcurrent_salt)); - intro()->setHasRecovery(mtpIsTrue(d.vhas_recovery)); - intro()->setPwdHint(qs(d.vhint)); - intro()->replaceStep(new IntroPwdCheck(intro())); + auto &d = result.c_account_password(); + getData()->pwdSalt = qba(d.vcurrent_salt); + getData()->hasRecovery = mtpIsTrue(d.vhas_recovery); + getData()->pwdHint = qs(d.vhint); + goReplace(new Intro::PwdCheckWidget(parentWidget(), getData())); } break; } } -void IntroCode::onSubmitCode() { +void CodeWidget::submit() { if (_sentRequest) return; _code->setDisabled(true); setFocus(); - showError(QString()); + hideError(); _checkRequest->start(1000); - _sentCode = _code->text(); - intro()->setPwdSalt(QByteArray()); - intro()->setHasRecovery(false); - intro()->setPwdHint(QString()); - _sentRequest = MTP::send(MTPauth_SignIn(MTP_string(intro()->getPhone()), MTP_string(intro()->getPhoneHash()), MTP_string(_sentCode)), rpcDone(&IntroCode::codeSubmitDone), rpcFail(&IntroCode::codeSubmitFail)); + _sentCode = _code->getLastText(); + getData()->pwdSalt = QByteArray(); + getData()->hasRecovery = false; + getData()->pwdHint = QString(); + _sentRequest = MTP::send(MTPauth_SignIn(MTP_string(getData()->phone), MTP_string(getData()->phoneHash), MTP_string(_sentCode)), rpcDone(&CodeWidget::codeSubmitDone), rpcFail(&CodeWidget::codeSubmitFail)); } -void IntroCode::onNoTelegramCode() { +void CodeWidget::onNoTelegramCode() { if (_noTelegramCodeRequestId) return; - _noTelegramCodeRequestId = MTP::send(MTPauth_ResendCode(MTP_string(intro()->getPhone()), MTP_string(intro()->getPhoneHash())), rpcDone(&IntroCode::noTelegramCodeDone), rpcFail(&IntroCode::noTelegramCodeFail)); + _noTelegramCodeRequestId = MTP::send(MTPauth_ResendCode(MTP_string(getData()->phone), MTP_string(getData()->phoneHash)), rpcDone(&CodeWidget::noTelegramCodeDone), rpcFail(&CodeWidget::noTelegramCodeFail)); } -void IntroCode::noTelegramCodeDone(const MTPauth_SentCode &result) { +void CodeWidget::noTelegramCodeDone(const MTPauth_SentCode &result) { if (result.type() != mtpc_auth_sentCode) { - showError(lang(lng_server_error)); + showCodeError(lang(lng_server_error)); return; } - const auto &d(result.c_auth_sentCode()); - switch (d.vtype.type()) { - case mtpc_auth_sentCodeTypeApp: intro()->setCodeByTelegram(true); - case mtpc_auth_sentCodeTypeSms: - case mtpc_auth_sentCodeTypeCall: intro()->setCodeByTelegram(false); - case mtpc_auth_sentCodeTypeFlashCall: LOG(("Error: should not be flashcall!")); break; - } + auto &d = result.c_auth_sentCode(); + fillSentCodeData(d.vtype); + _code->setDigitsCountMax(getData()->codeLength); if (d.has_next_type() && d.vnext_type.type() == mtpc_auth_codeTypeCall) { - intro()->setCallStatus({ IntroWidget::CallWaiting, d.has_timeout() ? d.vtimeout.v : 60 }); + getData()->callStatus = Widget::Data::CallStatus::Waiting; + getData()->callTimeout = d.has_timeout() ? d.vtimeout.v : 60; } else { - intro()->setCallStatus({ IntroWidget::CallDisabled, 0 }); + getData()->callStatus = Widget::Data::CallStatus::Disabled; + getData()->callTimeout = 0; } - intro()->setCodeByTelegram(false); + getData()->codeByTelegram = false; updateDescText(); } -bool IntroCode::noTelegramCodeFail(const RPCError &error) { +bool CodeWidget::noTelegramCodeFail(const RPCError &error) { if (MTP::isFloodError(error)) { - showError(lang(lng_flood_error)); - _code->setFocus(); + showCodeError(lang(lng_flood_error)); return true; } if (MTP::isDefaultHandledError(error)) return false; if (cDebug()) { // internal server error - showError(error.type() + ": " + error.description()); + showCodeError(error.type() + ": " + error.description()); } else { - showError(lang(lng_server_error)); + showCodeError(lang(lng_server_error)); } - _code->setFocus(); return false; } -void IntroCode::onSubmit() { - onSubmitCode(); -} +} // namespace Intro diff --git a/Telegram/SourceFiles/intro/introcode.h b/Telegram/SourceFiles/intro/introcode.h index eb8a76a9d..81b37a82a 100644 --- a/Telegram/SourceFiles/intro/introcode.h +++ b/Telegram/SourceFiles/intro/introcode.h @@ -26,55 +26,63 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org namespace Ui { class RoundButton; class LinkButton; +class FlatLabel; } // namespace Ui -class CodeInput final : public Ui::FlatInput { +namespace Intro { + +class CodeInput final : public Ui::MaskedInputField { Q_OBJECT public: - CodeInput(QWidget *parent, const style::FlatInput &st, const QString &ph); + CodeInput(QWidget *parent, const style::InputField &st, const QString &ph); + + void setDigitsCountMax(int digitsCount); signals: void codeEntered(); protected: - void correctValue(const QString &was, QString &now); + void correctValue(const QString &was, int wasCursor, QString &now, int &nowCursor) override; + +private: + int _digitsCountMax = 5; }; -class IntroCode final : public IntroStep { +class CodeWidget : public Widget::Step { Q_OBJECT public: - IntroCode(IntroWidget *parent); - - void paintEvent(QPaintEvent *e) override; - void resizeEvent(QResizeEvent *e) override; - - void step_error(float64 ms, bool timer); + CodeWidget(QWidget *parent, Widget::Data *data); bool hasBack() const override { return true; } + void setInnerFocus() override; void activate() override; void finished() override; void cancelled() override; - void onSubmit() override; - - void codeSubmitDone(const MTPauth_Authorization &result); - bool codeSubmitFail(const RPCError &error); + void submit() override; void updateDescText(); -public slots: - void onSubmitCode(); +protected: + void resizeEvent(QResizeEvent *e) override; + +private slots: void onNoTelegramCode(); void onInputChange(); void onSendCall(); void onCheckRequest(); private: - void showError(const QString &err); + void updateCallText(); + + void codeSubmitDone(const MTPauth_Authorization &result); + bool codeSubmitFail(const RPCError &error); + + void showCodeError(const QString &text); void callDone(const MTPauth_SentCode &v); void gotPassword(const MTPaccount_Password &result); @@ -83,23 +91,21 @@ private: void stopCheck(); - QString _error; - anim::fvalue a_errorAlpha; - Animation _a_error; - - ChildWidget _next; - - Text _desc; ChildWidget _noTelegramCode; - mtpRequestId _noTelegramCodeRequestId; - QRect _textRect; + mtpRequestId _noTelegramCodeRequestId = 0; ChildWidget _code; QString _sentCode; mtpRequestId _sentRequest = 0; + ChildObject _callTimer; - IntroWidget::CallStatus _callStatus; + Widget::Data::CallStatus _callStatus; + int _callTimeout; + mtpRequestId _callRequestId = 0; + ChildWidget _callLabel; ChildObject _checkRequest; }; + +} // namespace Intro diff --git a/Telegram/SourceFiles/intro/introphone.cpp b/Telegram/SourceFiles/intro/introphone.cpp index 837781b6d..9b98d3cfc 100644 --- a/Telegram/SourceFiles/intro/introphone.cpp +++ b/Telegram/SourceFiles/intro/introphone.cpp @@ -27,20 +27,16 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "styles/style_intro.h" #include "ui/widgets/buttons.h" #include "ui/widgets/labels.h" +#include "ui/effects/widget_fade_wrap.h" +#include "core/click_handler_types.h" -IntroPhone::IntroPhone(IntroWidget *parent) : IntroStep(parent) -, a_errorAlpha(0) -, _a_error(animation(this, &IntroPhone::step_error)) -, _next(this, lang(lng_intro_next), st::introNextButton) +namespace Intro { + +PhoneWidget::PhoneWidget(QWidget *parent, Widget::Data *data) : Step(parent, data) , _country(this, st::introCountry) -, _phone(this, st::introPhone) , _code(this, st::introCountryCode) -, _signup(this, lng_phone_notreg(lt_signup_start, textcmdStartLink(1), lt_signup_end, textcmdStopLink()), Ui::FlatLabel::InitType::Rich, st::introErrorLabel, st::introErrorLabelTextStyle) +, _phone(this, st::introPhone) , _checkRequest(this) { - setVisible(false); - setGeometry(parent->innerRect()); - - connect(_next, SIGNAL(clicked()), this, SLOT(onSubmitPhone())); connect(_phone, SIGNAL(voidBackspace(QKeyEvent*)), _code, SLOT(startErasing(QKeyEvent*))); connect(_country, SIGNAL(codeChanged(const QString &)), _code, SLOT(codeSelected(const QString &))); connect(_code, SIGNAL(codeChanged(const QString &)), _country, SLOT(onChooseCode(const QString &))); @@ -49,146 +45,112 @@ IntroPhone::IntroPhone(IntroWidget *parent) : IntroStep(parent) connect(_code, SIGNAL(addedToNumber(const QString &)), _phone, SLOT(addedToNumber(const QString &))); connect(_phone, SIGNAL(changed()), this, SLOT(onInputChange())); connect(_code, SIGNAL(changed()), this, SLOT(onInputChange())); - connect(intro(), SIGNAL(countryChanged()), this, SLOT(countryChanged())); connect(_checkRequest, SIGNAL(timeout()), this, SLOT(onCheckRequest())); - _signup->setLink(1, MakeShared([this] { - toSignUp(); - })); - _signup->hide(); + setTitleText(lang(lng_phone_title)); + setDescriptionText(lang(lng_phone_desc)); + subscribe(getData()->updated, [this] { countryChanged(); }); + setErrorCentered(true); - _signupCache = myGrab(_signup); - - if (!_country->onChooseCountry(intro()->currentCountry())) { + if (!_country->onChooseCountry(getData()->country)) { _country->onChooseCountry(qsl("US")); } _changed = false; } -void IntroPhone::paintEvent(QPaintEvent *e) { - bool trivial = (rect() == e->rect()); +void PhoneWidget::resizeEvent(QResizeEvent *e) { + Step::resizeEvent(e); + _country->moveToLeft(contentLeft(), contentTop() + st::introStepFieldTop); + auto phoneTop = _country->y() + _country->height() + st::introPhoneTop; + _code->moveToLeft(contentLeft(), phoneTop); + _phone->moveToLeft(contentLeft() + _country->width() - st::introPhone.width, phoneTop); + updateSignupGeometry(); +} - QPainter p(this); - if (!trivial) { - p.setClipRect(e->rect()); - } - if (trivial || e->rect().intersects(_textRect)) { - p.setFont(st::introHeaderFont->f); - p.drawText(_textRect, lang(lng_phone_title), style::al_top); - p.setFont(st::introFont->f); - p.drawText(_textRect, lang(lng_phone_desc), style::al_bottom); - } - if (_a_error.animating() || _error.length()) { - int32 errorY = _showSignup ? ((_phone->y() + _phone->height() + _next->y() - st::introErrorFont->height) / 2) : (_next->y() + _next->height() + st::introErrorTop); - p.setOpacity(a_errorAlpha.current()); - p.setFont(st::introErrorFont); - p.setPen(st::introErrorFg); - p.drawText(QRect(_textRect.x(), errorY, _textRect.width(), st::introErrorFont->height), _error, style::al_top); - - if (_signup->isHidden() && _showSignup) { - p.drawPixmap(_signup->x(), _signup->y(), _signupCache); - } +void PhoneWidget::updateSignupGeometry() { + if (_signup) { + _signup->moveToLeft(contentLeft() + st::buttonRadius, contentTop() + st::introDescriptionTop); } } -void IntroPhone::resizeEvent(QResizeEvent *e) { - if (e->oldSize().width() != width()) { - _next->move((width() - _next->width()) / 2, st::introBtnTop); - _country->move((width() - _country->width()) / 2, st::introTextTop + st::introTextSize.height() + st::introCountry.top); - int phoneTop = _country->y() + _country->height() + st::introPhoneTop; - _phone->move((width() - _country->width()) / 2 + _country->width() - st::introPhone.width, phoneTop); - _code->move((width() - _country->width()) / 2, phoneTop); - } - _signup->move((width() - _signup->width()) / 2, _next->y() + _next->height() + st::introErrorTop - ((st::introErrorLabelTextStyle.lineHeight - st::introErrorFont->height) / 2)); - _textRect = QRect((width() - st::introTextSize.width()) / 2, st::introTextTop, st::introTextSize.width(), st::introTextSize.height()); +void PhoneWidget::showPhoneError(const QString &text) { + _phone->showError(); + showError(text); } -void IntroPhone::showError(const QString &error, bool signUp) { - if (!error.isEmpty()) { - _phone->notaBene(); - _showSignup = signUp; +void PhoneWidget::hidePhoneError() { + hideError(); + if (_signup) { + _signup->fadeOut(); + showDescription(); } - - if (!_a_error.animating() && error == _error) return; - - if (error.length()) { - _error = error; - a_errorAlpha.start(1); - } else { - a_errorAlpha.start(0); - } - _signup->hide(); - _a_error.start(); } -void IntroPhone::step_error(float64 ms, bool timer) { - float64 dt = ms / st::introErrorDuration; - - if (dt >= 1) { - _a_error.stop(); - a_errorAlpha.finish(); - if (!a_errorAlpha.current()) { - _error.clear(); - _signup->hide(); - } else if (!_error.isEmpty() && _showSignup) { - _signup->show(); - } - } else { - a_errorAlpha.update(dt, anim::linear); +void PhoneWidget::showSignup() { + showPhoneError(lang(lng_bad_phone_noreg)); + if (!_signup) { + auto signupText = lng_phone_notreg(lt_link_start, textcmdStartLink(1), lt_link_end, textcmdStopLink(), lt_signup_start, textcmdStartLink(2), lt_signup_end, textcmdStopLink()); + auto inner = new Ui::FlatLabel(this, signupText, Ui::FlatLabel::InitType::Rich, st::introDescription, st::introDescriptionTextStyle); + _signup.create(this, inner, base::lambda(), st::introErrorDuration); + _signup->entity()->setLink(1, MakeShared(qsl("https://telegram.org"), false)); + _signup->entity()->setLink(2, MakeShared([this] { + toSignUp(); + })); + _signup->hideFast(); + updateSignupGeometry(); } - if (timer) update(); + _signup->fadeIn(); + hideDescription(); } -void IntroPhone::countryChanged() { +void PhoneWidget::countryChanged() { if (!_changed) { - selectCountry(intro()->currentCountry()); + selectCountry(getData()->country); } } -void IntroPhone::onInputChange() { +void PhoneWidget::onInputChange() { _changed = true; - showError(QString()); + hidePhoneError(); } -void IntroPhone::disableAll() { - _next->setDisabled(true); +void PhoneWidget::disableAll() { _phone->setDisabled(true); _country->setDisabled(true); _code->setDisabled(true); setFocus(); } -void IntroPhone::enableAll(bool failed) { - _next->setDisabled(false); +void PhoneWidget::enableAll(bool failed) { _phone->setDisabled(false); _country->setDisabled(false); _code->setDisabled(false); if (failed) _phone->setFocus(); } -void IntroPhone::onSubmitPhone() { +void PhoneWidget::submit() { if (_sentRequest || isHidden()) return; if (!App::isValidPhone(fullNumber())) { - showError(lang(lng_bad_phone)); + showPhoneError(lang(lng_bad_phone)); _phone->setFocus(); return; } disableAll(); - showError(QString()); + hidePhoneError(); _checkRequest->start(1000); _sentPhone = fullNumber(); - _sentRequest = MTP::send(MTPauth_CheckPhone(MTP_string(_sentPhone)), rpcDone(&IntroPhone::phoneCheckDone), rpcFail(&IntroPhone::phoneSubmitFail)); + _sentRequest = MTP::send(MTPauth_CheckPhone(MTP_string(_sentPhone)), rpcDone(&PhoneWidget::phoneCheckDone), rpcFail(&PhoneWidget::phoneSubmitFail)); } -void IntroPhone::stopCheck() { +void PhoneWidget::stopCheck() { _checkRequest->stop(); } -void IntroPhone::onCheckRequest() { +void PhoneWidget::onCheckRequest() { int32 status = MTP::state(_sentRequest); if (status < 0) { int32 leftms = -status; @@ -202,66 +164,65 @@ void IntroPhone::onCheckRequest() { } } -void IntroPhone::phoneCheckDone(const MTPauth_CheckedPhone &result) { +void PhoneWidget::phoneCheckDone(const MTPauth_CheckedPhone &result) { stopCheck(); - const auto &d(result.c_auth_checkedPhone()); + auto &d = result.c_auth_checkedPhone(); if (mtpIsTrue(d.vphone_registered)) { disableAll(); - showError(QString()); + hidePhoneError(); _checkRequest->start(1000); MTPauth_SendCode::Flags flags = 0; - _sentRequest = MTP::send(MTPauth_SendCode(MTP_flags(flags), MTP_string(_sentPhone), MTPBool(), MTP_int(ApiId), MTP_string(ApiHash)), rpcDone(&IntroPhone::phoneSubmitDone), rpcFail(&IntroPhone::phoneSubmitFail)); + _sentRequest = MTP::send(MTPauth_SendCode(MTP_flags(flags), MTP_string(_sentPhone), MTPBool(), MTP_int(ApiId), MTP_string(ApiHash)), rpcDone(&PhoneWidget::phoneSubmitDone), rpcFail(&PhoneWidget::phoneSubmitFail)); } else { - showError(lang(lng_bad_phone_noreg), true); + showSignup(); enableAll(true); _sentRequest = 0; } } -void IntroPhone::phoneSubmitDone(const MTPauth_SentCode &result) { +void PhoneWidget::phoneSubmitDone(const MTPauth_SentCode &result) { stopCheck(); _sentRequest = 0; enableAll(true); if (result.type() != mtpc_auth_sentCode) { - showError(lang(lng_server_error)); + showPhoneError(lang(lng_server_error)); return; } - const auto &d(result.c_auth_sentCode()); - switch (d.vtype.type()) { - case mtpc_auth_sentCodeTypeApp: intro()->setCodeByTelegram(true); break; - case mtpc_auth_sentCodeTypeSms: - case mtpc_auth_sentCodeTypeCall: intro()->setCodeByTelegram(false); break; - case mtpc_auth_sentCodeTypeFlashCall: LOG(("Error: should not be flashcall!")); break; - } - intro()->setPhone(_sentPhone, d.vphone_code_hash.c_string().v.c_str(), d.is_phone_registered()); + auto &d = result.c_auth_sentCode(); + fillSentCodeData(d.vtype); + getData()->phone = _sentPhone; + getData()->phoneHash = d.vphone_code_hash.c_string().v.c_str(); + getData()->phoneIsRegistered = d.is_phone_registered(); if (d.has_next_type() && d.vnext_type.type() == mtpc_auth_codeTypeCall) { - intro()->setCallStatus({ IntroWidget::CallWaiting, d.has_timeout() ? d.vtimeout.v : 60 }); + getData()->callStatus = Widget::Data::CallStatus::Waiting; + getData()->callTimeout = d.has_timeout() ? d.vtimeout.v : 60; } else { - intro()->setCallStatus({ IntroWidget::CallDisabled, 0 }); + getData()->callStatus = Widget::Data::CallStatus::Disabled; + getData()->callTimeout = 0; } - intro()->nextStep(new IntroCode(intro())); + goNext(new Intro::CodeWidget(parentWidget(), getData())); } -void IntroPhone::toSignUp() { +void PhoneWidget::toSignUp() { disableAll(); - showError(QString()); + hideError(); // Hide error, but leave the signup label visible. _checkRequest->start(1000); MTPauth_SendCode::Flags flags = 0; - _sentRequest = MTP::send(MTPauth_SendCode(MTP_flags(flags), MTP_string(_sentPhone), MTPBool(), MTP_int(ApiId), MTP_string(ApiHash)), rpcDone(&IntroPhone::phoneSubmitDone), rpcFail(&IntroPhone::phoneSubmitFail)); + _sentRequest = MTP::send(MTPauth_SendCode(MTP_flags(flags), MTP_string(_sentPhone), MTPBool(), MTP_int(ApiId), MTP_string(ApiHash)), rpcDone(&PhoneWidget::phoneSubmitDone), rpcFail(&PhoneWidget::phoneSubmitFail)); } -bool IntroPhone::phoneSubmitFail(const RPCError &error) { +bool PhoneWidget::phoneSubmitFail(const RPCError &error) { if (MTP::isFloodError(error)) { stopCheck(); _sentRequest = 0; - showError(lang(lng_flood_error)); + showPhoneError(lang(lng_flood_error)); enableAll(true); return true; } @@ -271,48 +232,50 @@ bool IntroPhone::phoneSubmitFail(const RPCError &error) { _sentRequest = 0; const QString &err = error.type(); if (err == qstr("PHONE_NUMBER_INVALID")) { // show error - showError(lang(lng_bad_phone)); + showPhoneError(lang(lng_bad_phone)); enableAll(true); return true; } if (cDebug()) { // internal server error - showError(err + ": " + error.description()); + showPhoneError(err + ": " + error.description()); } else { - showError(lang(lng_server_error)); + showPhoneError(lang(lng_server_error)); } enableAll(true); return false; } -QString IntroPhone::fullNumber() const { - return _code->text() + _phone->text(); +QString PhoneWidget::fullNumber() const { + return _code->getLastText() + _phone->getLastText(); } -void IntroPhone::selectCountry(const QString &c) { +void PhoneWidget::selectCountry(const QString &c) { _country->onChooseCountry(c); } -void IntroPhone::activate() { - IntroStep::activate(); +void PhoneWidget::setInnerFocus() { _phone->setFocus(); } -void IntroPhone::finished() { - IntroStep::finished(); +void PhoneWidget::activate() { + Step::activate(); + _country->show(); + _phone->show(); + _code->show(); + setInnerFocus(); +} + +void PhoneWidget::finished() { + Step::finished(); _checkRequest->stop(); rpcClear(); - _error.clear(); - a_errorAlpha = anim::fvalue(0); + cancelled(); enableAll(true); } -void IntroPhone::cancelled() { - if (_sentRequest) { - MTP::cancel(base::take(_sentRequest)); - } +void PhoneWidget::cancelled() { + MTP::cancel(base::take(_sentRequest)); } -void IntroPhone::onSubmit() { - onSubmitPhone(); -} +} // namespace Intro diff --git a/Telegram/SourceFiles/intro/introphone.h b/Telegram/SourceFiles/intro/introphone.h index 1591977df..d7379405e 100644 --- a/Telegram/SourceFiles/intro/introphone.h +++ b/Telegram/SourceFiles/intro/introphone.h @@ -30,35 +30,41 @@ class RoundButton; class FlatLabel; } // namespace Ui -class IntroPhone final : public IntroStep { +namespace Intro { + +class PhoneWidget : public Widget::Step, private base::Subscriber { Q_OBJECT public: - IntroPhone(IntroWidget *parent); - - void paintEvent(QPaintEvent *e) override; - void resizeEvent(QResizeEvent *e) override; - - void step_error(float64 ms, bool timer); + PhoneWidget(QWidget *parent, Widget::Data *data); void selectCountry(const QString &country); + void setInnerFocus() override; void activate() override; void finished() override; void cancelled() override; - void onSubmit() override; + void submit() override; + + bool hasBack() const override { + return true; + } + +protected: + void resizeEvent(QResizeEvent *e) override; + +private slots: + void onInputChange(); + void onCheckRequest(); + +private: + void updateSignupGeometry(); + void countryChanged(); void phoneCheckDone(const MTPauth_CheckedPhone &result); void phoneSubmitDone(const MTPauth_SentCode &result); bool phoneSubmitFail(const RPCError &error); -public slots: - void countryChanged(); - void onInputChange(); - void onSubmitPhone(); - void onCheckRequest(); - -private: void toSignUp(); QString fullNumber() const; @@ -66,24 +72,17 @@ private: void enableAll(bool failed); void stopCheck(); - void showError(const QString &err, bool signUp = false); - - QString _error; - anim::fvalue a_errorAlpha; - Animation _a_error; + void showPhoneError(const QString &text); + void hidePhoneError(); + void showSignup(); bool _changed = false; - ChildWidget _next; - - QRect _textRect; ChildWidget _country; - ChildWidget _phone; ChildWidget _code; + ChildWidget _phone; - ChildWidget _signup; - QPixmap _signupCache; - bool _showSignup = false; + ChildWidget> _signup = { nullptr }; QString _sentPhone; mtpRequestId _sentRequest = 0; @@ -91,3 +90,5 @@ private: ChildObject _checkRequest; }; + +} // namespace Intro diff --git a/Telegram/SourceFiles/intro/intropwdcheck.cpp b/Telegram/SourceFiles/intro/intropwdcheck.cpp index f1e974cda..f4b80843c 100644 --- a/Telegram/SourceFiles/intro/intropwdcheck.cpp +++ b/Telegram/SourceFiles/intro/intropwdcheck.cpp @@ -30,117 +30,52 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "intro/introsignup.h" #include "ui/widgets/buttons.h" #include "ui/widgets/input_fields.h" +#include "ui/widgets/labels.h" -IntroPwdCheck::IntroPwdCheck(IntroWidget *parent) : IntroStep(parent) -, a_errorAlpha(0) -, _a_error(animation(this, &IntroPwdCheck::step_error)) -, _next(this, lang(lng_intro_submit), st::introNextButton) -, _salt(parent->getPwdSalt()) -, _hasRecovery(parent->getHasRecovery()) -, _hint(parent->getPwdHint()) +namespace Intro { + +PwdCheckWidget::PwdCheckWidget(QWidget *parent, Widget::Data *data) : Step(parent, data) +, _salt(getData()->pwdSalt) +, _hasRecovery(getData()->hasRecovery) +, _hint(getData()->pwdHint) , _pwdField(this, st::introPassword, lang(lng_signin_password)) +, _pwdHint(this, st::introPasswordHint, st::introPasswordHintTextStyle) , _codeField(this, st::introPassword, lang(lng_signin_code)) , _toRecover(this, lang(lng_signin_recover)) , _toPassword(this, lang(lng_signin_try_password)) -, _reset(this, lang(lng_signin_reset_account), st::introResetLink) , _checkRequest(this) { - setVisible(false); - setGeometry(parent->innerRect()); - - connect(_next, SIGNAL(clicked()), this, SLOT(onSubmitPwd())); connect(_checkRequest, SIGNAL(timeout()), this, SLOT(onCheckRequest())); connect(_toRecover, SIGNAL(clicked()), this, SLOT(onToRecover())); connect(_toPassword, SIGNAL(clicked()), this, SLOT(onToPassword())); connect(_pwdField, SIGNAL(changed()), this, SLOT(onInputChange())); connect(_codeField, SIGNAL(changed()), this, SLOT(onInputChange())); - connect(_reset, SIGNAL(clicked()), this, SLOT(onReset())); - _pwdField->setEchoMode(QLineEdit::Password); + setTitleText(lang(lng_signin_title)); + updateDescriptionText(); + setErrorBelowLink(true); - if (!_hint.isEmpty()) { - _hintText.setText(st::introFont, lng_signin_hint(lt_password_hint, _hint)); + if (_hint.isEmpty()) { + _pwdHint->hide(); + } else { + _pwdHint->setText(lng_signin_hint(lt_password_hint, _hint)); } _codeField->hide(); _toPassword->hide(); - _toRecover->show(); - _reset->hide(); setMouseTracking(true); } -void IntroPwdCheck::paintEvent(QPaintEvent *e) { - bool trivial = (rect() == e->rect()); - - QPainter p(this); - if (!trivial) { - p.setClipRect(e->rect()); - } - if (trivial || e->rect().intersects(_textRect)) { - p.setFont(st::introHeaderFont->f); - p.drawText(_textRect, lang(lng_signin_title), style::al_top); - p.setFont(st::introFont->f); - p.drawText(_textRect, lang(_pwdField->isHidden() ? lng_signin_recover_desc : lng_signin_desc), style::al_bottom); - } - if (_pwdField->isHidden()) { - if (!_emailPattern.isEmpty()) { - p.drawText(QRect(_textRect.x(), _pwdField->y() + _pwdField->height() + st::introFinishSkip, _textRect.width(), st::introFont->height), _emailPattern, style::al_top); - } - } else if (!_hint.isEmpty()) { - _hintText.drawElided(p, _pwdField->x(), _pwdField->y() + _pwdField->height() + st::introFinishSkip, _pwdField->width(), 1, style::al_top); - } - if (_a_error.animating() || _error.length()) { - p.setOpacity(a_errorAlpha.current()); - - QRect errRect((width() - st::introErrorWidth) / 2, (_pwdField->y() + _pwdField->height() + st::introFinishSkip + st::introFont->height + _next->y() - st::introErrorHeight) / 2, st::introErrorWidth, st::introErrorHeight); - p.setFont(st::introErrorFont); - p.setPen(st::introErrorFg); - p.drawText(errRect, _error, QTextOption(style::al_center)); - - p.setOpacity(1); - } +void PwdCheckWidget::resizeEvent(QResizeEvent *e) { + Step::resizeEvent(e); + _pwdField->moveToLeft(contentLeft(), contentTop() + st::introPasswordTop); + _pwdHint->moveToLeft(contentLeft() + st::buttonRadius, contentTop() + st::introPasswordHintTop); + _codeField->moveToLeft(contentLeft(), contentTop() + st::introStepFieldTop); + auto linkTop = _codeField->y() + _codeField->height() + st::introLinkTop; + _toRecover->moveToLeft(contentLeft() + st::buttonRadius, linkTop); + _toPassword->moveToLeft(contentLeft() + st::buttonRadius, linkTop); } -void IntroPwdCheck::resizeEvent(QResizeEvent *e) { - if (e->oldSize().width() != width()) { - _next->move((width() - _next->width()) / 2, st::introBtnTop); - _pwdField->move((width() - _pwdField->width()) / 2, st::introTextTop + st::introTextSize.height() + st::introCountry.top); - _codeField->move((width() - _codeField->width()) / 2, st::introTextTop + st::introTextSize.height() + st::introCountry.top); - _toRecover->move(_next->x() + (_pwdField->width() - _toRecover->width()) / 2, _next->y() + _next->height() + st::introFinishSkip); - _toPassword->move(_next->x() + (_pwdField->width() - _toPassword->width()) / 2, _next->y() + _next->height() + st::introFinishSkip); - _reset->move((width() - _reset->width()) / 2, _toRecover->y() + _toRecover->height() + st::introFinishSkip); - } - _textRect = QRect((width() - st::introTextSize.width()) / 2, st::introTextTop, st::introTextSize.width(), st::introTextSize.height()); -} - -void IntroPwdCheck::showError(const QString &error) { - if (!_a_error.animating() && error == _error) return; - - if (error.length()) { - _error = error; - a_errorAlpha.start(1); - } else { - a_errorAlpha.start(0); - } - _a_error.start(); -} - -void IntroPwdCheck::step_error(float64 ms, bool timer) { - float64 dt = ms / st::introErrorDuration; - - if (dt >= 1) { - _a_error.stop(); - a_errorAlpha.finish(); - if (!a_errorAlpha.current()) { - _error.clear(); - } - } else { - a_errorAlpha.update(dt, anim::linear); - } - if (timer) update(); -} - -void IntroPwdCheck::activate() { - IntroStep::activate(); +void PwdCheckWidget::setInnerFocus() { if (_pwdField->isHidden()) { _codeField->setFocus(); } else { @@ -148,17 +83,25 @@ void IntroPwdCheck::activate() { } } -void IntroPwdCheck::cancelled() { - if (_sentRequest) { - MTP::cancel(base::take(_sentRequest)); +void PwdCheckWidget::activate() { + if (_pwdField->isHidden() && _codeField->isHidden()) { + Step::activate(); + _pwdField->show(); + _pwdHint->show(); + _toRecover->show(); } + setInnerFocus(); } -void IntroPwdCheck::stopCheck() { +void PwdCheckWidget::cancelled() { + MTP::cancel(base::take(_sentRequest)); +} + +void PwdCheckWidget::stopCheck() { _checkRequest->stop(); } -void IntroPwdCheck::onCheckRequest() { +void PwdCheckWidget::onCheckRequest() { int32 status = MTP::state(_sentRequest); if (status < 0) { int32 leftms = -status; @@ -176,7 +119,7 @@ void IntroPwdCheck::onCheckRequest() { } } -void IntroPwdCheck::pwdSubmitDone(bool recover, const MTPauth_Authorization &result) { +void PwdCheckWidget::pwdSubmitDone(bool recover, const MTPauth_Authorization &result) { _sentRequest = 0; stopCheck(); if (recover) { @@ -184,22 +127,22 @@ void IntroPwdCheck::pwdSubmitDone(bool recover, const MTPauth_Authorization &res } _pwdField->setDisabled(false); _codeField->setDisabled(false); - const auto &d(result.c_auth_authorization()); + auto &d = result.c_auth_authorization(); if (d.vuser.type() != mtpc_user || !d.vuser.c_user().is_self()) { // wtf? showError(lang(lng_server_error)); return; } - intro()->finish(d.vuser); + finish(d.vuser); } -bool IntroPwdCheck::pwdSubmitFail(const RPCError &error) { +bool PwdCheckWidget::pwdSubmitFail(const RPCError &error) { if (MTP::isFloodError(error)) { _sentRequest = 0; stopCheck(); _codeField->setDisabled(false); showError(lang(lng_flood_error)); _pwdField->setDisabled(false); - _pwdField->notaBene(); + _pwdField->showError(); return true; } if (MTP::isDefaultHandledError(error)) return false; @@ -212,10 +155,10 @@ bool IntroPwdCheck::pwdSubmitFail(const RPCError &error) { if (err == qstr("PASSWORD_HASH_INVALID")) { showError(lang(lng_signin_bad_password)); _pwdField->selectAll(); - _pwdField->notaBene(); + _pwdField->showError(); return true; } else if (err == qstr("PASSWORD_EMPTY")) { - intro()->onBack(); + goBack(); } if (cDebug()) { // internal server error showError(err + ": " + error.description()); @@ -226,10 +169,10 @@ bool IntroPwdCheck::pwdSubmitFail(const RPCError &error) { return false; } -bool IntroPwdCheck::codeSubmitFail(const RPCError &error) { +bool PwdCheckWidget::codeSubmitFail(const RPCError &error) { if (MTP::isFloodError(error)) { showError(lang(lng_flood_error)); - _codeField->notaBene(); + _codeField->showError(); return true; } if (MTP::isDefaultHandledError(error)) return false; @@ -240,7 +183,7 @@ bool IntroPwdCheck::codeSubmitFail(const RPCError &error) { _codeField->setDisabled(false); const QString &err = error.type(); if (err == qstr("PASSWORD_EMPTY")) { - intro()->onBack(); + goBack(); return true; } else if (err == qstr("PASSWORD_RECOVERY_NA")) { recoverStartFail(error); @@ -252,7 +195,7 @@ bool IntroPwdCheck::codeSubmitFail(const RPCError &error) { } else if (err == qstr("CODE_INVALID")) { showError(lang(lng_signin_wrong_code)); _codeField->selectAll(); - _codeField->notaBene(); + _codeField->showError(); return true; } if (cDebug()) { // internal server error @@ -264,39 +207,42 @@ bool IntroPwdCheck::codeSubmitFail(const RPCError &error) { return false; } -void IntroPwdCheck::recoverStarted(const MTPauth_PasswordRecovery &result) { - _emailPattern = st::introFont->elided(lng_signin_recover_hint(lt_recover_email, qs(result.c_auth_passwordRecovery().vemail_pattern)), _textRect.width()); - update(); +void PwdCheckWidget::recoverStarted(const MTPauth_PasswordRecovery &result) { + _emailPattern = qs(result.c_auth_passwordRecovery().vemail_pattern); + updateDescriptionText(); } -bool IntroPwdCheck::recoverStartFail(const RPCError &error) { +bool PwdCheckWidget::recoverStartFail(const RPCError &error) { stopCheck(); _pwdField->setDisabled(false); _codeField->setDisabled(false); _pwdField->show(); + _pwdHint->show(); _codeField->hide(); _pwdField->setFocus(); + updateDescriptionText(); update(); - showError(QString()); + hideError(); return true; } -void IntroPwdCheck::onToRecover() { +void PwdCheckWidget::onToRecover() { if (_hasRecovery) { if (_sentRequest) { MTP::cancel(base::take(_sentRequest)); } - showError(QString()); + hideError(); _toRecover->hide(); _toPassword->show(); _pwdField->hide(); + _pwdHint->hide(); _pwdField->setText(QString()); _codeField->show(); _codeField->setFocus(); + updateDescriptionText(); if (_emailPattern.isEmpty()) { - MTP::send(MTPauth_RequestPasswordRecovery(), rpcDone(&IntroPwdCheck::recoverStarted), rpcFail(&IntroPwdCheck::recoverStartFail)); + MTP::send(MTPauth_RequestPasswordRecovery(), rpcDone(&PwdCheckWidget::recoverStarted), rpcFail(&PwdCheckWidget::recoverStartFail)); } - update(); } else { ConfirmBox *box = new InformBox(lang(lng_signin_no_email_forgot)); Ui::showLayer(box); @@ -304,101 +250,63 @@ void IntroPwdCheck::onToRecover() { } } -void IntroPwdCheck::onToPassword() { +void PwdCheckWidget::onToPassword() { ConfirmBox *box = new InformBox(lang(lng_signin_cant_email_forgot)); Ui::showLayer(box); connect(box, SIGNAL(destroyed(QObject*)), this, SLOT(onToReset())); } -void IntroPwdCheck::onToReset() { +void PwdCheckWidget::onToReset() { if (_sentRequest) { MTP::cancel(base::take(_sentRequest)); } _toRecover->show(); _toPassword->hide(); _pwdField->show(); + _pwdHint->show(); _codeField->hide(); _codeField->setText(QString()); _pwdField->setFocus(); - _reset->show(); + showResetButton(); + updateDescriptionText(); update(); } -void IntroPwdCheck::onReset() { - if (_sentRequest) return; - ConfirmBox *box = new ConfirmBox(lang(lng_signin_sure_reset), lang(lng_signin_reset), st::attentionBoxButton); - connect(box, SIGNAL(confirmed()), this, SLOT(onResetSure())); - Ui::showLayer(box); +void PwdCheckWidget::updateDescriptionText() { + setDescriptionText(_pwdField->isHidden() ? lng_signin_recover_desc(lt_email, _emailPattern) : lang(lng_signin_desc)); } -void IntroPwdCheck::onResetSure() { - if (_sentRequest) return; - _sentRequest = MTP::send(MTPaccount_DeleteAccount(MTP_string("Forgot password")), rpcDone(&IntroPwdCheck::deleteDone), rpcFail(&IntroPwdCheck::deleteFail)); +void PwdCheckWidget::onInputChange() { + hideError(); } -bool IntroPwdCheck::deleteFail(const RPCError &error) { - if (MTP::isDefaultHandledError(error)) return false; - - _sentRequest = 0; - - auto type = error.type(); - if (type.startsWith(qstr("2FA_CONFIRM_WAIT_"))) { - int seconds = type.mid(qstr("2FA_CONFIRM_WAIT_").size()).toInt(); - int days = (seconds + 59) / 86400; - int hours = ((seconds + 59) % 86400) / 3600; - int minutes = ((seconds + 59) % 3600) / 60; - QString when; - if (days > 0) { - when = lng_signin_reset_in_days(lt_count_days, days, lt_count_hours, hours, lt_count_minutes, minutes); - } else if (hours > 0) { - when = lng_signin_reset_in_hours(lt_count_hours, hours, lt_count_minutes, minutes); - } else { - when = lng_signin_reset_in_minutes(lt_count_minutes, minutes); - } - Ui::showLayer(new InformBox(lng_signin_reset_wait(lt_phone_number, App::formatPhone(intro()->getPhone()), lt_when, when))); - } else if (type == qstr("2FA_RECENT_CONFIRM")) { - Ui::showLayer(new InformBox(lang(lng_signin_reset_cancelled))); - } else { - Ui::hideLayer(); - showError(lang(lng_server_error)); - } - return true; -} - -void IntroPwdCheck::deleteDone(const MTPBool &v) { - Ui::hideLayer(); - intro()->replaceStep(new IntroSignup(intro())); -} - -void IntroPwdCheck::onInputChange() { - showError(QString()); -} - -void IntroPwdCheck::onSubmitPwd(bool force) { +void PwdCheckWidget::submit() { if (_sentRequest) return; if (_pwdField->isHidden()) { - if (!force && !_codeField->isEnabled()) return; - QString code = _codeField->text().trimmed(); + if (!_codeField->isEnabled()) return; + auto code = _codeField->getLastText().trimmed(); if (code.isEmpty()) { - _codeField->notaBene(); + _codeField->showError(); return; } - _sentRequest = MTP::send(MTPauth_RecoverPassword(MTP_string(code)), rpcDone(&IntroPwdCheck::pwdSubmitDone, true), rpcFail(&IntroPwdCheck::codeSubmitFail)); + _sentRequest = MTP::send(MTPauth_RecoverPassword(MTP_string(code)), rpcDone(&PwdCheckWidget::pwdSubmitDone, true), rpcFail(&PwdCheckWidget::codeSubmitFail)); } else { - if (!force && !_pwdField->isEnabled()) return; + if (!_pwdField->isEnabled()) return; _pwdField->setDisabled(true); setFocus(); - showError(QString()); + hideError(); - QByteArray pwdData = _salt + _pwdField->text().toUtf8() + _salt, pwdHash(32, Qt::Uninitialized); + QByteArray pwdData = _salt + _pwdField->getLastText().toUtf8() + _salt, pwdHash(32, Qt::Uninitialized); hashSha256(pwdData.constData(), pwdData.size(), pwdHash.data()); - _sentRequest = MTP::send(MTPauth_CheckPassword(MTP_bytes(pwdHash)), rpcDone(&IntroPwdCheck::pwdSubmitDone, false), rpcFail(&IntroPwdCheck::pwdSubmitFail)); + _sentRequest = MTP::send(MTPauth_CheckPassword(MTP_bytes(pwdHash)), rpcDone(&PwdCheckWidget::pwdSubmitDone, false), rpcFail(&PwdCheckWidget::pwdSubmitFail)); } } -void IntroPwdCheck::onSubmit() { - onSubmitPwd(); +QString PwdCheckWidget::nextButtonText() const { + return lang(lng_intro_submit); } + +} // namespace Intro diff --git a/Telegram/SourceFiles/intro/intropwdcheck.h b/Telegram/SourceFiles/intro/intropwdcheck.h index b25fca221..359fe4c62 100644 --- a/Telegram/SourceFiles/intro/intropwdcheck.h +++ b/Telegram/SourceFiles/intro/intropwdcheck.h @@ -23,26 +23,37 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "intro/introwidget.h" namespace Ui { -class FlatInput; +class InputField; +class PasswordInput; class RoundButton; class LinkButton; } // namespace Ui -class IntroPwdCheck final : public IntroStep { +namespace Intro { + +class PwdCheckWidget : public Widget::Step { Q_OBJECT public: - IntroPwdCheck(IntroWidget *parent); - - void paintEvent(QPaintEvent *e) override; - void resizeEvent(QResizeEvent *e) override; - - void step_error(float64 ms, bool timer); + PwdCheckWidget(QWidget *parent, Widget::Data *data); + void setInnerFocus() override; void activate() override; void cancelled() override; - void onSubmit() override; + void submit() override; + QString nextButtonText() const override; +protected: + void resizeEvent(QResizeEvent *e) override; + +private slots: + void onToRecover(); + void onToPassword(); + void onInputChange(); + void onCheckRequest(); + void onToReset(); + +private: void pwdSubmitDone(bool recover, const MTPauth_Authorization &result); bool pwdSubmitFail(const RPCError &error); bool codeSubmitFail(const RPCError &error); @@ -50,46 +61,24 @@ public: void recoverStarted(const MTPauth_PasswordRecovery &result); -public slots: - void onSubmitPwd(bool force = false); - void onToRecover(); - void onToPassword(); - void onInputChange(); - void onCheckRequest(); - void onToReset(); - void onReset(); - void onResetSure(); - -private: - void showError(const QString &error); + void updateDescriptionText(); void stopCheck(); - void deleteDone(const MTPBool &result); - bool deleteFail(const RPCError &error); - - QString _error; - anim::fvalue a_errorAlpha; - Animation _a_error; - - ChildWidget _next; - - QRect _textRect; - QByteArray _salt; bool _hasRecovery; QString _hint, _emailPattern; - ChildWidget _pwdField; - ChildWidget _codeField; + ChildWidget _pwdField; + ChildWidget _pwdHint; + ChildWidget _codeField; ChildWidget _toRecover; ChildWidget _toPassword; - ChildWidget _reset; mtpRequestId _sentRequest = 0; - Text _hintText; - QByteArray _pwdSalt; ChildObject _checkRequest; }; + +} // namespace Intro diff --git a/Telegram/SourceFiles/intro/introsignup.cpp b/Telegram/SourceFiles/intro/introsignup.cpp index df3e6ed58..de2d36128 100644 --- a/Telegram/SourceFiles/intro/introsignup.cpp +++ b/Telegram/SourceFiles/intro/introsignup.cpp @@ -29,200 +29,106 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "application.h" #include "ui/widgets/buttons.h" #include "ui/widgets/input_fields.h" +#include "ui/widgets/labels.h" +#include "ui/buttons/peer_avatar_button.h" -IntroSignup::IntroSignup(IntroWidget *parent) : IntroStep(parent) -, a_errorAlpha(0) -, a_photoOver(0) -, _a_error(animation(this, &IntroSignup::step_error)) -, _a_photo(animation(this, &IntroSignup::step_photo)) -, _next(this, lang(lng_intro_finish), st::introNextButton) +namespace Intro { + +SignupWidget::SignupWidget(QWidget *parent, Widget::Data *data) : Step(parent, data) +, _photo(this, st::introPhotoSize, st::introPhotoIconPosition) , _first(this, st::introName, lang(lng_signup_firstname)) , _last(this, st::introName, lang(lng_signup_lastname)) , _invertOrder(langFirstNameGoesSecond()) , _checkRequest(this) { - setVisible(false); - setGeometry(parent->innerRect()); - - connect(_next, SIGNAL(clicked()), this, SLOT(onSubmitName())); connect(_checkRequest, SIGNAL(timeout()), this, SLOT(onCheckRequest())); + _photo->setClickedCallback([this] { + auto imgExtensions = cImgExtensions(); + auto filter = qsl("Image files (*") + imgExtensions.join(qsl(" *")) + qsl(");;") + filedialogAllFilesFilter(); + _readPhotoFileQueryId = FileDialog::queryReadFile(lang(lng_choose_images), filter); + }); + subscribe(FileDialog::QueryDone(), [this](const FileDialog::QueryUpdate &update) { + notifyFileQueryUpdated(update); + }); + if (_invertOrder) { setTabOrder(_last, _first); } + setErrorCentered(true); + setTitleText(lang(lng_signup_title)); + setDescriptionText(lang(lng_signup_desc)); setMouseTracking(true); } -void IntroSignup::mouseMoveEvent(QMouseEvent *e) { - bool photoOver = QRect(_phLeft, _phTop, st::introPhotoSize, st::introPhotoSize).contains(e->pos()); - if (photoOver != _photoOver) { - _photoOver = photoOver; - if (_photoSmall.isNull()) { - a_photoOver.start(_photoOver ? 1 : 0); - _a_photo.start(); - } +void SignupWidget::notifyFileQueryUpdated(const FileDialog::QueryUpdate &update) { + if (_readPhotoFileQueryId != update.queryId) { + return; + } + _readPhotoFileQueryId = 0; + if (update.remoteContent.isEmpty() && update.filePaths.isEmpty()) { + return; } - setCursor(_photoOver ? style::cur_pointer : style::cur_default); -} - -void IntroSignup::mousePressEvent(QMouseEvent *e) { - mouseMoveEvent(e); - if (QRect(_phLeft, _phTop, st::introPhotoSize, st::introPhotoSize).contains(e->pos())) { - QStringList imgExtensions(cImgExtensions()); - QString filter(qsl("Image files (*") + imgExtensions.join(qsl(" *")) + qsl(");;") + filedialogAllFilesFilter()); - - QImage img; - QString file; - QByteArray remoteContent; - if (filedialogGetOpenFile(file, remoteContent, lang(lng_choose_images), filter)) { - if (!remoteContent.isEmpty()) { - img = App::readImage(remoteContent); - } else { - if (!file.isEmpty()) { - img = App::readImage(file); - } - } - } else { - return; - } - - if (img.isNull() || img.width() > 10 * img.height() || img.height() > 10 * img.width()) { - showError(lang(lng_bad_photo)); - return; - } - PhotoCropBox *box = new PhotoCropBox(img, PeerId(0)); - connect(box, SIGNAL(ready(const QImage &)), this, SLOT(onPhotoReady(const QImage &))); - Ui::showLayer(box); - } -} - -void IntroSignup::paintEvent(QPaintEvent *e) { - bool trivial = (rect() == e->rect()); - - Painter p(this); - if (!trivial) { - p.setClipRect(e->rect()); - } - if (trivial || e->rect().intersects(_textRect)) { - p.setFont(st::introHeaderFont->f); - p.drawText(_textRect, lang(lng_signup_title), style::al_top); - p.setFont(st::introFont->f); - p.drawText(_textRect, lang(lng_signup_desc), style::al_bottom); - } - if (_a_error.animating() || error.length()) { - p.setOpacity(a_errorAlpha.current()); - - QRect errRect; - if (_invertOrder) { - errRect = QRect((width() - st::introErrorWidth) / 2, (_first->y() + _first->height() + _next->y() - st::introErrorHeight) / 2, st::introErrorWidth, st::introErrorHeight); - } else { - errRect = QRect((width() - st::introErrorWidth) / 2, (_last->y() + _last->height() + _next->y() - st::introErrorHeight) / 2, st::introErrorWidth, st::introErrorHeight); - } - p.setFont(st::introErrorFont); - p.setPen(st::introErrorFg); - p.drawText(errRect, error, QTextOption(style::al_center)); - - p.setOpacity(1); - } - - if (_photoSmall.isNull()) { - float64 o = a_photoOver.current(); - QRect phRect(_phLeft, _phTop, st::introPhotoSize, st::introPhotoSize); - if (o > 0) { - if (o < 1) { - QColor c; - c.setRedF(st::newGroupPhotoBg->c.redF() * (1. - o) + st::newGroupPhotoBgOver->c.redF() * o); - c.setGreenF(st::newGroupPhotoBg->c.greenF() * (1. - o) + st::newGroupPhotoBgOver->c.greenF() * o); - c.setBlueF(st::newGroupPhotoBg->c.blueF() * (1. - o) + st::newGroupPhotoBgOver->c.blueF() * o); - p.fillRect(phRect, c); - } else { - p.fillRect(phRect, st::newGroupPhotoBgOver); - } - } else { - p.fillRect(phRect, st::newGroupPhotoBg); - } - st::newGroupPhotoIcon.paintInCenter(p, phRect); + QImage img; + if (!update.remoteContent.isEmpty()) { + img = App::readImage(update.remoteContent); } else { - p.drawPixmap(_phLeft, _phTop, _photoSmall); + img = App::readImage(update.filePaths.front()); } + + if (img.isNull() || img.width() > 10 * img.height() || img.height() > 10 * img.width()) { + showError(lang(lng_bad_photo)); + return; + } + auto box = new PhotoCropBox(img, PeerId(0)); + connect(box, SIGNAL(ready(const QImage &)), this, SLOT(onPhotoReady(const QImage &))); + Ui::showLayer(box); } -void IntroSignup::resizeEvent(QResizeEvent *e) { - _phLeft = (width() - _next->width()) / 2; - _phTop = st::introTextTop + st::introTextSize.height() + st::introCountry.top; - if (e->oldSize().width() != width()) { - _next->move((width() - _next->width()) / 2, st::introBtnTop); - if (_invertOrder) { - _last->move((width() - _next->width()) / 2 + _next->width() - _last->width(), _phTop); - _first->move((width() - _next->width()) / 2 + _next->width() - _first->width(), _last->y() + st::introCountry.height + st::introCountry.ptrSize.height() + st::introPhoneTop); - } else { - _first->move((width() - _next->width()) / 2 + _next->width() - _first->width(), _phTop); - _last->move((width() - _next->width()) / 2 + _next->width() - _last->width(), _first->y() + st::introCountry.height + st::introCountry.ptrSize.height() + st::introPhoneTop); - } - } - _textRect = QRect((width() - st::introTextSize.width()) / 2, st::introTextTop, st::introTextSize.width(), st::introTextSize.height()); -} +void SignupWidget::resizeEvent(QResizeEvent *e) { + Step::resizeEvent(e); -void IntroSignup::showError(const QString &err) { - if (!_a_error.animating() && err == error) return; + auto photoRight = contentLeft() + st::introNextButton.width; + auto photoTop = contentTop() + st::introPhotoTop; + _photo->moveToLeft(photoRight - _photo->width(), photoTop); - if (err.length()) { - error = err; - a_errorAlpha.start(1); - } else { - a_errorAlpha.start(0); - } - _a_error.start(); -} - -void IntroSignup::step_error(float64 ms, bool timer) { - float64 dt = ms / st::introErrorDuration; - - if (dt >= 1) { - _a_error.stop(); - a_errorAlpha.finish(); - if (!a_errorAlpha.current()) { - error.clear(); - } - } else { - a_errorAlpha.update(dt, anim::linear); - } - if (timer) update(); -} - -void IntroSignup::step_photo(float64 ms, bool timer) { - float64 dt = ms / st::introErrorDuration; - - if (dt >= 1) { - _a_photo.stop(); - a_photoOver.finish(); - } else { - a_photoOver.update(dt, anim::linear); - } - if (timer) update(); -} - -void IntroSignup::activate() { - IntroStep::activate(); + auto firstTop = contentTop() + st::introStepFieldTop; + auto secondTop = firstTop + st::introName.height + st::introPhoneTop; if (_invertOrder) { + _last->moveToLeft(contentLeft(), firstTop); + _first->moveToLeft(contentLeft(), secondTop); + } else { + _first->moveToLeft(contentLeft(), firstTop); + _last->moveToLeft(contentLeft(), secondTop); + } +} + +void SignupWidget::setInnerFocus() { + if (_invertOrder || _last->hasFocus()) { _last->setFocus(); } else { _first->setFocus(); } } -void IntroSignup::cancelled() { - if (_sentRequest) { - MTP::cancel(base::take(_sentRequest)); - } +void SignupWidget::activate() { + Step::activate(); + _first->show(); + _last->show(); + _photo->show(); + setInnerFocus(); } -void IntroSignup::stopCheck() { +void SignupWidget::cancelled() { + MTP::cancel(base::take(_sentRequest)); +} + +void SignupWidget::stopCheck() { _checkRequest->stop(); } -void IntroSignup::onCheckRequest() { +void SignupWidget::onCheckRequest() { int32 status = MTP::state(_sentRequest); if (status < 0) { int32 leftms = -status; @@ -244,13 +150,12 @@ void IntroSignup::onCheckRequest() { } } -void IntroSignup::onPhotoReady(const QImage &img) { - _photoBig = img; - _photoSmall = App::pixmapFromImageInPlace(img.scaled(st::introPhotoSize * cIntRetinaFactor(), st::introPhotoSize * cIntRetinaFactor(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation)); - _photoSmall.setDevicePixelRatio(cRetinaFactor()); +void SignupWidget::onPhotoReady(const QImage &img) { + _photoImage = img; + _photo->setImage(_photoImage); } -void IntroSignup::nameSubmitDone(const MTPauth_Authorization &result) { +void SignupWidget::nameSubmitDone(const MTPauth_Authorization &result) { stopCheck(); _first->setDisabled(false); _last->setDisabled(false); @@ -259,10 +164,10 @@ void IntroSignup::nameSubmitDone(const MTPauth_Authorization &result) { showError(lang(lng_server_error)); return; } - intro()->finish(d.vuser, _photoBig); + finish(d.vuser, _photoImage); } -bool IntroSignup::nameSubmitFail(const RPCError &error) { +bool SignupWidget::nameSubmitFail(const RPCError &error) { if (MTP::isFloodError(error)) { stopCheck(); _first->setDisabled(false); @@ -284,7 +189,7 @@ bool IntroSignup::nameSubmitFail(const RPCError &error) { if (err == qstr("PHONE_NUMBER_INVALID") || err == qstr("PHONE_CODE_EXPIRED") || err == qstr("PHONE_CODE_EMPTY") || err == qstr("PHONE_CODE_INVALID") || err == qstr("PHONE_NUMBER_OCCUPIED")) { - intro()->onBack(); + goBack(); return true; } else if (err == "FIRSTNAME_INVALID") { showError(lang(lng_bad_name)); @@ -308,29 +213,29 @@ bool IntroSignup::nameSubmitFail(const RPCError &error) { return false; } -void IntroSignup::onInputChange() { +void SignupWidget::onInputChange() { showError(QString()); } -void IntroSignup::onSubmitName(bool force) { +void SignupWidget::submit() { if (_invertOrder) { - if ((_last->hasFocus() || _last->text().trimmed().length()) && !_first->text().trimmed().length()) { + if ((_last->hasFocus() || _last->getLastText().trimmed().length()) && !_first->getLastText().trimmed().length()) { _first->setFocus(); return; - } else if (!_last->text().trimmed().length()) { + } else if (!_last->getLastText().trimmed().length()) { _last->setFocus(); return; } } else { - if ((_first->hasFocus() || _first->text().trimmed().length()) && !_last->text().trimmed().length()) { + if ((_first->hasFocus() || _first->getLastText().trimmed().length()) && !_last->getLastText().trimmed().length()) { _last->setFocus(); return; - } else if (!_first->text().trimmed().length()) { + } else if (!_first->getLastText().trimmed().length()) { _first->setFocus(); return; } } - if (!force && !_first->isEnabled()) return; + if (!_first->isEnabled()) return; _first->setDisabled(true); _last->setDisabled(true); @@ -338,11 +243,13 @@ void IntroSignup::onSubmitName(bool force) { showError(QString()); - _firstName = _first->text().trimmed(); - _lastName = _last->text().trimmed(); - _sentRequest = MTP::send(MTPauth_SignUp(MTP_string(intro()->getPhone()), MTP_string(intro()->getPhoneHash()), MTP_string(intro()->getCode()), MTP_string(_firstName), MTP_string(_lastName)), rpcDone(&IntroSignup::nameSubmitDone), rpcFail(&IntroSignup::nameSubmitFail)); + _firstName = _first->getLastText().trimmed(); + _lastName = _last->getLastText().trimmed(); + _sentRequest = MTP::send(MTPauth_SignUp(MTP_string(getData()->phone), MTP_string(getData()->phoneHash), MTP_string(getData()->code), MTP_string(_firstName), MTP_string(_lastName)), rpcDone(&SignupWidget::nameSubmitDone), rpcFail(&SignupWidget::nameSubmitFail)); } -void IntroSignup::onSubmit() { - onSubmitName(); +QString SignupWidget::nextButtonText() const { + return lang(lng_intro_finish); } + +} // namespace Intro diff --git a/Telegram/SourceFiles/intro/introsignup.h b/Telegram/SourceFiles/intro/introsignup.h index bbb60453a..88ab525a7 100644 --- a/Telegram/SourceFiles/intro/introsignup.h +++ b/Telegram/SourceFiles/intro/introsignup.h @@ -21,64 +21,58 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #pragma once #include "intro/introwidget.h" +#include "ui/filedialog.h" namespace Ui { class RoundButton; -class FlatInput; +class InputField; +class NewAvatarButton; } // namespace Ui -class IntroSignup final : public IntroStep { +namespace Intro { + +class SignupWidget : public Widget::Step, private base::Subscriber { Q_OBJECT public: - IntroSignup(IntroWidget *parent); - - void paintEvent(QPaintEvent *e) override; - void resizeEvent(QResizeEvent *e) override; - void mouseMoveEvent(QMouseEvent *e) override; - void mousePressEvent(QMouseEvent *e) override; - - void step_error(float64 ms, bool timer); - void step_photo(float64 ms, bool timer); + SignupWidget(QWidget *parent, Widget::Data *data); + void setInnerFocus() override; void activate() override; void cancelled() override; - void onSubmit() override; + void submit() override; + QString nextButtonText() const override; - void nameSubmitDone(const MTPauth_Authorization &result); - bool nameSubmitFail(const RPCError &error); +protected: + void resizeEvent(QResizeEvent *e) override; -public slots: - void onSubmitName(bool force = false); +private slots: void onInputChange(); void onCheckRequest(); void onPhotoReady(const QImage &img); private: - void showError(const QString &err); + void notifyFileQueryUpdated(const FileDialog::QueryUpdate &update); + + void nameSubmitDone(const MTPauth_Authorization &result); + bool nameSubmitFail(const RPCError &error); + void stopCheck(); - QString error; - anim::fvalue a_errorAlpha, a_photoOver; - Animation _a_error; - Animation _a_photo; + QImage _photoImage; - ChildWidget _next; - - QRect _textRect; - - bool _photoOver = false; - QImage _photoBig; - QPixmap _photoSmall; - int32 _phLeft, _phTop; - - ChildWidget _first; - ChildWidget _last; + ChildWidget _photo; + ChildWidget _first; + ChildWidget _last; QString _firstName, _lastName; mtpRequestId _sentRequest = 0; + FileDialog::QueryId _readPhotoFileQueryId = 0; + bool _invertOrder = false; ChildObject _checkRequest; }; + +} // namespace Intro diff --git a/Telegram/SourceFiles/intro/introstart.cpp b/Telegram/SourceFiles/intro/introstart.cpp index e6007793a..285168a51 100644 --- a/Telegram/SourceFiles/intro/introstart.cpp +++ b/Telegram/SourceFiles/intro/introstart.cpp @@ -24,67 +24,24 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "lang.h" #include "application.h" #include "intro/introphone.h" -#include "langloaderplain.h" #include "ui/widgets/buttons.h" #include "ui/widgets/labels.h" -IntroStart::IntroStart(IntroWidget *parent) : IntroStep(parent) -, _intro(this, lang(lng_intro), Ui::FlatLabel::InitType::Rich, st::introLabel, st::introLabelTextStyle) -, _changeLang(this, QString()) -, _next(this, lang(lng_start_msgs), st::introNextButton) { - _changeLang->hide(); - if (cLang() == languageDefault) { - int32 l = Sandbox::LangSystem(); - if (l != languageDefault) { - LangLoaderPlain loader(qsl(":/langs/lang_") + LanguageCodes[l].c_str() + qsl(".strings"), langLoaderRequest(lng_switch_to_this)); - QString text = loader.found().value(lng_switch_to_this); - if (!text.isEmpty()) { - _changeLang->setText(text); - parent->langChangeTo(l); - _changeLang->show(); - } - } - } else { - _changeLang->setText(langOriginal(lng_switch_to_this)); - parent->langChangeTo(languageDefault); - _changeLang->show(); - } - - _headerWidth = st::introHeaderFont->width(qsl("Telegram Desktop")); - - setGeometry(parent->innerRect()); - - connect(_next, SIGNAL(clicked()), parent, SLOT(onStepSubmit())); - - connect(_changeLang, SIGNAL(clicked()), parent, SLOT(onChangeLang())); +namespace Intro { +StartWidget::StartWidget(QWidget *parent, Widget::Data *data) : Step(parent, data, true) { setMouseTracking(true); + setTitleText(qsl("Telegram Desktop")); + setDescriptionText(lang(lng_intro_about)); + show(); } -void IntroStart::paintEvent(QPaintEvent *e) { - bool trivial = (rect() == e->rect()); - - Painter p(this); - if (!trivial) { - p.setClipRect(e->rect()); - } - int32 hy = _intro->y() - st::introHeaderFont->height - st::introHeaderSkip + st::introHeaderFont->ascent; - - p.setFont(st::introHeaderFont); - p.setPen(st::introHeaderFg); - p.drawText((width() - _headerWidth) / 2, hy, qsl("Telegram Desktop")); - - st::introIcon.paint(p, QPoint((width() - st::introIcon.width()) / 2, hy - st::introIconSkip - st::introIcon.height()), width()); +void StartWidget::submit() { + goNext(new Intro::PhoneWidget(parentWidget(), getData())); } -void IntroStart::resizeEvent(QResizeEvent *e) { - if (e->oldSize().width() != width()) { - _next->move((width() - _next->width()) / 2, st::introBtnTop); - _intro->move((width() - _intro->width()) / 2, _next->y() - _intro->height() - st::introSkip); - _changeLang->move((width() - _changeLang->width()) / 2, _next->y() + _next->height() + _changeLang->height()); - } +QString StartWidget::nextButtonText() const { + return lang(lng_start_msgs); } -void IntroStart::onSubmit() { - intro()->nextStep(new IntroPhone(intro())); -} +} // namespace Intro diff --git a/Telegram/SourceFiles/intro/introstart.h b/Telegram/SourceFiles/intro/introstart.h index dc254535d..f29d12073 100644 --- a/Telegram/SourceFiles/intro/introstart.h +++ b/Telegram/SourceFiles/intro/introstart.h @@ -28,22 +28,15 @@ class LinkButton; class RoundButton; } // namespace Ui -class IntroStart final : public IntroStep { +namespace Intro { + +class StartWidget : public Widget::Step { public: - IntroStart(IntroWidget *parent); + StartWidget(QWidget *parent, Widget::Data *data); - void paintEvent(QPaintEvent *e) override; - void resizeEvent(QResizeEvent *e) override; - - void onSubmit() override; - -private: - ChildWidget _intro; - - ChildWidget _changeLang; - - ChildWidget _next; - - int32 _headerWidth = 0; + void submit() override; + QString nextButtonText() const override; }; + +} // namespace Intro diff --git a/Telegram/SourceFiles/intro/introwidget.cpp b/Telegram/SourceFiles/intro/introwidget.cpp index 435d4c61d..5e708e9a5 100644 --- a/Telegram/SourceFiles/intro/introwidget.cpp +++ b/Telegram/SourceFiles/intro/introwidget.cpp @@ -23,6 +23,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "lang.h" #include "localstorage.h" +#include "langloaderplain.h" #include "intro/introstart.h" #include "intro/introphone.h" #include "intro/introcode.h" @@ -31,39 +32,60 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "mainwidget.h" #include "mainwindow.h" #include "application.h" +#include "boxes/confirmbox.h" #include "ui/text/text.h" #include "ui/widgets/buttons.h" +#include "ui/widgets/labels.h" #include "ui/effects/widget_fade_wrap.h" -#include "styles/style_intro.h" +#include "ui/effects/slide_animation.h" #include "autoupdater.h" -#include "window/slide_animation.h" +#include "window/window_slide_animation.h" #include "styles/style_boxes.h" +#include "styles/style_intro.h" +#include "styles/style_window.h" -IntroWidget::IntroWidget(QWidget *parent) : TWidget(parent) -, _a_stage(animation(this, &IntroWidget::step_stage)) -, _a_show(animation(this, &IntroWidget::step_show)) +namespace Intro { + +Widget::Widget(QWidget *parent) : TWidget(parent) +, _a_show(animation(this, &Widget::step_show)) , _back(this, new Ui::IconButton(this, st::introBackButton), base::lambda(), st::introSlideDuration) -, _settings(this, lang(lng_menu_settings), st::defaultBoxButton) { - _back->entity()->setClickedCallback([this] { onBack(); }); +, _settings(this, new Ui::RoundButton(this, lang(lng_menu_settings), st::defaultBoxButton), base::lambda(), st::introCoverDuration) +, _next(this, QString(), st::introNextButton) { + getData()->country = psCurrentCountry(); + + _back->entity()->setClickedCallback([this] { historyMove(Direction::Back); }); _back->hideFast(); - _settings->setClickedCallback([] { App::wnd()->showSettings(); }); + _next->setClickedCallback([this] { getStep()->submit(); }); - _countryForReg = psCurrentCountry(); + _settings->entity()->setClickedCallback([] { App::wnd()->showSettings(); }); - MTP::send(MTPhelp_GetNearestDc(), rpcDone(&IntroWidget::gotNearestDC)); + if (cLang() == languageDefault) { + auto systemLangId = Sandbox::LangSystem(); + if (systemLangId != languageDefault) { + LangLoaderPlain loader(qsl(":/langs/lang_") + LanguageCodes[systemLangId].c_str() + qsl(".strings"), langLoaderRequest(lng_switch_to_this)); + QString text = loader.found().value(lng_switch_to_this); + if (!text.isEmpty()) { + _changeLanguage.create(this, new Ui::LinkButton(this, text), base::lambda(), st::introCoverDuration); + _changeLanguage->entity()->setClickedCallback([this, systemLangId] { changeLanguage(systemLangId); }); + } + } + } else { + _changeLanguage.create(this, new Ui::LinkButton(this, langOriginal(lng_switch_to_this)), base::lambda(), st::introCoverDuration); + _changeLanguage->entity()->setClickedCallback([this] { changeLanguage(languageDefault); }); + } - _stepHistory.push_back(new IntroStart(this)); - _back->raise(); - _settings->raise(); + MTP::send(MTPhelp_GetNearestDc(), rpcDone(&Widget::gotNearestDC)); + + appendStep(new StartWidget(this, getData())); + fixOrder(); show(); - setFocus(); + showControls(); + getStep()->showFast(); cSetPasswordRecovered(false); - _back->moveToLeft(0, 0); - #ifndef TDESKTOP_DISABLE_AUTOUPDATE Sandbox::connect(SIGNAL(updateLatest()), this, SLOT(onCheckUpdateStatus())); Sandbox::connect(SIGNAL(updateFailed()), this, SLOT(onCheckUpdateStatus())); @@ -74,12 +96,12 @@ IntroWidget::IntroWidget(QWidget *parent) : TWidget(parent) } #ifndef TDESKTOP_DISABLE_AUTOUPDATE -void IntroWidget::onCheckUpdateStatus() { +void Widget::onCheckUpdateStatus() { if (Sandbox::updatingState() == Application::UpdatingReady) { if (_update) return; - _update.create(this, lang(lng_menu_update).toUpper(), st::defaultBoxButton); + _update.create(this, new Ui::RoundButton(this, lang(lng_menu_update).toUpper(), st::defaultBoxButton), base::lambda(), st::introCoverDuration); if (!_a_show.animating()) _update->show(); - _update->setClickedCallback([] { + _update->entity()->setClickedCallback([] { checkReadyUpdate(); App::restart(); }); @@ -91,123 +113,204 @@ void IntroWidget::onCheckUpdateStatus() { } #endif // TDESKTOP_DISABLE_AUTOUPDATE -void IntroWidget::langChangeTo(int32 langId) { - _langChangeTo = langId; -} - -void IntroWidget::onChangeLang() { - cSetLang(_langChangeTo); +void Widget::changeLanguage(int32 languageId) { + cSetLang(languageId); Local::writeSettings(); App::restart(); } -void IntroWidget::onStepSubmit() { - step()->onSubmit(); +void Widget::setInnerFocus() { + if (getStep()->animating()) { + setFocus(); + } else { + getStep()->setInnerFocus(); + } } -void IntroWidget::onBack() { - historyMove(MoveBack); -} - -void IntroWidget::historyMove(MoveType type) { - if (_a_stage.animating()) return; +void Widget::historyMove(Direction direction) { + if (getStep()->animating()) return; t_assert(_stepHistory.size() > 1); - if (App::app()) App::app()->mtpPause(); - - switch (type) { - case MoveBack: { - _cacheHide = grabStep(); - - IntroStep *back = step(); - _backFrom = back->hasBack() ? 1 : 0; + auto wasStep = getStep((direction == Direction::Back) ? 0 : 1); + if (direction == Direction::Back) { _stepHistory.pop_back(); - back->cancelled(); - delete back; - } break; - - case MoveForward: { - _cacheHide = grabStep(1); - _backFrom = step(1)->hasBack() ? 1 : 0; - step(1)->finished(); - } break; - - case MoveReplace: { - _cacheHide = grabStep(1); - IntroStep *replaced = step(1); - _backFrom = replaced->hasBack() ? 1 : 0; + wasStep->cancelled(); + } else if (direction == Direction::Replace) { _stepHistory.removeAt(_stepHistory.size() - 2); - replaced->finished(); - delete replaced; - } break; + } + getStep()->prepareShowAnimated(wasStep); + if (wasStep->hasCover() != getStep()->hasCover()) { + _nextTopFrom = wasStep->contentTop() + st::introStepHeight; + _controlsTopFrom = wasStep->hasCover() ? st::introCoverHeight : 0; + _coverShownAnimation.start([this] { updateControlsGeometry(); }, 0., 1., st::introCoverDuration, anim::easeOutCirc); } - _cacheShow = grabStep(); - _backTo = step()->hasBack() ? 1 : 0; - - int32 m = (type == MoveBack) ? -1 : 1; - a_coordHide = anim::ivalue(0, -m * st::introSlideShift); - a_opacityHide = anim::fvalue(1, 0); - a_coordShow = anim::ivalue(m * st::introSlideShift, 0); - a_opacityShow = anim::fvalue(0, 1); - _a_stage.start(); - - _a_stage.step(); - if (_backTo) { + if (direction == Direction::Forward || direction == Direction::Replace) { + wasStep->finished(); + } + if (direction == Direction::Back || direction == Direction::Replace) { + delete base::take(wasStep); + } + if (getStep()->hasBack()) { _back->fadeIn(); } else { _back->fadeOut(); } - step()->hide(); + if (getStep()->hasCover()) { + _settings->fadeOut(); + if (_update) _update->fadeOut(); + if (_changeLanguage) _changeLanguage->fadeIn(); + } else { + _settings->fadeIn(); + if (_update) _update->fadeIn(); + if (_changeLanguage) _changeLanguage->fadeOut(); + } + _next->setText(getStep()->nextButtonText()); + if (_resetAccount) _resetAccount->fadeOut(); + getStep()->showAnimated(direction); + fixOrder(); } -void IntroWidget::pushStep(IntroStep *step, MoveType type) { - _stepHistory.push_back(step); +void Widget::fixOrder() { + _next->raise(); + if (_update) _update->raise(); + _settings->raise(); + _back->raise(); +} + +void Widget::moveToStep(Step *step, Direction direction) { + appendStep(step); _back->raise(); _settings->raise(); if (_update) { _update->raise(); } - _stepHistory.back()->hide(); - historyMove(type); + historyMove(direction); } -void IntroWidget::gotNearestDC(const MTPNearestDc &result) { - const auto &nearest(result.c_nearestDc()); +void Widget::appendStep(Step *step) { + _stepHistory.push_back(step); + step->setGeometry(calculateStepRect()); + step->setGoCallback([this](Step *step, Direction direction) { + if (direction == Direction::Back) { + historyMove(direction); + } else { + moveToStep(step, direction); + } + }); + step->setShowResetCallback([this] { + showResetButton(); + }); +} + +void Widget::showResetButton() { + if (!_resetAccount) { + _resetAccount.create(this, new Ui::RoundButton(this, lang(lng_signin_reset_account), st::introResetButton), base::lambda(), st::introErrorDuration); + _resetAccount->hideFast(); + _resetAccount->entity()->setClickedCallback([this] { resetAccount(); }); + updateControlsGeometry(); + } + _resetAccount->fadeIn(); +} + +void Widget::resetAccount() { + if (_resetRequest) return; + + auto box = new ConfirmBox(lang(lng_signin_sure_reset), lang(lng_signin_reset), st::attentionBoxButton); + box->setConfirmedCallback([this] { resetAccountSure(); }); + Ui::showLayer(box); +} + +void Widget::resetAccountSure() { + if (_resetRequest) return; + _resetRequest = MTP::send(MTPaccount_DeleteAccount(MTP_string("Forgot password")), rpcDone(&Widget::resetDone), rpcFail(&Widget::resetFail)); +} + +void Widget::resetDone(const MTPBool &result) { + Ui::hideLayer(); + moveToStep(new SignupWidget(this, getData()), Direction::Replace); +} + +bool Widget::resetFail(const RPCError &error) { + if (MTP::isDefaultHandledError(error)) return false; + + _resetRequest = 0; + + auto type = error.type(); + if (type.startsWith(qstr("2FA_CONFIRM_WAIT_"))) { + int seconds = type.mid(qstr("2FA_CONFIRM_WAIT_").size()).toInt(); + int days = (seconds + 59) / 86400; + int hours = ((seconds + 59) % 86400) / 3600; + int minutes = ((seconds + 59) % 3600) / 60; + QString when; + if (days > 0) { + when = lng_signin_reset_in_days(lt_count_days, days, lt_count_hours, hours, lt_count_minutes, minutes); + } else if (hours > 0) { + when = lng_signin_reset_in_hours(lt_count_hours, hours, lt_count_minutes, minutes); + } else { + when = lng_signin_reset_in_minutes(lt_count_minutes, minutes); + } + Ui::showLayer(new InformBox(lng_signin_reset_wait(lt_phone_number, App::formatPhone(getData()->phone), lt_when, when))); + } else if (type == qstr("2FA_RECENT_CONFIRM")) { + Ui::showLayer(new InformBox(lang(lng_signin_reset_cancelled))); + } else { + Ui::hideLayer(); + getStep()->showError(lang(lng_server_error)); + } + return true; +} + +void Widget::gotNearestDC(const MTPNearestDc &result) { + auto &nearest = result.c_nearestDc(); DEBUG_LOG(("Got nearest dc, country: %1, nearest: %2, this: %3").arg(nearest.vcountry.c_string().v.c_str()).arg(nearest.vnearest_dc.v).arg(nearest.vthis_dc.v)); - MTP::setdc(result.c_nearestDc().vnearest_dc.v, true); - if (_countryForReg != nearest.vcountry.c_string().v.c_str()) { - _countryForReg = nearest.vcountry.c_string().v.c_str(); - emit countryChanged(); + MTP::setdc(nearest.vnearest_dc.v, true); + auto nearestCountry = qs(nearest.vcountry); + if (getData()->country != nearestCountry) { + getData()->country = nearestCountry; + getData()->updated.notify(); } } -QPixmap IntroWidget::grabStep(int skip) { - return myGrab(step(skip), QRect(st::introSlideShift, 0, st::introSize.width(), st::introSize.height())); +void Widget::showControls() { + getStep()->show(); + _next->show(); + _next->setText(getStep()->nextButtonText()); + if (getStep()->hasCover()) { + _settings->hideFast(); + if (_update) _update->hideFast(); + if (_changeLanguage) _changeLanguage->showFast(); + } else { + _settings->showFast(); + if (_update) _update->showFast(); + if (_changeLanguage) _changeLanguage->hideFast(); + } + if (getStep()->hasBack()) { + _back->showFast(); + } else { + _back->hideFast(); + } } -void IntroWidget::animShow(const QPixmap &bgAnimCache, bool back) { +void Widget::hideControls() { + getStep()->hide(); + _next->hide(); + _settings->hideFast(); + if (_update) _update->hideFast(); + if (_changeLanguage) _changeLanguage->hideFast(); + _back->hideFast(); +} + +void Widget::animShow(const QPixmap &bgAnimCache, bool back) { if (App::app()) App::app()->mtpPause(); (back ? _cacheOver : _cacheUnder) = bgAnimCache; _a_show.stop(); - step()->show(); - _settings->show(); - if (_update) _update->show(); - if (step()->hasBack()) { - _back->showFast(); - } else { - _back->hideFast(); - } + showControls(); (back ? _cacheUnder : _cacheOver) = myGrab(this); - - step()->hide(); - _back->hideFast(); - _settings->hide(); - if (_update) _update->hide(); + hideControls(); a_coordUnder = back ? anim::ivalue(-st::slideShift, 0) : anim::ivalue(0, -st::slideShift); a_coordOver = back ? anim::ivalue(0, width()) : anim::ivalue(width(), 0); @@ -217,7 +320,7 @@ void IntroWidget::animShow(const QPixmap &bgAnimCache, bool back) { show(); } -void IntroWidget::step_show(float64 ms, bool timer) { +void Widget::step_show(float64 ms, bool timer) { float64 dt = ms / st::slideDuration; if (dt >= 1) { _a_show.stop(); @@ -228,13 +331,9 @@ void IntroWidget::step_show(float64 ms, bool timer) { _cacheUnder = _cacheOver = QPixmap(); - setFocus(); - step()->activate(); - if (step()->hasBack()) { - _back->showFast(); - } - _settings->show(); - if (_update) _update->show(); + showControls(); + getStep()->activate(); + if (App::app()) App::app()->mtpUnpause(); } else { a_coordUnder.update(dt, Window::SlideAnimation::transition()); @@ -244,37 +343,14 @@ void IntroWidget::step_show(float64 ms, bool timer) { if (timer) update(); } -void IntroWidget::stop_show() { - _a_show.stop(); -} - -void IntroWidget::step_stage(float64 ms, bool timer) { - float64 fullDuration = st::introSlideDelta + st::introSlideDuration, dt = ms / fullDuration; - float64 dt1 = (ms > st::introSlideDuration) ? 1 : (ms / st::introSlideDuration), dt2 = (ms > st::introSlideDelta) ? (ms - st::introSlideDelta) / (st::introSlideDuration) : 0; - if (dt >= 1) { - _a_stage.stop(); - - a_coordShow.finish(); - a_opacityShow.finish(); - - _cacheHide = _cacheShow = QPixmap(); - - setFocus(); - step()->activate(); - if (App::app()) App::app()->mtpUnpause(); - } else { - a_coordShow.update(dt2, anim::easeOutCirc); - a_opacityShow.update(dt2, anim::easeInCirc); - a_coordHide.update(dt1, anim::easeInCirc); - a_opacityHide.update(dt1, anim::easeOutCirc); - } - if (timer) update(); -} - -void IntroWidget::paintEvent(QPaintEvent *e) { +void Widget::paintEvent(QPaintEvent *e) { bool trivial = (rect() == e->rect()); setMouseTracking(true); + if (_coverShownAnimation.animating()) { + _coverShownAnimation.step(getms()); + } + QPainter p(this); if (!trivial) { p.setClipRect(e->rect()); @@ -290,130 +366,406 @@ void IntroWidget::paintEvent(QPaintEvent *e) { p.drawPixmap(a_coordOver.current(), 0, _cacheOver); p.setOpacity(a_shadow.current()); st::slideShadow.fill(p, QRect(a_coordOver.current() - st::slideShadow.width(), 0, st::slideShadow.width(), height())); - } else if (_a_stage.animating()) { - p.setOpacity(a_opacityHide.current()); - p.drawPixmap(step()->x() + st::introSlideShift + a_coordHide.current(), step()->y(), _cacheHide); - p.setOpacity(a_opacityShow.current()); - p.drawPixmap(step()->x() + st::introSlideShift + a_coordShow.current(), step()->y(), _cacheShow); } } -QRect IntroWidget::innerRect() const { - int innerWidth = st::introSize.width() + 2 * st::introSlideShift, innerHeight = st::introSize.height(); - return QRect((width() - innerWidth) / 2, (height() - innerHeight) / 2, innerWidth, (height() + innerHeight) / 2); +QRect Widget::calculateStepRect() const { + auto stepInnerTop = (height() - st::introHeight) / 2; + accumulate_max(stepInnerTop, st::introStepTopMin); + auto nextTop = stepInnerTop + st::introStepHeight; + auto additionalHeight = st::introStepHeightAdd; + auto stepWidth = width(); + auto stepHeight = nextTop + additionalHeight; + return QRect(0, 0, stepWidth, stepHeight); } -QString IntroWidget::currentCountry() const { - return _countryForReg; -} - -void IntroWidget::setPhone(const QString &phone, const QString &phone_hash, bool registered) { - _phone = phone; - _phone_hash = phone_hash; - _registered = registered; -} - -void IntroWidget::setCode(const QString &code) { - _code = code; -} - -void IntroWidget::setPwdSalt(const QByteArray &salt) { - _pwdSalt = salt; -} - -void IntroWidget::setHasRecovery(bool has) { - _hasRecovery = has; -} - -void IntroWidget::setPwdHint(const QString &hint) { - _pwdHint = hint; -} - -void IntroWidget::setCodeByTelegram(bool byTelegram) { - _codeByTelegram = byTelegram; -} - -void IntroWidget::setCallStatus(const CallStatus &status) { - _callStatus = status; -} - -const QString &IntroWidget::getPhone() const { - return _phone; -} - -const QString &IntroWidget::getPhoneHash() const { - return _phone_hash; -} - -const QString &IntroWidget::getCode() const { - return _code; -} - -const IntroWidget::CallStatus &IntroWidget::getCallStatus() const { - return _callStatus; -} - -const QByteArray &IntroWidget::getPwdSalt() const { - return _pwdSalt; -} - -bool IntroWidget::getHasRecovery() const { - return _hasRecovery; -} - -const QString &IntroWidget::getPwdHint() const { - return _pwdHint; -} - -bool IntroWidget::codeByTelegram() const { - return _codeByTelegram; -} - -void IntroWidget::resizeEvent(QResizeEvent *e) { - auto r = innerRect(); - for (auto step : _stepHistory) { - step->setGeometry(r); +void Widget::resizeEvent(QResizeEvent *e) { + auto stepRect = calculateStepRect(); + for_const (auto step, _stepHistory) { + step->setGeometry(stepRect); } + updateControlsGeometry(); } -void IntroWidget::updateControlsGeometry() { - _settings->moveToRight(st::boxButtonPadding.right(), st::boxButtonPadding.top()); +void Widget::moveControls() { +} + +void Widget::updateControlsGeometry() { + auto shown = _coverShownAnimation.current(1.); + + auto controlsTopTo = getStep()->hasCover() ? st::introCoverHeight : 0; + auto controlsTop = anim::interpolate(_controlsTopFrom, controlsTopTo, shown); + _settings->moveToRight(st::introSettingsSkip, controlsTop + st::introSettingsSkip); if (_update) { - _update->moveToRight(st::boxButtonPadding.right() + _settings->width() + st::boxButtonPadding.left(), _settings->y()); + _update->moveToRight(st::introSettingsSkip + _settings->width() + st::introSettingsSkip, _settings->y()); + } + _back->moveToLeft(0, controlsTop); + + auto nextTopTo = getStep()->contentTop() + st::introStepHeight; + auto nextTop = anim::interpolate(_nextTopFrom, nextTopTo, shown); + _next->moveToLeft((width() - _next->width()) / 2, nextTop); + if (_changeLanguage) { + _changeLanguage->moveToLeft((width() - _changeLanguage->width()) / 2, _next->y() + _next->height() + _changeLanguage->height()); + } + if (_resetAccount) { + _resetAccount->moveToLeft((width() - _resetAccount->width()) / 2, height() - st::introResetBottom - _resetAccount->height()); } } -void IntroWidget::finish(const MTPUser &user, const QImage &photo) { + +void Widget::keyPressEvent(QKeyEvent *e) { + if (_a_show.animating() || getStep()->animating()) return; + + if (e->key() == Qt::Key_Escape) { + if (getStep()->hasBack()) { + historyMove(Direction::Back); + } + } else if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return || e->key() == Qt::Key_Space) { + getStep()->submit(); + } +} + +Widget::~Widget() { + for (auto step : base::take(_stepHistory)) { + delete step; + } + if (App::wnd()) App::wnd()->noIntro(this); +} + +QString Widget::Step::nextButtonText() const { + return lang(lng_intro_next); +} + +void Widget::Step::finish(const MTPUser &user, QImage photo) { App::wnd()->setupMain(&user); + + // "this" is already deleted here by creating the main widget. if (!photo.isNull()) { App::app()->uploadProfilePhoto(photo, MTP::authedId()); } } -void IntroWidget::keyPressEvent(QKeyEvent *e) { - if (_a_show.animating() || _a_stage.animating()) return; +void Widget::Step::paintEvent(QPaintEvent *e) { + Painter p(this); + paintAnimated(p, e->rect()); +} - if (e->key() == Qt::Key_Escape) { - if (step()->hasBack()) { - onBack(); +void Widget::Step::resizeEvent(QResizeEvent *e) { + updateLabelsPosition(); +} + +void Widget::Step::updateLabelsPosition() { + myEnsureResized(_description->entity()); + if (hasCover()) { + _title->moveToLeft((width() - _title->width()) / 2, contentTop() + st::introCoverTitleTop); + _description->moveToLeft((width() - _description->width()) / 2, contentTop() + st::introCoverDescriptionTop); + } else { + _title->moveToLeft(contentLeft() + st::buttonRadius, contentTop() + st::introTitleTop); + _description->moveToLeft(contentLeft() + st::buttonRadius, contentTop() + st::introDescriptionTop); + } + if (_error) { + if (_errorCentered) { + _error->entity()->resizeToWidth(width()); } - } else if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return || e->key() == Qt::Key_Space) { - onStepSubmit(); + myEnsureResized(_error->entity()); + auto errorLeft = _errorCentered ? 0 : (contentLeft() + st::buttonRadius); + auto errorTop = contentTop() + (_errorBelowLink ? st::introErrorBelowLinkTop : st::introErrorTop); + _error->moveToLeft(errorLeft, errorTop); } } -void IntroWidget::rpcClear() { - for (IntroStep *step : _stepHistory) { - step->rpcClear(); +void Widget::Step::setTitleText(QString richText) { + _title->setRichText(richText); + updateLabelsPosition(); +} + +void Widget::Step::setDescriptionText(QString richText) { + _description->entity()->setRichText(richText); + updateLabelsPosition(); +} + +void Widget::Step::showFinished() { + _a_show.finish(); + _coverAnimation = CoverAnimation(); + _slideAnimation.reset(); + prepareCoverMask(); + activate(); + if (App::app()) App::app()->mtpUnpause(); +} + +bool Widget::Step::paintAnimated(Painter &p, QRect clip) { + if (_slideAnimation) { + _slideAnimation->paintFrame(p, (width() - st::introStepWidth) / 2, contentTop(), width(), getms()); + if (!_slideAnimation->animating()) { + showFinished(); + return false; + } + return true; + } + + auto guard = base::scope_guard([this, &p] { + if (hasCover()) paintCover(p, 0); + }); + + auto dt = _a_show.current(getms(), 1.); + if (!_a_show.animating()) { + if (_coverAnimation.title) { + showFinished(); + } + if (!QRect(0, contentTop(), width(), st::introStepHeight).intersects(clip)) { + return true; + } + return false; + } + + auto easeOut = anim::easeOutCirc(1., dt); + auto arrivingAlpha = easeOut; + auto departingAlpha = 1. - easeOut; + auto showCoverMethod = easeOut; + auto hideCoverMethod = easeOut; + auto coverTop = (hasCover() ? anim::interpolate(-st::introCoverHeight, 0, showCoverMethod) : anim::interpolate(0, -st::introCoverHeight, hideCoverMethod)); + + paintCover(p, coverTop); + guard.dismiss(); + + auto positionReady = hasCover() ? showCoverMethod : hideCoverMethod; + _coverAnimation.title->paintFrame(p, positionReady, departingAlpha, arrivingAlpha); + _coverAnimation.description->paintFrame(p, positionReady, departingAlpha, arrivingAlpha); + + paintContentSnapshot(p, _coverAnimation.contentSnapshotWas, departingAlpha, showCoverMethod); + paintContentSnapshot(p, _coverAnimation.contentSnapshotNow, arrivingAlpha, 1. - hideCoverMethod); + + return true; +} + +void Widget::Step::fillSentCodeData(const MTPauth_SentCodeType &type) { + switch (type.type()) { + case mtpc_auth_sentCodeTypeApp: { + getData()->codeByTelegram = true; + getData()->codeLength = type.c_auth_sentCodeTypeApp().vlength.v; + } break; + case mtpc_auth_sentCodeTypeSms: { + getData()->codeByTelegram = false; + getData()->codeLength = type.c_auth_sentCodeTypeSms().vlength.v; + } break; + case mtpc_auth_sentCodeTypeCall: { + getData()->codeByTelegram = false; + getData()->codeLength = type.c_auth_sentCodeTypeCall().vlength.v; + } break; + case mtpc_auth_sentCodeTypeFlashCall: LOG(("Error: should not be flashcall!")); break; } } -IntroWidget::~IntroWidget() { - while (!_stepHistory.isEmpty()) { - IntroStep *back = _stepHistory.back(); - _stepHistory.pop_back(); - delete back; - } - if (App::wnd()) App::wnd()->noIntro(this); +void Widget::Step::showDescription() { + _description->fadeIn(); } + +void Widget::Step::hideDescription() { + _description->fadeOut(); +} + +void Widget::Step::paintContentSnapshot(Painter &p, const QPixmap &snapshot, float64 alpha, float64 howMuchHidden) { + if (!snapshot.isNull()) { + auto contentTop = anim::interpolate(height() - (snapshot.height() / cIntRetinaFactor()), height(), howMuchHidden); + if (contentTop < height()) { + p.setOpacity(alpha); + p.drawPixmap(QPoint(contentLeft(), contentTop), snapshot, QRect(0, 0, snapshot.width(), (height() - contentTop) * cIntRetinaFactor())); + } + } +} + +void Widget::Step::prepareCoverMask() { + if (!_coverMask.isNull()) return; + + auto maskWidth = cIntRetinaFactor(); + auto maskHeight = st::introCoverHeight * cIntRetinaFactor(); + auto mask = QImage(maskWidth, maskHeight, QImage::Format_ARGB32_Premultiplied); + auto maskInts = reinterpret_cast(mask.bits()); + t_assert(mask.depth() == (sizeof(uint32) << 3)); + auto maskIntsPerLineAdded = (mask.bytesPerLine() >> 2) - maskWidth; + t_assert(maskIntsPerLineAdded >= 0); + auto realHeight = static_cast(maskHeight - 1); + for (auto y = 0; y != maskHeight; ++y) { + auto color = anim::color(st::introCoverTopBg, st::introCoverBottomBg, y / realHeight); + auto colorInt = anim::getPremultiplied(color); + for (auto x = 0; x != maskWidth; ++x) { + *maskInts++ = colorInt; + } + maskInts += maskIntsPerLineAdded; + } + _coverMask = App::pixmapFromImageInPlace(std_::move(mask)); +} + +void Widget::Step::paintCover(Painter &p, int top) { + auto coverHeight = top + st::introCoverHeight; + if (coverHeight > 0) { + p.drawPixmap(QRect(0, 0, width(), coverHeight), _coverMask, QRect(0, -top * cIntRetinaFactor(), _coverMask.width(), coverHeight * cIntRetinaFactor())); + } + + auto left = 0; + auto right = 0; + if (width() < st::introCoverMaxWidth) { + auto iconsMaxSkip = st::introCoverMaxWidth - st::introCoverLeft.width() - st::introCoverRight.width(); + auto iconsSkip = st::introCoverIconsMinSkip + (iconsMaxSkip - st::introCoverIconsMinSkip) * (width() - st::introStepWidth) / (st::introCoverMaxWidth - st::introStepWidth); + auto outside = iconsSkip + st::introCoverLeft.width() + st::introCoverRight.width() - width(); + left = -outside / 2; + right = -outside - left; + } + if (top < 0) { + auto shown = float64(coverHeight) / st::introCoverHeight; + auto leftShown = qRound(shown * (left + st::introCoverLeft.width())); + left = leftShown - st::introCoverLeft.width(); + auto rightShown = qRound(shown * (right + st::introCoverRight.width())); + right = rightShown - st::introCoverRight.width(); + } + st::introCoverLeft.paint(p, left, coverHeight - st::introCoverLeft.height(), width()); + st::introCoverRight.paint(p, width() - right - st::introCoverRight.width(), coverHeight - st::introCoverRight.height(), width()); + + auto planeLeft = (width() - st::introCoverIcon.width()) / 2 - st::introCoverIconLeft; + auto planeTop = top + st::introCoverIconTop; + if (top < 0 && !_hasCover) { + auto deltaLeft = -qRound(float64(st::introPlaneWidth / st::introPlaneHeight) * top); +// auto deltaTop = top; + planeLeft += deltaLeft; + // planeTop += top; + } + st::introCoverIcon.paint(p, planeLeft, planeTop, width()); +} + +int Widget::Step::contentLeft() const { + return (width() - st::introNextButton.width) / 2; +} + +int Widget::Step::contentTop() const { + auto result = height() - st::introStepHeight - st::introStepHeightAdd; + if (_hasCover) { + auto added = 1. - snap(float64(height() - st::windowMinHeight) / (st::introStepHeightFull - st::windowMinHeight), 0., 1.); + result += qRound(added * st::introStepHeightAdd); + } + return result; +} + +void Widget::Step::setErrorCentered(bool centered) { + _errorCentered = centered; + _error.destroy(); +} + +void Widget::Step::setErrorBelowLink(bool below) { + _errorBelowLink = below; + if (_error) { + updateLabelsPosition(); + } +} + +void Widget::Step::showError(const QString &text) { + _errorText = text; + if (_errorText.isEmpty()) { + if (_error) _error->fadeOut(); + } else { + if (!_error) { + auto &st = _errorCentered ? st::introErrorCentered : st::introError; + _error.create(this, new Ui::FlatLabel(this, st, st::introErrorTextStyle), base::lambda(), st::introErrorDuration); + _error->hideFast(); + } + _error->entity()->setText(text); + updateLabelsPosition(); + _error->fadeIn(); + } +} + +Widget::Step::Step(QWidget *parent, Data *data, bool hasCover) : TWidget(parent) +, _data(data) +, _hasCover(hasCover) +, _title(this, _hasCover ? st::introCoverTitle : st::introTitle, st::defaultTextStyle) +, _description(this, new Ui::FlatLabel(this, _hasCover ? st::introCoverDescription : st::introDescription, _hasCover ? st::introCoverDescriptionTextStyle : st::introDescriptionTextStyle), base::lambda(), st::introErrorDuration) { + hide(); +} + +void Widget::Step::prepareShowAnimated(Step *after) { + if (hasCover() || after->hasCover()) { + _coverAnimation = prepareCoverAnimation(after); + prepareCoverMask(); + } else { + auto leftSnapshot = after->prepareSlideAnimation(); + auto rightSnapshot = prepareSlideAnimation(); + _slideAnimation = std_::make_unique(); + _slideAnimation->setSnapshots(std_::move(leftSnapshot), std_::move(rightSnapshot)); + _slideAnimation->setOverflowHidden(false); + } +} + +Widget::Step::CoverAnimation Widget::Step::prepareCoverAnimation(Step *after) { + auto result = CoverAnimation(); + result.title = Ui::FlatLabel::CrossFade(after->_title, _title, st::introBg); + result.description = Ui::FlatLabel::CrossFade(after->_description->entity(), _description->entity(), st::introBg, after->_description->pos(), _description->pos()); + result.contentSnapshotWas = after->prepareContentSnapshot(); + result.contentSnapshotNow = prepareContentSnapshot(); + return std_::move(result); +} + +QPixmap Widget::Step::prepareContentSnapshot() { + auto otherTop = _description->y() + _description->height(); + auto otherRect = myrtlrect(contentLeft(), otherTop, st::introStepWidth, height() - otherTop); + return myGrab(this, otherRect); +} + +QPixmap Widget::Step::prepareSlideAnimation() { + auto grabLeft = (width() - st::introStepWidth) / 2; + auto grabTop = contentTop(); + return myGrab(this, QRect(grabLeft, grabTop, st::introStepWidth, st::introStepHeight)); +} + +void Widget::Step::showAnimated(Direction direction) { + show(); + if (App::app()) App::app()->mtpPause(); + hideChildren(); + if (_slideAnimation) { + auto slideLeft = (direction == Direction::Back); + _slideAnimation->start(slideLeft, [this] { update(0, contentTop(), width(), st::introStepHeight); }, st::introSlideDuration); + } else { + _a_show.start([this] { update(); }, 0., 1., st::introCoverDuration); + } +} + +void Widget::Step::setGoCallback(base::lambda &&callback) { + _goCallback = std_::move(callback); +} + +void Widget::Step::setShowResetCallback(base::lambda &&callback) { + _showResetCallback = std_::move(callback); +} + +void Widget::Step::showFast() { + show(); + showFinished(); +} + +bool Widget::Step::animating() const { + return (_slideAnimation && _slideAnimation->animating()) || _a_show.animating(); +} + +bool Widget::Step::hasCover() const { + return _hasCover; +} + +bool Widget::Step::hasBack() const { + return false; +} + +void Widget::Step::activate() { + _title->show(); + _description->show(); + if (!_errorText.isEmpty()) { + _error->showFast(); + } +} + +void Widget::Step::cancelled() { +} + +void Widget::Step::finished() { + hide(); +} + +} // namespace Intro diff --git a/Telegram/SourceFiles/intro/introwidget.h b/Telegram/SourceFiles/intro/introwidget.h index ed639e01b..07c0addd4 100644 --- a/Telegram/SourceFiles/intro/introwidget.h +++ b/Telegram/SourceFiles/intro/introwidget.h @@ -23,77 +23,32 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org namespace Ui { class IconButton; class RoundButton; +class LinkButton; +class SlideAnimation; +class CrossFadeAnimation; +class FlatLabel; template class WidgetFadeWrap; } // namespace Ui -class IntroStep; -class IntroWidget : public TWidget, public RPCSender { +namespace Intro { + +class Widget : public TWidget, public RPCSender { Q_OBJECT public: - IntroWidget(QWidget *window); + Widget(QWidget *parent); void animShow(const QPixmap &bgAnimCache, bool back = false); - void step_show(float64 ms, bool timer); - void stop_show(); + void setInnerFocus(); - void step_stage(float64 ms, bool timer); - - QRect innerRect() const; - QString currentCountry() const; - - enum CallStatusType { - CallWaiting, - CallCalling, - CallCalled, - CallDisabled, - }; - struct CallStatus { - CallStatusType type; - int timeout; - }; - void setPhone(const QString &phone, const QString &phone_hash, bool registered); - void setCode(const QString &code); - void setCallStatus(const CallStatus &status); - void setPwdSalt(const QByteArray &salt); - void setHasRecovery(bool hasRecovery); - void setPwdHint(const QString &hint); - void setCodeByTelegram(bool byTelegram); - - const QString &getPhone() const; - const QString &getPhoneHash() const; - const QString &getCode() const; - const CallStatus &getCallStatus() const; - const QByteArray &getPwdSalt() const; - bool getHasRecovery() const; - const QString &getPwdHint() const; - bool codeByTelegram() const; - - void finish(const MTPUser &user, const QImage &photo = QImage()); - - void rpcClear() override; - void langChangeTo(int32 langId); - - void nextStep(IntroStep *step) { - pushStep(step, MoveForward); - } - void replaceStep(IntroStep *step) { - pushStep(step, MoveReplace); - } - - ~IntroWidget(); + ~Widget(); protected: void paintEvent(QPaintEvent *e) override; void resizeEvent(QResizeEvent *e) override; void keyPressEvent(QKeyEvent *e) override; -public slots: - void onStepSubmit(); - void onBack(); - void onChangeLang(); - signals: void countryChanged(); @@ -102,86 +57,199 @@ private slots: void onCheckUpdateStatus(); #endif // TDESKTOP_DISABLE_AUTOUPDATE + // Internal interface. +public: + struct Data { + QString country; + QString phone; + QString phoneHash; + bool phoneIsRegistered = false; + + enum class CallStatus { + Waiting, + Calling, + Called, + Disabled, + }; + CallStatus callStatus = CallStatus::Disabled; + int callTimeout = 0; + + QString code; + int codeLength = 5; + bool codeByTelegram = false; + + QByteArray pwdSalt; + bool hasRecovery = false; + QString pwdHint; + + base::Observable updated; + + }; + + enum class Direction { + Back, + Forward, + Replace, + }; + class Step : public TWidget, public RPCSender { + public: + Step(QWidget *parent, Data *data, bool hasCover = false); + + virtual void setInnerFocus() { + setFocus(); + } + + void setGoCallback(base::lambda &&callback); + void setShowResetCallback(base::lambda &&callback); + + void prepareShowAnimated(Step *after); + void showAnimated(Direction direction); + void showFast(); + bool animating() const; + + bool hasCover() const; + virtual bool hasBack() const; + virtual void activate(); + virtual void cancelled(); + virtual void finished(); + + virtual void submit() = 0; + virtual QString nextButtonText() const; + + int contentLeft() const; + int contentTop() const; + + void setErrorCentered(bool centered); + void setErrorBelowLink(bool below); + void showError(const QString &text); + void hideError() { + showError(QString()); + } + + protected: + void paintEvent(QPaintEvent *e) override; + void resizeEvent(QResizeEvent *e) override; + + void setTitleText(QString richText); + void setDescriptionText(QString richText); + bool paintAnimated(Painter &p, QRect clip); + + void fillSentCodeData(const MTPauth_SentCodeType &type); + + void showDescription(); + void hideDescription(); + + Data *getData() const { + return _data; + } + void finish(const MTPUser &user, QImage photo = QImage()); + + void goBack() { + if (_goCallback) _goCallback(nullptr, Direction::Back); + } + void goNext(Step *step) { + if (_goCallback) _goCallback(step, Direction::Forward); + } + void goReplace(Step *step) { + if (_goCallback) _goCallback(step, Direction::Replace); + } + void showResetButton() { + if (_showResetCallback) _showResetCallback(); + } + + private: + struct CoverAnimation { + std_::unique_ptr title; + std_::unique_ptr description; + + // From content top till the next button top. + QPixmap contentSnapshotWas; + QPixmap contentSnapshotNow; + }; + void updateLabelsPosition(); + void paintContentSnapshot(Painter &p, const QPixmap &snapshot, float64 alpha, float64 howMuchHidden); + + CoverAnimation prepareCoverAnimation(Step *step); + QPixmap prepareContentSnapshot(); + QPixmap prepareSlideAnimation(); + void showFinished(); + + void prepareCoverMask(); + void paintCover(Painter &p, int top); + + Data *_data = nullptr; + bool _hasCover = false; + base::lambda _goCallback; + base::lambda _showResetCallback; + + ChildWidget _title; + ChildWidget> _description; + + bool _errorCentered = false; + bool _errorBelowLink = false; + QString _errorText; + ChildWidget> _error = { nullptr }; + + FloatAnimation _a_show; + CoverAnimation _coverAnimation; + std_::unique_ptr _slideAnimation; + QPixmap _coverMask; + + }; + private: + void step_show(float64 ms, bool timer); + + void changeLanguage(int32 languageId); void updateControlsGeometry(); - QPixmap grabStep(int skip = 0); + Data *getData() { + return &_data; + } - int _langChangeTo = 0; + void fixOrder(); + void showControls(); + void hideControls(); + void moveControls(); + QRect calculateStepRect() const; - Animation _a_stage; - QPixmap _cacheHide, _cacheShow; - int _cacheHideIndex = 0; - int _cacheShowIndex = 0; - anim::ivalue a_coordHide, a_coordShow; - anim::fvalue a_opacityHide, a_opacityShow; + void showResetButton(); + void resetAccount(); + void resetAccountSure(); + void resetDone(const MTPBool &result); + bool resetFail(const RPCError &error); Animation _a_show; QPixmap _cacheUnder, _cacheOver; anim::ivalue a_coordUnder, a_coordOver; anim::fvalue a_shadow; - QVector _stepHistory; - IntroStep *step(int skip = 0) { + QVector _stepHistory; + Step *getStep(int skip = 0) { t_assert(_stepHistory.size() + skip > 0); return _stepHistory.at(_stepHistory.size() - skip - 1); } - enum MoveType { - MoveBack, - MoveForward, - MoveReplace, - }; - void historyMove(MoveType type); - void pushStep(IntroStep *step, MoveType type); + void historyMove(Direction direction); + void moveToStep(Step *step, Direction direction); + void appendStep(Step *step); void gotNearestDC(const MTPNearestDc &dc); - QString _countryForReg; + Data _data; - QString _phone, _phone_hash; - CallStatus _callStatus = { CallDisabled, 0 }; - bool _registered = false; - - QString _code; - - QByteArray _pwdSalt; - bool _hasRecovery = false; - bool _codeByTelegram = false; - QString _pwdHint; - - QString _firstname, _lastname; + FloatAnimation _coverShownAnimation; + int _nextTopFrom = 0; + int _controlsTopFrom = 0; ChildWidget> _back; - ChildWidget _settings; - ChildWidget _update = { nullptr }; + ChildWidget> _update = { nullptr }; + ChildWidget> _settings; - float64 _backFrom = 0.; - float64 _backTo = 0.; + ChildWidget _next; + ChildWidget> _changeLanguage = { nullptr }; + ChildWidget> _resetAccount = { nullptr }; + + mtpRequestId _resetRequest = 0; }; -class IntroStep : public TWidget, public RPCSender { -public: - IntroStep(IntroWidget *parent) : TWidget(parent) { - } - - virtual bool hasBack() const { - return false; - } - virtual void activate() { - show(); - } - virtual void cancelled() { - } - virtual void finished() { - hide(); - } - virtual void onSubmit() = 0; - -protected: - IntroWidget *intro() { - IntroWidget *result = qobject_cast(parentWidget()); - t_assert(result != nullptr); - return result; - } - -}; +} // namespace Intro diff --git a/Telegram/SourceFiles/localstorage.h b/Telegram/SourceFiles/localstorage.h index d871cc80a..6cadf5a41 100644 --- a/Telegram/SourceFiles/localstorage.h +++ b/Telegram/SourceFiles/localstorage.h @@ -173,7 +173,6 @@ class Manager : public QObject { Q_OBJECT public: - Manager(); void writeMap(bool fast); @@ -182,13 +181,11 @@ public: void writingLocations(); void finish(); - public slots: - +public slots: void mapWriteTimeout(); void locationsWriteTimeout(); private: - QTimer _mapWriteTimer; QTimer _locationsWriteTimer; diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index 46c7b2ae9..994738a65 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -2269,7 +2269,7 @@ void MainWidget::ui_showPeerHistory(quint64 peerId, qint32 showAtMsgId, Ui::Show _topBar->hide(); _history->hide(); if (!_a_show.animating()) { - if (!animationParams.oldContentCache.isNull()) { + if (!animationParams.oldContentCache.isNull() && !App::passcoded()) { _dialogs->showAnimated(back ? Window::SlideDirection::FromLeft : Window::SlideDirection::FromRight, animationParams); } else { _dialogs->showFast(); diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp index b9d1853c8..7ea3b6d6c 100644 --- a/Telegram/SourceFiles/mainwindow.cpp +++ b/Telegram/SourceFiles/mainwindow.cpp @@ -213,11 +213,7 @@ void MainWindow::clearWidgets() { Ui::hideLayer(true); _passcode.destroyDelayed(); _main.destroy(); - if (_intro) { - _intro->stop_show(); - _intro->rpcClear(); - _intro.destroyDelayed(); - } + _intro.destroy(); if (_mediaView) { hideMediaview(); _mediaView->rpcClear(); @@ -229,10 +225,10 @@ QPixmap MainWindow::grabInner() { QPixmap result; if (_intro) { result = myGrab(_intro); - } else if (_main) { - result = myGrab(_main); } else if (_passcode) { result = myGrab(_passcode); + } else if (_main) { + result = myGrab(_main); } return result; } @@ -240,10 +236,9 @@ QPixmap MainWindow::grabInner() { void MainWindow::clearPasscode() { if (!_passcode) return; - QPixmap bg = grabInner(); + auto bg = grabInner(); - _passcode->stop_show(); - _passcode.destroyDelayed(); + _passcode.destroy(); if (_intro) { _intro->animShow(bg, true); } else { @@ -260,10 +255,6 @@ void MainWindow::clearPasscode() { void MainWindow::setupPasscode() { auto animated = (_main || _intro); auto bg = animated ? grabInner() : QPixmap(); - if (_passcode) { - _passcode->stop_show(); - _passcode.destroyDelayed(); - } _passcode.create(bodyWidget()); updateControlsGeometry(); @@ -446,10 +437,6 @@ void MainWindow::updateConnectingStatus() { } } -IntroWidget *MainWindow::introWidget() { - return _intro; -} - MainWidget *MainWindow::mainWidget() { return _main; } @@ -650,6 +637,8 @@ void MainWindow::setInnerFocus() { _settings->setInnerFocus(); } else if (_main) { _main->setInnerFocus(); + } else if (_intro) { + _intro->setInnerFocus(); } } @@ -834,7 +823,7 @@ void MainWindow::activate() { } } -void MainWindow::noIntro(IntroWidget *was) { +void MainWindow::noIntro(Intro::Widget *was) { if (was == _intro) { _intro = nullptr; } diff --git a/Telegram/SourceFiles/mainwindow.h b/Telegram/SourceFiles/mainwindow.h index 452b41611..aadff4956 100644 --- a/Telegram/SourceFiles/mainwindow.h +++ b/Telegram/SourceFiles/mainwindow.h @@ -27,11 +27,14 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org class MediaView; class PasscodeWidget; -class IntroWidget; class MainWidget; class LayerStackWidget; class LayerWidget; +namespace Intro { +class Widget; +} // namespace Intro + namespace Local { class ClearManager; } // namespace Local @@ -99,7 +102,6 @@ public: void mtpStateChanged(int32 dc, int32 state); - IntroWidget *introWidget(); MainWidget *mainWidget(); PasscodeWidget *passcodeWidget(); @@ -112,7 +114,7 @@ public: void activate(); - void noIntro(IntroWidget *was); + void noIntro(Intro::Widget *was); void noMain(MainWidget *was); void noLayerStack(LayerStackWidget *was); void layerFinishedHide(LayerStackWidget *was); @@ -239,7 +241,7 @@ private: mtpRequestId _serviceHistoryRequest = 0; ChildWidget _passcode = { nullptr }; - ChildWidget _intro = { nullptr }; + ChildWidget _intro = { nullptr }; ChildWidget _main = { nullptr }; ChildWidget _settings = { nullptr }; ChildWidget _layerBg = { nullptr }; diff --git a/Telegram/SourceFiles/mtproto/connection_http.h b/Telegram/SourceFiles/mtproto/connection_http.h index 54f3af11d..e52feaae7 100644 --- a/Telegram/SourceFiles/mtproto/connection_http.h +++ b/Telegram/SourceFiles/mtproto/connection_http.h @@ -30,7 +30,6 @@ class HTTPConnection : public AbstractConnection { Q_OBJECT public: - HTTPConnection(QThread *thread); void sendData(mtpBuffer &buffer) override; @@ -46,15 +45,13 @@ public: QString transport() const override; - public slots: - +public slots: void requestFinished(QNetworkReply *reply); static mtpBuffer handleResponse(QNetworkReply *reply); static bool handleError(QNetworkReply *reply); // returnes "maybe bad key" private: - enum Status { WaitingHttp = 0, UsingHttp, diff --git a/Telegram/SourceFiles/mtproto/facade.cpp b/Telegram/SourceFiles/mtproto/facade.cpp index a09c9842c..c1f10068b 100644 --- a/Telegram/SourceFiles/mtproto/facade.cpp +++ b/Telegram/SourceFiles/mtproto/facade.cpp @@ -754,7 +754,7 @@ void ping() { } void cancel(mtpRequestId requestId) { - if (!_started) return; + if (!_started || !requestId) return; mtpMsgId msgId = 0; requestsDelays.remove(requestId); diff --git a/Telegram/SourceFiles/passcodewidget.cpp b/Telegram/SourceFiles/passcodewidget.cpp index 2da778aa9..f508036f2 100644 --- a/Telegram/SourceFiles/passcodewidget.cpp +++ b/Telegram/SourceFiles/passcodewidget.cpp @@ -29,14 +29,13 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "ui/widgets/buttons.h" #include "ui/widgets/input_fields.h" #include "styles/style_boxes.h" -#include "window/slide_animation.h" +#include "window/window_slide_animation.h" PasscodeWidget::PasscodeWidget(QWidget *parent) : TWidget(parent) , _a_show(animation(this, &PasscodeWidget::step_show)) , _passcode(this, st::passcodeInput) , _submit(this, lang(lng_passcode_submit), st::passcodeSubmit) , _logout(this, lang(lng_passcode_logout)) { - _passcode->setEchoMode(QLineEdit::Password); connect(_passcode, SIGNAL(changed()), this, SLOT(onChanged())); connect(_passcode, SIGNAL(submitted(bool)), this, SLOT(onSubmit())); @@ -49,12 +48,12 @@ PasscodeWidget::PasscodeWidget(QWidget *parent) : TWidget(parent) void PasscodeWidget::onSubmit() { if (_passcode->text().isEmpty()) { - _passcode->notaBene(); + _passcode->showError(); return; } if (!passcodeCanTry()) { _error = lang(lng_flood_error); - _passcode->notaBene(); + _passcode->showError(); update(); return; } @@ -62,7 +61,8 @@ void PasscodeWidget::onSubmit() { if (App::main()) { if (Local::checkPasscode(_passcode->text().toUtf8())) { cSetPasscodeBadTries(0); - App::wnd()->clearPasscode(); + App::wnd()->clearPasscode(); // Destroys this widget. + return; } else { cSetPasscodeBadTries(cPasscodeBadTries() + 1); cSetPasscodeLastTry(getms(true)); @@ -93,7 +93,7 @@ void PasscodeWidget::onSubmit() { void PasscodeWidget::onError() { _error = lang(lng_passcode_wrong); _passcode->selectAll(); - _passcode->notaBene(); + _passcode->showError(); update(); } diff --git a/Telegram/SourceFiles/passcodewidget.h b/Telegram/SourceFiles/passcodewidget.h index ab41cde0a..79a789e44 100644 --- a/Telegram/SourceFiles/passcodewidget.h +++ b/Telegram/SourceFiles/passcodewidget.h @@ -21,7 +21,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #pragma once namespace Ui { -class FlatInput; +class PasswordInput; class LinkButton; class RoundButton; } // namespace Ui @@ -56,7 +56,7 @@ private: anim::ivalue a_coordUnder, a_coordOver; anim::fvalue a_shadow; - ChildWidget _passcode; + ChildWidget _passcode; ChildWidget _submit; ChildWidget _logout; QString _error; diff --git a/Telegram/SourceFiles/settings/settings_privacy_widget.cpp b/Telegram/SourceFiles/settings/settings_privacy_widget.cpp index 673c73e72..dbc6608c2 100644 --- a/Telegram/SourceFiles/settings/settings_privacy_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_privacy_widget.cpp @@ -144,7 +144,7 @@ void CloudPasswordState::getPasswordDone(const MTPaccount_Password &result) { void CloudPasswordState::paintEvent(QPaintEvent *e) { Painter p(this); - auto text = st::linkFont->elided(_waitingConfirm, width() - _turnOff->width()); + auto text = st::boxTextFont->elided(_waitingConfirm, width() - _turnOff->width() - st::boxTextFont->spacew); if (!text.isEmpty()) { p.setPen(st::windowFg); p.setFont(st::boxTextFont); diff --git a/Telegram/SourceFiles/stickers/stickers.style b/Telegram/SourceFiles/stickers/stickers.style index e4efb2a69..17e742b40 100644 --- a/Telegram/SourceFiles/stickers/stickers.style +++ b/Telegram/SourceFiles/stickers/stickers.style @@ -149,7 +149,6 @@ emojiPanShowDuration: 200; emojiPanDuration: 200; emojiPanHover: windowBgOver; emojiPanSlideDuration: 200; -emojiPanSlideDelta: 0; // between hide start and show start emojiPanHeader: 42px; emojiPanHeaderFont: semiboldFont; diff --git a/Telegram/SourceFiles/ui/abstract_button.cpp b/Telegram/SourceFiles/ui/abstract_button.cpp index 0ce112850..3bc62ce8a 100644 --- a/Telegram/SourceFiles/ui/abstract_button.cpp +++ b/Telegram/SourceFiles/ui/abstract_button.cpp @@ -73,8 +73,9 @@ void AbstractButton::mouseReleaseEvent(QMouseEvent *e) { _modifiers = e->modifiers(); if (_clickedCallback) { _clickedCallback(); + } else { + emit clicked(); } - emit clicked(); } else { leaveEvent(e); } diff --git a/Telegram/SourceFiles/ui/animation.h b/Telegram/SourceFiles/ui/animation.h index 05118319e..f27f1006f 100644 --- a/Telegram/SourceFiles/ui/animation.h +++ b/Telegram/SourceFiles/ui/animation.h @@ -269,6 +269,14 @@ FORCE_INLINE Shifted shifted(QColor color) { return reshifted(components * alpha); } +FORCE_INLINE uint32 getPremultiplied(QColor color) { + // Make it premultiplied. + auto alpha = static_cast((color.alpha() & 0xFF) + 1); + auto components = Shifted(static_cast(color.blue() & 0xFF) | (static_cast(color.green() & 0xFF) << 16), + static_cast(color.red() & 0xFF) | (static_cast(255) << 16)); + return unshifted(components * alpha); +} + FORCE_INLINE uint32 getAlpha(Shifted components) { return (components.high & 0x00FF0000U) >> 16; } @@ -344,6 +352,16 @@ FORCE_INLINE Shifted shifted(QColor color) { return reshifted(components * alpha); } +FORCE_INLINE uint32 getPremultiplied(QColor color) { + // Make it premultiplied. + auto alpha = static_cast((color.alpha() & 0xFF) + 1); + auto components = static_cast(color.blue() & 0xFF) + | (static_cast(color.green() & 0xFF) << 16) + | (static_cast(color.red() & 0xFF) << 32) + | (static_cast(255) << 48); + return unshifted(components * alpha); +} + FORCE_INLINE uint32 getAlpha(Shifted components) { return (components.value & 0x00FF000000000000ULL) >> 48; } diff --git a/Telegram/SourceFiles/ui/buttons/peer_avatar_button.cpp b/Telegram/SourceFiles/ui/buttons/peer_avatar_button.cpp index 246ecab7f..10b69d6ec 100644 --- a/Telegram/SourceFiles/ui/buttons/peer_avatar_button.cpp +++ b/Telegram/SourceFiles/ui/buttons/peer_avatar_button.cpp @@ -40,7 +40,8 @@ void PeerAvatarButton::paintEvent(QPaintEvent *e) { } } -NewAvatarButton::NewAvatarButton(QWidget *parent, int size) : RippleButton(parent, st::defaultActiveButton.ripple) { +NewAvatarButton::NewAvatarButton(QWidget *parent, int size, QPoint position) : RippleButton(parent, st::defaultActiveButton.ripple) +, _position(position) { resize(size, size); } @@ -58,7 +59,7 @@ void NewAvatarButton::paintEvent(QPaintEvent *e) { paintRipple(p, 0, 0, getms()); - st::newGroupPhotoIcon.paint(p, st::newGroupPhotoIconPosition, width()); + st::newGroupPhotoIcon.paint(p, _position, width()); } void NewAvatarButton::setImage(const QImage &image) { diff --git a/Telegram/SourceFiles/ui/buttons/peer_avatar_button.h b/Telegram/SourceFiles/ui/buttons/peer_avatar_button.h index dbd5357b5..d2f485085 100644 --- a/Telegram/SourceFiles/ui/buttons/peer_avatar_button.h +++ b/Telegram/SourceFiles/ui/buttons/peer_avatar_button.h @@ -47,7 +47,7 @@ private: class NewAvatarButton : public RippleButton { public: - NewAvatarButton(QWidget *parent, int size); + NewAvatarButton(QWidget *parent, int size, QPoint position); void setImage(const QImage &image); @@ -58,6 +58,7 @@ protected: private: QPixmap _image; + QPoint _position; }; diff --git a/Telegram/SourceFiles/ui/countryinput.cpp b/Telegram/SourceFiles/ui/countryinput.cpp index 50e68012a..da9d3a94f 100644 --- a/Telegram/SourceFiles/ui/countryinput.cpp +++ b/Telegram/SourceFiles/ui/countryinput.cpp @@ -28,6 +28,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "boxes/contactsbox.h" #include "countries.h" #include "styles/style_boxes.h" +#include "styles/style_intro.h" namespace { @@ -89,50 +90,33 @@ QString findValidCode(QString fullCode) { return ""; } -CountryInput::CountryInput(QWidget *parent, const style::countryInput &st) : QWidget(parent), _st(st), _active(false), _text(lang(lng_country_code)) { +CountryInput::CountryInput(QWidget *parent, const style::InputField &st) : TWidget(parent) +, _st(st) +, _text(lang(lng_country_code)) { initCountries(); - - resize(_st.width, _st.height + _st.ptrSize.height()); - QImage trImage(_st.ptrSize.width(), _st.ptrSize.height(), QImage::Format_ARGB32_Premultiplied); - { - static const QPoint trPoints[3] = { - QPoint(0, 0), - QPoint(_st.ptrSize.width(), 0), - QPoint(qCeil(trImage.width() / 2.), trImage.height()) - }; - QPainter p(&trImage); - p.setRenderHint(QPainter::Antialiasing); - p.setCompositionMode(QPainter::CompositionMode_Source); - p.fillRect(0, 0, trImage.width(), trImage.height(), Qt::transparent); - - p.setPen(Qt::NoPen); - p.setBrush(_st.bgColor); - p.drawPolygon(trPoints, 3); - } - _arrow = App::pixmapFromImageInPlace(std_::move(trImage)); - _inner = QRect(0, 0, _st.width, _st.height); - _arrowRect = QRect((st::introCountryCode.width - _arrow.width() - 1) / 2, _st.height, _arrow.width(), _arrow.height()); + resize(_st.width, _st.height); } void CountryInput::paintEvent(QPaintEvent *e) { - QPainter p(this); + Painter p(this); - p.setRenderHint(QPainter::HighQualityAntialiasing); - p.setBrush(_st.bgColor); - p.setPen(Qt::NoPen); - p.drawRoundedRect(_inner, st::buttonRadius, st::buttonRadius); - p.setRenderHint(QPainter::HighQualityAntialiasing, false); + QRect r(rect().intersected(e->rect())); + if (_st.textBg->c.alphaF() > 0.) { + p.fillRect(r, _st.textBg); + } + if (_st.border) { + p.fillRect(0, height() - _st.border, width(), _st.border, _st.borderFg->b); + } - p.drawPixmap(_arrowRect.x(), _arrowRect.top(), _arrow); + st::introCountryIcon.paint(p, width() - st::introCountryIcon.width() - st::introCountryIconPosition.x(), st::introCountryIconPosition.y(), width()); p.setFont(_st.font); - p.setPen(st::windowFg); - - p.drawText(rect().marginsRemoved(_st.textMrg), _text, QTextOption(_st.align)); + p.setPen(_st.textFg); + p.drawText(rect().marginsRemoved(_st.textMargins), _text, _st.textAlign); } void CountryInput::mouseMoveEvent(QMouseEvent *e) { - bool newActive = _inner.contains(e->pos()) || _arrowRect.contains(e->pos()); + bool newActive = rect().contains(e->pos()); if (_active != newActive) { _active = newActive; setCursor(_active ? style::cur_pointer : style::cur_default); @@ -192,7 +176,7 @@ bool CountryInput::onChooseCountry(const QString &iso) { } void CountryInput::setText(const QString &newText) { - _text = _st.font->elided(newText, width() - _st.textMrg.left() - _st.textMrg.right()); + _text = _st.font->elided(newText, width() - _st.textMargins.left() - _st.textMargins.right()); } CountrySelectBox::CountrySelectBox() : ItemListBox(st::countriesScroll, st::boxWidth) diff --git a/Telegram/SourceFiles/ui/countryinput.h b/Telegram/SourceFiles/ui/countryinput.h index 4e0503019..ae3b03bbc 100644 --- a/Telegram/SourceFiles/ui/countryinput.h +++ b/Telegram/SourceFiles/ui/countryinput.h @@ -22,7 +22,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "ui/effects/rect_shadow.h" #include "boxes/abstractbox.h" -#include "styles/style_intro.h" +#include "styles/style_widgets.h" QString findValidCode(QString fullCode); @@ -30,11 +30,11 @@ namespace Ui { class MultiSelect; } // namespace Ui -class CountryInput : public QWidget { +class CountryInput : public TWidget { Q_OBJECT public: - CountryInput(QWidget *parent, const style::countryInput &st); + CountryInput(QWidget *parent, const style::InputField &st); public slots: void onChooseCode(const QString &code); @@ -53,10 +53,8 @@ protected: private: void setText(const QString &newText); - QPixmap _arrow; - QRect _inner, _arrowRect; - const style::countryInput &_st; - bool _active; + const style::InputField &_st; + bool _active = false; QString _text; }; diff --git a/Telegram/SourceFiles/ui/effects/slide_animation.cpp b/Telegram/SourceFiles/ui/effects/slide_animation.cpp new file mode 100644 index 000000000..9ebdfc002 --- /dev/null +++ b/Telegram/SourceFiles/ui/effects/slide_animation.cpp @@ -0,0 +1,67 @@ +/* +This file is part of Telegram Desktop, +the official desktop version of Telegram messaging app, see https://telegram.org + +Telegram Desktop is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE +Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org +*/ +#include "stdafx.h" +#include "ui/effects/slide_animation.h" + +namespace Ui { + +void SlideAnimation::setSnapshots(QPixmap leftSnapshot, QPixmap rightSnapshot) { + _leftSnapshot = std_::move(leftSnapshot); + _rightSnapshot = std_::move(rightSnapshot); + t_assert(!_leftSnapshot.isNull()); + t_assert(!_rightSnapshot.isNull()); + _leftSnapshot.setDevicePixelRatio(cRetinaFactor()); + _rightSnapshot.setDevicePixelRatio(cRetinaFactor()); +} + +void SlideAnimation::paintFrame(Painter &p, int x, int y, int outerWidth, uint64 ms) { + auto dt = _animation.current(ms, 1.); + if (!animating()) return; + + auto easeOut = anim::easeOutCirc(1., dt); + auto easeIn = anim::easeInCirc(1., dt); + auto arrivingAlpha = easeIn; + auto departingAlpha = 1. - easeOut; + auto leftCoord = (_slideLeft ? anim::interpolate(-_leftSnapshotWidth, 0, easeOut) : anim::interpolate(0, -_leftSnapshotWidth, easeIn)); + auto leftAlpha = (_slideLeft ? arrivingAlpha : departingAlpha); + auto rightCoord = (_slideLeft ? anim::interpolate(0, _rightSnapshotWidth, easeIn) : anim::interpolate(_rightSnapshotWidth, 0, easeOut)); + auto rightAlpha = (_slideLeft ? departingAlpha : arrivingAlpha); + + if (_overflowHidden) { + auto leftWidth = (_leftSnapshotWidth + leftCoord); + if (leftWidth > 0) { + p.setOpacity(leftAlpha); + p.drawPixmap(x, y, leftWidth, _leftSnapshotHeight, _leftSnapshot, (_leftSnapshot.width() - leftWidth * cIntRetinaFactor()), 0, leftWidth * cIntRetinaFactor(), _leftSnapshot.height()); + } + auto rightWidth = _rightSnapshotWidth - rightCoord; + if (rightWidth > 0) { + p.setOpacity(rightAlpha); + p.drawPixmap(x + rightCoord, y, _rightSnapshot, 0, 0, rightWidth * cIntRetinaFactor(), _rightSnapshot.height()); + } + } else { + p.setOpacity(leftAlpha); + p.drawPixmap(x + leftCoord, y, _leftSnapshot); + p.setOpacity(rightAlpha); + p.drawPixmap(x + rightCoord, y, _rightSnapshot); + } +} + +} // namespace Ui diff --git a/Telegram/SourceFiles/ui/effects/slide_animation.h b/Telegram/SourceFiles/ui/effects/slide_animation.h new file mode 100644 index 000000000..ddbb5c4b8 --- /dev/null +++ b/Telegram/SourceFiles/ui/effects/slide_animation.h @@ -0,0 +1,66 @@ +/* +This file is part of Telegram Desktop, +the official desktop version of Telegram messaging app, see https://telegram.org + +Telegram Desktop is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE +Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org +*/ +#pragma once + +namespace Ui { + +class SlideAnimation { +public: + void setSnapshots(QPixmap leftSnapshot, QPixmap rightSnapshot); + + void setOverflowHidden(bool hidden) { + _overflowHidden = hidden; + } + + template + void start(bool slideLeft, Lambda &&updateCallback, float64 duration); + + void paintFrame(Painter &p, int x, int y, int outerWidth, uint64 ms); + + bool animating() const { + return _animation.animating(); + } + +private: + FloatAnimation _animation; + QPixmap _leftSnapshot; + QPixmap _rightSnapshot; + bool _slideLeft = false; + bool _overflowHidden = true; + int _leftSnapshotWidth = 0; + int _leftSnapshotHeight = 0; + int _rightSnapshotWidth = 0; + +}; + +template +void SlideAnimation::start(bool slideLeft, Lambda &&updateCallback, float64 duration) { + _slideLeft = slideLeft; + if (_slideLeft) { + std_::swap_moveable(_leftSnapshot, _rightSnapshot); + } + _leftSnapshotWidth = _leftSnapshot.width() / cIntRetinaFactor(); + _leftSnapshotHeight = _leftSnapshot.height() / cIntRetinaFactor(); + _rightSnapshotWidth = _rightSnapshot.width() / cIntRetinaFactor(); + _animation.start(std_::forward(updateCallback), 0., 1., duration); +} + +} // namespace Ui diff --git a/Telegram/SourceFiles/ui/effects/widget_fade_wrap.cpp b/Telegram/SourceFiles/ui/effects/widget_fade_wrap.cpp index f309937f6..6dfb34f2a 100644 --- a/Telegram/SourceFiles/ui/effects/widget_fade_wrap.cpp +++ b/Telegram/SourceFiles/ui/effects/widget_fade_wrap.cpp @@ -90,6 +90,7 @@ void FadeAnimation::fadeOut(int duration) { void FadeAnimation::startAnimation(int duration) { if (_cache.isNull()) { + _widget->showChildren(); _cache = myGrab(_widget); _widget->hideChildren(); } diff --git a/Telegram/SourceFiles/ui/twidget.cpp b/Telegram/SourceFiles/ui/twidget.cpp index 4eec33cda..e31d3a339 100644 --- a/Telegram/SourceFiles/ui/twidget.cpp +++ b/Telegram/SourceFiles/ui/twidget.cpp @@ -67,7 +67,7 @@ QPixmap myGrab(TWidget *target, QRect rect) { myEnsureResized(target); if (rect.isNull()) rect = target->rect(); - QPixmap result(rect.size() * cRetinaFactor()); + auto result = QPixmap(rect.size() * cRetinaFactor()); result.setDevicePixelRatio(cRetinaFactor()); result.fill(Qt::transparent); @@ -75,7 +75,24 @@ QPixmap myGrab(TWidget *target, QRect rect) { target->render(&result, QPoint(0, 0), rect, QWidget::DrawChildren | QWidget::IgnoreMask); target->grabFinish(); - return result; + return std_::move(result); +} + +QImage myGrabImage(TWidget *target, QRect rect) { + myEnsureResized(target); + if (rect.isNull()) rect = target->rect(); + + auto result = QImage(rect.size() * cRetinaFactor(), QImage::Format_ARGB32_Premultiplied); + result.setDevicePixelRatio(cRetinaFactor()); + if (!target->testAttribute(Qt::WA_OpaquePaintEvent)) { + result.fill(Qt::transparent); + } + + target->grabStart(); + target->render(&result, QPoint(0, 0), rect, QWidget::DrawChildren | QWidget::IgnoreMask); + target->grabFinish(); + + return std_::move(result); } void sendSynteticMouseEvent(QWidget *widget, QEvent::Type type, Qt::MouseButton button, const QPoint &globalPoint) { diff --git a/Telegram/SourceFiles/ui/twidget.h b/Telegram/SourceFiles/ui/twidget.h index 9970640fc..f3b4123cd 100644 --- a/Telegram/SourceFiles/ui/twidget.h +++ b/Telegram/SourceFiles/ui/twidget.h @@ -207,6 +207,7 @@ protected: void myEnsureResized(QWidget *target); QPixmap myGrab(TWidget *target, QRect rect = QRect()); +QImage myGrabImage(TWidget *target, QRect rect = QRect()); class SingleDelayedCall : public QObject { Q_OBJECT diff --git a/Telegram/SourceFiles/ui/widgets/buttons.cpp b/Telegram/SourceFiles/ui/widgets/buttons.cpp index 1514126b1..d4ba1b90a 100644 --- a/Telegram/SourceFiles/ui/widgets/buttons.cpp +++ b/Telegram/SourceFiles/ui/widgets/buttons.cpp @@ -255,6 +255,7 @@ void RoundButton::updateText() { _secondaryTextWidth = _secondaryText.isEmpty() ? 0 : _st.font->width(_secondaryText); resizeToText(); + update(); } void RoundButton::resizeToText() { diff --git a/Telegram/SourceFiles/ui/widgets/input_fields.cpp b/Telegram/SourceFiles/ui/widgets/input_fields.cpp index 552af652b..7b63a3bca 100644 --- a/Telegram/SourceFiles/ui/widgets/input_fields.cpp +++ b/Telegram/SourceFiles/ui/widgets/input_fields.cpp @@ -1798,199 +1798,6 @@ void FlatInput::notaBene() { _a_appearance.start(); } -CountryCodeInput::CountryCodeInput(QWidget *parent, const style::FlatInput &st) : FlatInput(parent, st) -, _nosignal(false) { -} - -void CountryCodeInput::startErasing(QKeyEvent *e) { - setFocus(); - keyPressEvent(e); -} - -void CountryCodeInput::codeSelected(const QString &code) { - QString wasText(getLastText()), newText = '+' + code; - setText(newText); - _nosignal = true; - correctValue(wasText, newText); - _nosignal = false; - emit changed(); -} - -void CountryCodeInput::correctValue(const QString &was, QString &now) { - QString newText, addToNumber; - int oldPos(cursorPosition()), newPos(-1), oldLen(now.length()), start = 0, digits = 5; - newText.reserve(oldLen + 1); - newText += '+'; - if (oldLen && now[0] == '+') { - ++start; - } - for (int i = start; i < oldLen; ++i) { - QChar ch(now[i]); - if (ch.isDigit()) { - if (!digits || !--digits) { - addToNumber += ch; - } else { - newText += ch; - } - } - if (i == oldPos) { - newPos = newText.length(); - } - } - if (!addToNumber.isEmpty()) { - QString validCode = findValidCode(newText.mid(1)); - addToNumber = newText.mid(1 + validCode.length()) + addToNumber; - newText = '+' + validCode; - } - if (newPos < 0 || newPos > newText.length()) { - newPos = newText.length(); - } - if (newText != now) { - now = newText; - setText(newText); - updatePlaceholder(); - if (newPos != oldPos) { - setCursorPosition(newPos); - } - } - if (!_nosignal && was != newText) { - emit codeChanged(newText.mid(1)); - } - if (!addToNumber.isEmpty()) { - emit addedToNumber(addToNumber); - } -} - -PhonePartInput::PhonePartInput(QWidget *parent, const style::FlatInput &st) : FlatInput(parent, st, lang(lng_phone_ph)) { -} - -void PhonePartInput::paintEvent(QPaintEvent *e) { - FlatInput::paintEvent(e); - - Painter p(this); - auto t = text(); - if (!_pattern.isEmpty() && !t.isEmpty()) { - auto ph = placeholder().mid(t.size()); - if (!ph.isEmpty()) { - p.setClipRect(rect()); - auto phRect = placeholderRect(); - int tw = phFont()->width(t); - if (tw < phRect.width()) { - phRect.setLeft(phRect.left() + tw); - phPrepare(p); - p.drawText(phRect, ph, style::al_left); - } - } - } -} - -void PhonePartInput::keyPressEvent(QKeyEvent *e) { - if (e->key() == Qt::Key_Backspace && text().isEmpty()) { - emit voidBackspace(e); - } else { - FlatInput::keyPressEvent(e); - } -} - -void PhonePartInput::correctValue(const QString &was, QString &now) { - QString newText; - int oldPos(cursorPosition()), newPos(-1), oldLen(now.length()), digitCount = 0; - for (int i = 0; i < oldLen; ++i) { - if (now[i].isDigit()) { - ++digitCount; - } - } - if (digitCount > MaxPhoneTailLength) digitCount = MaxPhoneTailLength; - - bool inPart = !_pattern.isEmpty(); - int curPart = -1, leftInPart = 0; - newText.reserve(oldLen); - for (int i = 0; i < oldLen; ++i) { - if (i == oldPos && newPos < 0) { - newPos = newText.length(); - } - - QChar ch(now[i]); - if (ch.isDigit()) { - if (!digitCount--) { - break; - } - if (inPart) { - if (leftInPart) { - --leftInPart; - } else { - newText += ' '; - ++curPart; - inPart = curPart < _pattern.size(); - leftInPart = inPart ? (_pattern.at(curPart) - 1) : 0; - - ++oldPos; - } - } - newText += ch; - } else if (ch == ' ' || ch == '-' || ch == '(' || ch == ')') { - if (inPart) { - if (leftInPart) { - } else { - newText += ch; - ++curPart; - inPart = curPart < _pattern.size(); - leftInPart = inPart ? _pattern.at(curPart) : 0; - } - } else { - newText += ch; - } - } - } - int32 newlen = newText.size(); - while (newlen > 0 && newText.at(newlen - 1).isSpace()) { - --newlen; - } - if (newlen < newText.size()) newText = newText.mid(0, newlen); - if (newPos < 0) { - newPos = newText.length(); - } - if (newText != now) { - now = newText; - setText(now); - updatePlaceholder(); - setCursorPosition(newPos); - } -} - -void PhonePartInput::addedToNumber(const QString &added) { - setFocus(); - QString wasText(getLastText()), newText = added + wasText; - setText(newText); - setCursorPosition(added.length()); - correctValue(wasText, newText); - updatePlaceholder(); -} - -void PhonePartInput::onChooseCode(const QString &code) { - _pattern = phoneNumberParse(code); - if (!_pattern.isEmpty() && _pattern.at(0) == code.size()) { - _pattern.pop_front(); - } else { - _pattern.clear(); - } - if (_pattern.isEmpty()) { - setPlaceholder(lang(lng_phone_ph)); - } else { - QString ph; - ph.reserve(20); - for (int i = 0, l = _pattern.size(); i < l; ++i) { - ph.append(' '); - ph.append(QString(_pattern.at(i), QChar(0x2212))); - } - setPlaceholder(ph); - } - auto newText = getLastText(); - correctValue(newText, newText); - setPlaceholderFast(!_pattern.isEmpty()); - updatePlaceholder(); -} - InputArea::InputArea(QWidget *parent, const style::InputArea &st, const QString &ph, const QString &val) : TWidget(parent) , _maxLength(-1) , _inner(this) @@ -3533,6 +3340,23 @@ MaskedInputField::MaskedInputField(QWidget *parent, const style::InputField &st, updatePlaceholder(); } +void MaskedInputField::setCorrectedText(QString &now, int &nowCursor, const QString &newText, int newPos) { + if (newPos < 0 || newPos > newText.size()) { + newPos = newText.size(); + } + auto updateText = (newText != now); + if (updateText) { + now = newText; + setText(now); + updatePlaceholder(); + } + auto updateCursorPosition = (newPos != nowCursor) || updateText; + if (updateCursorPosition) { + nowCursor = newPos; + setCursorPosition(nowCursor); + } +} + void MaskedInputField::customUpDown(bool custom) { _customUpDown = custom; } @@ -3770,9 +3594,6 @@ QRect MaskedInputField::placeholderRect() const { return rect().marginsRemoved(_st.textMargins + _st.placeholderMargins); } -void MaskedInputField::correctValue(const QString &was, int32 wasCursor, QString &now, int32 &nowCursor) { -} - void MaskedInputField::paintPlaceholder(Painter &p) { bool drawPlaceholder = _placeholderVisible; if (_a_placeholderShift.animating()) { @@ -3860,6 +3681,195 @@ void MaskedInputField::onCursorPositionChanged(int oldPosition, int position) { _oldcursor = position; } +CountryCodeInput::CountryCodeInput(QWidget *parent, const style::InputField &st) : MaskedInputField(parent, st) +, _nosignal(false) { +} + +void CountryCodeInput::startErasing(QKeyEvent *e) { + setFocus(); + keyPressEvent(e); +} + +void CountryCodeInput::codeSelected(const QString &code) { + auto wasText = getLastText(); + auto wasCursor = cursorPosition(); + auto newText = '+' + code; + auto newCursor = newText.size(); + setText(newText); + _nosignal = true; + correctValue(wasText, wasCursor, newText, newCursor); + _nosignal = false; + emit changed(); +} + +void CountryCodeInput::correctValue(const QString &was, int32 wasCursor, QString &now, int32 &nowCursor) { + QString newText, addToNumber; + int oldPos(nowCursor), newPos(-1), oldLen(now.length()), start = 0, digits = 5; + newText.reserve(oldLen + 1); + if (oldLen && now[0] == '+') { + if (start == oldPos) { + newPos = newText.length(); + } + ++start; + } + newText += '+'; + for (int i = start; i < oldLen; ++i) { + if (i == oldPos) { + newPos = newText.length(); + } + auto ch = now[i]; + if (ch.isDigit()) { + if (!digits || !--digits) { + addToNumber += ch; + } else { + newText += ch; + } + } + } + if (!addToNumber.isEmpty()) { + auto validCode = findValidCode(newText.mid(1)); + addToNumber = newText.mid(1 + validCode.length()) + addToNumber; + newText = '+' + validCode; + } + setCorrectedText(now, nowCursor, newText, newPos); + + if (!_nosignal && was != newText) { + emit codeChanged(newText.mid(1)); + } + if (!addToNumber.isEmpty()) { + emit addedToNumber(addToNumber); + } +} + +PhonePartInput::PhonePartInput(QWidget *parent, const style::InputField &st) : MaskedInputField(parent, st, lang(lng_phone_ph)) { +} + +void PhonePartInput::paintPlaceholder(Painter &p) { + auto t = getLastText(); + if (!_pattern.isEmpty() && !t.isEmpty()) { + auto ph = placeholder().mid(t.size()); + if (!ph.isEmpty()) { + p.setClipRect(rect()); + auto phRect = placeholderRect(); + int tw = phFont()->width(t); + if (tw < phRect.width()) { + phRect.setLeft(phRect.left() + tw); + placeholderPreparePaint(p); + p.drawText(phRect, ph, style::al_topleft); + } + } + } else { + MaskedInputField::paintPlaceholder(p); + } +} + +void PhonePartInput::keyPressEvent(QKeyEvent *e) { + if (e->key() == Qt::Key_Backspace && getLastText().isEmpty()) { + emit voidBackspace(e); + } else { + MaskedInputField::keyPressEvent(e); + } +} + +void PhonePartInput::correctValue(const QString &was, int32 wasCursor, QString &now, int32 &nowCursor) { + QString newText; + int oldPos(nowCursor), newPos(-1), oldLen(now.length()), digitCount = 0; + for (int i = 0; i < oldLen; ++i) { + if (now[i].isDigit()) { + ++digitCount; + } + } + if (digitCount > MaxPhoneTailLength) digitCount = MaxPhoneTailLength; + + bool inPart = !_pattern.isEmpty(); + int curPart = -1, leftInPart = 0; + newText.reserve(oldLen); + for (int i = 0; i < oldLen; ++i) { + if (i == oldPos && newPos < 0) { + newPos = newText.length(); + } + + auto ch = now[i]; + if (ch.isDigit()) { + if (!digitCount--) { + break; + } + if (inPart) { + if (leftInPart) { + --leftInPart; + } else { + newText += ' '; + ++curPart; + inPart = curPart < _pattern.size(); + leftInPart = inPart ? (_pattern.at(curPart) - 1) : 0; + + ++oldPos; + } + } + newText += ch; + } else if (ch == ' ' || ch == '-' || ch == '(' || ch == ')') { + if (inPart) { + if (leftInPart) { + } else { + newText += ch; + ++curPart; + inPart = curPart < _pattern.size(); + leftInPart = inPart ? _pattern.at(curPart) : 0; + } + } else { + newText += ch; + } + } + } + auto newlen = newText.size(); + while (newlen > 0 && newText.at(newlen - 1).isSpace()) { + --newlen; + } + if (newlen < newText.size()) { + newText = newText.mid(0, newlen); + } + setCorrectedText(now, nowCursor, newText, newPos); +} + +void PhonePartInput::addedToNumber(const QString &added) { + setFocus(); + auto wasText = getLastText(); + auto wasCursor = cursorPosition(); + auto newText = added + wasText; + auto newCursor = newText.size(); + setText(newText); + setCursorPosition(added.length()); + correctValue(wasText, wasCursor, newText, newCursor); + updatePlaceholder(); +} + +void PhonePartInput::onChooseCode(const QString &code) { + _pattern = phoneNumberParse(code); + if (!_pattern.isEmpty() && _pattern.at(0) == code.size()) { + _pattern.pop_front(); + } else { + _pattern.clear(); + } + if (_pattern.isEmpty()) { + setPlaceholder(lang(lng_phone_ph)); + } else { + QString ph; + ph.reserve(20); + for (int i = 0, l = _pattern.size(); i < l; ++i) { + ph.append(' '); + ph.append(QString(_pattern.at(i), QChar(0x2212))); + } + setPlaceholder(ph); + } + auto wasText = getLastText(); + auto wasCursor = cursorPosition(); + auto newText = getLastText(); + auto newCursor = newText.size(); + correctValue(wasText, wasCursor, newText, newCursor); + setPlaceholderFast(!_pattern.isEmpty()); + updatePlaceholder(); +} + PasswordInput::PasswordInput(QWidget *parent, const style::InputField &st, const QString &ph, const QString &val) : MaskedInputField(parent, st, ph, val) { setEchoMode(QLineEdit::Password); } @@ -3873,29 +3883,22 @@ PortInput::PortInput(QWidget *parent, const style::InputField &st, const QString void PortInput::correctValue(const QString &was, int32 wasCursor, QString &now, int32 &nowCursor) { QString newText; newText.reserve(now.size()); - int32 newCursor = nowCursor; - for (int32 i = 0, l = now.size(); i < l; ++i) { + auto newPos = nowCursor; + for (auto i = 0, l = now.size(); i < l; ++i) { if (now.at(i).isDigit()) { newText.append(now.at(i)); } else if (i < nowCursor) { - --newCursor; + --newPos; } } if (!newText.toInt()) { newText = QString(); - newCursor = 0; + newPos = 0; } else if (newText.toInt() > 65535) { newText = was; - newCursor = wasCursor; - } - if (newText != now) { - now = newText; - setText(newText); - } - if (newCursor != nowCursor) { - nowCursor = newCursor; - setCursorPosition(newCursor); + newPos = wasCursor; } + setCorrectedText(now, nowCursor, newText, newPos); } UsernameInput::UsernameInput(QWidget *parent, const style::InputField &st, const QString &ph, const QString &val, bool isLink) : MaskedInputField(parent, st, ph, val), @@ -3916,13 +3919,13 @@ void UsernameInput::paintPlaceholder(Painter &p) { } void UsernameInput::correctValue(const QString &was, int32 wasCursor, QString &now, int32 &nowCursor) { - QString newText; - int32 newCursor = nowCursor, from, len = now.size(); - for (from = 0; from < len; ++from) { + auto newPos = nowCursor; + auto from = 0, len = now.size(); + for (; from < len; ++from) { if (!now.at(from).isSpace()) { break; } - if (newCursor > 0) --newCursor; + if (newPos > 0) --newPos; } len -= from; if (len > MaxUsernameLength) len = MaxUsernameLength + (now.at(from) == '@' ? 1 : 0); @@ -3933,18 +3936,7 @@ void UsernameInput::correctValue(const QString &was, int32 wasCursor, QString &n } --len; } - newText = now.mid(from, len); - if (newCursor > len) { - newCursor = len; - } - if (newText != now) { - now = newText; - setText(newText); - } - if (newCursor != nowCursor) { - nowCursor = newCursor; - setCursorPosition(newCursor); - } + setCorrectedText(now, nowCursor, now.mid(from, len), newPos); } PhoneInput::PhoneInput(QWidget *parent, const style::InputField &st, const QString &ph, const QString &val) : MaskedInputField(parent, st, ph, val) @@ -3996,7 +3988,7 @@ void PhoneInput::paintPlaceholder(Painter &p) { } void PhoneInput::correctValue(const QString &was, int32 wasCursor, QString &now, int32 &nowCursor) { - QString digits(now); + auto digits = now; digits.replace(QRegularExpression(qsl("[^\\d]")), QString()); _pattern = phoneNumberParse(digits); @@ -4075,16 +4067,10 @@ void PhoneInput::correctValue(const QString &was, int32 wasCursor, QString &now, while (newlen > 0 && newText.at(newlen - 1).isSpace()) { --newlen; } - if (newlen < newText.size()) newText = newText.mid(0, newlen); - if (newPos < 0) { - newPos = newText.length(); - } - if (newText != now) { - now = newText; - setText(newText); - updatePlaceholder(); - setCursorPosition(newPos); + if (newlen < newText.size()) { + newText = newText.mid(0, newlen); } + setCorrectedText(now, nowCursor, newText, newPos); } } // namespace Ui diff --git a/Telegram/SourceFiles/ui/widgets/input_fields.h b/Telegram/SourceFiles/ui/widgets/input_fields.h index 908e70dbc..abbc36f89 100644 --- a/Telegram/SourceFiles/ui/widgets/input_fields.h +++ b/Telegram/SourceFiles/ui/widgets/input_fields.h @@ -114,7 +114,7 @@ public: }; void setTagMimeProcessor(std_::unique_ptr &&processor); - public slots: +public slots: void onTouchTimer(); void onDocumentContentsChange(int position, int charsRemoved, int charsAdded); @@ -267,7 +267,7 @@ public: return _oldtext; } - public slots: +public slots: void onTextChange(const QString &text); void onTextEdited(); @@ -330,52 +330,6 @@ private: QPoint _touchStart; }; -class CountryCodeInput : public FlatInput { - Q_OBJECT - -public: - CountryCodeInput(QWidget *parent, const style::FlatInput &st); - - public slots: - void startErasing(QKeyEvent *e); - void codeSelected(const QString &code); - -signals: - void codeChanged(const QString &code); - void addedToNumber(const QString &added); - -protected: - void correctValue(const QString &was, QString &now) override; - -private: - bool _nosignal; - -}; - -class PhonePartInput : public FlatInput { - Q_OBJECT - -public: - PhonePartInput(QWidget *parent, const style::FlatInput &st); - - public slots: - void addedToNumber(const QString &added); - void onChooseCode(const QString &code); - -signals: - void voidBackspace(QKeyEvent *e); - -protected: - void paintEvent(QPaintEvent *e) override; - void keyPressEvent(QKeyEvent *e) override; - - void correctValue(const QString &was, QString &now) override; - -private: - QVector _pattern; - -}; - enum CtrlEnterSubmit { CtrlEnterSubmitEnter, CtrlEnterSubmitCtrlEnter, @@ -439,7 +393,7 @@ public: _inner.clearFocus(); } - public slots: +public slots: void onTouchTimer(); void onDocumentContentsChange(int position, int charsRemoved, int charsAdded); @@ -610,7 +564,7 @@ public: _inner.setTextCursor(c); } - public slots: +public slots: void onTouchTimer(); void onDocumentContentsChange(int position, int charsRemoved, int charsAdded); @@ -715,20 +669,11 @@ private: class MaskedInputField : public QLineEdit { Q_OBJECT - T_WIDGET + T_WIDGET public: MaskedInputField(QWidget *parent, const style::InputField &st, const QString &placeholder = QString(), const QString &val = QString()); - bool event(QEvent *e) override; - void touchEvent(QTouchEvent *e); - void paintEvent(QPaintEvent *e) override; - void focusInEvent(QFocusEvent *e) override; - void focusOutEvent(QFocusEvent *e) override; - void keyPressEvent(QKeyEvent *e) override; - void resizeEvent(QResizeEvent *e) override; - void contextMenuEvent(QContextMenuEvent *e) override; - void showError(); bool setPlaceholder(const QString &ph); @@ -757,7 +702,7 @@ public: updatePlaceholder(); } - public slots: +public slots: void onTextChange(const QString &text); void onCursorPositionChanged(int oldPosition, int position); @@ -773,6 +718,15 @@ signals: void blurred(); protected: + bool event(QEvent *e) override; + void touchEvent(QTouchEvent *e); + void paintEvent(QPaintEvent *e) override; + void focusInEvent(QFocusEvent *e) override; + void focusOutEvent(QFocusEvent *e) override; + void keyPressEvent(QKeyEvent *e) override; + void resizeEvent(QResizeEvent *e) override; + void contextMenuEvent(QContextMenuEvent *e) override; + void enterEventHook(QEvent *e) { return QLineEdit::enterEvent(e); } @@ -780,7 +734,10 @@ protected: return QLineEdit::leaveEvent(e); } - virtual void correctValue(const QString &was, int32 wasCursor, QString &now, int32 &nowCursor); + virtual void correctValue(const QString &was, int32 wasCursor, QString &now, int32 &nowCursor) { + } + void setCorrectedText(QString &now, int &nowCursor, const QString &newText, int newPos); + virtual void paintPlaceholder(Painter &p); style::font phFont() { @@ -828,6 +785,52 @@ private: QPoint _touchStart; }; +class CountryCodeInput : public MaskedInputField { + Q_OBJECT + +public: + CountryCodeInput(QWidget *parent, const style::InputField &st); + +public slots: + void startErasing(QKeyEvent *e); + void codeSelected(const QString &code); + +signals: + void codeChanged(const QString &code); + void addedToNumber(const QString &added); + +protected: + void correctValue(const QString &was, int32 wasCursor, QString &now, int32 &nowCursor) override; + +private: + bool _nosignal; + +}; + +class PhonePartInput : public MaskedInputField { + Q_OBJECT + +public: + PhonePartInput(QWidget *parent, const style::InputField &st); + +public slots: + void addedToNumber(const QString &added); + void onChooseCode(const QString &code); + +signals: + void voidBackspace(QKeyEvent *e); + +protected: + void keyPressEvent(QKeyEvent *e) override; + + void correctValue(const QString &was, int32 wasCursor, QString &now, int32 &nowCursor) override; + void paintPlaceholder(Painter &p) override; + +private: + QVector _pattern; + +}; + class PasswordInput : public MaskedInputField { public: PasswordInput(QWidget *parent, const style::InputField &st, const QString &ph = QString(), const QString &val = QString()); diff --git a/Telegram/SourceFiles/ui/widgets/labels.cpp b/Telegram/SourceFiles/ui/widgets/labels.cpp index ae1be814e..84d36b6dc 100644 --- a/Telegram/SourceFiles/ui/widgets/labels.cpp +++ b/Telegram/SourceFiles/ui/widgets/labels.cpp @@ -43,6 +43,57 @@ TextParseOptions _labelMarkedOptions = { } // namespace +CrossFadeAnimation::CrossFadeAnimation(const style::color &bg) : _bg(bg) { +} + +void CrossFadeAnimation::addLine(Part was, Part now) { + _lines.push_back(Line(std_::move(was), std_::move(now))); +} + +void CrossFadeAnimation::paintFrame(Painter &p, float64 positionReady, float64 alphaWas, float64 alphaNow) { + if (_lines.isEmpty()) return; + + for_const (auto &line, _lines) { + paintLine(p, line, positionReady, alphaWas, alphaNow); + } +} + +void CrossFadeAnimation::paintLine(Painter &p, const Line &line, float64 positionReady, float64 alphaWas, float64 alphaNow) { + auto &snapshotWas = line.was.snapshot; + auto &snapshotNow = line.now.snapshot; + t_assert(!snapshotWas.isNull() || !snapshotNow.isNull()); + + auto positionWas = line.was.position; + auto positionNow = line.now.position; + auto left = anim::interpolate(positionWas.x(), positionNow.x(), positionReady); + auto topDelta = (snapshotNow.height() / cIntRetinaFactor()) - (snapshotWas.height() / cIntRetinaFactor()); + auto widthDelta = (snapshotNow.width() / cIntRetinaFactor()) - (snapshotWas.width() / cIntRetinaFactor()); + auto topWas = anim::interpolate(positionWas.y(), positionNow.y() + topDelta, positionReady); + auto topNow = topWas - topDelta; + + p.setOpacity(alphaWas); + if (!snapshotWas.isNull()) { + p.drawPixmap(left, topWas, snapshotWas); + if (topDelta > 0) { + p.fillRect(left, topWas - topDelta, snapshotWas.width() / cIntRetinaFactor(), topDelta, _bg); + } + } + if (widthDelta > 0) { + p.fillRect(left + (snapshotWas.width() / cIntRetinaFactor()), topNow, widthDelta, snapshotNow.height() / cIntRetinaFactor(), _bg); + } + + p.setOpacity(alphaNow); + if (!snapshotNow.isNull()) { + p.drawPixmap(left, topNow, snapshotNow); + if (topDelta < 0) { + p.fillRect(left, topNow + topDelta, snapshotNow.width() / cIntRetinaFactor(), -topDelta, _bg); + } + } + if (widthDelta < 0) { + p.fillRect(left + (snapshotNow.width() / cIntRetinaFactor()), topWas, -widthDelta, snapshotWas.height() / cIntRetinaFactor(), _bg); + } +} + LabelSimple::LabelSimple(QWidget *parent, const style::LabelSimple &st, const QString &value) : TWidget(parent) , _st(st) { setText(value); @@ -548,6 +599,72 @@ void FlatLabel::clickHandlerPressedChanged(const ClickHandlerPtr &action, bool a update(); } +std_::unique_ptr FlatLabel::CrossFade(FlatLabel *from, FlatLabel *to, const style::color &bg, QPoint fromPosition, QPoint toPosition) { + auto result = std_::make_unique(bg); + + struct Data { + QImage full; + QVector lineWidths; + int lineHeight = 0; + int lineAddTop = 0; + }; + auto prepareData = [&bg](FlatLabel *label) { + auto result = Data(); + result.full = QImage(label->size() * cIntRetinaFactor(), QImage::Format_ARGB32_Premultiplied); + result.full.setDevicePixelRatio(cRetinaFactor()); + result.full.fill(bg->c); + Painter(&result.full).drawImage(0, 0, myGrabImage(label)); + auto textWidth = label->width() - label->_st.margin.left() - label->_st.margin.right(); + label->_text.countLineWidths(textWidth, &result.lineWidths); + result.lineHeight = label->_st.font->height; + auto addedHeight = (label->_tst.lineHeight - result.lineHeight); + if (addedHeight > 0) { + result.lineAddTop = addedHeight / 2; + result.lineHeight += addedHeight; + } + return std_::move(result); + }; + auto was = prepareData(from); + auto now = prepareData(to); + + auto maxLines = qMax(was.lineWidths.size(), now.lineWidths.size()); + auto fillDataTill = [maxLines](Data &data) { + for (auto i = data.lineWidths.size(); i != maxLines; ++i) { + data.lineWidths.push_back(-1); + } + }; + fillDataTill(was); + fillDataTill(now); + auto preparePart = [](FlatLabel *label, QPoint position, Data &data, int index, Data &other) { + auto result = CrossFadeAnimation::Part(); + auto lineWidth = data.lineWidths[index]; + if (lineWidth < 0) { + lineWidth = other.lineWidths[index]; + } + auto fullWidth = data.full.width() / cIntRetinaFactor(); + auto top = index * data.lineHeight + data.lineAddTop; + auto left = 0; + if (label->_st.align & Qt::AlignHCenter) { + left += (fullWidth - lineWidth) / 2; + } else if (label->_st.align & Qt::AlignRight) { + left += (fullWidth - lineWidth); + } + auto snapshotRect = data.full.rect().intersected(QRect(left * cIntRetinaFactor(), top * cIntRetinaFactor(), lineWidth * cIntRetinaFactor(), label->_st.font->height * cIntRetinaFactor())); + if (!snapshotRect.isEmpty()) { + result.snapshot = App::pixmapFromImageInPlace(data.full.copy(snapshotRect)); + result.snapshot.setDevicePixelRatio(cRetinaFactor()); + } + auto positionBase = position + label->pos(); + result.position = positionBase + QPoint(label->_st.margin.left() + left, label->_st.margin.top() + top); + return std_::move(result); + }; + for (int i = 0; i != maxLines; ++i) { + result->addLine(preparePart(from, fromPosition, was, i, now), preparePart(to, toPosition, now, i, was)); + } + + return std_::move(result); +} + Text::StateResult FlatLabel::dragActionUpdate() { auto m = mapFromGlobal(_lastMousePos); auto state = getTextState(m); diff --git a/Telegram/SourceFiles/ui/widgets/labels.h b/Telegram/SourceFiles/ui/widgets/labels.h index f3abfe607..d0da4da7e 100644 --- a/Telegram/SourceFiles/ui/widgets/labels.h +++ b/Telegram/SourceFiles/ui/widgets/labels.h @@ -26,6 +26,37 @@ namespace Ui { class PopupMenu; +class CrossFadeAnimation { +public: + CrossFadeAnimation(const style::color &bg); + + struct Part { + QPixmap snapshot; + QPoint position; + }; + void addLine(Part was, Part now); + + void paintFrame(Painter &p, float64 dt) { + auto progress = anim::linear(1., dt); + paintFrame(p, progress, 1. - progress, progress); + } + + void paintFrame(Painter &p, float64 positionReady, float64 alphaWas, float64 alphaNow); + +private: + struct Line { + Line(Part was, Part now) : was(std_::move(was)), now(std_::move(now)) { + } + Part was; + Part now; + }; + void paintLine(Painter &p, const Line &line, float64 positionReady, float64 alphaWas, float64 alphaNow); + + const style::color &_bg; + QList _lines; + +}; + class LabelSimple : public TWidget { public: LabelSimple(QWidget *parent, const style::LabelSimple &st = st::defaultLabelSimple, const QString &value = QString()); @@ -81,6 +112,8 @@ public: void clickHandlerActiveChanged(const ClickHandlerPtr &action, bool active) override; void clickHandlerPressedChanged(const ClickHandlerPtr &action, bool pressed) override; + static std_::unique_ptr CrossFade(FlatLabel *from, FlatLabel *to, const style::color &bg, QPoint fromPosition = QPoint(), QPoint toPosition = QPoint()); + protected: void paintEvent(QPaintEvent *e) override; void mouseMoveEvent(QMouseEvent *e) override; diff --git a/Telegram/SourceFiles/ui/widgets/scroll_area.h b/Telegram/SourceFiles/ui/widgets/scroll_area.h index 8a5479acb..aefb37527 100644 --- a/Telegram/SourceFiles/ui/widgets/scroll_area.h +++ b/Telegram/SourceFiles/ui/widgets/scroll_area.h @@ -160,7 +160,7 @@ private: class SplittedWidgetOther; class ScrollArea : public QScrollArea { Q_OBJECT - T_WIDGET + T_WIDGET public: ScrollArea(QWidget *parent, const style::FlatScroll &st = st::defaultFlatScroll, bool handleTouch = true); diff --git a/Telegram/SourceFiles/window/section_widget.h b/Telegram/SourceFiles/window/section_widget.h index ca72b0dd7..4a4e6d924 100644 --- a/Telegram/SourceFiles/window/section_widget.h +++ b/Telegram/SourceFiles/window/section_widget.h @@ -21,7 +21,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #pragma once #include "ui/twidget.h" -#include "window/slide_animation.h" +#include "window/window_slide_animation.h" namespace Window { diff --git a/Telegram/SourceFiles/window/slide_animation.cpp b/Telegram/SourceFiles/window/window_slide_animation.cpp similarity index 98% rename from Telegram/SourceFiles/window/slide_animation.cpp rename to Telegram/SourceFiles/window/window_slide_animation.cpp index bca18bfe7..6510908cf 100644 --- a/Telegram/SourceFiles/window/slide_animation.cpp +++ b/Telegram/SourceFiles/window/window_slide_animation.cpp @@ -19,7 +19,7 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org */ #include "stdafx.h" -#include "window/slide_animation.h" +#include "window/window_slide_animation.h" #include "styles/style_window.h" diff --git a/Telegram/SourceFiles/window/slide_animation.h b/Telegram/SourceFiles/window/window_slide_animation.h similarity index 100% rename from Telegram/SourceFiles/window/slide_animation.h rename to Telegram/SourceFiles/window/window_slide_animation.h diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp index 4747387c0..f709915f1 100644 --- a/Telegram/gyp/Telegram.gyp +++ b/Telegram/gyp/Telegram.gyp @@ -466,6 +466,8 @@ '<(src_loc)/ui/effects/ripple_animation.h', '<(src_loc)/ui/effects/round_checkbox.cpp', '<(src_loc)/ui/effects/round_checkbox.h', + '<(src_loc)/ui/effects/slide_animation.cpp', + '<(src_loc)/ui/effects/slide_animation.h', '<(src_loc)/ui/effects/widget_fade_wrap.cpp', '<(src_loc)/ui/effects/widget_fade_wrap.h', '<(src_loc)/ui/effects/widget_slide_wrap.cpp', @@ -546,8 +548,8 @@ '<(src_loc)/window/player_wrap_widget.h', '<(src_loc)/window/section_widget.cpp', '<(src_loc)/window/section_widget.h', - '<(src_loc)/window/slide_animation.cpp', - '<(src_loc)/window/slide_animation.h', + '<(src_loc)/window/window_slide_animation.cpp', + '<(src_loc)/window/window_slide_animation.h', '<(src_loc)/window/top_bar_widget.cpp', '<(src_loc)/window/top_bar_widget.h', '<(src_loc)/window/window_main_menu.cpp',