From feb5d8e49332b61124f4526ffa0219627c3880fa Mon Sep 17 00:00:00 2001 From: RadRussianRus Date: Wed, 1 Apr 2020 05:19:49 +0300 Subject: [PATCH] Moved some settings in separate section --- Telegram/Resources/langs/lang.strings | 2 + Telegram/Resources/langs/rewrites/ru.json | 3 +- .../SourceFiles/settings/settings_kotato.cpp | 136 +++++++++--------- .../SourceFiles/settings/settings_kotato.h | 1 + 4 files changed, 77 insertions(+), 65 deletions(-) diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index f9e79443c..e3b8fab60 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -2473,4 +2473,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "ktg_settings_top_bar_mute" = "Mute in profile top bar"; +"ktg_settings_messages" = "Messages"; + // Keys finished diff --git a/Telegram/Resources/langs/rewrites/ru.json b/Telegram/Resources/langs/rewrites/ru.json index cd89a057b..6eca43b2b 100644 --- a/Telegram/Resources/langs/rewrites/ru.json +++ b/Telegram/Resources/langs/rewrites/ru.json @@ -105,5 +105,6 @@ "ktg_settings_filters_only_unmuted_counter": "Не считать чаты без уведомлений", "ktg_settings_filters_hide_edit": "Скрыть кнопку изменения", "ktg_settings_filters_hide_folder_names": "Компактные папки", - "ktg_settings_top_bar_mute": "Уведомления вверху профиля" + "ktg_settings_top_bar_mute": "Уведомления вверху профиля", + "ktg_settings_messages": "Сообщения" } diff --git a/Telegram/SourceFiles/settings/settings_kotato.cpp b/Telegram/SourceFiles/settings/settings_kotato.cpp index 8d10d009e..5cd00a6d5 100644 --- a/Telegram/SourceFiles/settings/settings_kotato.cpp +++ b/Telegram/SourceFiles/settings/settings_kotato.cpp @@ -42,34 +42,6 @@ void SetupKotatoChats(not_null container) { AddSkip(container); AddSubsectionTitle(container, tr::ktg_settings_chats()); - const auto stickerHeightLabel = container->add( - object_ptr( - container, - st::settingsAudioVolumeLabel), - st::settingsAudioVolumeLabelPadding); - const auto stickerHeightSlider = container->add( - object_ptr( - container, - st::settingsAudioVolumeSlider), - st::settingsAudioVolumeSliderPadding); - const auto updateStickerHeightLabel = [=](int value) { - const auto pixels = QString::number(value); - stickerHeightLabel->setText( - tr::ktg_settings_sticker_height(tr::now, lt_pixels, pixels)); - }; - const auto updateStickerHeight = [=](int value) { - updateStickerHeightLabel(value); - SetStickerHeight(value); - KotatoSettings::Write(); - }; - stickerHeightSlider->resize(st::settingsAudioVolumeSlider.seekSize); - stickerHeightSlider->setPseudoDiscrete( - 193, - [](int val) { return val + 64; }, - StickerHeight(), - updateStickerHeight); - updateStickerHeightLabel(StickerHeight()); - const auto recentStickersLimitLabel = container->add( object_ptr( container, @@ -104,29 +76,29 @@ void SetupKotatoChats(not_null container) { AddButton( container, - tr::ktg_settings_adaptive_bubbles(), + tr::ktg_settings_top_bar_mute(), st::settingsButton )->toggleOn( - rpl::single(AdaptiveBubbles()) + rpl::single(cProfileTopBarNotifications()) )->toggledValue( ) | rpl::filter([](bool enabled) { - return (enabled != AdaptiveBubbles()); + return (enabled != cProfileTopBarNotifications()); }) | rpl::start_with_next([](bool enabled) { - SetAdaptiveBubbles(enabled); + cSetProfileTopBarNotifications(enabled); KotatoSettings::Write(); }, container->lifetime()); AddButton( container, - tr::ktg_settings_emoji_outline(), + tr::ktg_settings_disable_up_edit(), st::settingsButton )->toggleOn( - rpl::single(BigEmojiOutline()) + rpl::single(cDisableUpEdit()) )->toggledValue( ) | rpl::filter([](bool enabled) { - return (enabled != BigEmojiOutline()); + return (enabled != cDisableUpEdit()); }) | rpl::start_with_next([](bool enabled) { - SetBigEmojiOutline(enabled); + cSetDisableUpEdit(enabled); KotatoSettings::Write(); }, container->lifetime()); @@ -159,34 +131,6 @@ void SetupKotatoChats(not_null container) { KotatoSettings::Write(); }, container->lifetime()); - AddButton( - container, - tr::ktg_settings_disable_up_edit(), - st::settingsButton - )->toggleOn( - rpl::single(cDisableUpEdit()) - )->toggledValue( - ) | rpl::filter([](bool enabled) { - return (enabled != cDisableUpEdit()); - }) | rpl::start_with_next([](bool enabled) { - cSetDisableUpEdit(enabled); - KotatoSettings::Write(); - }, container->lifetime()); - - AddButton( - container, - tr::ktg_settings_top_bar_mute(), - st::settingsButton - )->toggleOn( - rpl::single(cProfileTopBarNotifications()) - )->toggledValue( - ) | rpl::filter([](bool enabled) { - return (enabled != cProfileTopBarNotifications()); - }) | rpl::start_with_next([](bool enabled) { - cSetProfileTopBarNotifications(enabled); - KotatoSettings::Write(); - }, container->lifetime()); - AddButton( container, tr::ktg_settings_fonts(), @@ -195,6 +139,69 @@ void SetupKotatoChats(not_null container) { Ui::show(Box()); }); + AddSkip(container); +} + +void SetupKotatoMessages(not_null container) { + AddDivider(container); + AddSkip(container); + AddSubsectionTitle(container, tr::ktg_settings_messages()); + + const auto stickerHeightLabel = container->add( + object_ptr( + container, + st::settingsAudioVolumeLabel), + st::settingsAudioVolumeLabelPadding); + const auto stickerHeightSlider = container->add( + object_ptr( + container, + st::settingsAudioVolumeSlider), + st::settingsAudioVolumeSliderPadding); + const auto updateStickerHeightLabel = [=](int value) { + const auto pixels = QString::number(value); + stickerHeightLabel->setText( + tr::ktg_settings_sticker_height(tr::now, lt_pixels, pixels)); + }; + const auto updateStickerHeight = [=](int value) { + updateStickerHeightLabel(value); + SetStickerHeight(value); + KotatoSettings::Write(); + }; + stickerHeightSlider->resize(st::settingsAudioVolumeSlider.seekSize); + stickerHeightSlider->setPseudoDiscrete( + 193, + [](int val) { return val + 64; }, + StickerHeight(), + updateStickerHeight); + updateStickerHeightLabel(StickerHeight()); + + AddButton( + container, + tr::ktg_settings_adaptive_bubbles(), + st::settingsButton + )->toggleOn( + rpl::single(AdaptiveBubbles()) + )->toggledValue( + ) | rpl::filter([](bool enabled) { + return (enabled != AdaptiveBubbles()); + }) | rpl::start_with_next([](bool enabled) { + SetAdaptiveBubbles(enabled); + KotatoSettings::Write(); + }, container->lifetime()); + + AddButton( + container, + tr::ktg_settings_emoji_outline(), + st::settingsButton + )->toggleOn( + rpl::single(BigEmojiOutline()) + )->toggledValue( + ) | rpl::filter([](bool enabled) { + return (enabled != BigEmojiOutline()); + }) | rpl::start_with_next([](bool enabled) { + SetBigEmojiOutline(enabled); + KotatoSettings::Write(); + }, container->lifetime()); AddSkip(container); } @@ -357,6 +364,7 @@ void Kotato::setupContent(not_null controller) { const auto content = Ui::CreateChild(this); SetupKotatoChats(content); + SetupKotatoMessages(content); SetupKotatoNetwork(content); SetupKotatoFolders(controller, content); SetupKotatoSystem(content); diff --git a/Telegram/SourceFiles/settings/settings_kotato.h b/Telegram/SourceFiles/settings/settings_kotato.h index 7da5917f8..d63b0891a 100644 --- a/Telegram/SourceFiles/settings/settings_kotato.h +++ b/Telegram/SourceFiles/settings/settings_kotato.h @@ -14,6 +14,7 @@ class BoxContent; namespace Settings { void SetupKotatoChats(not_null container); +void SetupKotatoMessages(not_null container); void SetupKotatoNetwork(not_null container); void SetupKotatoFolders( not_null controller,