From 6daa267329276da6f875faf83c5cac04c535dd82 Mon Sep 17 00:00:00 2001 From: John Preston Date: Sun, 13 Feb 2022 16:30:43 +0300 Subject: [PATCH] Adjust privacy edit boxes to the mockup. --- Telegram/Resources/icons/settings/arrows.png | Bin 0 -> 454 bytes .../Resources/icons/settings/arrows@2x.png | Bin 0 -> 818 bytes .../Resources/icons/settings/arrows@3x.png | Bin 0 -> 1198 bytes Telegram/Resources/icons/settings/email.png | Bin 0 -> 368 bytes .../Resources/icons/settings/email@2x.png | Bin 0 -> 586 bytes .../Resources/icons/settings/email@3x.png | Bin 0 -> 842 bytes Telegram/Resources/icons/settings/forward.png | Bin 0 -> 374 bytes .../Resources/icons/settings/forward@2x.png | Bin 0 -> 636 bytes .../Resources/icons/settings/forward@3x.png | Bin 0 -> 972 bytes Telegram/Resources/icons/settings/laptop.png | Bin 0 -> 272 bytes .../Resources/icons/settings/laptop@2x.png | Bin 0 -> 373 bytes .../Resources/icons/settings/laptop@3x.png | Bin 0 -> 500 bytes Telegram/Resources/icons/settings/minus.png | Bin 0 -> 400 bytes .../Resources/icons/settings/minus@2x.png | Bin 0 -> 642 bytes .../Resources/icons/settings/minus@3x.png | Bin 0 -> 955 bytes Telegram/Resources/icons/settings/online.png | Bin 0 -> 439 bytes .../Resources/icons/settings/online@2x.png | Bin 0 -> 778 bytes .../Resources/icons/settings/online@3x.png | Bin 0 -> 1140 bytes Telegram/Resources/icons/settings/plus.png | Bin 0 -> 355 bytes Telegram/Resources/icons/settings/plus@2x.png | Bin 0 -> 650 bytes Telegram/Resources/icons/settings/plus@3x.png | Bin 0 -> 968 bytes Telegram/Resources/icons/settings/timer.png | Bin 0 -> 441 bytes .../Resources/icons/settings/timer@2x.png | Bin 0 -> 724 bytes .../Resources/icons/settings/timer@3x.png | Bin 0 -> 1058 bytes .../Resources/icons/settings/video_calls.png | Bin 0 -> 440 bytes .../icons/settings/video_calls@2x.png | Bin 0 -> 832 bytes .../icons/settings/video_calls@3x.png | Bin 0 -> 1208 bytes .../SourceFiles/boxes/auto_download_box.cpp | 2 +- .../SourceFiles/boxes/edit_privacy_box.cpp | 77 +++-- Telegram/SourceFiles/boxes/edit_privacy_box.h | 10 +- Telegram/SourceFiles/boxes/sessions_box.cpp | 5 +- .../calls/group/calls_group_settings.cpp | 9 +- .../info/media/info_media_buttons.h | 5 +- Telegram/SourceFiles/settings/settings.style | 46 ++- .../settings/settings_advanced.cpp | 22 +- .../SourceFiles/settings/settings_calls.cpp | 12 +- .../SourceFiles/settings/settings_chat.cpp | 28 +- .../SourceFiles/settings/settings_common.cpp | 5 +- .../SourceFiles/settings/settings_common.h | 3 +- .../settings/settings_experimental.cpp | 8 +- .../SourceFiles/settings/settings_main.cpp | 18 +- .../settings/settings_privacy_controllers.cpp | 303 +++++++++++------- .../settings/settings_privacy_controllers.h | 8 +- .../settings/settings_privacy_security.cpp | 184 ++++++----- .../settings/settings_privacy_security.h | 1 + .../SourceFiles/ui/boxes/edit_invite_link.cpp | 2 +- .../SourceFiles/window/window_main_menu.cpp | 4 +- 47 files changed, 460 insertions(+), 292 deletions(-) create mode 100644 Telegram/Resources/icons/settings/arrows.png create mode 100644 Telegram/Resources/icons/settings/arrows@2x.png create mode 100644 Telegram/Resources/icons/settings/arrows@3x.png create mode 100644 Telegram/Resources/icons/settings/email.png create mode 100644 Telegram/Resources/icons/settings/email@2x.png create mode 100644 Telegram/Resources/icons/settings/email@3x.png create mode 100644 Telegram/Resources/icons/settings/forward.png create mode 100644 Telegram/Resources/icons/settings/forward@2x.png create mode 100644 Telegram/Resources/icons/settings/forward@3x.png create mode 100644 Telegram/Resources/icons/settings/laptop.png create mode 100644 Telegram/Resources/icons/settings/laptop@2x.png create mode 100644 Telegram/Resources/icons/settings/laptop@3x.png create mode 100644 Telegram/Resources/icons/settings/minus.png create mode 100644 Telegram/Resources/icons/settings/minus@2x.png create mode 100644 Telegram/Resources/icons/settings/minus@3x.png create mode 100644 Telegram/Resources/icons/settings/online.png create mode 100644 Telegram/Resources/icons/settings/online@2x.png create mode 100644 Telegram/Resources/icons/settings/online@3x.png create mode 100644 Telegram/Resources/icons/settings/plus.png create mode 100644 Telegram/Resources/icons/settings/plus@2x.png create mode 100644 Telegram/Resources/icons/settings/plus@3x.png create mode 100644 Telegram/Resources/icons/settings/timer.png create mode 100644 Telegram/Resources/icons/settings/timer@2x.png create mode 100644 Telegram/Resources/icons/settings/timer@3x.png create mode 100644 Telegram/Resources/icons/settings/video_calls.png create mode 100644 Telegram/Resources/icons/settings/video_calls@2x.png create mode 100644 Telegram/Resources/icons/settings/video_calls@3x.png diff --git a/Telegram/Resources/icons/settings/arrows.png b/Telegram/Resources/icons/settings/arrows.png new file mode 100644 index 0000000000000000000000000000000000000000..ce4d5cd751eb18621ec4f60ad9b4483041712cb2 GIT binary patch literal 454 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgf%)rydF~maf zZSclbEd~NME-qUxIJx{`IM{#Xp8ST*SL!!xx^yWhAeuW+V9Tc6v%iZuaZD`#-nIK# zP|MkzvPnK^`P<+BSi-bwm73?I)S0=r57{;;e5j3Qch6W`9(XPb0PeHY)gU{1LIefm)y!Q+P8{4Q_N;cnWNYxuZHUwC0r>~#a4LLH5m z>u-0xv*267woW`RB~pyj$7RKp(z~Dcr00Dp7LoqFZ}W_%&o<91#T;G+ODB}Tty{?Sa?f7)E@ Z14EMio^b7L(+xpk=;`X`vd$@?2>_&nsxANk literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings/arrows@2x.png b/Telegram/Resources/icons/settings/arrows@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..dcba1e4f6cbdbda04f112320f06c7a1131484453 GIT binary patch literal 818 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@HGx*LEOt9~TDR{}+Wg{c_pnACa>C_w~iP&p#J7yQgwz8dt+f@0#s1ebi>3jaqBJ zNK|stj{@nbUaI@=uU}yPf1)PGh7i#&T$9W0i7okgV#^G>z4|O0jdYB@+&2>8VEOR( z^>>vWjs^V>%nr^yBy_BB-RGOuGJR*$noocJSn=d@B}?_+H;PFH5+3H&i!VMuBp38pz@F)bXz(&nuzs-p4WS0zU$>I`~V)uTGy<;F7ycwa07eA;%L?mdKI;Vst01TR2z5oCK literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings/arrows@3x.png b/Telegram/Resources/icons/settings/arrows@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..9bda1806c78e4a8a2eab78dc7ee97634b69d00d0 GIT binary patch literal 1198 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1SD_us|Wxo#^NA%Cx&(BWL^R}E~ycoX}-P; zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz1|Sip>6gA`6MbbHUhz#`%4;uw;_ z`ZmhaL)%f}+Vtg4A}rQNy?mYueq`F6keDo}+N5+tLrlzU+B7XQF{QXx2|?W>hazsS z(6n{<=&(iLwu^z*qgL_vwR>7qXT%=AslD5#j(g_M@_&ziKf7`BzrP#XUqR+042BLo z0!Y+@OtzY9i%*|BmzR;TV%@sB%F4=$iVb-egvGS9we|J%{{8v=`^OInS=qB^&U|r6 z32V~O*WbT)Z)m{E|I3#z_q}oE{Q3BZh#fn3T3TCkw;xv1xv?xLC}@(0N{CHPa!SgP z6|U33T$mxv%*_00-iE6A^X5e;H#awbdbO=rM?>R4 zQ{v+bx#i{M-n))`JRB(@Ej{_l*4&7=xO@Np*@?I3egFK~Sg7-aMVWkrpWnG}-?r)T z#6G-zJ32V{a{rAOwr8JzCT*Od$IvJ+n?2vs(9FCsu^#9PE(Q*{yZ7%uE>%D9Ol?DF zCui=9lPN*g?Z(E&yOh1Xz4sq}Cbi+)x3b(dK$~Z<%f#PNe&c+1r>&LMp`>d^pRsI+ z-!;!7F+5ycy|S(@FE7u|*7oU>7fkAWzrKDgeHR!S8X6fXsa~>9o0VsKv{}>l@87Ro zyLR_(Y}koy`}gg$va)*g(L&qh_t&peCtF;f%4B9|*EfBV5X(F3xpU{vo;~}~jDib~ zPaSVME)y3Q*R?gL=2!GFu}7=duYdpc?a>E6fBrmt*jZ9n=F7r>75n$wOYq3a$ecNM z?o>u)YR|V12Rsu@EUxqMFK(<#+;c_lv(o~%WQ7Db$>M68vomfRCtR^VJ0tMe9l8Ja z&&{|p^_1SX&6_s;`t>U-JKNvSPfcCDaOSivF~H!ve7X5xadGjFKNGKPGC6Z$D%baf zua9%n)7dK(k8c0rb@kdcHZBp@n1l5`CJ~1gYn^81W?|COTH3frV4qi_7X!~ug&K_w zU8`5GURCa>Tw8tS{rBQR6Em}QYu40!kL*1-W6svCrtiYmZaq9Rbk|GfHksESKN^a= z00ZAd>gw8Lh4&jaZk#xK_UV;6y1Ioz?z=vD3%;9p-tk|1Y`B;7{H!?wmWy7$&i3oj zEAr|)a6!tHh3C}__LRq41W$WRP`)%bIyc13qlc;4`;E*x7R6?+VvQTUW(p5|W-zdE z-`ecglbfCGZE0`$p0DgIqqD<`a0N$|V~cHEd0lEBTXwV<=SoSuQTY2q*^`0?U}e{QuCLZ9DSp(`dPwv4&$8hh5N9nV%U&a61e!_U9^RSt7$LP+yg zxy$N~Ng~{ArG+8K1C`AmR%B&$wYHdLeOqy7w!u?f(KYuLE>!%gV`*=He7&1a+lz(w zQ$)nYuV1~oG-&1Cy|y~}-3L78N+_^(FeWu1Q~kyt#9y50J8J#u>|;<_;pyt_?&4Kn}$ literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings/email.png b/Telegram/Resources/icons/settings/email.png new file mode 100644 index 0000000000000000000000000000000000000000..3c95d18daddb97c06bea1b923af137ec2c915869 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlfU-STvC46zV= zJ83s>vx9)kK?N7?08UW{^N@y?Ie}bL9A#5jp19Nq{hqniFM~hP+Dv-E%$qxRrXDO@ zx63TSEMVGG6W{*JhZ@ex2tLrVJHPq$z9R}8A>J=`tz*#RI{e|n2eCpCSHa_jmrcG! zbZjxWVC6k=^{;*Ymqq5JMqV!!VsB8obm&9qggI+oTXiWt+n>*xAm;M&pFm5g%yFCZ zd)G1qOip5dnR>e~QKCZm*u$OrKh@lR%A~B}TCreumj3BQQ=GGI+dNHH^qll#-}*1M nPvcjwT9tcyZ^gs?_YMf3_`c)E1I^p9Am4hr`njxgN@xNA2FrqF literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings/email@2x.png b/Telegram/Resources/icons/settings/email@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..8c1eac98c6cdcf933f9bce030893cbb67d6ad564 GIT binary patch literal 586 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@H3zO_uJmDIBFFq~$DObbDB+}5#boXsp z^IRJS2APx>ReS9|u-#|SFkf==xPb!8@yCIeO^z2n`L+D=<(DkyYV5>=3+A1QGIdpY z{`sbfZ|wEj`}(Ih)%pk|v+`}=>xjrH{h&S3LB!Ru-*m3u_usYB{u3N^PDHRj$!%k} zm1EYHIN|-%qM6TsYDY`xig61i3%*uaRyV&%LxZoq`FW+wK|@D@kkHWU55&&yDqWMX zah;;m{6&01U(0rH&7B>w`KFGikfBp!w3H)T;bey8s{EDWS7Er(>??I$b>CvFS$4%L@|=40qjspC}PEO|?U#pnF-3cio;x)?67s z?UwzR=yh4-Xx7$QK5AaIe>dlK-A`D-Iko&rTglH)_x*29&?6gA`6MbbHUhz_i8F#W5s< z^=;(db(xMLcK^7vwyemnV4OH1!*x+G*IuVZpBQYKIC|L?xYjz^FmC;kt?8+9{r=u~ z55KT)Jhyjj{_g8{ZQZpsKkL$JZ=aNWUQ_$=FlPbN90v6R*r*T1!XJMBJ)2g%G2%|% zc6%}V4Gn^C60&j^H9910z8PWD=OVXk!?uELWxI7ZZe7Zn&CMRYHf)=ZqG99KO9_0c zCOlI=R2}4NKa_b_zWTBH?(462-hCIN_xxjp-8I3^=btMrWa9Lu*Vw%;v2tzr$M?76 zO4inPM;)=*K58Ye>LWFW)t5vX9#S-x^*^FXe4t%y3oeOVUOU)8LgN zq6?#EWoHHJP3L`eFk!>xmo*=L^NI*KnsXd#vXUw*)mwSC#*V+$X;GEZ#2IJPM1JmK zlMo4Hf3#sijNsz6&ba~azyJ1H`lx6p58I27)mINcOgJDtje$XJsk7K4wmk=3pI>_L zCBkp{0@r3s4?qPj(LWwVs8-F~|*K%*lqZvFPS_5b(TYitlPRA|!6y3}{#(zS(V=U;uS zkm+@EJstnu{S7nEDPz-H;yZ6yU3unOYc*G@x9!W>3yT>TBo62=c_H>RYu(D;%)N2z zH{X1-SvY~4Ay|;BLT%|n|J-|P*qa?ygcjb5SoBkE?x7VOnQIH;+r)BwL|qSjtawwl zdk0IB_FTWmpPqjH=`thJ{bgDH@q}gSb;1iwX6VLq-Lu&dCc(eV)KB`zkKUUCo5Hy3 zlD}INhF_3c-85s>)?3ojy>49T7rC}x`*r+Zr}TS<%{Tx1bG{6ZSS!yV_L#+j(XT=H g0XFK#e9k|t%AViD9<2X(1C)+EUHx3vIVCg!05$(w!2kdN literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings/forward.png b/Telegram/Resources/icons/settings/forward.png new file mode 100644 index 0000000000000000000000000000000000000000..8aedeed9e5357ef00d3af00889840766a1d68367 GIT binary patch literal 374 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlfUJ@9mK46zVQ zPLN=2)@GS9b!u#E?8*nrnwpyS*Z)sTOM7J4&Dk%rNkmxq@|MiYuU@~N$m*Fked^S| z?TiZw9h^PQ4xK-re|uZ5L;b-sj2BmjuTM))SHGsS;8H8MxYBF)wD-5S_fMZbeM97* zKYxz*%e!CeJn84}uby*ZlB%~ssZzJV(?uUX6r|YB$Voc<;?K{|0%!Z>Y-bszdKDBD zl$V>|u}Dhxb#-N3@%&&j`^AeFb#!zl1Td(1bU3OkS-fYDO@cvpXQv{&ilL@-q-}?; rg2I7g$J*4qw(e<5d#6#pz?p$T_u>PklTA4{L4Njh^>bP0l+XkK>`H+O literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings/forward@2x.png b/Telegram/Resources/icons/settings/forward@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..0cdbe6f9b6078d8a25a468dbd6092fef4e4611fe GIT binary patch literal 636 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@HZz#7cvv{MGDH`N4 zrFQuU#{#lcQNtPodl$mMS_1B@RuU^n;m0Xo_u zw%_u}OkG+(`B)Ul*>ayLshXqy8?uzrcS%&OB%Y%wYb1s!^UxdUo*P2}<&ynD=z`b6Mw<&;$Ts CzxJH~ literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings/forward@3x.png b/Telegram/Resources/icons/settings/forward@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..04eb4817961bf8fbd9cb98ca88ac8c0e3fe70519 GIT binary patch literal 972 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1SD_us|Wxo#^NA%Cx&(BWL^R}E~ycoX}-P; zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz1|Sip>6gA`6MbbAj}ZszIY7?Q#I zcBa3#QJ~1N(<;$RCMsMq6YpwzYG-(mrMyd*^sMN&_lW$df4<;}i<6&!#IDE!#{rTt2 z;b+!g&AORmHqk`G<&^iNu=UrcpH5wV*;D9@xtmw=g3!emMY@mPy&Jo4SE{&ujpo1I zD(rvj{y%u&P!?6mIV+>5u%fQ+oc7c`O_n{4dqcFA26)tzb38ek%d_X{=gO&Gss_IU z%x^wyY-O1y91+sya%$hsUAwAEOOLLTl_;{H#H^0!; zp+BdoC1{Fu@7=eruS4w*_tKNko-Nz+EVr=me*+X?cm$xu2Rw0xod}U$%0Qe?%h+{Rgu9O zsUsHWy0#&6%CfLM`}d14n7W5M~$t`|?G3VL-;B)m3}t_}ZsWpKcjcAnmO-Ip|%`-Me>tC93P{?Ck8? zrhD^wpV91#UDe&)z4Go+-V76|!^aZ-*XHK-7M$ojmai6&SEB?nvJoq>< z_l|^!*rpr1`B|8H41b&vHlqU-vfzevlm~~U=V6!t5!r!v+x9* bVAUv}$9iA=lRRG=C?|Qk`njxgN@xNAKk=iV literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings/laptop.png b/Telegram/Resources/icons/settings/laptop.png new file mode 100644 index 0000000000000000000000000000000000000000..62a1e866d5e06df168d45e585a083e75e5a8ca1e GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlfURe8ENhFA!` z4cg7epvVzy&r*N)e6h)+H?ouU4OIN5cl%tpCM4Cn^J_PY6UX^|S!-1uv`6tx~0QMwOIeNErDP|H4iX=hhJPhjTu?~WJjcn-%+eZF6K z!?nK09Oul}X3pBR&U)fy%ktnUSFcs?m(2Jbc>eRAmFp^I6x%%)bBdUjD!bwl+cpFH j>1|nH*D(rJ@HLu?1|3=BHTlgZke5AO{an^LB{Ts5#y5S8 literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings/laptop@3x.png b/Telegram/Resources/icons/settings/laptop@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..314dc3de75d9bcd94dba8ad9ec7fd123e8ab2ddd GIT binary patch literal 500 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1SD_us|Wxo#^NA%Cx&(BWL^R}E~ycoX}-P; zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz1|Sip>6gA`6MbbAj}7U${W7?Q#I zcILs(76$>> zzCLPXU{PRT)j52!b;TGf_#lAH|DLt`T==jI0>hX5geafCfhXWQHo;P1~ju7rM)%cMyedariPTlVr;QT|#b=OZ(E3j`5?01J;sex~}@vfTl)m((VM OLfq5U&t;ucLK6U>iofds literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings/minus.png b/Telegram/Resources/icons/settings/minus.png new file mode 100644 index 0000000000000000000000000000000000000000..531e2e0b220c657144321909631b7aa9ce3f5420 GIT binary patch literal 400 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlfU{ql5i46zV= z8)C@UY{0{_;sAHVj2S2GD>(lrp3D}oQRY_GP8L^bxfQI-sve-xD(L_G^V5#GEQ;@b zR5Jyg+N87f+IfEl1=h*~20YG7ubB9*cWrRtY^t^Hn6)g@BElv1`tP_O3%0)SX1aN8 znL*RlzG-Px==T}@Tsc%cAG%g!4UIb}>r z4SAerEz67Kn4mF{ElKakO2K^xKHJQb%Gr9YG{an^LB{Ts5++v;6 zZ_8$<-uzov&b<9|*W-%4aq)W7;~yVjFz$JKVeK0C#TT=-?z)?I%tOknr|{s#tVLnR zoLFyfL3(^iR!Q%OTm3!kt*WArpzS;C-L0}=n^qM15lVq$Wmv2o;I_`1W zeD>KbH9y2l=RLo4PP|-l?g|lsYWG`qw^%|HAFSFisl(JIUgzhJ)3FDt%S#H1C|C-)hvE!OxhJ4i*Yd7h50X8-!=0?VHwtox}QHOas=kF>3 O#lNSkpUXO@geCyFfB&KY literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings/minus@3x.png b/Telegram/Resources/icons/settings/minus@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..10a127ea2b50a4ff9efca9093f48fefc5663d125 GIT binary patch literal 955 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1SD_us|Wxo#^NA%Cx&(BWL^R}E~ycoX}-P; zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz1|Sip>6gA`6MbbAj}uIlOH7?Q#I zHp+H=rlZK-@0GlcP9_ZFoEA^?PB?e?DbpI&&^x^`P(u3J_h#&XF54ZeBewZwj)@d+`{C11KW#Dp%phkZfy683JmkURVQ^Q|RU)&?A4iZPFuirX9K?zH>qlGQ8^ z3LGCVI?tt7$~ob2#ML&(q%G@RRu-gW`aIfd_9d>f>PY$y<9Xf_I<`J{2t2$u-NMwG zJz>($=eJ8NV_tg;#!uX!v%!YrXu`p*%S%tLU;iZaf7IGAqnT48XRK+?7P#=9vHME< z^~R(J^DEgHe?`r_m3%eJRI2wC{|s>#0S4YA?o}J2*1EZvWVtPOyp@r3eaFolo4vc+ zp3FV}+(oG|GP=|MmEoJ#`X;RoM&1d5tC|=+CCYw?=vbS%812{0Dadm)w3h3?{8GeS zO60M&^pf2%dg6TT>rdtX7dm;ztVDC>`RAuh?!N#2_~Q=m;dw06Pe|?imqT0E zTZni*tULO|(d)a##AAkAZP=!IrS6Q0^7yWxoc`#_q?U(s_QvRGKQ!PLMnzs#Y)4oim5v!|_N z=2&nhF0SjYQ{}N;NAl;(bZ*)h_D@m1bE4TSrP4>6@7ujrK9y#SntmI@I}XSTzFQw# T@W3q&lyN*={an^LB{Ts5yK z<@wt)Dc!zh@gIxc*?yl>es6Egzw_&FG^|>cIqTf#nCn|}Z?ib=5%Qk2B=`2c{JzH) z>m@4Zl_!7VoSu5HW!LO!&wpP2ZQ{FGr#frVr*(mWA{j5ZW-XIE{_)D6eM>Y}>3Dy! z{xN;sYl)lEZOWdPHt9r8`@Qdb?f%^8Gavc`~eiAKn_3 zyD>tBul;1oq|;B|l>NT`C$9Nm!20X;0{bq%oZ_|gNYY2|R85htmnB{T#mt*-zVT)i zIW8dh`9Wtd#*+|ykdH6d#4KJUh;EEB0I z-AwgS7pnFy^Jp)>*ned6ylsE${x45-)N$wy(5SJpW^Qs&c=5H0L(<%0rjL=wxd};| zZ+`pzcdf<2S0z>pW+#@VZE;Z85Ve-WtB&z)ne@5Bw9LqjAzGn!^Y6bco3Z9*j##hT z&lct@ zaCP$Ln>y1^KP5+X{)c^%G=(*YV+sptx+=~E7)ZF-E$@cvf1>UdRk;4krFO^ zFidOe%Mz)1tt&n)saP6hIMb(NicZ4z+q}PLZc$;KaWW<1ic9d?Fzp^D*TkUktx-q) zl$T%r`S0JqkH49jr@hEBu~{0_xkbga!}jark3XIk9b}(>KAj;m#I5DP(q4b}<9Q}h z*HbR=X!tK-@VK~~{k`Ii0FIR&J8r*?tKAsUb6oi(zrv1y8X+dTEfG48rkA|Am{G!8 zY$3Cvg6n#@$n!3DCBcavPd@*AptZE`$ex1riQo389+;=ZcR`f#x_Cya*_Hb645f)X xZf9&r+4}b8>sGtJCz~hkRnTLGqzJi^2kJ-XYP@ExtU3uwhn}u}F6*2UngErHOWFVc literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings/online@3x.png b/Telegram/Resources/icons/settings/online@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..b626b15cabee0ab40493c7842da70a2112bcd862 GIT binary patch literal 1140 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1SD_us|Wxo#^NA%Cx&(BWL^R}E~ycoX}-P; zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz1|Sip>6gA`6MbbAj}e$UgzF(iZa zZIrdQwxdX&;Vif24mQ(>2$zik`3o}?T?BM|xDLAIBq{!5&fW4&{DuZcSd#=RYoLkJ zBrC0`nQnq2^MBOYzx%tRG4=2}zjN=-<>;hw&z$q~oaOzWW#wr_i%zTRuWSf$&{7bc zz~#ZZgeiy-%>A%h^n~#7bI(72{r0Wx@WW%rj-5K?rDA1ofB*jd_{hl4qe=Yy{EvdV zyXMTFZ*OB$Q(OD@`h#6NcS=f1eyp%rB+=0k9Tv82=g!Q4z_!Zl?A3er#IUgcGwkl_ zDl029dSPt;=IvWiaq-X3586Jub4O;gz+BHg`FAo4_-3J!P9PcwTYCimDQ;g&R-w?_)(FNpinI$&C$4)an6QayLKr}5 z&!dFQ=4~ZYfssZ@^W&^f>t&+ zGndru+qbVsm&v$3Humm|7a2Bk#}@`}-H6m`1tcY?|-ORF=f;)>Ylcg z>Cl&V@7_Ilu;8(1hR`BID?7VB_wEBTS!T|h`SJJPSvKdSs;a6kEK~ca+5lANv~a>^ z(Tq(C_3aG}9TU7;_w3oTW&8H*PZoJI=FC|Vr1s##s{`i^Un$+mE02%A|LK#_EY|n$ z-~Z?~)Y-5)anA9(cki-nQ&Y(3T&;QS$`zH#p0V{e3|F&#mU;YP)$FUY1nw zdr(_hd6J_wGH~nNd-sflX3vd^iV9kFXmVP~`YVZzf}ecs?Cn=yz9GZU%d6S?P*=%~ zIp|{&&zZdw)z#H|BGQ&`P}bJ_`}gmu8MX>aXGOQ|*m2@qR@S#yue=VLo11GVe{1MV zIev1++EuG|?bxAUXB?Smp`?9r+gD& zOqFwnBH{@zJdzwX8oW7l#F|Z|wQHxfTW1Du^YVrl9_~WSU9C?mDu;X=)4jq!^Q*x!HLU(fyK_B2qA_jL7hS?83{1ONrK B_`LuC literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings/plus.png b/Telegram/Resources/icons/settings/plus.png new file mode 100644 index 0000000000000000000000000000000000000000..04de61be38bb08a76ee5e0c2c5fe31362cfea517 GIT binary patch literal 355 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlfUo%M8a46zV= zJ7p*D5d{HPU8eMC&fJ~yLgCE|c(iUxRL<{dNp#zE-Tg)9vmZ5ScE=6<nUTuPxSF z`X!dPeZmvYLxnQWE6-W#pYjM|D)3>~IJQD!mkYz>% literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings/plus@2x.png b/Telegram/Resources/icons/settings/plus@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..9a3e54740c31eb28d8911872069c3e0d55ac0b63 GIT binary patch literal 650 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@Hg;2MhOj zhi&3EnYX7>&R+f7jEfpumpB9|Xnu%dJ(hSlJ#t%&Uij*(HFov;%`5EQzb&!K-G2M< z!+`6h5|!Im*qk??efDeB->h7Q2F7>C?s3}A^yyl(V$~|s$;X@zv^-y6 zx8JV4Bi;7x#G6lj_OZh146U{MG$#d$NTjjNVn6huHCg%Mi#4&9irNmvPTI~jx!)cw z-#uT-(jM*K_YQR`fgjk9oI5 z)QP#Ag)Os7e*djAo83Fx_s}f=V-1`W8B(K9`bHcs-hKB>_@|Gp<_p%!zK&zqseNMQ z1nmc@|33fB(OP1b`hU)Z3PcvF?iR?!42#p!{U%Jd|st~hdZYc$aK zK=I?gPMcaM@V|TU;9S78rE|h`q;DPIKKbAjzskaSM*9WNelBN~;^bY|qN*;I=is`p zYGQjSZ;<7};16G$4}7qS;?4j2v{vdu=&y-N#ec8bOaJ?S-;jUhq=_OPTq>-OG(PZh WR-Ci9^3xFlr2|h_KbLh*2~7aIDF#dc literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings/plus@3x.png b/Telegram/Resources/icons/settings/plus@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..91d045ee272c34695e947bf5263feac64aa7078c GIT binary patch literal 968 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1SD_us|Wxo#^NA%Cx&(BWL^R}E~ycoX}-P; zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz1|Sip>6gA`6MbbAj}Zsh6W7?Q#I zcGmuPiH;)2BRLfnw`}3^U$7u3!*zW?C0G6f-fx;7B0^lY`U(rfJOu=wzEjUu-u!G< zbxirY{O|AXWX-YsY~)ni77_ar^4X4`K|+kCTZ_uZ_mSzDvFM(IxV z`dK4)<@D1c8@ck`chfdU>P_!H`lxJot;|_F2Bu$s|5e!Ri(7BcBA#bq+|u~%CTrJ( z(@)zDKm1uEcH(0}qQYTDPLVt37KCV-O7ML9y_fyIxo-ml>jK$j?-xuv{q$Acj+#9eWtCbeR3T)+6NbDBEb4_YP^a-Q#=kjQE9*kx7k>?5yY zRt9m3T(muzocnTT(AO2Yha&5ze^BE4#@BM^dwlqYB?4F8nK$(J%<@i@jyjt3@n6Gb zj%iX(?cck82zPE$h}b9H+tzi&KhZ73-0AizZ;i?;9-qpr=7zO?47LmV+S1S^>^ED< zv_N)+alp${w*@9#KXw1hih0xgmIrHy*z8s^c4Ck^R1lPSH!r*+x9Rrc!Du9+S_>0txI(%-Aa;*C~q_WxaAAu%r}tI7T76K0hc zY^P%GJGe1S7C3vO_W2vpJ0(`ObN$v=-QUX0x*&1N%rnUgJZ>De&g-rJ7$$P|VA*a{ zo8*#>LJQOCwaQ#CbO|43{1|)1!A zS|j(LQSN2ov)HST=b60spCPW$7MGxGbt2^Jinm@%AMG|V;rQ@|>B29;Wvd>B&dz7J zzdc|XpTL4Qa&h}6eLUqCE3|#T%*vpZQ~yu0@7%fn>&nlMZlR~;|E_FxOdFFInCP7G Q+y=@;p00i_>zopr0JkomKmY&$ literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings/timer.png b/Telegram/Resources/icons/settings/timer.png new file mode 100644 index 0000000000000000000000000000000000000000..e6893f7c7129faa436a138e6a3d12ce95f5081b1 GIT binary patch literal 441 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9jKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgfOxe@LF~maf zZOBI6W(OV>N0AT{9f#8r8yG`)8g4X9GmT&i+`u5j+~DHe+VUb}(&RX%{r{OYCu#jW zWjFu*-)#pC{yksCyj{5Iu|=Xp)jW2;``<%Dbx#)^y516V9Z28a#%@`_sI=332|m>MZkncB=|)a&JxbjhS9$#|2>l4Uoy@d`*^G2!igw2{a1jzwRj z{sS@B#=7PyDkn{Rtrfc#DNl~f+Uy#2z0^^lVa~FZ4p-8QHJf|u_shG*UYA(ppm&Tv zv{Z5Bv<>&8JThvZ2@CqW#%j#dRgY;{Z`Y^)-|YuS-R*j&?aj5Wk!A(^LBZzf>gTe~ HDWM4f!626H literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings/timer@2x.png b/Telegram/Resources/icons/settings/timer@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d1c986c7339cdde02c0d2b596fe370efb7acd16e GIT binary patch literal 724 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@HHk; zd|x1tHtD09WctC_Nw3tt-zh#H^ZCo;!zRIu5E#y?6Yjq=`F5Gs)KkwtpG^7m`JTY9 z(){kDNd^*U(l+0IyX?$&CIg|)E3d!)t^4n526Xz5))20RN0SP7-<{+YzhC4rL_l3tU@^tUJ7okOt|)X>yEsg z6ED9M;cAU2Fq=J9ukM1;o_U5deRh1A7n`^KuvxI)^#0?E)g_u2T)lko!rHLck}Hd4 z%n$o57w&b7ROpG&x%Refu0fjlY+v=D!{<_rdR(()_}YV3KDpESG5Fl`Vncx~Qc80I zrY>$iy*)g)EH8DE;*G#;ZdQb>&xe7T0f}6y@pa=d#Wzp$P!wj4C4l literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings/timer@3x.png b/Telegram/Resources/icons/settings/timer@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..21556424394bdd6bf0dd369032155685bba32e8c GIT binary patch literal 1058 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1SD_us|Wxo#^NA%Cx&(BWL^R}E~ycoX}-P; zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz1|Sip>6gA`6MbbAj}-s9=w7?Q#I zHfnE{mZL=P^aO>Dt#Q0!Ntw!BW?DdD4cON?f7FuQR{YwX9bJcdWH1s_V2&_wn*W5P@}d*2$Rn#PZO!y+S;d0 zXV$W`7ihD3U;6Rw+qcJ$o2552DBU@KDfByXWQ`({BdGq@zg}g?v7*6#z2J z%gblYj5x%}_&~L7?}k3Z>rPL9>oPDL`)>D2R^RZ=2Yr40m3dn@7#IvJoIeUV-)y?P zcy-nv1D=h=e~*XQCUhT7+8ej})3FbSe`_p~Iq~6;Kx}O6#GoAKM<0J2KFoacd@M|J{nEGJp1Xvd;g7J1?i^oxtxM|3 z#v)aF3qxY|+^0pNm z%x=5y0%OdfQ!&Lt#>l2)8e7XuZ@HB+&c|nT?&Mp4f8&b_j~C2P_VL;Br;I`U@`Wv; zBDyn91vIT))};CG(PrJk=G&EWUT^N7{%qrBRZ#rW;H5hMzi)Rw_-NS&H8~$!RU{vN zT>qF*>tmIeiOY?xI5s3FteQAycjCIteM!a}rzSmooM8LYzy5&Jrz1u((LKwTs~@{3 zqNK6o`^kyErcEsxH;=V_Ut=dU*{9vmT+#py7ML>EGfK=~Bf3{K>jx-*db;|#taD0e F0sywdziSrygB#A*S|SiPpbXq zPJ6bu@{Ff7U_~*Dp7g zWrl>R9xL2p;+v>CgNaj1vdz#}Si(m9mDA>j36oToJ27n1X$}YtHM*oeW8Lf8`_9@N zP5wWO`W{<+wn;u_z|+b8*l^A3UDHxeTJ=kqu|}CFt30qxvicosYsRHjp+D>6$`3n| z-?Qdaa@HNJ{?(_`&aeO8%5|ggjrF_MZTx;C^H2ZsEA}5$+4GWrbLa{($-DrCny0Iu J%Q~loCIE%pp1=SA literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings/video_calls@2x.png b/Telegram/Resources/icons/settings/video_calls@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..10907b17f7f4b74bbfbf846b0311ea1d1ab361cc GIT binary patch literal 832 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@H{5uu%&E@ZUCZ6#sD_%aKcz*G@V!7jc)7P!n|8;>62LCLV{qgUgo>=$qzyFTE ze_pkB+wI)hXOI2eCD)&BB4sPbuQur~r@{_}hS^`ug7l`}ywYPk|GX#{>oHcVT|5$)kGyl1py8pwaFeTO;3xa?}@qma*8x>$H^3>M~4!Y23^eBddRTnd#>Y! zO2a)7JwTHM_C3AbbS2AFe!7aq`UM{=d~_J18#}n04eVN&saKIe@U{N zti1nT*|*i{p>b*JsvkA`o_{`>vFrZ(hXoNDzl`@~ZS9&>Vk7sq?05RBPho*8L-xk; zXEx3K_ub@VMd+WG22#L~x{$Qd;KR$3uH%o_hIPxb=1=uedt735{`u#$&5fE?v(K_M zGyb{o#^7Ym^wX?X0rMB|yeTYsx9H-FtgTLQDGh3mY=fmD7i8{?S(KD;K&Rm+i}7UM zq_X9gCoZ#@$XaLpt?p2k@bm(C^&n5SLvroK?P-jGENot3(G4eFf8CU>wu~W~>x0M3 zCQH8eV&8uAT|TIzx`Su$QmK@Kdl}wo-T5u7%<=Djr@DxB`w@df@!JA4o|NrQ%rW9m uxtg^#$Ei}$Jj;aP5=)a&W$=d#Wzp$PyPfL|>D literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings/video_calls@3x.png b/Telegram/Resources/icons/settings/video_calls@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..910862b9f6b65de14f77395e97a2ac663a6f50a3 GIT binary patch literal 1208 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1SD_us|Wxo#^NA%Cx&(BWL^R}E~ycoX}-P; zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz1|Sip>6gA`6MbbHUhz@p^o;uw;_ z`Zn^kcAcZdx1CeHBQ%P z!*!v@y8X-VpL|)8cFwx^*_`*qFaMf7+w=YT%;aZtEei|(B(u$6Oly!#K&Ki%NO*X9 zN=iyv+St@oSO5O=>+YR9Yu2o}a^;G~=aQ0=H}Bu?-?y)B=c)gP7}DOpeS50mp~RA9 z%a|tZnRfpC_wV1gZ8K964ygQDb@HJSo6EF=2M;ziF$Jb-NXp87U3Fm6{rmTqFI`&c zdR*ngyG3Gp=Q3PfT~D7rJ?-YTYtw>7GipjoRGyW2c6bKwYg`vl(b64Ss3P?8-MhMq zih^4#Opi!MZ=b7oZsV0WO_!ESmoD}8@?N|oc_(|$i=_ppHhMfrE$}+B z@sdNyLRBD`J$v@fojbS8oNji{`{9)Mm>3KBrH>CCa$0#O!otojuZPQXYs1|6^R-`d z%SI$8FE-LlT)@iH%`SK-sFhDgTibi)6oU&)+jj5vZrKoWhci&Yd??**@L77pJ80&|`&wK<@YB$J;ZUpL|;D<>htAO!rv> zOKq%^6O*8!hj(ar`1ZYf-=6Y*Viefh+q+Zffnbl4xvXA-a8KFB&6_{JdUfhlT~(FW z^3Q8^wY7!gduGm*OkEJrrwfcsXJ_Z);^M7ax1Q?R$9wJCwV26f_V(+Ak6w2Su9CQX zGAS=OKK?yZ+wrzGw$B~*$1mG`xXJPT+czQMt$v*L?5#^CojT=phxNvaHIDJ|^N)PF z-l?Xp9(!Qk{P|O}AL}>FoHwtotnAsLvdT)ys^myd zo`-=!eklHcnW?F2(&0Us`zC+<7?sX#e2=+uq3aRf4IR91`8Q5`^7QH1bLSq_3)P;v zd-pCd?L2z)=*yQc2M#!RdvmXw!+cd_T5($1vM<*JU#om$xc-k#sj8}~V7FFLqBjH3 zbEa!PF&)*^)0>v$ytYF3?LHP;xot(#42Bmn*D!~!dEZkxdEex)uP@XuYIpORH0G9; zhT2z`=zg5#d0l8xl~b$qlo!)pn^%R0Pv5a$kbz_B{VRdn^Ru!JMNU`|5iI)EiC1XB zb0>SvZ>MHW&@pb_V_39u#fpfis86iN%#M{`mI%$9!bP0l+XkK25l*u literal 0 HcmV?d00001 diff --git a/Telegram/SourceFiles/boxes/auto_download_box.cpp b/Telegram/SourceFiles/boxes/auto_download_box.cpp index 2908405a2..5e8262a5a 100644 --- a/Telegram/SourceFiles/boxes/auto_download_box.cpp +++ b/Telegram/SourceFiles/boxes/auto_download_box.cpp @@ -112,7 +112,7 @@ void AutoDownloadBox::setupContent() { AddButton( content, std::move(label), - st::settingsButton + st::settingsButtonNoIcon )->toggleOn( rpl::single(value > 0) )->toggledChanges( diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp index c223e51c5..aaa57941a 100644 --- a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp +++ b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp @@ -201,28 +201,42 @@ Ui::Radioenum *EditPrivacyBox::AddOption( group, option, controller->optionLabel(option), - st::settingsSendType), - st::settingsSendTypePadding); + st::settingsPrivacyOption), + (st::settingsSendTypePadding + style::margins( + -st::lineWidth, + st::settingsPrivacySkipTop, + 0, + 0))); } Ui::FlatLabel *EditPrivacyBox::addLabel( not_null container, - rpl::producer text) { - const auto wrap = container->add( - object_ptr>( + rpl::producer text, + int topSkip) { + if (!text) { + return nullptr; + } + return container->add( + object_ptr( container, object_ptr( container, rpl::duplicate(text), st::boxDividerLabel), - st::settingsPrivacyEditLabelPadding)); - wrap->hide(anim::type::instant); - wrap->toggleOn(std::move( - text - ) | rpl::map([](const QString &text) { - return !text.isEmpty(); - })); - return wrap->entity(); + st::settingsDividerLabelPadding), + { 0, topSkip, 0, 0 } + )->entity(); +} + +void EditPrivacyBox::addLabelOrDivider( + not_null container, + rpl::producer text, + int topSkip) { + if (!addLabel(container, std::move(text), topSkip)) { + container->add( + object_ptr(container), + { 0, topSkip, 0, 0 }); + } } void EditPrivacyBox::setupContent() { @@ -262,13 +276,20 @@ void EditPrivacyBox::setupContent() { : tr::lng_edit_privacy_exceptions_add(tr::now); }); auto text = _controller->exceptionButtonTextKey(exception); + const auto always = (exception == Exception::Always); const auto button = content->add( object_ptr>( content, - object_ptr