RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add sub-label-s to CallMuteButton.

This commit is contained in:
John Preston 2020-12-17 17:25:09 +04:00
parent d799dfe564
commit f0b8d4e62b
5 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/Resources/langs/lang.strings
View File

@ -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";

4
Telegram/SourceFiles/calls/calls.style
View File

@ -596,8 +596,8 @@ groupCallHangup: CallButton(callHangup) {
label: callButtonLabel;
}
groupCallButtonSkip: 43px;
groupCallButtonBottomSkip: 134px;
groupCallMuteBottomSkip: 149px;
groupCallButtonBottomSkip: 145px;
groupCallMuteBottomSkip: 160px;
groupCallTopBarUserpicSize: 28px;
groupCallTopBarUserpicShift: 8px;

4
Telegram/SourceFiles/calls/calls_group_members.cpp
View File

@ -1116,7 +1116,9 @@ base::unique_qptr<Ui::PopupMenu> MembersController::rowContextMenu(
};
const auto showHistory = [=] {
performOnMainWindow([=](not_null<Window::SessionController*> window) {
window->showPeerHistory(user);
window->showPeerHistory(
user,
Window::SectionShow::Way::Forward);
});
};
const auto removeFromGroup = crl::guard(this, [=] {

7
Telegram/SourceFiles/calls/calls_group_panel.cpp
View File

@ -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

2
Telegram/lib_ui

@ -1 +1 @@
Subproject commit 5e3897fcff29c65c72fdf8f7f282aee0f6bed644
Subproject commit 407079e5b1cffdad2a08b0e00eafb78a175680c0