From 383195f1b26d697401a46d811a5bd10230afbfb8 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 18 Sep 2019 11:05:37 +0300 Subject: [PATCH] Use some icons from lib_ui. --- .gitignore | 21 +----- Telegram/Resources/icons/box_button_close.png | Bin 148 -> 0 bytes .../Resources/icons/box_button_close@2x.png | Bin 269 -> 0 bytes .../Resources/icons/box_button_close@3x.png | Bin 590 -> 0 bytes Telegram/Resources/icons/box_search.png | Bin 350 -> 0 bytes Telegram/Resources/icons/box_search@2x.png | Bin 707 -> 0 bytes Telegram/Resources/icons/box_search@3x.png | Bin 825 -> 0 bytes .../icons/default_checkbox_check.png | Bin 136 -> 0 bytes .../icons/default_checkbox_check@2x.png | Bin 255 -> 0 bytes .../icons/default_checkbox_check@3x.png | Bin 296 -> 0 bytes .../icons/dropdown_submenu_arrow.png | Bin 119 -> 0 bytes .../icons/dropdown_submenu_arrow@2x.png | Bin 166 -> 0 bytes .../icons/dropdown_submenu_arrow@3x.png | Bin 293 -> 0 bytes Telegram/Resources/icons/fade_horizontal.png | Bin 142 -> 0 bytes .../Resources/icons/fade_horizontal@2x.png | Bin 190 -> 0 bytes .../Resources/icons/fade_horizontal@3x.png | Bin 165 -> 0 bytes .../Resources/icons/round_shadow_bottom.png | Bin 86 -> 0 bytes .../icons/round_shadow_bottom@2x.png | Bin 107 -> 0 bytes .../icons/round_shadow_bottom@3x.png | Bin 108 -> 0 bytes .../icons/round_shadow_bottom_left.png | Bin 179 -> 0 bytes .../icons/round_shadow_bottom_left@2x.png | Bin 262 -> 0 bytes .../icons/round_shadow_bottom_left@3x.png | Bin 373 -> 0 bytes .../icons/round_shadow_box_bottom.png | Bin 98 -> 0 bytes .../icons/round_shadow_box_bottom@2x.png | Bin 111 -> 0 bytes .../icons/round_shadow_box_bottom@3x.png | Bin 117 -> 0 bytes .../icons/round_shadow_box_bottom_left.png | Bin 292 -> 0 bytes .../icons/round_shadow_box_bottom_left@2x.png | Bin 539 -> 0 bytes .../icons/round_shadow_box_bottom_left@3x.png | Bin 887 -> 0 bytes .../Resources/icons/round_shadow_box_left.png | Bin 93 -> 0 bytes .../icons/round_shadow_box_left@2x.png | Bin 98 -> 0 bytes .../icons/round_shadow_box_left@3x.png | Bin 106 -> 0 bytes .../Resources/icons/round_shadow_box_top.png | Bin 93 -> 0 bytes .../icons/round_shadow_box_top@2x.png | Bin 102 -> 0 bytes .../icons/round_shadow_box_top@3x.png | Bin 106 -> 0 bytes .../icons/round_shadow_box_top_left.png | Bin 219 -> 0 bytes .../icons/round_shadow_box_top_left@2x.png | Bin 423 -> 0 bytes .../icons/round_shadow_box_top_left@3x.png | Bin 741 -> 0 bytes .../Resources/icons/round_shadow_left.png | Bin 78 -> 0 bytes .../Resources/icons/round_shadow_left@2x.png | Bin 93 -> 0 bytes .../Resources/icons/round_shadow_left@3x.png | Bin 99 -> 0 bytes Telegram/Resources/icons/round_shadow_top.png | Bin 75 -> 0 bytes .../Resources/icons/round_shadow_top@2x.png | Bin 90 -> 0 bytes .../Resources/icons/round_shadow_top@3x.png | Bin 95 -> 0 bytes .../Resources/icons/round_shadow_top_left.png | Bin 141 -> 0 bytes .../icons/round_shadow_top_left@2x.png | Bin 195 -> 0 bytes .../icons/round_shadow_top_left@3x.png | Bin 269 -> 0 bytes Telegram/Resources/icons/simple_close.png | Bin 124 -> 0 bytes Telegram/Resources/icons/simple_close@2x.png | Bin 176 -> 0 bytes Telegram/Resources/icons/simple_close@3x.png | Bin 264 -> 0 bytes Telegram/Resources/icons/slide_shadow.png | Bin 103 -> 0 bytes Telegram/Resources/icons/slide_shadow@2x.png | Bin 116 -> 0 bytes Telegram/Resources/icons/slide_shadow@3x.png | Bin 130 -> 0 bytes Telegram/SourceFiles/boxes/boxes.style | 65 ++++++++++++------ Telegram/SourceFiles/history/history.style | 8 +++ .../info/profile/info_profile_cover.cpp | 3 +- Telegram/SourceFiles/window/window.style | 1 + Telegram/lib_ui | 2 +- 57 files changed, 59 insertions(+), 41 deletions(-) delete mode 100644 Telegram/Resources/icons/box_button_close.png delete mode 100644 Telegram/Resources/icons/box_button_close@2x.png delete mode 100644 Telegram/Resources/icons/box_button_close@3x.png delete mode 100644 Telegram/Resources/icons/box_search.png delete mode 100644 Telegram/Resources/icons/box_search@2x.png delete mode 100644 Telegram/Resources/icons/box_search@3x.png delete mode 100644 Telegram/Resources/icons/default_checkbox_check.png delete mode 100644 Telegram/Resources/icons/default_checkbox_check@2x.png delete mode 100644 Telegram/Resources/icons/default_checkbox_check@3x.png delete mode 100644 Telegram/Resources/icons/dropdown_submenu_arrow.png delete mode 100644 Telegram/Resources/icons/dropdown_submenu_arrow@2x.png delete mode 100644 Telegram/Resources/icons/dropdown_submenu_arrow@3x.png delete mode 100644 Telegram/Resources/icons/fade_horizontal.png delete mode 100644 Telegram/Resources/icons/fade_horizontal@2x.png delete mode 100644 Telegram/Resources/icons/fade_horizontal@3x.png delete mode 100644 Telegram/Resources/icons/round_shadow_bottom.png delete mode 100644 Telegram/Resources/icons/round_shadow_bottom@2x.png delete mode 100644 Telegram/Resources/icons/round_shadow_bottom@3x.png delete mode 100644 Telegram/Resources/icons/round_shadow_bottom_left.png delete mode 100644 Telegram/Resources/icons/round_shadow_bottom_left@2x.png delete mode 100644 Telegram/Resources/icons/round_shadow_bottom_left@3x.png delete mode 100644 Telegram/Resources/icons/round_shadow_box_bottom.png delete mode 100644 Telegram/Resources/icons/round_shadow_box_bottom@2x.png delete mode 100644 Telegram/Resources/icons/round_shadow_box_bottom@3x.png delete mode 100644 Telegram/Resources/icons/round_shadow_box_bottom_left.png delete mode 100644 Telegram/Resources/icons/round_shadow_box_bottom_left@2x.png delete mode 100644 Telegram/Resources/icons/round_shadow_box_bottom_left@3x.png delete mode 100644 Telegram/Resources/icons/round_shadow_box_left.png delete mode 100644 Telegram/Resources/icons/round_shadow_box_left@2x.png delete mode 100644 Telegram/Resources/icons/round_shadow_box_left@3x.png delete mode 100644 Telegram/Resources/icons/round_shadow_box_top.png delete mode 100644 Telegram/Resources/icons/round_shadow_box_top@2x.png delete mode 100644 Telegram/Resources/icons/round_shadow_box_top@3x.png delete mode 100644 Telegram/Resources/icons/round_shadow_box_top_left.png delete mode 100644 Telegram/Resources/icons/round_shadow_box_top_left@2x.png delete mode 100644 Telegram/Resources/icons/round_shadow_box_top_left@3x.png delete mode 100644 Telegram/Resources/icons/round_shadow_left.png delete mode 100644 Telegram/Resources/icons/round_shadow_left@2x.png delete mode 100644 Telegram/Resources/icons/round_shadow_left@3x.png delete mode 100644 Telegram/Resources/icons/round_shadow_top.png delete mode 100644 Telegram/Resources/icons/round_shadow_top@2x.png delete mode 100644 Telegram/Resources/icons/round_shadow_top@3x.png delete mode 100644 Telegram/Resources/icons/round_shadow_top_left.png delete mode 100644 Telegram/Resources/icons/round_shadow_top_left@2x.png delete mode 100644 Telegram/Resources/icons/round_shadow_top_left@3x.png delete mode 100644 Telegram/Resources/icons/simple_close.png delete mode 100644 Telegram/Resources/icons/simple_close@2x.png delete mode 100644 Telegram/Resources/icons/simple_close@3x.png delete mode 100644 Telegram/Resources/icons/slide_shadow.png delete mode 100644 Telegram/Resources/icons/slide_shadow@2x.png delete mode 100644 Telegram/Resources/icons/slide_shadow@3x.png diff --git a/.gitignore b/.gitignore index 0cc39366d..baa529015 100644 --- a/.gitignore +++ b/.gitignore @@ -1,24 +1,8 @@ /out/ -/Debug/ -/Release/ -/Deploy/ +Debug/ +Release/ /ThirdParty/ /Telegram/build/target -/Telegram/GeneratedFiles/ -/Telegram/SourceFiles/art/grid.png -/Telegram/SourceFiles/art/grid_125x.png -/Telegram/SourceFiles/art/grid_150x.png -/Telegram/SourceFiles/art/grid_200x.png -/Telegram/SourceFiles/art/sprite_125x.png -/Telegram/SourceFiles/art/sprite_150x.png -/Telegram/Resources/art/grid.png -/Telegram/Resources/art/grid_125x.png -/Telegram/Resources/art/grid_150x.png -/Telegram/Resources/art/grid_200x.png -/Telegram/Resources/art/sprite_125x.png -/Telegram/Resources/art/sprite_150x.png -/Telegram/Debug/ -/Telegram/Release/ /Telegram/tests/ /Telegram/gyp/tests/*.test /Telegram/out/ @@ -32,7 +16,6 @@ *.VC.db *.aps *.xcodeproj -/Win32/ ipch/ .vs/ diff --git a/Telegram/Resources/icons/box_button_close.png b/Telegram/Resources/icons/box_button_close.png deleted file mode 100644 index 3b0402893ab0c64450b8d081ba33aa55f8cc5e01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a)4Xipc%5RHj*0}t{t7;-4Z9{xN3 z-9x1fY~Od>k2THo{UhNJkh08E>c9<^xii^3Z_9bgpUF39jCXR+YWbFR_}bpqbB_+W w-i@^4sx7&8`S{vZO)4%f(nd-OoT07kiV-r$UTbaZ09wP~>FVdQ&MBb@0Ck@)j zJym5Xg(O*Py@aHcSZgIomQor5fa@`ftmCf%fMRC52T`OKUp0hRkdt@=W)VmH14I#L zd<%GyKzt9JA;EYb7$Fmr;dqAhkYIcaj1ccMe#j5Te?Cz!zAVcKoEwlBb~_MRiK0x zYIsAC5J?CSLE;JAyTPS5JWbc&3-2`natsEFfRe6vW6#Boe#bPE0o%4X@X$ z?*tf%D1`+^Cy>Ig*=%b10Rt?GY`5EZJpK*kh9wc&YPD|q0RSe_H=9i?7P}^}L_#FA z+iis(sZOVJhm#f2Xmq_^i!|g!KNh>)u1G-&LDhytB9Y~CDUuPr^5eGG>xp1Qkh=Y< z0WB5_QKH}P`+PnN#s#+`47!%nm)~qQ6NLtY!TUM55CIVHaIzvC4o|03QSRd$VhRex zM+#3U6q-yXrgi{^@_0!N27{V@(I^lI*wY3PQam3izu&K;^QHr` zL={=Pn)~Uo*d-^nQRju(^MN?`={xsRJ6Eps3-Mom^Z8u2&GJZRDu)ye5N2Z^Ch-2{|he0a}g~F?k cxt{_I0NxbTCUcV|{r~^~07*qoM6N<$g7G2-RsaA1 diff --git a/Telegram/Resources/icons/box_search.png b/Telegram/Resources/icons/box_search.png deleted file mode 100644 index 04735260760a3bc5d9b99022d3d868882a5d59c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 350 zcmV-k0iphhP)9C=+{pqNh0sP%Cb}xMGY>BB9&z+@4b>FxxY6BilUI2DGWnBbAZAy zl$oh0igp1rQ=aFo!*}F)E;AFLuQv0ls_HVHs;Y?N7=Ranx~@snv{N8W(?$~i>%qGz zyxf6vj>%+#_a6BB4*J06dH8%jlVuq}5HKE(na}4)V!z+BTCKQTE)7ov$T=rTa?W)| w*n*FS)dx1W+l}FH$aFgGjIXU)Khrz)4TY@wg>IlGNB{r;07*qoM6N<$f;RA;vH$=8 diff --git a/Telegram/Resources/icons/box_search@2x.png b/Telegram/Resources/icons/box_search@2x.png deleted file mode 100644 index 4d2c66f86e536edb168c150881677aeb32b04d57..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 707 zcmV;!0zCbRP)S*txX<0KyF=T%t%I5CDh60RRAl!2l5X z?g@E^-EPNBCWEb33lFK+>tQ~hN3Yjwr5>O8!@~oO*APDCJ2!eo> zO68!@a5zLl2ogeYyWRepZ@1g%cDv65sMqUE(a~sxsZcKffju~-ZVA`MRZ-~`eu^JBmFxwUfpi@U|myy{oMlq%;)p70G7)ojh#-XHGoU% z?(UApyWP$jz{kf2jeS1fSpXi7hsLwn%o@O8FraZH5;+SX8jaGp*XuEJrdwz{9-B20 zOGB1rrWyJDe(R0s|0eSK`iinFa|0NLVb+dMH<7ouH(J0j3@-CrE=O~>+bt@J!Uq5V z7>~#C^YfDyB7|Tl6f(^bMG?#8GV|z<{6|g$sH(~U>{TolF&2xVBuUgX7!0DOX*iuu znYE2Z18p`NKY*&L%pv0t$SDVSIdiv}8OS4ly2&pL)X9&7Dps zomUhE^Z7g)hC#RLVzEF%2v)0Ao-NC7e&KOba~9wR=HCFRRO%My-vE*%(U0kh=Ikqw pBng|%<~7aHwx_t2u680irY{@T^!=co>}>!5002ovPDHLkV1f}EK==Rv diff --git a/Telegram/Resources/icons/box_search@3x.png b/Telegram/Resources/icons/box_search@3x.png deleted file mode 100644 index 3b681f682e3e977569984958ca6917c6910f6b16..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 825 zcmV-91IGM`P)w6XIAmI`W`lv*VrLQ({@Q5#)fdr+7iuDhB$cM=Tv zRo}gQ=gf(BX1?>~?CccZEM(FtR4SF<@3-6SS65eBt@ix<952V?alha1cDv1HvtF;i zzrTOQUt_geE0xN8K40&R#bSXn6n~;Hk zGMU|F?(gs8@wmxkQYw|dHh~0>u~@9r>Fm~ngpZn3DkY#U6bjhU`%x%BnE;qhr#XBn z0cj)>`8Yfr4h!HQWLKlp>2Q(>*UQU`%jFVF0?708Ga&&XXc+|w&Xm{dW#jR9Jc4t_ z!eX&ln7`C+08X>9+)w3lncl_H4+p)+OQn+N&OqPAfj~gIAe=iw2y!eT0(^ION8dNR z?lVvkS}Z}{|2T+5*CctdSmY&$rgAtOA_Sp_lf2bx@e)K+84Lyy$iZMhep@sIUV=bH zXoth02;_7+B}lnk&Px#b9ig4gW+FbBO!n8r0sPq>>#(57WI}Rb}r|5USDt=L9sv@QN$>h0~#>2xyuvjJyHuh;WegZJA4o6Ux6 zZLwJF*RfnKQHEkkm+3(@^jH!M26MUG!@~pY6?QU diff --git a/Telegram/Resources/icons/default_checkbox_check.png b/Telegram/Resources/icons/default_checkbox_check.png deleted file mode 100644 index 574f57123bd038d32c8e3bf99a69d06c028444c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^d_c^_!3HE-Zss2cQvRMUjv*Qor(QV7d%%E$*UC`R$QFGvXLkEW?ufrslO=)(kHYK<-q*XX@dhQcr_PW8$=5?c)tt#)& lA@(iy=|`C_h5pLFyK&;vvwQ2e6$6cC@O1TaS?83{1OOVvFtq>x diff --git a/Telegram/Resources/icons/default_checkbox_check@2x.png b/Telegram/Resources/icons/default_checkbox_check@2x.png deleted file mode 100644 index 6d3859c84cb809ea2feda32901477b47b31768a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 255 zcmVIfkOX0+BC-g_ve z?q~d%F$Otj06>iKj?Tl5^4`w@Ygo=1T5Eo=g&AY`-|z)C4!*=nkcc3qoQa*_vMdN8 zVB0pV>pBbDK_Ws3p&0C;1K18qDXRfBbPzkQv=wwk8L;xx^iU@3xfZQpChQ5eP$sMn z_RvAB4Yp8g?FiNfuV_jM&bd+SHz>rur$oeo;d7|}sxPY`gfDM-%B%nY002ovPDHLk FV1iQwXb=DZ diff --git a/Telegram/Resources/icons/default_checkbox_check@3x.png b/Telegram/Resources/icons/default_checkbox_check@3x.png deleted file mode 100644 index 46f67cbde14f5759ef7642d2948e2dd5085ff29a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 296 zcmV+@0oVSCP)uw)PlR^a}`#KOxVCh&8GUr7SbTS5rR#&OhIGsX!1IOpE`7^8D;7=||X zG1P*Keasls%!ZSBo?rX5i*A~xzq8>y_ld6S)^!y^G_d==-}fD^g%Ffds5Yh4T6BftRh!^^9CLZemy0000(e~XaU5fTDy7Jd{{$ESh7e67RLjuE diff --git a/Telegram/Resources/icons/fade_horizontal.png b/Telegram/Resources/icons/fade_horizontal.png deleted file mode 100644 index f10b4f924644713a9cc976b8405651cbce2ca3ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^8bHj*!3HGP#J-sfq(VJi978x}`kt}oV^-i{xp=T4 zvVO<^!pT}1M=xj0mVNhcqKk_{=c-3@4(}EBEHMvtO}lhA<=JifNk9H~aD2PB!}{I1 sd$YG*OHMmuX=r?=$M6{Q9;O<`Yp0q28NX8!1X{r0>FVdQ&MBb@02OIAv;Y7A diff --git a/Telegram/Resources/icons/fade_horizontal@2x.png b/Telegram/Resources/icons/fade_horizontal@2x.png deleted file mode 100644 index ed229a5b7903aa815c482fd391469ed046add8b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 190 zcmV;v073tWP)F|38d-s1jwi&Y_kNwrsH&Nx3^nf+VU65pmIDjK!-8nTavR!OP4;X3x!8 z)1TSQyzHtfkX*TWPeiODiFvoXBO+EevkTw*UI1?Ojqyzu;%-KKdfARLm2fhs?{hwP+O#lD@07*qoM6N<$g7qI!xBvhE diff --git a/Telegram/Resources/icons/fade_horizontal@3x.png b/Telegram/Resources/icons/fade_horizontal@3x.png deleted file mode 100644 index 5f7f76e800bc9d39b8790cdf31f42ac2d277a906..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^6+q0)!2~3)KaOb!Qj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS>JirhV2978H@y}97c#h}2!a^Yk7e{FSEBaXMqHQbU-DFF;G z($dn6%IzmRcX9A-49)oY?S|d9v#r?$+h5IbVaX5fvHapcje(h=O@Wy?@>#<~ppguo Lu6{1-oD!MmdKI;Vst06-=ey#N3J diff --git a/Telegram/Resources/icons/round_shadow_bottom@2x.png b/Telegram/Resources/icons/round_shadow_bottom@2x.png deleted file mode 100644 index a64ca5c8e364c18a98e98d764e312fda9f8e57e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^OhC-R!3HER>*_fHDI-r8#}JO0s>gQnGAQt{9CTfz z^gVv6^8Tg=YO|8l_#f=DW-wQpawcSz*UP-rv?+I4A26$EiK)$5@5~O=&EVeT=H zlh{yP_y1pS^XJ#s^^+_tcoR~RlA5AVoj7oS;kkjK0wcrkozm9p=lMPdYG?3t^>bP0 Hl+XkKBbFlW diff --git a/Telegram/Resources/icons/round_shadow_bottom_left.png b/Telegram/Resources/icons/round_shadow_bottom_left.png deleted file mode 100644 index 8beb9a7e12a1c878d326750a2237db2179a71ec3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^96-#;!3HGxgLCzORF$WTV~E7m)_zB>W(NV5)#+g$ zHyr=_Uw-e(H@7TRxSX7%eq9IpARTRHE`y?W`K zVj1?=yNr%i+&E;G%=4{w`S)|%a``KP)o5kv&c3=u(V4I+Zq>xJVu z^7q(7L;#TAyWq7KU{*tEPa6Dje6$oZ{o_b9M$qL|!hYpK8Nwy#wSK)SLC7qgx{L(WWuE zQw0Egmqi^i0NbpWZ8~N?Mzrb-egz-^zS?kA&Bv2mW94&g*t>gy)pj z&H95jCJin@g;P`S2V7+lC}(##({tU$#n86aF-^=ObJKNub6xgE6Q3(TE*=7!z~JfX K=d#Wzp$Pyf-XWs^ diff --git a/Telegram/Resources/icons/round_shadow_box_bottom@3x.png b/Telegram/Resources/icons/round_shadow_box_bottom@3x.png deleted file mode 100644 index 5bd51530921a811fd14f1646d9c0852fcd5dd001..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 117 zcmeAS@N?(olHy`uVBq!ia0vp^%s?#1!3HE>CM@{{q-;E09780gCWnNE{yopYs`LN< z;hQ`<_5c657X17ByWN@1mA}jA&N9K3?Av)lry3e6Fxs#^xZ=EoamQB%2JM@kd7b9= R-9U2~JYD@<);T3K0RZ4QCTjoy diff --git a/Telegram/Resources/icons/round_shadow_box_bottom_left.png b/Telegram/Resources/icons/round_shadow_box_bottom_left.png deleted file mode 100644 index 3bb8de35632d70c6025be26dc8b874732a14aad5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 292 zcmV+<0o(qGP)=DSWm(oS5kakWcO%B2Pmf~X z=O!p3E3`c`@S*cwC=)QV)$tJA-9a)9t_4bR2aeGG`>^LxG;`X6GUo)av6?No1KiAy q@NCf;@a!r`;iJy3>Ju$p!424g~-v5!~{TZ3-8s7pqK= zKid)YG5N(Ac)yWaXr?#R2mICgfWKP*8=Qz{43pB|a@=z84tF(`9DfIR6I=pnz;^{v z&hfil|B7}bqNhzyhbN-*@?>qCGIAaFVD550>^Rpb*S#QSxeXM+d&+Q7dDk=(8c|k>i=g=!#NHzE=M3fCh?nT;3({$`t8x_v0fcHSps&7UTY^>^N_C=+>HBR%gkr zD!iI-^_mXg0lK@+kJX6i;W$qoyH$?hLXKNoTK?PvIF929tdEfaxAXum9hNJlRV^em zZ%2X4;Fcl*c+ebJgB^iu?^CHF%bgcMCN&}fguzD@f(PIoWsDroIId~K&%yq~%fZ*J z-K`Xe0B0&m89W<=*0#pX1P}txz(-)C>0$n+foI^Ofp}v?flJ^~h?T%+Ukt!A6GQ>4 zAEL?t1Kb-t3s%i%wLcv2%7j-_;Zly52Ak-pI~RiB6@aU-rE++6;MM=X1U?faJr^c| dhbNs7;5Y0phJ{}GN3H+>002ovPDHLkV1iP0_>lkr diff --git a/Telegram/Resources/icons/round_shadow_box_bottom_left@3x.png b/Telegram/Resources/icons/round_shadow_box_bottom_left@3x.png deleted file mode 100644 index a8b2b8d0b8976c72ac26d6631163a5dad9f64b2f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 887 zcmV--1Bm>IP)867kEwDw7h?=5rO!F)xct6e zuTQz0s|7U=JWsBj6{&i5{}_i90*4d=hZF*b6at470*4d=hZF*b6at470#iuIIp2O) z$59G_?xeIV_Ey1O>tXyd&g5T-P!dB5|7FbfWWDQ=k)Z4*q3Wg+aI6{^3bzNq2crxi5zV`8A1x4MI zLPZS;P!UxAf)hB{W@R*+4@U+*w)&P8)=E|818=O?O{}CKvr?!@bLyao`ZviNx8Bj# zL0q_&2wA~w3YwF*)+fKBa=PRxR7zittx8!5&7@!gu;0)~S;=e)%;uwoTn{{ZGEcz$ z-iIRru4t*G4!2#EkPteXkA|}L;WFS=P(=!t%2U@%9o&9pr|VAMq=b#yXo9e+s$7R3 zBI6H=VV}J}F0N7vB#4@j<>gpP>2nOfqNaRP4|w{jCZ)y~a1NLw0q(y@>L>)`deqn! ze32q;0Z^S=2IG8)Wj#dAC#7^d|9-!3V_D`Sp~=y5J8T-D$%OE&2=31a1+adNYPETG z-;Trsb1UX@&FXY9LGb)_UF2A`PPf_7Qe~>H)Q@*uZY=DiYjdEckj&MA_28Pw+P}rQ zTINuTA?9PvR=Fpyg>-FCSnEdvOA7aNrELPv=36GH0gp@h7q1z0-MID;A^9ba^a86x zrN*;hSoF~#ks__cVO>lAxUB_UqE9)enH877No5Tq7MC%Ep!O)S%!Nj->^-*h>6x1a zQ_RP!tO99ELNhU`j)q}x2rUaU&tC4#{TGw@gwQ6}7IWyaKjOvI=p!XpT26%PQ^0-H zs>`etZeVY{k&5W09ycl8!M%~IWvpIpA4}dadb}v><&3M8@@ZW0B%Uw_FPccXb<}tR zqX`(E=Ffs;4kJnIrj)Oa7kcvUzQZ6=*a08%6CRu|t_e(6N(*MG>=(j7a#|JuwWt69 N002ovPDHLkV1h*~n;!rG diff --git a/Telegram/Resources/icons/round_shadow_box_left.png b/Telegram/Resources/icons/round_shadow_box_left.png deleted file mode 100644 index 7f5e183c9902c54fccb225c6df948c4fbccb5c51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 93 zcmeAS@N?(olHy`uVBq!ia0vp^AT}ch8<2ed)xHi$sd&0LhH%VeJ=n;|V8GFAu;J=| q`+Gu-%NH3Lt0;2jW}bdmR9>U`j4|Ti#kM}6dInEdKbLh*2~7a}3>wY= diff --git a/Telegram/Resources/icons/round_shadow_box_left@2x.png b/Telegram/Resources/icons/round_shadow_box_left@2x.png deleted file mode 100644 index 1e28073414f034c5cc32b4a23db4487bf87d548d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 98 zcmeAS@N?(olHy`uVBq!ia0vp^B0$WA4$1cCB`|25eEARC4*rOecv1u0dH-VZMJYD@<);T3K0RY`;A87yp diff --git a/Telegram/Resources/icons/round_shadow_box_left@3x.png b/Telegram/Resources/icons/round_shadow_box_left@3x.png deleted file mode 100644 index f52dac8931eb6ee42e01ba3a736d6de981668ffe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^azMTNj==t=#aQJc|!MnaYZH#AECwpce7eDXC7_Z>B`VmkwgQu&X%Q~lo FCIBAOB9#CD diff --git a/Telegram/Resources/icons/round_shadow_box_top.png b/Telegram/Resources/icons/round_shadow_box_top.png deleted file mode 100644 index f2ff11208bc527027f58ab6d23d1f2f9e6ddc9f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 93 zcmeAS@N?(olHy`uVBq!ia0vp^j6lrA!3HEtFPV4&DHTr_#}JO0x<@uLG8ph2GH`zI sfAVcsUZx7R4NFp`@89*>bn6qN@m7P$PqCM@{{qzpY>9780gCZ{AM{5a3R>civF zAj8M4tgO89l*YB@+YBM8K0ZDcDJxdmdKI;Vst E06xha*Z=?k diff --git a/Telegram/Resources/icons/round_shadow_box_top_left.png b/Telegram/Resources/icons/round_shadow_box_top_left.png deleted file mode 100644 index a5736889a34945c4c1a01ccfa925c4134f274d70..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^;vmey1|%P7U0DF67J0fjhIn-DopO=yr~-$x_OJi@ z_xyh1+inf{YjGMOM+L1-?T-7Z2^tZ5t_f@|?1J!o}MD+*H)@w(nt+nYkmV&PU zLNx_G3p(?>8{E^`odbix5eTi$YBz$wy+BfZ6dtK(f_tF7X|#-!3XWQCOiTAj+9MGh zfwu0^0a^K+Tu}uDm9E;o)Q=<<+?sF*s0NL|TV?L3g2JMMkN_>Khg?Mi)Y94&1s1`j zhEV9}06fqvxHgC}--5OVqCqcNfX0T#PBrM>yZa4jz+8T4uVMjb=;I3r30)PSi6%B# z5`326$*KA4=+jvWeMop*eE z&DPYRXQ|1FYL}%?so>VKFXd$@WbxhBCKA9kunN#b5B^=a1boL^_-%{t&>M3D3igpo R#8?0T002ovPDHLkV1kPm!KnZM diff --git a/Telegram/Resources/icons/round_shadow_box_top_left@3x.png b/Telegram/Resources/icons/round_shadow_box_top_left@3x.png deleted file mode 100644 index d8e5c7fb185890ba21719c768d9f4caa2b47214c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 741 zcmV7DP>4M!$}!6u?UWQ2z2w5-X77j{WMadgQV`i@4RB$GQOn)?X36{BE>Uk%RO6> zk~OjV8YdM?U$_k~smsVG!z*wb!${F~#Mxz?kJ?I5lcMRcHL=>gODRA9G4A_jB}Uof zbKdMVR6bVsmh2-BsRb1&o&ji{WNVV17?B~Nu%~DyLtU$-!5!BUE2Zp1iUuv>@G*65 zq}Pa~WNBWK2}gqFUdhnm)OSX|fV^pJby!moi`S0_!o? zKSv5x?^uzNeI(DICX98jCB;itYy22f)@UgbwkPFrO(_;g$JT5x8b731bG}vryAT54 z{O;qO)DDCIBm`RO4R?1>38iFe;`q8II0EE;q5*v&>)`P9d+%svu0&*2D(kTN3Xgg5Ps ze(KX>3ipmfNv4M6A+M5;wosGmklHQ_J>-;H=FdQnzEc*iC9jzwpQ!hIkzySzmxghB zR7P4Ep+%-u5gl9lawH`Y{O+?dp#TCYtx{Z5>T^p6tK;mrCeUqjG380GE8a9{Rk^jz z$`~S_6&8*xP?KWaW>wp+?im>2ZRp$z*>znXo7#2;E+P#kV4=e X;<}47-El{100000NkvXXu0mjfT?J7x diff --git a/Telegram/Resources/icons/round_shadow_left.png b/Telegram/Resources/icons/round_shadow_left.png deleted file mode 100644 index e7df24dc12ec19205ecf3c84be4ad43a18583729..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 78 zcmeAS@N?(olHy`uVBq!ia0vp^%s|Y@!3HFyABb!LQlg$Njv*W~lT#8Cf1W>h@SuW@ b&KU*Km`n*u6{1-oD!M> q?fy2ugd&x-Dmjx|W-ip7-p_7R!I;zk_0xBtdInEdKbLh*2~7a)F&hp5 diff --git a/Telegram/Resources/icons/round_shadow_left@3x.png b/Telegram/Resources/icons/round_shadow_left@3x.png deleted file mode 100644 index 2431067e2372d1fa43deeed9eee760f87ec5c8d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 99 zcmeAS@N?(olHy`uVBq!ia0vp^oIuRX!3HE9xm3%5l$NK9V+hC0-cuU|84Ng%7}!74 xxKV#Ug*8O`m3Na@=)y~PSG>_Pb}lUNlAqAUnD@`!>@83igQu&X%Q~loCID@W9EJb@ diff --git a/Telegram/Resources/icons/round_shadow_top.png b/Telegram/Resources/icons/round_shadow_top.png deleted file mode 100644 index 39edc4a4ebe14f516bca0a1b64bdba296d74fe57..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 75 zcmeAS@N?(olHy`uVBq!ia0vp^j6lr9!3HE}Hf~b~QbL|Cjv*W~lM@mXf1X#-&^W=s Yz|PL-=FVdQ&MBb@00%!1LI3~& diff --git a/Telegram/Resources/icons/round_shadow_top@2x.png b/Telegram/Resources/icons/round_shadow_top@2x.png deleted file mode 100644 index af421f2a05bde2ce515e850112f9fc42d65ddd73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 90 zcmeAS@N?(olHy`uVBq!ia0vp^OhC-S!3HFkynkm2q!c|}978x}svg_O%b>u(tl+cz o+yCOy37wOlI8AQY_V*^6oXQi%py!?vEzopr0L2>_&Hw-a diff --git a/Telegram/Resources/icons/round_shadow_top@3x.png b/Telegram/Resources/icons/round_shadow_top@3x.png deleted file mode 100644 index 5e3c7b6ac0882527d77c0dd50738492180001899..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 95 zcmeAS@N?(olHy`uVBq!ia0vp^%s|Y>!3H9qs_+0QHBT4E5RRG2DQRi{&NHy;^z`)b r6z~}v8#9+l`uX{>wDR|A6^>bP0l+XkKaHWbP0l+XkKQtwIl diff --git a/Telegram/Resources/icons/round_shadow_top_left@3x.png b/Telegram/Resources/icons/round_shadow_top_left@3x.png deleted file mode 100644 index 16d3a6862b5005cc3d00f9485c5d51b796dcfa7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 269 zcmV+o0rLKdP)A3atQeG!l`=^=dz4HQ3#!>m6_lSQ&`Oa@_)+ zf@Y@f{vI$h%X=|MLRF!v?*WlbH3l$@R260hGXu%7_hb$L)*a-`L}Zu-pi^yz+YPE| zNL6pfBtfz@nyKxg{NC04Cx9>^iR-#XQKKGPfZ4|spy-;IZv(PnEp7#Lb=n5h9?!`-T=A Tc8Rq600000NkvXXu0mjfxvXwE diff --git a/Telegram/Resources/icons/simple_close.png b/Telegram/Resources/icons/simple_close.png deleted file mode 100644 index 10f8b030e8cd105c9c3ac7af355ac80689fada49..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 124 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4IeWS|hDc1EI>C^O!GMF=xxQxq z+5AfjXKzhl6)zSLzR4%x`Ic#;ETiY8L$15|WJ?Zc*~H|nem8Y#|IFzALp`r&itS@e XW7--y?Rs%L&^QK9S3j3^P62i8i!3(nixPixIk2@h aGyfsu%hQhzXx{)jfx*+&&t;ucLK6TR1Vk_Z diff --git a/Telegram/Resources/icons/simple_close@3x.png b/Telegram/Resources/icons/simple_close@3x.png deleted file mode 100644 index 5a5f817033b6165696a4693f51a60b7778cd58b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 264 zcmV+j0r&oiP)X=WQZ|}h(JV;Qi7R5Rng{l4ONAiA?MuB z3v$k=wE_T2DO=&Hic$&ypw{|<_t2(Y@E+RqhMO7AvU9auT@ndewFCHye={)`L@ngr1tGel)Ida4$fM@3U7UL=IjIj(14RaU|%(-58 Q2xtt0r>mdKI;Vst0L_gj`~Uy| diff --git a/Telegram/Resources/icons/slide_shadow@3x.png b/Telegram/Resources/icons/slide_shadow@3x.png deleted file mode 100644 index a67d341e0e3ccecaba0c4a8bd8fa8a17994f0e55..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^6M&eRgAGX5Y-tMxQl6eJjv*GkZzmaYF&J<#pa1j! z{M)FmD90C1d}p~7UTAP_nweT=DP1|QE<0WR>csfDUpGzlaXtU-&pJjG+t1(MPSk5# fc+lp;g(T*kEsTfke4FbP0l+XkKq>3>8 diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style index 50d25deb7..9faae34d5 100644 --- a/Telegram/SourceFiles/boxes/boxes.style +++ b/Telegram/SourceFiles/boxes/boxes.style @@ -10,8 +10,26 @@ using "ui/basic.style"; using "ui/widgets/widgets.style"; using "intro/intro.style"; -boxDuration: 200; -boxRadius: 3px; +UserpicButton { + size: size; + photoSize: pixels; + photoPosition: point; + changeButton: RoundButton; + changeIcon: icon; + changeIconPosition: point; + duration: int; + uploadHeight: pixels; + uploadBg: color; + uploadIcon: icon; + uploadIconPosition: point; +} + +FeedUserpicButton { + size: size; + innerSize: pixels; + innerPosition: point; + innerPart: UserpicButton; +} ServiceCheck { margin: margins; @@ -26,6 +44,9 @@ ServiceCheck { duration: int; } +boxDuration: 200; +boxRadius: 3px; + boxButtonFont: font(boxFontSize semibold); defaultBoxButton: RoundButton(defaultLightButton) { width: -24px; @@ -161,6 +182,28 @@ boxPhotoCompressedSkip: 20px; boxPhotoCaptionSkip: 8px; boxPhotoTextFg: windowSubTextFg; +defaultChangeUserpicIcon: icon {{ "new_chat_photo", activeButtonFg }}; +defaultUploadUserpicIcon: icon {{ "upload_chat_photo", msgDateImgFg }}; +defaultUserpicButton: UserpicButton { + size: size(76px, 76px); + photoSize: 76px; + photoPosition: point(-1px, -1px); + changeButton: defaultActiveButton; + changeIcon: defaultChangeUserpicIcon; + changeIconPosition: point(23px, 25px); + duration: 500; + uploadHeight: 24px; + uploadBg: msgDateImgBgOver; + uploadIcon: defaultUploadUserpicIcon; + uploadIconPosition: point(-1px, 1px); +} +defaultFeedUserpicButton: FeedUserpicButton { + size: size(76px, 76px); + innerSize: 76px; + innerPosition: point(-1px, -1px); + innerPart: defaultUserpicButton; +} + boxLoadingAnimation: InfiniteRadialAnimation(defaultInfiniteRadialAnimation) { color: windowSubTextFg; thickness: 2px; @@ -224,24 +267,6 @@ contactUserIcon: icon {{ "settings_name", menuIconFg }}; contactPhoneIcon: icon {{ "settings_phone_number", menuIconFg }}; contactIconPosition: point(-5px, 23px); -contactsAddIconAbove: icon {{ "contacts_add", activeButtonFg, point(18px, 18px) }}; -contactsAdd: TwoIconButton { - width: 52px; - height: 52px; - - iconBelow: contactsAddIconBelow; - iconBelowOver: contactsAddIconBelowOver; - iconAbove: contactsAddIconAbove; - iconAboveOver: contactsAddIconAbove; - - rippleAreaPosition: point(5px, 5px); - rippleAreaSize: 42px; - ripple: RippleAnimation(defaultRippleAnimation) { - color: activeButtonBgRipple; - } -} -contactsAddPosition: point(14px, 8px); - contactPadding: margins(49px, 2px, 0px, 12px); contactSkip: 6px; contactPhoneSkip: 30px; diff --git a/Telegram/SourceFiles/history/history.style b/Telegram/SourceFiles/history/history.style index eebecd866..d090907c8 100644 --- a/Telegram/SourceFiles/history/history.style +++ b/Telegram/SourceFiles/history/history.style @@ -47,6 +47,14 @@ historyToDownPosition: point(12px, 10px); historyToDownAbove: icon {{ "history_down_arrow", historyToDownFg, point(17px, 23px) }}; historyToDownAboveOver: icon {{ "history_down_arrow", historyToDownFgOver, point(17px, 23px) }}; historyToDownPaddingTop: 10px; +historyToDownBelow: icon { + { "history_down_shadow", historyToDownShadow }, + { "history_down_circle", historyToDownBg, point(4px, 4px) }, +}; +historyToDownBelowOver: icon { + { "history_down_shadow", historyToDownShadow }, + { "history_down_circle", historyToDownBgOver, point(4px, 4px) }, +}; historyToDown: TwoIconButton { width: 52px; height: 62px; diff --git a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp index 0f3aa8934..bd953a0d5 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp @@ -17,7 +17,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "info/info_controller.h" #include "info/info_memento.h" #include "lang/lang_keys.h" -#include "styles/style_info.h" #include "ui/widgets/labels.h" #include "ui/effects/ripple_animation.h" #include "ui/text/text_utilities.h" // Ui::Text::ToUpper @@ -29,6 +28,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/application.h" #include "main/main_session.h" #include "apiwrap.h" +#include "styles/style_boxes.h" +#include "styles/style_info.h" namespace Info { namespace Profile { diff --git a/Telegram/SourceFiles/window/window.style b/Telegram/SourceFiles/window/window.style index 1a561099c..9257c530c 100644 --- a/Telegram/SourceFiles/window/window.style +++ b/Telegram/SourceFiles/window/window.style @@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL using "ui/basic.style"; using "ui/widgets/widgets.style"; using "history/history.style"; +using "boxes/boxes.style"; // UserpicButton windowMinWidth: 380px; windowMinHeight: 480px; diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 342fad864..946c33ef2 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 342fad864a30acc92f6cfc2cd5ad631c7133ee8f +Subproject commit 946c33ef251ea5a46340e72ae903487576baf9b4