diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index d0dd31de9..667c07dac 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -1820,8 +1820,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_group_call_inactive" = "listening"; "lng_group_call_settings" = "Settings"; "lng_group_call_unmute" = "Unmute"; +"lng_group_call_unmute_sub" = "or hold spacebar to talk"; "lng_group_call_you_are_live" = "You are Live"; -"lng_group_call_force_muted" = "You are in Listen Only mode"; +"lng_group_call_force_muted" = "Muted by admin"; +"lng_group_call_force_muted_sub" = "You are in Listen Only mode"; "lng_group_call_connecting" = "Connecting..."; "lng_group_call_leave" = "Leave"; "lng_group_call_leave_title" = "Leave voice chat"; diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style index 4dc45ad5b..0fb1facc7 100644 --- a/Telegram/SourceFiles/calls/calls.style +++ b/Telegram/SourceFiles/calls/calls.style @@ -596,8 +596,8 @@ groupCallHangup: CallButton(callHangup) { label: callButtonLabel; } groupCallButtonSkip: 43px; -groupCallButtonBottomSkip: 134px; -groupCallMuteBottomSkip: 149px; +groupCallButtonBottomSkip: 145px; +groupCallMuteBottomSkip: 160px; groupCallTopBarUserpicSize: 28px; groupCallTopBarUserpicShift: 8px; diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp index 1e6f54e04..e343454de 100644 --- a/Telegram/SourceFiles/calls/calls_group_members.cpp +++ b/Telegram/SourceFiles/calls/calls_group_members.cpp @@ -1116,7 +1116,9 @@ base::unique_qptr MembersController::rowContextMenu( }; const auto showHistory = [=] { performOnMainWindow([=](not_null window) { - window->showPeerHistory(user); + window->showPeerHistory( + user, + Window::SectionShow::Way::Forward); }); }; const auto removeFromGroup = crl::guard(this, [=] { diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp index 3a148d70d..3823f0c2d 100644 --- a/Telegram/SourceFiles/calls/calls_group_panel.cpp +++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp @@ -435,6 +435,13 @@ void GroupPanel::initWithCall(GroupCall *call) { : mute == MuteState::Muted ? tr::lng_group_call_unmute(tr::now) : tr::lng_group_call_you_are_live(tr::now)), + .subtext = (connecting + ? QString() + : mute == MuteState::ForceMuted + ? tr::lng_group_call_force_muted_sub(tr::now) + : mute == MuteState::Muted + ? tr::lng_group_call_unmute_sub(tr::now) + : QString()), .type = (connecting ? Ui::CallMuteButtonType::Connecting : mute == MuteState::ForceMuted diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 5e3897fcf..407079e5b 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 5e3897fcff29c65c72fdf8f7f282aee0f6bed644 +Subproject commit 407079e5b1cffdad2a08b0e00eafb78a175680c0