diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index 0763000c0b..f21eeed320 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -1180,17 +1180,18 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_settings_restart_now" = "Restart"; "lng_settings_restart_later" = "Later"; -"lng_settings_swipe_subsection" = "Chat list swipe gesture"; -"lng_settings_swipe_mute" = "Mute"; -"lng_settings_swipe_unmute" = "Unmute"; -"lng_settings_swipe_pin" = "Pin"; -"lng_settings_swipe_unpin" = "Unpin"; -"lng_settings_swipe_read" = "Read"; -"lng_settings_swipe_unread" = "Unread"; -"lng_settings_swipe_archive" = "Archive"; -"lng_settings_swipe_unarchive" = "Unarchive"; -"lng_settings_swipe_delete" = "Delete"; -"lng_settings_swipe_disabled" = "Change folder"; +"lng_settings_quick_dialog_action_title" = "Chat list quick action"; +"lng_settings_quick_dialog_action_about" = "Choose the action you want to perform when you middle-click or swipe left in the chat list."; +"lng_settings_quick_dialog_action_mute" = "Mute"; +"lng_settings_quick_dialog_action_unmute" = "Unmute"; +"lng_settings_quick_dialog_action_pin" = "Pin"; +"lng_settings_quick_dialog_action_unpin" = "Unpin"; +"lng_settings_quick_dialog_action_read" = "Read"; +"lng_settings_quick_dialog_action_unread" = "Unread"; +"lng_settings_quick_dialog_action_archive" = "Archive"; +"lng_settings_quick_dialog_action_unarchive" = "Unarchive"; +"lng_settings_quick_dialog_action_delete" = "Delete"; +"lng_settings_quick_dialog_action_disabled" = "Change folder"; "lng_sessions_header" = "This device"; "lng_sessions_other_header" = "Active Devices"; diff --git a/Telegram/SourceFiles/dialogs/dialogs_quick_action.cpp b/Telegram/SourceFiles/dialogs/dialogs_quick_action.cpp index 1d5f16e107..4c7a6d8e6c 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_quick_action.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_quick_action.cpp @@ -158,25 +158,25 @@ Ui::QuickDialogActionLabel ResolveQuickDialogLabel( QString ResolveQuickDialogLabel(Ui::QuickDialogActionLabel action) { switch (action) { case Ui::QuickDialogActionLabel::Mute: - return tr::lng_settings_swipe_mute(tr::now); + return tr::lng_settings_quick_dialog_action_mute(tr::now); case Ui::QuickDialogActionLabel::Unmute: - return tr::lng_settings_swipe_unmute(tr::now); + return tr::lng_settings_quick_dialog_action_unmute(tr::now); case Ui::QuickDialogActionLabel::Pin: - return tr::lng_settings_swipe_pin(tr::now); + return tr::lng_settings_quick_dialog_action_pin(tr::now); case Ui::QuickDialogActionLabel::Unpin: - return tr::lng_settings_swipe_unpin(tr::now); + return tr::lng_settings_quick_dialog_action_unpin(tr::now); case Ui::QuickDialogActionLabel::Read: - return tr::lng_settings_swipe_read(tr::now); + return tr::lng_settings_quick_dialog_action_read(tr::now); case Ui::QuickDialogActionLabel::Unread: - return tr::lng_settings_swipe_unread(tr::now); + return tr::lng_settings_quick_dialog_action_unread(tr::now); case Ui::QuickDialogActionLabel::Archive: - return tr::lng_settings_swipe_archive(tr::now); + return tr::lng_settings_quick_dialog_action_archive(tr::now); case Ui::QuickDialogActionLabel::Unarchive: - return tr::lng_settings_swipe_unarchive(tr::now); + return tr::lng_settings_quick_dialog_action_unarchive(tr::now); case Ui::QuickDialogActionLabel::Delete: - return tr::lng_settings_swipe_delete(tr::now); + return tr::lng_settings_quick_dialog_action_delete(tr::now); default: - return tr::lng_settings_swipe_disabled(tr::now); + return tr::lng_settings_quick_dialog_action_disabled(tr::now); }; } diff --git a/Telegram/SourceFiles/settings/settings_chat.cpp b/Telegram/SourceFiles/settings/settings_chat.cpp index bf803cc512..33e4f9c2c7 100644 --- a/Telegram/SourceFiles/settings/settings_chat.cpp +++ b/Telegram/SourceFiles/settings/settings_chat.cpp @@ -1278,7 +1278,9 @@ void SetupChatListSwipe( not_null container) { Ui::AddDivider(container); Ui::AddSkip(container); - Ui::AddSubsectionTitle(container, tr::lng_settings_swipe_subsection()); + Ui::AddSubsectionTitle( + container, + tr::lng_settings_quick_dialog_action_title()); using Type = Dialogs::Ui::QuickDialogAction; const auto group = std::make_shared>( @@ -1288,19 +1290,19 @@ void SetupChatListSwipe( container, group->value() | rpl::map([](Type value) { return ((value == Dialogs::Ui::QuickDialogAction::Mute) - ? tr::lng_settings_swipe_mute + ? tr::lng_settings_quick_dialog_action_mute : (value == Dialogs::Ui::QuickDialogAction::Pin) - ? tr::lng_settings_swipe_pin + ? tr::lng_settings_quick_dialog_action_pin : (value == Dialogs::Ui::QuickDialogAction::Read) - ? tr::lng_settings_swipe_read + ? tr::lng_settings_quick_dialog_action_read : (value == Dialogs::Ui::QuickDialogAction::Archive) - ? tr::lng_settings_swipe_archive - : tr::lng_settings_swipe_disabled)(); + ? tr::lng_settings_quick_dialog_action_archive + : tr::lng_settings_quick_dialog_action_disabled)(); }) | rpl::flatten_latest(), st::settingsButtonNoIcon) )->setClickedCallback([=] { controller->uiShow()->showBox(Box([=](not_null box) { - box->setTitle(tr::lng_settings_swipe_subsection()); + box->setTitle(tr::lng_settings_quick_dialog_action_title()); const auto addRadio = [&](Type value, tr::phrase<> phrase) { box->verticalLayout()->add( object_ptr>( @@ -1311,12 +1313,18 @@ void SetupChatListSwipe( st::settingsSendType), st::settingsSendTypePadding); }; - addRadio(Type::Mute, tr::lng_settings_swipe_mute); - addRadio(Type::Pin, tr::lng_settings_swipe_pin); - addRadio(Type::Read, tr::lng_settings_swipe_read); - addRadio(Type::Archive, tr::lng_settings_swipe_archive); - addRadio(Type::Delete, tr::lng_settings_swipe_delete); - addRadio(Type::Disabled, tr::lng_settings_swipe_disabled); + addRadio(Type::Mute, tr::lng_settings_quick_dialog_action_mute); + addRadio(Type::Pin, tr::lng_settings_quick_dialog_action_pin); + addRadio(Type::Read, tr::lng_settings_quick_dialog_action_read); + addRadio( + Type::Archive, + tr::lng_settings_quick_dialog_action_archive); + addRadio( + Type::Delete, + tr::lng_settings_quick_dialog_action_delete); + addRadio( + Type::Disabled, + tr::lng_settings_quick_dialog_action_disabled); box->addButton(tr::lng_settings_save(), [=] { Core::App().settings().setQuickDialogAction( group->current()); @@ -1327,6 +1335,10 @@ void SetupChatListSwipe( })); }); Ui::AddSkip(container); + Ui::AddDividerText( + container, + tr::lng_settings_quick_dialog_action_about()); + Ui::AddSkip(container); } void SetupDefaultThemes(