From fbf3c005ffc9854e3a2999929d0628a9f464e08c Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 10 Sep 2018 15:18:39 +0300 Subject: [PATCH] Implement new settings design with icons etc. --- Telegram/Resources/icons/settings_chat.png | Bin 0 -> 248 bytes Telegram/Resources/icons/settings_chat@2x.png | Bin 0 -> 393 bytes Telegram/Resources/icons/settings_edit.png | Bin 0 -> 318 bytes Telegram/Resources/icons/settings_edit@2x.png | Bin 0 -> 647 bytes Telegram/Resources/icons/settings_faq.png | Bin 0 -> 715 bytes Telegram/Resources/icons/settings_faq@2x.png | Bin 0 -> 1707 bytes Telegram/Resources/icons/settings_general.png | Bin 0 -> 290 bytes .../Resources/icons/settings_general@2x.png | Bin 0 -> 566 bytes .../Resources/icons/settings_information.png | Bin 0 -> 589 bytes .../icons/settings_information@2x.png | Bin 0 -> 1358 bytes .../icons/settings_interface_scale.png | Bin 0 -> 541 bytes .../icons/settings_interface_scale@2x.png | Bin 0 -> 1416 bytes .../Resources/icons/settings_language.png | Bin 0 -> 382 bytes .../Resources/icons/settings_language@2x.png | Bin 0 -> 729 bytes Telegram/Resources/icons/settings_name.png | Bin 0 -> 586 bytes Telegram/Resources/icons/settings_name@2x.png | Bin 0 -> 1104 bytes .../icons/settings_notifications.png | Bin 0 -> 431 bytes .../icons/settings_notifications@2x.png | Bin 0 -> 930 bytes .../Resources/icons/settings_phone_number.png | Bin 0 -> 715 bytes .../icons/settings_phone_number@2x.png | Bin 0 -> 1409 bytes .../icons/settings_privacy_security.png | Bin 0 -> 391 bytes .../icons/settings_privacy_security@2x.png | Bin 0 -> 770 bytes .../Resources/icons/settings_set_photo.png | Bin 0 -> 408 bytes .../Resources/icons/settings_set_photo@2x.png | Bin 0 -> 1224 bytes .../Resources/icons/settings_username.png | Bin 0 -> 992 bytes .../Resources/icons/settings_username@2x.png | Bin 0 -> 2878 bytes Telegram/SourceFiles/info/info.style | 11 +- .../SourceFiles/info/info_layer_widget.cpp | 1 - Telegram/SourceFiles/settings/settings.style | 94 ++++++++++++++---- .../SourceFiles/settings/settings_chat.cpp | 11 +- .../SourceFiles/settings/settings_common.cpp | 33 +++++- .../SourceFiles/settings/settings_common.h | 6 +- .../SourceFiles/settings/settings_general.cpp | 1 + .../settings/settings_information.cpp | 21 ++-- .../SourceFiles/settings/settings_main.cpp | 49 ++++++--- .../settings/settings_notifications.cpp | 5 +- .../settings/settings_privacy_security.cpp | 5 +- 37 files changed, 179 insertions(+), 58 deletions(-) create mode 100644 Telegram/Resources/icons/settings_chat.png create mode 100644 Telegram/Resources/icons/settings_chat@2x.png create mode 100644 Telegram/Resources/icons/settings_edit.png create mode 100644 Telegram/Resources/icons/settings_edit@2x.png create mode 100644 Telegram/Resources/icons/settings_faq.png create mode 100644 Telegram/Resources/icons/settings_faq@2x.png create mode 100644 Telegram/Resources/icons/settings_general.png create mode 100644 Telegram/Resources/icons/settings_general@2x.png create mode 100644 Telegram/Resources/icons/settings_information.png create mode 100644 Telegram/Resources/icons/settings_information@2x.png create mode 100644 Telegram/Resources/icons/settings_interface_scale.png create mode 100644 Telegram/Resources/icons/settings_interface_scale@2x.png create mode 100644 Telegram/Resources/icons/settings_language.png create mode 100644 Telegram/Resources/icons/settings_language@2x.png create mode 100644 Telegram/Resources/icons/settings_name.png create mode 100644 Telegram/Resources/icons/settings_name@2x.png create mode 100644 Telegram/Resources/icons/settings_notifications.png create mode 100644 Telegram/Resources/icons/settings_notifications@2x.png create mode 100644 Telegram/Resources/icons/settings_phone_number.png create mode 100644 Telegram/Resources/icons/settings_phone_number@2x.png create mode 100644 Telegram/Resources/icons/settings_privacy_security.png create mode 100644 Telegram/Resources/icons/settings_privacy_security@2x.png create mode 100644 Telegram/Resources/icons/settings_set_photo.png create mode 100644 Telegram/Resources/icons/settings_set_photo@2x.png create mode 100644 Telegram/Resources/icons/settings_username.png create mode 100644 Telegram/Resources/icons/settings_username@2x.png diff --git a/Telegram/Resources/icons/settings_chat.png b/Telegram/Resources/icons/settings_chat.png new file mode 100644 index 0000000000000000000000000000000000000000..ca3b669cebde73b2f0c9271d62f347b047c5cd20 GIT binary patch literal 248 zcmVq*gG!?911&gQaIskyXhx5Dk^Uii`p6BddI*#M9Uit~{|5~34B<)>?7kEoi#P>Gn`oFYWLX|h@TI9bX?|hy9jsMNq*MpH$604U&((j z{myvKui=ic!grPvwv0vo4R>zy`dkiSYwF1+py9T=4 z6x*}+`Go5%a2t>;12KOr*>bJ>{JrW+c9&dU@7?YVe$t zaC_VG!*Q&#fASdDA7hoj`=50W*YmyZ3=8h8%-2eLBd6W%jfj1+|NM?)ueQIK2=n=G Zw%T29k3SV??gs`jgQu&X%Q~loCIFt0wD|x4 literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings_edit.png b/Telegram/Resources/icons/settings_edit.png new file mode 100644 index 0000000000000000000000000000000000000000..fad4f64fa136fc0b5f1bd390cd11e8715015705c GIT binary patch literal 318 zcmV-E0m1%>P)vn)f`btsAgwrxWQfxhp-IX@mu(-canXRER-;kquuFoaDb`$8mhYrfJ%X>4Q?rJZV47E;i=b55r^%&nzn!=-;*aq0@U>xqGNy?hb*rD1 zSgpL6;Ud}V7Wn%0*QzJQ6W*NI8KW1mHf&L!41>e^>&&fAja71&9^A<@UvoYC;*PxS z+E>MU>lVxPvzyKC&4^ikdEy%#C%z?_QW9-~z1dr%f*xI9%AD19H&0#adXCxBV+)z9 z_Qu_K|9w$mhg|DD<}W{M{;5nAI=V<^$MeS9Z^KO11!$aTt(MdHcIC{|qM}Fh*yZ@zIcw|U@I<8Vg^5gfSEa(65{K$FBqlpOegQou^?Ee5J;v6yzLw0v}WqW&D z*4EZ!b#+xfKR?BB9C>EmH%52-lG|kYve*1K>UazYQ zyWK99Wl<`Xn3ghRP2=I^ZBX3+uK_JE-o%6>g((4Q&T#&ydNJQ zMMT6j%~46&&d!dAh+JJ=P1LuxwgPvJ+SIW~BodL0GwO*%0>^RUkA-0vbUK}}!T;*M zP13#&zF`>AK#|~Tn=~HNfQ3Tg`>V}&e|TNjWq*G^ba`u<#=*gX>hRH}5eq0HoSvSl zujzC;SeC`c#s-;8hPk;pHa9o1EK8NZ^E}SZ&Z6oZ-UO9OCH4=vQmI5XmF82!Z1jn- xva%u~BDQVI^Yin!o*1!!f7AZ`XX1|oe*q&Dh*6&uwyXdE002ovPDHLkV1n<~T1Wr@ literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings_faq@2x.png b/Telegram/Resources/icons/settings_faq@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..924d2ddb81a2f127b4b2837140d11124f23b7f0d GIT binary patch literal 1707 zcmV;c22}ZpP)1KY%_UI{J6izXElI2!dp zFvgP}G-c70(ozx)YY3Q7N-Cl2LYwY<58rS1+hu>W+aCgkPclhgnKv_^GW+JedD{R0 z2!AnDhaEt@aYFF8FI&q-d;F={ydn?W@v71hBIf*03t#v zm4Z|%1>4)(5R1hi91g>mFJIv2&!6=O2e4M+bUN|bvuC)nvVuyHNF?y-)2HZkI%^is ze^R{>yWNh{)6&vx7&{f!NI{nTwPt24LX<0VJ4H|NiLU@owK^S zii3lLheyz8G-4h*fm>-E^w)P!!g8%IV)aB6Bw_6G`u zLTEG^|13eH(TH!~z7-9KqA2wFe2P-c;c%ee@5diMeu&zfo0~(E$@FIk>U27M{ra^a zh^?(H^!xo){n{pz3H^RQZf$J|?7w>T3UxYN{Rxhbj|-f~^U~6lusD5K(BL;&(+}+(3eXbA@cXxL& z5C}-7URzrmCK3tW9Ezf_rKP3z1Scmad5+TQG`ihxQC*!*hqJS@lEe;Tc6Ju^dc9-@ zq|<4h{^aCjZ3%XDbs zo6Q)D#dyYthlk7l?=3Gcqt$8^=vgclTwY%0=>~&ANxQ?t!#v%1JdS3wxq5;F0|S`P z=Q+a^MWM}R6V)XM0;AC=FOZ?3AxYaqLqo{2ETHa0|c34#EV$pkb_15MMAN~Pfa`}dNz-@SVWdwYA_*k-cNhkr@W%W5`@piS zr2gm6pTX<(O2#IJk_6A5JOt=!d1R<2#UhU@F=oNbn6@z$+dvU6HnTX`$= z+S*$6i_Ff>4rh?2X*_-Ubk*eU+_{6vWRkZSy?F5gwOXz0Jd?@9tE0bu{i>c|@h*a< z>1vKGs8*{*H|sB7zLea_$PrAZ)729!P9uh4B=?@>$b$zD1mr@YP}#?zgDJYczFs}S z`T2QX?YVyadPU?eU%o8Zct3vpSdoqX{(fFf4u``f=aj62-@bk0KC4tJxNzY@sVSnk zd-pCF3Pu9#kaS&7pzvRqQKN@H5d#AZilnIy$vKuDzag4pntyas4()kBB+p$;-o12@fUt|CP1Azd~cr+T7 zJT6H|F*&6KH5!dz6JN9A5&&RlXQ$wxIyN>|c7S@l9yd2PxdZR!=4M%SuORpD-{<+x zWHQ**)m1x!0LoexVg!rp7sD`R6Z|7B3jpb+Q#lRZN(tKScELqX-I`7SfVXeo#)BY9 zQnqbaX^M7qbl}3mg2120<55CR89{)`8^48qOhM#yolfWBG=2g8Z3(`4^G4wOuW8)_ z{CoK_H#a8;qVSCPd_HtI9A(=p=kle}AFiRmQYnl^BTP(8z`c9-ME_1v6ny;n5lE5* zk|ZIKNC3;SU@#cKVzGe5Vu6m14(RFWf&Tt}a5x;IcAh_f4x^)^u(PvMNtggoVLBB= z=>_QT-@h@N&GNcwVmR~*&|>q+$+uO05pzPvKF}x|_H}L!+Opyy}{5x1S#}N_e#(dogdw}-> znVD3T%#6&8RF#-{3KZ93X5^f4P0kt2T&-`cdQepX04XJi2t))aB>;e`&Ig(q06;{3 z$3&#M@h7>S{qd*y**hnHwlv0wbzQM-8)A$AfDpp`mNGL+DOGz)De&IU2NDsy_Xr{2 zJWm|QfqmbxEXybi?nS*T|Hm{fX|>YOn{-%d4A^0%`jDQyvyz$ho2Df%D>>)h&yQ4x omBv3!qm{;h)M%y0G!L*j-|)U$NZ#jF&Hw-a07*qoM6N<$f{>YijQ{`u literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings_general@2x.png b/Telegram/Resources/icons/settings_general@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..95a6e3c3f55af274985da25fac2a138a1850cf96 GIT binary patch literal 566 zcmV-60?GY}P)d3bgb+;A6sxMjHma(^-EN1=%o zkaONhno`;tODR?Ul>723Z>P3=#pCe+Lde(idcB70_4;e` z*PPGi#`9*gX^q`(xBW93fL=w0bKY8He*UkFvFR6?D2krigb)HLrRcgYx~_|q(x(bq zmL*0}G<`vUevLlMGM#d2g0mmhYRTCS+uu(ZhR7I0Ap}Y(@qWMK@pweWnC^eBaXL48 zQ?ZTSbgbam46*CcUg==i_A?E+0S5^Ef&=e*^vaE}>(MJX!mg)VB4eSl>*1Wg%)9fb zhS(|WZB%wWQc74X7JuG1xjv|Zl=5ZF-^a_r!>(MI+F!-)V zzu@dgwOVqv!}j;{-@6{WlQA7DXgXHVbgZE1SV7bI1TGZRo~W&qEdT%j07*qoM6N<$ Ef*Dm2IsgCw literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings_information.png b/Telegram/Resources/icons/settings_information.png new file mode 100644 index 0000000000000000000000000000000000000000..02cf5c07ae9cacd2015a5e474cf3178be3120cbe GIT binary patch literal 589 zcmV-T0g)citD{5&d7_+W!u|uTwARvUwPZG%i7`gPFqAM1#TX;g=~SA{rf97b zLy3x7t;TM*BTn1xmTI*cS?fElCmhG&e)bO^67ELcu~Sl}a+8*4p;$ z*2zw~mg{sn0BklJT-S{UwpuOQvs)*L0xG3!PaBQK&%1GXWlN=!h=>e_!^@PFQc9Fk zS95@jMx(P@Ki2#n#uxxHnM~r|T}CdK17N*g$6FePA;2yFV=a~MdjJpwLA<4ZT0eka zUtc03l1il>E}BlKMMPw`+rjvRI6104u=DULLu=uyuQA2JRSikm&>=-UH^D6 z7+9$1c{lAn+35Seh4uUWsEu7uIF4hXr=GsQzmv=5&|0IlCZEsK?RIU?0D8UNW51_U zR4NrVn+F+;n b{~YiaZ$J1gG2L^R00000NkvXXu0mjf&~gvy literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings_information@2x.png b/Telegram/Resources/icons/settings_information@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..b335acf2165ffa074623fe81fc7383be897ac2a7 GIT binary patch literal 1358 zcmV-U1+n^xP)5m1ZX&U$U_un+cvMjpY zZb@B?VHosyJa~P5{brkcdwZzSXg&t8rKJUTc6N9s?(gr>F=_#7c=9cXv0&Vlg5o%d%)R8fy=@va&)X zdVG9Do6RN~E}2Z09udi8QZ%H^X2ZwFM`T8u;@ zMB^@(OG+21s*4uG<#G`oqR}X7wc6?d9S#Q;3I$@28w>_X=8BL~Z!+a!Fc^q`JcU95 z9S(Up%8E!SL#va-rkcSU}tA% z={TRy!_Cc&WMdRXK_ZbTL1r=;Fq_SiAz7A%TrLOA&CNV-?@17lrs>i#$8qrT@*>Gp zQEhE)C1XuZO|sf}etw2Rp+K}LB*8Jraa_f+Sd|+qKdwfID0q$_V0kxEC={ZuTD{cP z)<*pLV!F5>VEIayQmF*9*(}pu^-941RVTe(52K@_ zr838HqMpfufT2(b;_-N?%rFc%olcoH<;&@G65~G>i`51&l}f?E!2$7^%jE)XNQM}@bK^;s=nYqa*M@+>2#Wyt}HApeAs+&adDA1;qB||tId3{7~guy z0^t2cC$S5>a^{03lZm&HQ@2GY0Kn<#Y5Z4#K%g$mhCMw!cy@Ni%QrPOCABSSi9cfD z*J`zX&cZLipQZcV-CbVtZ?kj{@MrU7Z*PxhqBus}ZZ|RvBf32?n=f)N+^-^~RM9jI zUauEsXJ_C1o@H4$Iy!+37#ayjHUu40`}-vBKSlgWfWpHFbtR*drbJo
>r05-aQ02^KZ0pWiT1h$0J Q3Ht(m4q)zHKt7)r?RHyqIvvq$Hbt#g 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 Y0O^uG%EKyi0RR9107*qoM6N<$f_zI0M*si- literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings_name@2x.png b/Telegram/Resources/icons/settings_name@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..85249294f8811e30b8b438a1278ff59eab0be930 GIT binary patch literal 1104 zcmV-W1h4yvP)3#iW6*+Z#1bP*(p&YnQsTHZEu5Cc*xJ7B1WgN(Dk{ z3RxmWP~uOt^DLgnm&TuCUZ2+qzi<{8=6mn?%-orC?oa@L@Pjq?edP|8KBxV z15~?afa8c^7&tgMfM75P*=!c-^*WSFB}gWd5DW%E6h&YdW|AoYz@JWrco$J6s#m&-MsfDFUnAaj4N~P@~Zx$8mjIHBl5v!jT080QC8MJrh?VpU+1cjyxbu(|CS< zJ~G_J#f3VKOYIN@LGgii0w;*c0|NZ{@VMP>4243N&1SLDXkeq!z-%^)p->3jZa3+Z zLsw93%Acy)Up2Ms7wHL&MkBB+3mnJ6`uaMUOeQd!&0sd0VR3O0007G6GNjXKczAe# zTrLO6WD@S~?jWDf!|UrS(R_%!gBFVgc6N4Pb8{26x3|G+wE|7kBhArjwICLYK`a)7 z+uK{XzP^TZIz4V`05HZE%HeRJBuSXbWWH0^2P%`vpd?9(etQgw(M>GNVjvK}YPCun ztW(u$6$60)vMl>=%Ea#OF8F*tSX)~gc-_m(3uH1GczSw*LZJZf@9*&T_68J1fnKi% zy`071OfeiKNbpwzVp{=H9S2%oy->Hc^*rpQqL_EiA3=5@DL3K!`PjN z!C=6nqa%z&B0X>B$HxcqJWn1_lBBN1qR}WiozAhL`i0Z!#Ar0ywXP&dR58UjRh1xX(RJ&$?YS#=;5cIYt8X^`~<626a`xAp8;yEsj3QqEXxRj0HqX4DZ(%$%Q66}s%i^;emEYF zDT)GsG)0~nL4~*j&fYoZ%c=P3Q2|$u0{ehd!27oXO8-YO(0I=O|`vcGC zGXP4dM&NKb1mJSHeCcy)s!eb^avbNGrL+J4ueKMkH*h+g_8!{Q`{~#9JdZrj@4M3G zu~n@+&+$C3eGb>__0vV&MYh@29M*aIu55W6*o;z2>wwW{BxbXjxL&Wf=D|Shb~|x8 zojP5l^*8c;pRz3PudFOfeBW=~FPe7gV@WBQ&*$v-dk%*Ki^T#dWhda5yYx5oe}ey8 ZdIvn4L>u|&0Nelo002ovPDHLkV1i%w!?gea literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings_notifications@2x.png b/Telegram/Resources/icons/settings_notifications@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..998b44c341b85c9457e3aefffa5a3054d09422f3 GIT binary patch literal 930 zcmV;T16}-yP)DAfFbc4u*qWT$cD)^(QhD$pTTHMTucZo&TJ48 zHDLgfve+(GNz?Y+f$NRjDi>%A_NGtrCeZeM&iR%0{c~Ud5dLHRn0Eqh%Lnwjd_b?u z2lTpvvj`Fh1hBuq4?z$B0QdLzxV^oFVHmRr4|2N|i$(fd#bVL*xWAjb0pjsE_4|Db zV87p|cs%YppzH4-&+`a{LYCv9PzXHFyB*&BL5AbFsm?j20DzxPn+AhH@H`Ju6mfWX zh{eUlPp{k9*gzx_!OP1Fdc7V@({wr&01iL%+uPf8d3kAh=l-Rut1H^s+4949PC6medKcd&y*OugJwHigE(Xl+36s$bpOoa&$k)FwD2`_^AKB zs^$ZFT|S`Km7-RwWvQWzs=tieSeCWacv`I% zrBbQcYgX?FlK znao__K0;(p+yzZ?zo&AYvz0Vqu{v3<(xmNUD^ISX+sLnnLgk_z5h;CP+{OKY`eYF)74C z5W!RyqOJi!FbY{$o%vs7;4V>4lS_3EUi0QLznPt3ca?}BO^i@8vHzgBt}Bk?NGQ~} zb=kFw?d|Q7NF-!zY)q!7r{((kTK4z%<@EGaj*gDx<>jR=ls_|>Oj0W@FE5G3VpaX$ z%}okdvRU&FHfp=)C8}tu0%xS`T1FtQk6xtwzf*ST&@cgsj=h2?(PVO z!ziW5WHJEk?(R1J3?0XzTrLA}adE-Z(-Qy>4-Z76(Z+)!!q(On0KV_zc^-?4i^Svc zda=*JzP>)R*1W&JGdnv=G#bTq-LG$8DD-nsL`bL802~|~U|CipcK0>d+uKX2R03di zb@kIe%d+V2?I(OLtru&_`yZre7So14GA0*x^|K0Xo- zhrbVs2&q)6GTGYN8cHb~$Dy;clcl94j4}AW&-(g0J3Bkv+}r?=%jJFsiU{-b^Sr&i z0g%t<85|sBVq${V*H?ldV0d^K%d)U-n^-J{)*9dUe-4TWBO@aei$wr#Z*M6S3TUl4 zJUpbOr3Dc|DMeRT7eNrh|t~LO*);%7*l!7=jZ24O-&JrMCj<~U}a^6AP6`< zKCU19$ap+XE|;tM-3)?&QmMr9@^a(AkL>B`VQy}Yy}doo&d%^W53M!Z+uO9YwN>@2 x54DkDS(X@M1gfY0C!mOkQmVP&XVLWk(qHU}1I6%}JQe@|002ovPDHLkV1lBxQc?f_ literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings_phone_number@2x.png b/Telegram/Resources/icons/settings_phone_number@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..8f536db05e57b8cf2347fdd6892fdd05fc76b3fe GIT binary patch literal 1409 zcmV-{1%CR8P)E(#2!o#FCBu+Lh$IpBnm+kimpNse~eBA)u~Q})F}`u z2tu|FOC}+S9b{?nB`~{a<;&{qxI6Rh5YB(6nRRD()p29L@Pqx${+{Rgedc+YXP#XF z0PzpYVRr&sts-Eds|Z-=DgqX|ihzYK%YYt_2PaRS#PjFRA2Dmg_@cgt4(Z) zECa5rtmyoQ4<8z0!r?GpzkUr>Rkdpe4<5`Tz5HbvaAsyk=Sz}g8u#keE5ze*0DvF} zSXfxdBfb1(8Bi2OonKW|Wg54-x~dz>4u`#uTFb3RqfwooZf;4EqyyZyZ(ok7ZH_Dh ze*O9tE*Ai04F9UG=I;YJ#f3-hPdYDW;mTr&6j04 z&lK~MWx#LWzF~ZPT=PSr5Q4!V0BA$<$dMyxYirYdl2~3|-pqV+lI4fy&6_v1hj=29 z;K0BDckS9mpU=m}#zubp_>swEQj1wwSYT~!ZDH(W0I;sEPPbi?WtlHtyx_BE&p0_b zsoSTjs>;5;KD*(v0|dZGB$9E9rm8C6zkg4++if>o_J9{JUNi+t{Tz)(Sy548H&||f zm6eqgMKNv9jgF4e>2%r+l{+8+_V)G~z>>)%`}+Fma5(G+${(=0x|%aHGdjpKK)2hyb9!*y{C+?0-MhEpuTpb!b3A?e zbjG?o9*?eEJRY|naNW+IKhNRe;k1xzYisQ9?`LCUBg@OnP3!P_y}B}zBxP(j@10CG zDl02PS63IVUAv~8$fZhA6f7<-Vs35@q9`I94r6w97C(RfL`6jfT3cIj>Cz=FUXmn~ zm6c^|cUyWe)vBth*xTF7$;rvIJ-R+m*Ue0^SZwDEQ8U}We?L1rJ2^Bo#O3AX4PnhR zKR>^-0aLA^p@Fw<-QvraFF7?el@U%=RSpac?5sIxRY#8=MKBmdFc`$~=+`(n&$O%Aj9k>7mbn%6Jn#fdk0SEZD*nqT3_)C@uX`eI=^E?k`-k3l{ zkPqVPlVaxczF^7e284kJH+P2+(wJD|0TI0RnE#$pN lYmHLswIA?b;~b_r65nHAery|sS@!?{002ovPDHLkV1n0Ov(x|p literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings_privacy_security@2x.png b/Telegram/Resources/icons/settings_privacy_security@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..5b5bacc993e4540f63f2e5989467df4b7e316465 GIT binary patch literal 770 zcmV+d1O5DoP)%=3*fB`Fzw0!(=IN6gb)}E1~8pY;cz&B<2Znb zj9HciyWI|^(<$`(eISJJC2zX> zGYkXU?Y8e2?RFat!(d{Z&u1irBo8=s!%9|jwJ{J6U%X&$bh*AWmqAy?zvnpO1RkL zWqZ-ID+5fsGC;QoA)qJ<=(-M;WqH=ob?yslZdsNEx~_wwD51}czGq6gT*l32iwOYMgTP~Np(*pqK-$1Qad)Z`awOaa{419G`N-18i zSG-=YNGT1}L8Ii)_M&N52AFpF2E5OaqQnm<2!iK5dJ@`hw|uS*0g}J?H4KB_#qYxiAvl>#aJ^omZQI~5dX1CGB-FnyBERANbY*ie?aBbtu3r!M7e+~R*@0@e$p8QV07*qoM6N<$g3)hs AZvX%Q literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings_set_photo.png b/Telegram/Resources/icons/settings_set_photo.png new file mode 100644 index 0000000000000000000000000000000000000000..e350c5c3646ac322165853b96c6faa31def245ce GIT binary patch literal 408 zcmV;J0cZY+P)rzX4z2(lE|HKz9V*}o(2*uL^l^r zk|e#Nna}6{xGg%QsfY5G*weA4LKxMkkl47 zxfEJUl!8M=7(_xQmDYKO_buLg^Qu=*^|QAR+~IpW-*cYloO3ii@#nWkOYKr9Zc|mRFayc?EFd*FE?(VLjh6o{Ketw>aM52lfip65Gu&^Mw-Mzg% z;osoh-5um|`FnhOdy7ma!#mIS_xEA9+mX-bdCQc8SS-fs>MHvB`gqGUG&De|RKCaQ zbQ%hUg13A@=h!2W9HY_r;RJGdc}b*F>7VxvG7JN?TFrVlIy#C-B*L2$i9|3u zI?8&dQmJ6ESZK+jH$_b*6D#(3JVnjD5s5@TOjmAQ)j-W)Pfrgk4g>;a=Wc9luwsM3 zKt&Tk(O_$9D=SVU5@qLd%eJ+(QPBiYH2D1d%!(`7p?n6^3|?Pfv*M19jF8NLqpK(^-!r)0D!BjD;ymiVQXs(fk5EH zCV?iOW)S#iceB2}j`j8R&upeBKmLA@*I->;9V;&OKhdv-tA(rezwl1c*Vk88Y%-b9 z($Z3;G&&fKMpn$#%BA4?adviA@p|^voS&ZyUkBIL)~e{^ucegMg3gsnB?*Va-#s`b z35UZ(sZ{cgV9^WE=H_NN91hrQHr@-+?;?}QU}a?mi;Ii6xw+vjSMr9p*7^UggFl5| mgSF1D!CL3nV6F4x4gL+1^W@b2L5`RJ0000oI$ z3h9HWg%~rF+Jw$b=iNNX(=&ZOix%&D;B3x)&AH}WbKloJ3;@CpM&D18{XYn~uYiV! zhcP=li@D#bQ)0mq}GsQdO0j%_fPW zNTMiGv)Sy`%jGh~VzCc<{mQo&%w{uXG8s}7rPnZ>PE#NdAh+91Znv8PfdFl7ZPD@Z zF=?7cilR_9nrMx)W*11~Z%3`5y$mJ~%HUDv5zuT#BVCtcTj z-;H6Ip1dzF9F0alC(P&bq^c@yZf^E!f*_EhC?tv^B@zkp`F!N_`6!V{kSL0zC<+OJ z(8F(RY>=v|l+WisC#+Vh)ND4%@Ane`;y8|q#UkmtPHSsxh6d~F>!j;C9UUF@cBkL( zr)INB)oRs%H#m*WW`m|_xV*ds0Jz<5jE;^%mSybh?EDEwp-_M<%NQ9Mfy?Cr09;*N zLDMwYY&HY_U27xy`X%!G{0xrc!1Fu+;Qsy|x~`+YzyEVWS(d?Z9LC1R004J)cc|Cv z7#bQvI2<-K2#3QM92`VnUmqBT0RT804zMf>UDpkG7QjEh7lOecCMG8E@bG~B{e9@V z4wK1*U@(Zu$w^o&7Cb#Y!R2ycetsT;Ab{gISS%I{3=BY$BrGp4!|V0p`uZB%+uH`x zH;={1$;p?FMXS}KQmNE)nMR{Q-ENm2A0H_mj~h0PVZz(nTZBR(jE|3lVHg}99s&UN z_V&jA1&%gaBx1X{l#z zb8~ZFwl)Cd^?J!_wf?<%%d$+VRO&`Sr$CcgJoH89M>}kmSxdyw~@=`&}cM1oR0a${A2Oo|4saH!hZoE6&L6e;#AQ9 O0000 literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings_username@2x.png b/Telegram/Resources/icons/settings_username@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..7125e84bcc1ca47b0d66967679ac5f696d97778f GIT binary patch literal 2878 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 container) { AddDivider(container); - AddSkip(container); + AddSkip(container, st::settingsCheckboxesSkip); auto wrap = object_ptr(container); const auto inner = wrap.data(); @@ -468,13 +468,13 @@ void SetupChatOptions(not_null container) { }, inner->lifetime()); - AddSkip(container); + AddSkip(container, st::settingsCheckboxesSkip); } void SetupSendKey(not_null container) { AddDivider(container); const auto skip = st::settingsSendTypeSkip; - const auto full = st::settingsSectionSkip + skip; + const auto full = st::settingsCheckboxesSkip + skip; AddSkip(container, full); enum class SendByType { @@ -553,7 +553,7 @@ void SetupMediaOptions(not_null container) { void SetupChatBackground(not_null container) { AddDivider(container); - AddSkip(container); + AddSkip(container, st::settingsCheckboxesSkip); AddSubsectionTitle(container, lng_settings_section_background); @@ -571,7 +571,7 @@ void SetupChatBackground(not_null container) { std::move(wrap), QMargins(0, skipTop, 0, skipBottom))); - AddSkip(container); + AddSkip(container, st::settingsTileSkip); const auto tile = inner->add( object_ptr( @@ -693,6 +693,7 @@ Chat::Chat(QWidget *parent, not_null self) void Chat::setupContent() { const auto content = Ui::CreateChild(this); + AddSkip(content, st::settingsFirstDividerSkip); SetupChatOptions(content); SetupSendKey(content); SetupMediaOptions(content); diff --git a/Telegram/SourceFiles/settings/settings_common.cpp b/Telegram/SourceFiles/settings/settings_common.cpp index b58530cc6..c2957c4af 100644 --- a/Telegram/SourceFiles/settings/settings_common.cpp +++ b/Telegram/SourceFiles/settings/settings_common.cpp @@ -76,11 +76,35 @@ void AddDividerText( not_null AddButton( not_null container, LangKey text, - const style::InfoProfileButton &st) { - return container->add(object_ptr