From 166020723ff31b222310368a5bb51f1b64e6b543 Mon Sep 17 00:00:00 2001 From: AlexeyZavar Date: Sun, 5 May 2024 16:56:04 +0300 Subject: [PATCH] chore: remove application font setting --- Telegram/SourceFiles/ayu/ayu_infra.cpp | 1 - Telegram/SourceFiles/ayu/ayu_settings.cpp | 5 ----- Telegram/SourceFiles/ayu/ayu_settings.h | 3 --- .../ayu/ui/boxes/font_selector.cpp | 2 +- .../ayu/ui/settings/settings_ayu.cpp | 22 ------------------- 5 files changed, 1 insertion(+), 32 deletions(-) diff --git a/Telegram/SourceFiles/ayu/ayu_infra.cpp b/Telegram/SourceFiles/ayu/ayu_infra.cpp index 6da5877ae..03bf98792 100644 --- a/Telegram/SourceFiles/ayu/ayu_infra.cpp +++ b/Telegram/SourceFiles/ayu/ayu_infra.cpp @@ -29,7 +29,6 @@ void initLang() { void initFonts() { auto settings = &AyuSettings::getInstance(); - AyuFonts::setMainFont(settings->mainFont); AyuFonts::setMonoFont(settings->monoFont); } diff --git a/Telegram/SourceFiles/ayu/ayu_settings.cpp b/Telegram/SourceFiles/ayu/ayu_settings.cpp index 7021e0135..996dd61f3 100644 --- a/Telegram/SourceFiles/ayu/ayu_settings.cpp +++ b/Telegram/SourceFiles/ayu/ayu_settings.cpp @@ -234,7 +234,6 @@ AyuGramSettings::AyuGramSettings() { showGhostToggleInTray = true; showStreamerToggleInTray = false; - mainFont = ""; monoFont = ""; hideNotificationCounters = false; @@ -412,10 +411,6 @@ void AyuGramSettings::set_showStreamerToggleInTray(bool val) { showStreamerToggleInTray = val; } -void AyuGramSettings::set_mainFont(QString val) { - mainFont = val; -} - void AyuGramSettings::set_monoFont(QString val) { monoFont = val; } diff --git a/Telegram/SourceFiles/ayu/ayu_settings.h b/Telegram/SourceFiles/ayu/ayu_settings.h index dfede8802..53c086a9e 100644 --- a/Telegram/SourceFiles/ayu/ayu_settings.h +++ b/Telegram/SourceFiles/ayu/ayu_settings.h @@ -61,7 +61,6 @@ public: bool showGhostToggleInTray; bool showStreamerToggleInTray; - QString mainFont; QString monoFont; bool hideNotificationCounters; @@ -121,7 +120,6 @@ public: void set_showGhostToggleInTray(bool val); void set_showStreamerToggleInTray(bool val); - void set_mainFont(QString val); void set_monoFont(QString val); void set_hideNotificationCounters(bool val); @@ -172,7 +170,6 @@ NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT( showStreamerToggleInDrawer, showGhostToggleInTray, showStreamerToggleInTray, - mainFont, monoFont, hideNotificationCounters, hideAllChatsFolder, diff --git a/Telegram/SourceFiles/ayu/ui/boxes/font_selector.cpp b/Telegram/SourceFiles/ayu/ui/boxes/font_selector.cpp index d0e87188d..d9e5eae32 100644 --- a/Telegram/SourceFiles/ayu/ui/boxes/font_selector.cpp +++ b/Telegram/SourceFiles/ayu/ui/boxes/font_selector.cpp @@ -665,7 +665,7 @@ void Content::setupContent( const std::vector &fonts) { using namespace rpl::mappers; - const auto current = AyuFonts::getMainFont(); + const auto current = AyuFonts::getMonoFont(); const auto content = Ui::CreateChild(this); const auto add = [&](const std::vector &list) { diff --git a/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp b/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp index 2b92fb568..f4c616da3 100644 --- a/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp +++ b/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp @@ -1068,28 +1068,6 @@ void SetupRecentStickersLimitSlider(not_null container) { void SetupFonts(not_null container, not_null controller) { const auto settings = &AyuSettings::getInstance(); - const auto commonButton = AddButtonWithLabel( - container, - tr::ayu_MainFont(), - rpl::single( - settings->mainFont.isEmpty() ? tr::ayu_FontDefault(tr::now) : settings->mainFont - ), - st::settingsButtonNoIcon); - const auto commonGuard = Ui::CreateChild(commonButton.get()); - - commonButton->addClickHandler( - [=] - { - *commonGuard = AyuUi::FontSelectorBox::Show(controller, - [=](QString font) - { - auto ayuSettings = &AyuSettings::getInstance(); - - ayuSettings->set_mainFont(std::move(font)); - AyuSettings::save(); - }); - }); - const auto monoButton = AddButtonWithLabel( container, tr::ayu_MonospaceFont(),