From 3998fad7ef75a8f3ba7f2a2d35511073716ced81 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 8 Nov 2017 20:45:30 +0400 Subject: [PATCH] Add manage supergroup / channel box. --- .../Resources/icons/info_administrators.png | Bin 0 -> 807 bytes .../icons/info_administrators@2x.png | Bin 0 -> 1558 bytes Telegram/Resources/icons/info_blacklist.png | Bin 0 -> 600 bytes .../Resources/icons/info_blacklist@2x.png | Bin 0 -> 1227 bytes .../Resources/icons/info_recent_actions.png | Bin 0 -> 296 bytes .../icons/info_recent_actions@2x.png | Bin 0 -> 552 bytes .../Resources/icons/info_restricted_users.png | Bin 0 -> 354 bytes .../icons/info_restricted_users@2x.png | Bin 0 -> 737 bytes Telegram/Resources/langs/lang.strings | 10 + Telegram/SourceFiles/boxes/peer_list_box.cpp | 6 +- Telegram/SourceFiles/boxes/peer_list_box.h | 3 +- .../boxes/peers/manage_peer_box.cpp | 228 ++++++++++++++++++ .../SourceFiles/boxes/peers/manage_peer_box.h | 39 +++ Telegram/SourceFiles/data/data_peer.cpp | 26 +- .../history/history_admin_log_section.h | 2 +- .../SourceFiles/history/history_widget.cpp | 4 + Telegram/SourceFiles/info/info.style | 24 ++ .../SourceFiles/info/info_section_widget.cpp | 4 +- .../SourceFiles/info/info_section_widget.h | 2 +- Telegram/SourceFiles/info/info_wrap_widget.h | 2 +- .../info_profile_members_controllers.cpp | 11 +- .../info_profile_members_controllers.h | 3 +- .../info/profile/info_profile_values.cpp | 39 +++ .../info/profile/info_profile_values.h | 6 + Telegram/SourceFiles/mainwidget.cpp | 23 +- Telegram/SourceFiles/mainwidget.h | 1 - .../profile/profile_common_groups_section.h | 2 +- Telegram/SourceFiles/profile/profile_widget.h | 2 +- Telegram/SourceFiles/rpl/rpl.h | 2 + Telegram/SourceFiles/window/section_widget.h | 2 +- .../SourceFiles/window/top_bar_widget.cpp | 18 +- Telegram/SourceFiles/window/top_bar_widget.h | 4 + .../SourceFiles/window/window_controller.h | 5 + .../SourceFiles/window/window_peer_menu.cpp | 12 +- Telegram/gyp/telegram_sources.txt | 2 + 35 files changed, 438 insertions(+), 44 deletions(-) create mode 100644 Telegram/Resources/icons/info_administrators.png create mode 100644 Telegram/Resources/icons/info_administrators@2x.png create mode 100644 Telegram/Resources/icons/info_blacklist.png create mode 100644 Telegram/Resources/icons/info_blacklist@2x.png create mode 100644 Telegram/Resources/icons/info_recent_actions.png create mode 100644 Telegram/Resources/icons/info_recent_actions@2x.png create mode 100644 Telegram/Resources/icons/info_restricted_users.png create mode 100644 Telegram/Resources/icons/info_restricted_users@2x.png create mode 100644 Telegram/SourceFiles/boxes/peers/manage_peer_box.cpp create mode 100644 Telegram/SourceFiles/boxes/peers/manage_peer_box.h diff --git a/Telegram/Resources/icons/info_administrators.png b/Telegram/Resources/icons/info_administrators.png new file mode 100644 index 0000000000000000000000000000000000000000..18629085af9009bd53f3bd86871ac59e885d8a79 GIT binary patch literal 807 zcmV+?1K9kDP)JjAG|B`2k@djb#dLY>dA_F@j=#L%L|9m?1~$Qdn-GH6*Vk;IQmOPk#+%l^XmfLuBv~vLX;~IYa${rT^9-Dxo{}Wj*4Ahk z21)YdR1p?kiedT_s6gTwHv}6GE_9ERrNwR#tjStEY=d*L46uKA-=PM-qiX;hm-%dNMFK zHwOT?yu5tZ9}0yK3WeVFH8>4TFZeJbRaHrnj^l82bd&%X2n3i+CTZI?ZQEutnPeak zAOMbyjnQ>olBA+2gYSXH<8yX)MgUx1US_FOYPs!7r4pmjC;{;N{JiJKscQ+w$HxHx zwOS2(dwa;|^9YB-D3{BK#bSuXVkno(2#3Qc6bjhg-9@cd0{~1+OblLvU@+K>w1MsI z?G|1tm3qf<9EX#WlU)<&_!_=NFc?H65`n6!uq+FeN~JAtW@ZMuuEVx%SeAvy$H%U# l@5#Ww#Q*y(|2FWq@C&^k7|JeyHp~D3002ovPDHLkV1jX`ZQuX^ literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/info_administrators@2x.png b/Telegram/Resources/icons/info_administrators@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..c23630fa80e02adb1b39cc5610b1f2bcae4bcac5 GIT binary patch literal 1558 zcmV+x2I={UP)$&dh`8YctmjD3a zFUCJo3y>NC1EdxpH39}mEkJ4n43JuY)Cd?LwE(FRFhFVnQbSS$v|26PyLV4Y2>|fl z#gM2+b8|E9@9(1vPNx$M27~B2{y)S|-Wwz`LA=glV`GVt_k`2w#OUZ~Q4J7v4|wwA z3CQJgcX@1V3`{1IyL{!!6?ppeshE-gKt#7^XJ?5K&&|!n{QP{PZhCt9&s+ip1qDQ+ zR;v{mhCzm5@W+oIL|a~7-k)cH(P$)+Y;0_Fw>3325p71J@y{|qtJM+-9vvOw-Me?) z?J+Sicyx3`#3Uvriei8$o8aTekBM?`Z!gTx&%4VOiv{}o`-zyWtSm940l+ystWYR$ zd3l)_-R$gaPFzk-4iU4kuzxVpMZ#Fmwnox1@t z?-S!>s8lKl4Go1GH*P>^Xeekj8n2(n(bm=mhlht8zQe;qXlrYO>gsBD-HR75K&R7z z-EIe)&F20*{@rS|g57S1&CN}JQ#qSsdc7XaW;6PO{r!EsdGn@M?pwER;laUyU)*N1 z8TESo`7QyyUhkJU7uws~Pwk_lqeD<1ewg5Uu)ibkLV9}oseNQ*WC-fRY&M_CfJ-hH zPD4UM0!&X&yUSZ!TVS`_VPj*1vqt&Wtkr7ud7XxYgg{tWnAbh!_;**__3PIOtur$- zKJ^9Oobf!0i;D@TTUuIpcXP21xm=E~U%w`_opBlX7MPHbz?p7ezI;KoS}j@fYPA~s z`uaG!;^X7#8vp<}G&IENY;JB2@7%c~dh*fH(P*()IC=&L2hYmodvJVwJg*5hn+?;_ z(nL!>Jv|+5HXCp9adC0yX8-^o!!X#@)y3(2Z*LC^3JT6W`NG0N-n&X&U0rzj@@0QG z{S)%;-8+s5M8x{~dJGB*qMmqAP!Jjn2Hrm3zI`i%+ka87UcKTK)ZN{UN~Mxo^4G3i z!w(-m@b>lcBt`E=SnpHx##ESIlSZJ<1}xW(3z$oAtBh)(?baT`0=A)-p`*u6P%wueL|H= zMJsuFcZ7ca{0XzOvqas{(2!u>!NEbIJTo&R=+c)D)ZCn$oFqm|tJMnTOioTFIKO@S zMoll!TmmYUiV(WBwMFGxK`xi$_VzZxP4f&xZ3#Sh@PH_fj*jx)`8g{N4h~>+bd;z| zOG^{X>jE_cSe7Nq0|Nsm#w!#GsI9GqnwlD580N%S&waqNFQK3^l_n-8h-sRVlHxTs zGcyyHmX_SHi;Ih>)9Jj%vn)$+n@pyQwFg|idX*5kv$KP8xttRh85xP4ot>QXx(n~$ zzsHD(2+r?pt1*euF2!)|J2k}n3$M=hK2@EDwU^lDV0hv7z|)CnIJhi*N=i69rKP2~wzkImoAvc|EGjC(y}do6p3hr@xDm6d*TR#jE;a?*T*#ODVizTo!l+rY9c+`oSxhKGm2Xf(po($a@~ literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/info_blacklist.png b/Telegram/Resources/icons/info_blacklist.png new file mode 100644 index 0000000000000000000000000000000000000000..8907a45cc07076bc9538069facc787664db71f03 GIT binary patch literal 600 zcmV-e0;m0nP)<=OWy)b^g()`(&CX`MytK7}EKC zrtNl1rfHHSNyHdS4S^)tZnxoi9^%6DJajspM4G?z`vQ*RpzC^M;5ZIOqY*?=1kdxx z=kuskDo|Awj^jjix~_xcxaR@BnvcihSi#wBb_ekkK(E(}#On2WtXQ#FgzLI@E$Q`o z*#H=0*zflM08P_UnY*rw>2wMJI2;aOjHL&VWjX43TJut=1R{#o#9%N;53pP=0RW1k zWHKir42MGifMr?f0fHa^00@GR$()EF2m$~g2!iwgm&*kJkjv#VnG+Fso(BMgVVEA^ zbUFb53WY)@^QQrJyBz?aTrOuaPuhZqvtYB?5D`(M(TJWEi$$_+o2u0+t=DU6Hk))j z9v?|itJNYRqSb2ku;$?(_;VYk`SM%Zww-+&em#gLlSyiGRaK*di0AqA07L{ylJ1Vx zq~^6+EqX_iq`3O;#SFuU#AdTuthuIXQN3XpvGuV49LHfkpGTsO<3Ldqh@uF_7#L#^ zMG=ak+>PVKV)1Xr@h!XEZsH3`f(e)&;I=SjS%zg<@O>ZG>lN4Q6~6DovMk8595?y? m%8whxtKw(fir)bLBR&D=Z{@!-Nb!XL0000C7?w(;`@Gldq1){?&H$e0Wdw@FqG95P_Y{jo+4nrp8)JaUWWsj4 zElVDaMhz7Y02qx%W%sn(Z8Vuo`WxW$`DBS3jfUakhpo|Q$nN#|e2Q}_-VX={gR<-M z^K+#kCL$7v!0G8JEG#Vi|Jh(LfTN=$I6FI=*k?3%AP|@-w<5=~*{sZUj^hmf<%f;q zI9Z=;Hmm<5P_0&FNm-U9A|3#cWm#FjYPG7r0o`s_mel2P5fKjn=yJJaeY@SR{sxS0 za?H9QQ7aw*&}y~H`b(1ZcNn0Bcwz>qeFU@;4?yS_< z9`?UCEnbBc8!%}xG;PyUPw}x>OcvL$#Sp;wa=26~87dwC#&(PiTMh$!mb^ya2Y%lW z(OdlJPO&6OYD#Fckw~Z0IEu~9P2I(h{`Db#7E4sboUJ2G(_=414-XHzig!31czb&* zi{I^b)z%GXCln5c$9@gH#ILNZU_PH8%W-gUpfH=6SmZ_z&cs#C}U_2h57(18Cp~Ye$Zven&arElyY9diRildj8muR=!H5px+ z7ytlBQPkAO0THoYugl8gPNx$oib9H_(CKu_%H#EVeQKOcCW913X(e7e1BNXe4(oP6 zLW4S>{ssViuG0lU(CmneAPB0q-V8Tj*cgVvWHO1OC@K~%iXtYHN!<@g{TRBSCx*x5 zg25ncZ*POg;{k?YU}gKGc)002ovPDHLkV1jP~LRtU- literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/info_recent_actions.png b/Telegram/Resources/icons/info_recent_actions.png new file mode 100644 index 0000000000000000000000000000000000000000..ec6b701b0bf52b24c542b47e19cec67e9ab3a8c4 GIT binary patch literal 296 zcmV+@0oVSCP)pB1c=X`QL&mW$b@CwWe%mti90|bKpg1W9Z z$r%&WflxN@z$e&UfWJ?95;}xyI9CT^htbEmI&jUvPtL%x1)8P-&<|fsjBEICE(=O2 u(pq~L4j)=;l2XPmB;VlJGjIv~g}@z@R((0EuTIkd0000Qiq~ zxR|i-0^@}Z3?&REIt;Q5yxb1#4u_e5LKfl|^0pr>u@YT<)$2*6p5OAxCpP)`s0jUbS?9On6AUCK1a)n>_J3Z?!5p*220WTwN|S=7$>sMfH1S<||9vtGPrI{~4Bygb z@s`Aj)uP8Ymd^cK7a!Vm_rTAZJlRkp|Gz)~KVR2NkaGpJ`3qsnbtCeX-snTq7L8V8tMHkNrx} z*WLui7YrFcIt73NVhwx^ZLABJ7i`=oedhC@b*o=rwcc+ek-X-3)cS^}MVYmi!Z%0g zX!W*lIkBhfZl3$zxbwB`9Rk3SjVb^>bP0l+XkKihAqF literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/info_restricted_users.png b/Telegram/Resources/icons/info_restricted_users.png new file mode 100644 index 0000000000000000000000000000000000000000..348a6a820f02ca412aa1b0a9f5d2cee93558882b GIT binary patch literal 354 zcmV-o0iFJdP)ptfx(&+}vm>~US!i1OaUd;hbps%qC+-`>8tEK2}D-}ewgfSJL} zkWyk81^|Fk>No(cH2^>e@l?CrZUBI$X^sO3A;5bNW`3$=S%z^OF-_BP08w*wW6Wax zl}{f-q7}lTDBzsKUUgl!HIU02QZA3O)~*6@q?m0F?qz1)*Vc{iot}Zu1t^MwoO9H5 z9Vw;$1d%lRzr*<|Y-|6F=;RK>kUc&powek-FHuUtS_@+gq?E}WxW@4P0i1J0bZ_Y% z6A@W!H$g0hB!+FT=EC{t)es)7_s_ru@b3Y>0CeYx;_cP+$^ZZW07*qoM6N<$f=5-I AuK)l5 literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/info_restricted_users@2x.png b/Telegram/Resources/icons/info_restricted_users@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..e059b2efe2df006682436042f9b32d5e86f772f2 GIT binary patch literal 737 zcmV<70v`Q|P)G4NqArApkm@#yj#1w1xtPfrb1M5zy2r1x z;DC{PyY??TE^`2Y@WGO(4Nyw}pf*4)0f5>7wFCfa1Jn`#s0~mnRRD^jK)cw@q5;QKzft_%HsA6l&zD2kG%B>?ypg%e+fVc>SV#b?@VHrQx1Qt|YAC3^u$lCazD zJ{|m4olXZONyM_HDG^JH1ZMx%j? z#UgTky*EXBYP;IZ*%N_vNbweB8E4Oi>P{7OO64b9&tLy>reLomrHk-X% z?>J6Sf4N)|1CUq}%;)pLajjN+x&C}U2gkB3zs1wPB;Ez64N&Xj0RX&VBhfSsZQDlA z^CC&^-C~TPWm%}I>i_W+&@>GXheP6n-)g_#zY79i1KYM!AO0%SG`Ruft`xp1&-0*I zEb_GYvKV7fsZ_Xna05ULm*;Xho_48U@8h2W0syrEY6$?;2B<{>K+`m^Z5uq#1I8Fw zmIbP+Qdj{1&LDBCXXoEbj&YOStJjOM(gpA+ImStL?*@>15PFmx<0QMx2cg>msFgZ^ z>2!McyUApdqLV*Lbq`Qg75Dpnq;9v{VYOQQ{+r+xf@zv~JRb3QJmPRTj5T}`0L0rM zSM@iL06=YkS^@yI0c!o=ZQywxluD)GbDBwyF~;44`wn=N?2^{Ik|S4;xR>mbR@~$m zV{tbKCA*~cYI1zGxRYSk_3=*u0f5>7wFCfa1Jn`#s0~m{0H8KNEdhYq0JVMs5_>^L TF?y6V00000NkvXXu0mjf1}9U5 literal 0 HcmV?d00001 diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index d5fc7f8e6..95241634c 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -649,6 +649,16 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org "lng_media_selected_link#one" = "{count} Shared link"; "lng_media_selected_link#other" = "{count} Shared links"; +"lng_manage_group_title" = "Manage Group"; +"lng_manage_channel_title" = "Manage Channel"; +"lng_manage_group_info" = "Group Info"; +"lng_manage_channel_info" = "Channel Info"; +"lng_manage_peer_recent_actions" = "Recent Actions"; +"lng_manage_peer_members" = "Members"; +"lng_manage_peer_administrators" = "Administrators"; +"lng_manage_peer_banned_users" = "Banned users"; +"lng_manage_peer_restricted_users" = "Restricted users"; + "lng_report_title" = "Report channel"; "lng_report_group_title" = "Report group"; "lng_report_bot_title" = "Report bot"; diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp index d043049de..bf39695a7 100644 --- a/Telegram/SourceFiles/boxes/peer_list_box.cpp +++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp @@ -387,7 +387,8 @@ void PeerListRow::paintNameIcon( Painter &p, int x, int y, - int outerWidth) { + int outerWidth, + bool selected) { st::dialogsVerifiedIcon.paint(p, x, y, outerWidth); } @@ -1060,7 +1061,8 @@ TimeMs PeerListContent::paintRow(Painter &p, TimeMs ms, RowIndex index) { p, namex + qMin(name.maxWidth(), namew), _st.item.namePosition.y(), - width()); + width(), + selected); } auto nameCheckedRatio = row->disabled() ? 0. : row->checkedRatio(); p.setPen(anim::pen(st::contactsNameFg, st::contactsNameCheckedFg, nameCheckedRatio)); diff --git a/Telegram/SourceFiles/boxes/peer_list_box.h b/Telegram/SourceFiles/boxes/peer_list_box.h index 19c128acd..203998f41 100644 --- a/Telegram/SourceFiles/boxes/peer_list_box.h +++ b/Telegram/SourceFiles/boxes/peer_list_box.h @@ -91,7 +91,8 @@ public: Painter &p, int x, int y, - int outerWidth); + int outerWidth, + bool selected); virtual QSize actionSize() const { return QSize(); } diff --git a/Telegram/SourceFiles/boxes/peers/manage_peer_box.cpp b/Telegram/SourceFiles/boxes/peers/manage_peer_box.cpp new file mode 100644 index 000000000..8cd0af796 --- /dev/null +++ b/Telegram/SourceFiles/boxes/peers/manage_peer_box.cpp @@ -0,0 +1,228 @@ +/* +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-2017 John Preston, https://desktop.telegram.org +*/ +#include "boxes/peers/manage_peer_box.h" + +#include +#include "lang/lang_keys.h" +#include "ui/wrap/vertical_layout.h" +#include "ui/widgets/labels.h" +#include "history/history_admin_log_section.h" +#include "window/window_controller.h" +#include "profile/profile_channel_controllers.h" +#include "info/profile/info_profile_button.h" +#include "info/profile/info_profile_icon.h" +#include "info/profile/info_profile_values.h" +#include "styles/style_boxes.h" +#include "styles/style_info.h" + +namespace { + +base::lambda ManageBoxTitle( + not_null channel) { + return langFactory(channel->isMegagroup() + ? lng_manage_group_title + : lng_manage_channel_title); +} + +auto ToPositiveNumberString() { + return rpl::map([](int count) { + return count ? QString::number(count) : QString(); + }); +} + +template +Info::Profile::Button *AddButton( + not_null parent, + rpl::producer &&text, + Callback callback, + const style::icon &icon) { + auto button = parent->add( + object_ptr( + parent, + std::move(text), + st::managePeerButton)); + button->addClickHandler(std::forward(callback)); + Ui::CreateChild( + button, + icon, + st::managePeerButtonIconPosition); + return button; +} + +template +void AddButtonWithCount( + not_null parent, + rpl::producer &&text, + rpl::producer &&count, + Callback callback, + const style::icon &icon) { + auto button = AddButton( + parent, + std::move(text), + std::forward(callback), + icon); + auto label = Ui::CreateChild( + button, + std::move(count), + st::managePeerButtonLabel); + rpl::combine(button->widthValue(), label->widthValue()) + | rpl::start_with_next([label](int outerWidth, int width) { + label->moveToRight( + st::managePeerButtonLabelPosition.x(), + st::managePeerButtonLabelPosition.y(), + outerWidth); + }, label->lifetime()); +} + +bool HasRecentActions(not_null channel) { + return channel->hasAdminRights() || channel->amCreator(); +} + +void ShowRecentActions( + not_null controller, + not_null channel) { + controller->showSection( + AdminLog::SectionMemento(channel), + Window::SectionShow()); + +} + +void FillManageBox( + not_null controller, + not_null channel, + not_null content) { + using Profile::ParticipantsBoxController; + + auto isGroup = channel->isMegagroup(); + if (channel->canEditInformation()) { + AddButton( + content, + Lang::Viewer(isGroup + ? lng_manage_group_info + : lng_manage_channel_info), + [=] { + + }, + st::infoIconInformation); + } + if (HasRecentActions(channel)) { + AddButton( + content, + Lang::Viewer(lng_manage_peer_recent_actions), + [=] { ShowRecentActions(controller, channel); }, + st::infoIconRecentActions); + } + if (channel->canViewMembers()) { + AddButtonWithCount( + content, + Lang::Viewer(lng_manage_peer_members), + Info::Profile::MembersCountValue(channel) + | ToPositiveNumberString(), + [=] { + ParticipantsBoxController::Start( + controller, + channel, + ParticipantsBoxController::Role::Members); + }, + st::infoIconMembers); + } + if (channel->canViewAdmins()) { + AddButtonWithCount( + content, + Lang::Viewer(lng_manage_peer_administrators), + Info::Profile::AdminsCountValue(channel) + | ToPositiveNumberString(), + [=] { + ParticipantsBoxController::Start( + controller, + channel, + ParticipantsBoxController::Role::Admins); + }, + st::infoIconAdministrators); + } + if (channel->canViewBanned()) { + AddButtonWithCount( + content, + Lang::Viewer(lng_manage_peer_restricted_users), + Info::Profile::RestrictedCountValue(channel) + | ToPositiveNumberString(), + [=] { + ParticipantsBoxController::Start( + controller, + channel, + ParticipantsBoxController::Role::Restricted); + }, + st::infoIconRestrictedUsers); + AddButtonWithCount( + content, + Lang::Viewer(lng_manage_peer_banned_users), + Info::Profile::KickedCountValue(channel) + | ToPositiveNumberString(), + [=] { + ParticipantsBoxController::Start( + controller, + channel, + ParticipantsBoxController::Role::Kicked); + }, + st::infoIconBlacklist); + } +} + +} // namespace + +ManagePeerBox::ManagePeerBox( + QWidget*, + not_null channel) +: _channel(channel) { +} + +bool ManagePeerBox::Available(not_null channel) { + // canViewAdmins() is removed, because in supergroups it is + // always true and in channels it is equal to canViewBanned(). + + return channel->canViewMembers() +// || channel->canViewAdmins() + || channel->canViewBanned() + || channel->canEditInformation() + || HasRecentActions(channel); +} + +void ManagePeerBox::prepare() { + _channel->updateFull(); + + setTitle(ManageBoxTitle(_channel)); + addButton(langFactory(lng_cancel), [this] { closeBox(); }); + + setupContent(); +} + +void ManagePeerBox::setupContent() { + auto content = Ui::CreateChild(this); + FillManageBox(controller(), _channel, content); + widthValue() + | rpl::start_with_next([=](int width) { + content->resizeToWidth(width); + }, content->lifetime()); + content->heightValue() + | rpl::start_with_next([=](int height) { + setDimensions(st::boxWidth, height); + }, content->lifetime()); +} diff --git a/Telegram/SourceFiles/boxes/peers/manage_peer_box.h b/Telegram/SourceFiles/boxes/peers/manage_peer_box.h new file mode 100644 index 000000000..a0acfe37c --- /dev/null +++ b/Telegram/SourceFiles/boxes/peers/manage_peer_box.h @@ -0,0 +1,39 @@ +/* +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-2017 John Preston, https://desktop.telegram.org +*/ +#pragma once + +#include "boxes/abstract_box.h" + +class ManagePeerBox : public BoxContent { +public: + ManagePeerBox(QWidget*, not_null channel); + + static bool Available(not_null channel); + +protected: + void prepare() override; + +private: + void setupContent(); + + not_null _channel; + +}; diff --git a/Telegram/SourceFiles/data/data_peer.cpp b/Telegram/SourceFiles/data/data_peer.cpp index 281c2bea6..56891867a 100644 --- a/Telegram/SourceFiles/data/data_peer.cpp +++ b/Telegram/SourceFiles/data/data_peer.cpp @@ -245,16 +245,20 @@ using UpdateFlag = Notify::PeerUpdate::Flag; NotifySettings globalNotifyAll, globalNotifyUsers, globalNotifyChats; NotifySettingsPtr globalNotifyAllPtr = UnknownNotifySettings, globalNotifyUsersPtr = UnknownNotifySettings, globalNotifyChatsPtr = UnknownNotifySettings; -PeerClickHandler::PeerClickHandler(not_null peer) : _peer(peer) { +PeerClickHandler::PeerClickHandler(not_null peer) +: _peer(peer) { } void PeerClickHandler::onClick(Qt::MouseButton button) const { - if (button == Qt::LeftButton && App::main()) { - if (_peer && _peer->isChannel() && App::main()->historyPeer() != _peer) { + if (button == Qt::LeftButton && App::wnd()) { + auto controller = App::wnd()->controller(); + if (_peer && _peer->isChannel() && controller->historyPeer.current() != _peer) { if (!_peer->asChannel()->isPublic() && !_peer->asChannel()->amIn()) { - Ui::show(Box(lang((_peer->isMegagroup()) ? lng_group_not_accessible : lng_channel_not_accessible))); + Ui::show(Box(lang(_peer->isMegagroup() + ? lng_group_not_accessible + : lng_channel_not_accessible))); } else { - App::wnd()->controller()->showPeerHistory( + controller->showPeerHistory( _peer, Window::SectionShow::Way::Forward); } @@ -264,15 +268,21 @@ void PeerClickHandler::onClick(Qt::MouseButton button) const { } } -PeerData::PeerData(const PeerId &id) : id(id), _colorIndex(peerColorIndex(id)) { +PeerData::PeerData(const PeerId &id) +: id(id) +, _colorIndex(peerColorIndex(id)) { nameText.setText(st::msgNameStyle, QString(), _textNameOptions); _userpicEmpty.set(_colorIndex, QString()); } -void PeerData::updateNameDelayed(const QString &newName, const QString &newNameOrPhone, const QString &newUsername) { +void PeerData::updateNameDelayed( + const QString &newName, + const QString &newNameOrPhone, + const QString &newUsername) { if (name == newName) { if (isUser()) { - if (asUser()->nameOrPhone == newNameOrPhone && asUser()->username == newUsername) { + if (asUser()->nameOrPhone == newNameOrPhone + && asUser()->username == newUsername) { return; } } else if (isChannel()) { diff --git a/Telegram/SourceFiles/history/history_admin_log_section.h b/Telegram/SourceFiles/history/history_admin_log_section.h index ab4ea1387..314b43c66 100644 --- a/Telegram/SourceFiles/history/history_admin_log_section.h +++ b/Telegram/SourceFiles/history/history_admin_log_section.h @@ -85,7 +85,7 @@ public: Widget(QWidget *parent, not_null controller, not_null channel); not_null channel() const; - PeerData *peerForDialogs() const override { + PeerData *activePeer() const override { return channel(); } diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp index fc956e485..8e46127f3 100644 --- a/Telegram/SourceFiles/history/history_widget.cpp +++ b/Telegram/SourceFiles/history/history_widget.cpp @@ -1731,6 +1731,7 @@ void HistoryWidget::showHistory(const PeerId &peerId, MsgId showAtMsgId, bool re if (peerId) { _peer = App::peer(peerId); + _topBar->setHistoryPeer(_peer); _channel = peerToChannel(_peer->id); _canSendMessages = canSendMessages(_peer); _tabbedSelector->setCurrentPeer(_peer); @@ -1843,6 +1844,9 @@ void HistoryWidget::showHistory(const PeerId &peerId, MsgId showAtMsgId, bool re emit historyShown(_history, _showAtMsgId); controller()->historyPeer = _peer; + if (_peer) { + controller()->activePeer = _peer; + } update(); } diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style index fe494253c..06c999198 100644 --- a/Telegram/SourceFiles/info/info.style +++ b/Telegram/SourceFiles/info/info.style @@ -313,6 +313,10 @@ infoIconMediaLink: icon {{ "info_media_link", infoIconFg }}; infoIconMediaGroup: icon {{ "info_common_groups", infoIconFg }}; infoIconMediaVoice: icon {{ "info_media_voice", infoIconFg }}; infoIconMediaRound: icon {{ "info_media_round", infoIconFg }}; +infoIconRecentActions: icon {{ "info_recent_actions", infoIconFg }}; +infoIconAdministrators: icon {{ "info_administrators", infoIconFg }}; +infoIconBlacklist: icon {{ "info_blacklist", infoIconFg }}; +infoIconRestrictedUsers: icon {{ "info_restricted_users", infoIconFg }}; infoInformationIconPosition: point(25px, 12px); infoNotificationsIconPosition: point(20px, 5px); infoSharedMediaIconPosition: point(20px, 24px); @@ -483,11 +487,21 @@ infoMembersCreatorIcon: icon {{ profileAdminStartFg, point(4px, 3px) }}; +infoMembersCreatorIconOver: icon {{ + "profile_admin_star", + profileAdminStarFgOver, + point(4px, 3px) +}}; infoMembersAdminIcon: icon {{ "profile_admin_star", profileOtherAdminStarFg, point(4px, 3px) }}; +infoMembersAdminIconOver: icon {{ + "profile_admin_star", + profileOtherAdminStarFgOver, + point(4px, 3px) +}}; infoMembersRemoveIcon: icon {{ "simple_close", menuIconFg @@ -522,3 +536,13 @@ infoCommonGroupsList: PeerList(infoMembersList) { statusPosition: point(79px, 31px); } } + +managePeerButton: InfoProfileButton(infoProfileButton) { + padding: margins(76px, 10px, 76px, 8px); +} +managePeerButtonIconPosition: infoSharedMediaButtonIconPosition; +managePeerButtonLabel: FlatLabel(defaultFlatLabel) { + textFg: windowActiveTextFg; + style: semiboldTextStyle; +} +managePeerButtonLabelPosition: point(25px, 10px); diff --git a/Telegram/SourceFiles/info/info_section_widget.cpp b/Telegram/SourceFiles/info/info_section_widget.cpp index 7a8d7d7b9..fff4f9846 100644 --- a/Telegram/SourceFiles/info/info_section_widget.cpp +++ b/Telegram/SourceFiles/info/info_section_widget.cpp @@ -56,8 +56,8 @@ void SectionWidget::init() { }, _content->lifetime()); } -PeerData *SectionWidget::peerForDialogs() const { - return _content->peerForDialogs(); +PeerData *SectionWidget::activePeer() const { + return _content->activePeer(); } bool SectionWidget::hasTopBarShadow() const { diff --git a/Telegram/SourceFiles/info/info_section_widget.h b/Telegram/SourceFiles/info/info_section_widget.h index 7ee9f899d..6dd34ae8d 100644 --- a/Telegram/SourceFiles/info/info_section_widget.h +++ b/Telegram/SourceFiles/info/info_section_widget.h @@ -48,7 +48,7 @@ public: Wrap wrap, not_null memento); - PeerData *peerForDialogs() const override; + PeerData *activePeer() const override; bool hasTopBarShadow() const override; QPixmap grabForShowAnimation( diff --git a/Telegram/SourceFiles/info/info_wrap_widget.h b/Telegram/SourceFiles/info/info_wrap_widget.h index e15dba0d0..d0b7f1da0 100644 --- a/Telegram/SourceFiles/info/info_wrap_widget.h +++ b/Telegram/SourceFiles/info/info_wrap_widget.h @@ -88,7 +88,7 @@ public: not_null memento); not_null peer() const; - PeerData *peerForDialogs() const override { + PeerData *activePeer() const override { return peer(); } Wrap wrap() const { diff --git a/Telegram/SourceFiles/info/profile/info_profile_members_controllers.cpp b/Telegram/SourceFiles/info/profile/info_profile_members_controllers.cpp index 0a4b562a3..f6e5dea5a 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_members_controllers.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_members_controllers.cpp @@ -363,11 +363,16 @@ void MemberListRow::paintNameIcon( Painter &p, int x, int y, - int outerWidth) { + int outerWidth, + bool selected) { auto icon = [&] { return (_type.rights == Rights::Admin) - ? &st::infoMembersAdminIcon - : &st::infoMembersCreatorIcon; + ? (selected + ? &st::infoMembersAdminIconOver + : &st::infoMembersAdminIcon) + : (selected + ? &st::infoMembersCreatorIconOver + : &st::infoMembersCreatorIcon); }(); icon->paint(p, x, y, outerWidth); } diff --git a/Telegram/SourceFiles/info/profile/info_profile_members_controllers.h b/Telegram/SourceFiles/info/profile/info_profile_members_controllers.h index 56762d9fe..2c1ad5fd6 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_members_controllers.h +++ b/Telegram/SourceFiles/info/profile/info_profile_members_controllers.h @@ -58,7 +58,8 @@ public: Painter &p, int x, int y, - int outerWidth) override; + int outerWidth, + bool selected) override; not_null user() const { return peer()->asUser(); diff --git a/Telegram/SourceFiles/info/profile/info_profile_values.cpp b/Telegram/SourceFiles/info/profile/info_profile_values.cpp index 7d1d535f4..5bbc677b3 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_values.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_values.cpp @@ -202,6 +202,45 @@ rpl::producer MembersCountValue( Unexpected("User in MembersCountViewer()."); } +rpl::producer AdminsCountValue( + not_null channel) { + using Flag = Notify::PeerUpdate::Flag; + return Notify::PeerUpdateValue( + channel, + Flag::AdminsChanged | Flag::ChannelRightsChanged) + | rpl::map([channel] { + return channel->canViewAdmins() + ? channel->adminsCount() + : 0; + }); +} + +rpl::producer RestrictedCountValue( + not_null channel) { + using Flag = Notify::PeerUpdate::Flag; + return Notify::PeerUpdateValue( + channel, + Flag::BannedUsersChanged | Flag::ChannelRightsChanged) + | rpl::map([channel] { + return channel->canViewBanned() + ? channel->restrictedCount() + : 0; + }); +} + +rpl::producer KickedCountValue( + not_null channel) { + using Flag = Notify::PeerUpdate::Flag; + return Notify::PeerUpdateValue( + channel, + Flag::BannedUsersChanged | Flag::ChannelRightsChanged) + | rpl::map([channel] { + return channel->canViewBanned() + ? channel->kickedCount() + : 0; + }); +} + rpl::producer SharedMediaCountValue( not_null peer, PeerData *migrated, diff --git a/Telegram/SourceFiles/info/profile/info_profile_values.h b/Telegram/SourceFiles/info/profile/info_profile_values.h index 3852ab82f..79ead5e86 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_values.h +++ b/Telegram/SourceFiles/info/profile/info_profile_values.h @@ -75,6 +75,12 @@ rpl::producer AmInChannelValue( not_null channel); rpl::producer MembersCountValue( not_null peer); +rpl::producer AdminsCountValue( + not_null channel); +rpl::producer RestrictedCountValue( + not_null channel); +rpl::producer KickedCountValue( + not_null channel); rpl::producer SharedMediaCountValue( not_null peer, PeerData *migrated, diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index f2ad4e059..306407568 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -271,7 +271,7 @@ MainWidget::MainWidget( }); using namespace rpl::mappers; - _controller->historyPeer.value() + _controller->activePeer.value() | rpl::map([](PeerData *peer) { auto canWrite = peer ? Data::CanWriteValue(peer) @@ -2432,7 +2432,7 @@ void MainWidget::ui_showPeerHistory( break; } } - if (auto historyPeer = _history->peer()) { + if (auto historyPeer = _controller->historyPeer.current()) { if (way == Way::Forward && historyPeer->id == peerId) { way = Way::ClearStack; } @@ -2552,6 +2552,10 @@ void MainWidget::ui_showPeerHistory( _dialogs->update(); } + if (!peerId) { + _controller->activePeer = nullptr; + } + checkFloatPlayerVisibility(); } @@ -2577,10 +2581,6 @@ void MainWidget::peerAfter(const PeerData *inPeer, MsgId inMsg, PeerData *&outPe _dialogs->peerAfter(inPeer, inMsg, outPeer, outMsg); } -PeerData *MainWidget::historyPeer() { - return _history->peer(); -} - PeerData *MainWidget::peer() { return _overview ? _overview->peer() : _history->peer(); } @@ -2962,6 +2962,10 @@ void MainWidget::showNewSection( settingSection->showFast(); } + if (settingSection.data() == _mainSection.data()) { + _controller->activePeer = _mainSection->activePeer(); + } + checkFloatPlayerVisibility(); orderWidgets(); } @@ -3530,8 +3534,11 @@ void MainWidget::updateThirdColumnToCurrentPeer( } else { Auth().data().setTabbedReplacedWithInfo(false); if (!peer) { - _thirdSection.destroy(); - _thirdShadow.destroy(); + if (_thirdSection) { + _thirdSection.destroy(); + _thirdShadow.destroy(); + updateControlsGeometry(); + } } else if (Adaptive::ThreeColumn() && Auth().data().thirdSectionInfoEnabled()) { switchInfoFast(); diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h index 0144793e9..2a8488161 100644 --- a/Telegram/SourceFiles/mainwidget.h +++ b/Telegram/SourceFiles/mainwidget.h @@ -149,7 +149,6 @@ public: void peerBefore(const PeerData *inPeer, MsgId inMsg, PeerData *&outPeer, MsgId &outMsg); void peerAfter(const PeerData *inPeer, MsgId inMsg, PeerData *&outPeer, MsgId &outMsg); - PeerData *historyPeer(); PeerData *peer(); PeerData *activePeer(); diff --git a/Telegram/SourceFiles/profile/profile_common_groups_section.h b/Telegram/SourceFiles/profile/profile_common_groups_section.h index f9afacac8..b0734f028 100644 --- a/Telegram/SourceFiles/profile/profile_common_groups_section.h +++ b/Telegram/SourceFiles/profile/profile_common_groups_section.h @@ -177,7 +177,7 @@ public: Widget(QWidget *parent, not_null controller, not_null user); not_null user() const; - PeerData *peerForDialogs() const override { + PeerData *activePeer() const override { return user(); } diff --git a/Telegram/SourceFiles/profile/profile_widget.h b/Telegram/SourceFiles/profile/profile_widget.h index 6fc462d95..b43a80cd4 100644 --- a/Telegram/SourceFiles/profile/profile_widget.h +++ b/Telegram/SourceFiles/profile/profile_widget.h @@ -39,7 +39,7 @@ public: Widget(QWidget *parent, not_null controller, PeerData *peer); PeerData *peer() const; - PeerData *peerForDialogs() const override { + PeerData *activePeer() const override { return peer(); } diff --git a/Telegram/SourceFiles/rpl/rpl.h b/Telegram/SourceFiles/rpl/rpl.h index 1805607f6..67505b4a3 100644 --- a/Telegram/SourceFiles/rpl/rpl.h +++ b/Telegram/SourceFiles/rpl/rpl.h @@ -20,6 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org */ #pragma once +// rpl - reactive programming library + #include #include #include diff --git a/Telegram/SourceFiles/window/section_widget.h b/Telegram/SourceFiles/window/section_widget.h index 1847ec398..1b3ae98db 100644 --- a/Telegram/SourceFiles/window/section_widget.h +++ b/Telegram/SourceFiles/window/section_widget.h @@ -82,7 +82,7 @@ class SectionWidget : public AbstractSectionWidget { public: SectionWidget(QWidget *parent, not_null controller); - virtual PeerData *peerForDialogs() const { + virtual PeerData *activePeer() const { return nullptr; } diff --git a/Telegram/SourceFiles/window/top_bar_widget.cpp b/Telegram/SourceFiles/window/top_bar_widget.cpp index 684ec2fd3..6a59b95c7 100644 --- a/Telegram/SourceFiles/window/top_bar_widget.cpp +++ b/Telegram/SourceFiles/window/top_bar_widget.cpp @@ -99,7 +99,7 @@ TopBarWidget::TopBarWidget( }); } subscribe(App::histories().sendActionAnimationUpdated(), [this](const Histories::SendActionAnimationUpdate &update) { - if (App::main() && update.history->peer == App::main()->historyPeer()) { + if (update.history->peer == _controller->historyPeer.current()) { rtlupdate(0, 0, width(), height()); } }); @@ -139,9 +139,8 @@ void TopBarWidget::onClearSelection() { } void TopBarWidget::onInfoClicked() { - auto p = App::main() ? App::main()->historyPeer() : nullptr; - if (p) { - _controller->showPeerInfo(p); + if (auto peer = _controller->historyPeer.current()) { + _controller->showPeerInfo(peer); } } @@ -205,7 +204,7 @@ void TopBarWidget::toggleInfoSection() { && (Auth().data().thirdSectionInfoEnabled() || Auth().data().tabbedReplacedWithInfo())) { _controller->closeThirdSection(); - } else if (auto peer = App::main()->historyPeer()) { + } else if (auto peer = _controller->historyPeer.current()) { if (_controller->canShowThirdSection()) { Auth().data().setThirdSectionInfoEnabled(true); Auth().saveDataDelayed(); @@ -289,7 +288,7 @@ void TopBarWidget::paintUnreadCounter(Painter &p, int outerWidth) { auto fullCounter = App::histories().unreadBadge() + (Global::IncludeMuted() ? 0 : mutedCount); // Do not include currently shown chat in the top bar unread counter. - if (auto historyShown = App::historyLoaded(App::main()->historyPeer())) { + if (auto historyShown = App::historyLoaded(App::wnd()->controller()->historyPeer.current())) { auto shownUnreadCount = historyShown->unreadCount(); if (!historyShown->mute() || Global::IncludeMuted()) { fullCounter -= shownUnreadCount; @@ -370,7 +369,6 @@ void TopBarWidget::animationFinished() { } void TopBarWidget::updateControlsVisibility() { - auto historyPeer = App::main() ? App::main()->historyPeer() : nullptr; auto overviewPeer = App::main() ? App::main()->overviewPeer() : nullptr; _clearSelection->show(); @@ -378,9 +376,9 @@ void TopBarWidget::updateControlsVisibility() { _forward->setVisible(_canForward); _mediaType->setVisible(App::main() ? App::main()->showMediaTypeSwitch() : false); - if (historyPeer && !overviewPeer) { + if (_historyPeer && !overviewPeer) { if (Adaptive::OneColumn() || !App::main()->stackIsEmpty()) { - _info->setPeer(historyPeer); + _info->setPeer(_historyPeer); _info->show(); _menuToggle->hide(); _menu.destroy(); @@ -392,7 +390,7 @@ void TopBarWidget::updateControlsVisibility() { _infoToggle->setVisible(!Adaptive::OneColumn() && _controller->canShowThirdSection()); auto callsEnabled = false; - if (auto user = historyPeer->asUser()) { + if (auto user = _historyPeer->asUser()) { callsEnabled = Global::PhoneCallsEnabled() && user->hasCalls(); } _call->setVisible(callsEnabled); diff --git a/Telegram/SourceFiles/window/top_bar_widget.h b/Telegram/SourceFiles/window/top_bar_widget.h index 3fabbc739..0e1ba7c71 100644 --- a/Telegram/SourceFiles/window/top_bar_widget.h +++ b/Telegram/SourceFiles/window/top_bar_widget.h @@ -52,6 +52,9 @@ public: void updateMembersShowArea(); Ui::RoundButton *mediaTypeButton(); + void setHistoryPeer(not_null historyPeer) { + _historyPeer = historyPeer; + } static void paintUnreadCounter(Painter &p, int outerWidth); @@ -83,6 +86,7 @@ private: int countSelectedButtonsTop(float64 selectedShown); not_null _controller; + PeerData *_historyPeer = nullptr; int _selectedCount = 0; bool _canDelete = false; diff --git a/Telegram/SourceFiles/window/window_controller.h b/Telegram/SourceFiles/window/window_controller.h index 9889f9db8..7f10978ad 100644 --- a/Telegram/SourceFiles/window/window_controller.h +++ b/Telegram/SourceFiles/window/window_controller.h @@ -90,8 +90,13 @@ public: // This is needed while we have one HistoryWidget and one TopBarWidget // for all histories we show in a window. Once each history is shown // in its own HistoryWidget with its own TopBarWidget this can be removed. + // + // Also used in the Info::Profile to toggle Send Message button. rpl::variable historyPeer; + // This is used for auto-switch in third column Info::Profile. + rpl::variable activePeer; + void enableGifPauseReason(GifPauseReason reason); void disableGifPauseReason(GifPauseReason reason); base::Observable &gifPauseLevelChanged() { diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp index fa0d31e38..bdb94cfef 100644 --- a/Telegram/SourceFiles/window/window_peer_menu.cpp +++ b/Telegram/SourceFiles/window/window_peer_menu.cpp @@ -26,6 +26,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #include "boxes/add_contact_box.h" #include "boxes/report_box.h" #include "boxes/peer_list_controllers.h" +#include "boxes/peers/manage_peer_box.h" #include "auth_session.h" #include "apiwrap.h" #include "mainwidget.h" @@ -153,7 +154,7 @@ Filler::Filler( bool Filler::showInfo() { if (_source == PeerMenuSource::Profile) { return false; - } else if (_controller->historyPeer.current() != _peer) { + } else if (_controller->activePeer.current() != _peer) { return true; } else if (!Adaptive::ThreeColumn()) { return true; @@ -377,7 +378,14 @@ void Filler::addChatActions(not_null chat) { void Filler::addChannelActions(not_null channel) { if (_source != PeerMenuSource::ChatsList) { - //_addAction(manage); + if (ManagePeerBox::Available(channel)) { + auto text = lang(channel->isMegagroup() + ? lng_manage_group_title + : lng_manage_channel_title); + _addAction(text, [channel] { + Ui::show(Box(channel)); + }); + } if (channel->canAddMembers()) { _addAction( lang(lng_channel_add_members), diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt index 1d652e793..eb13f292c 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt @@ -34,6 +34,8 @@ <(src_loc)/base/virtual_method.h <(src_loc)/base/weak_unique_ptr.h <(src_loc)/base/zlib_help.h +<(src_loc)/boxes/peers/manage_peer_box.cpp +<(src_loc)/boxes/peers/manage_peer_box.h <(src_loc)/boxes/about_box.cpp <(src_loc)/boxes/about_box.h <(src_loc)/boxes/abstract_box.cpp