From 04dd4e30a85a29cd372c5c1aea6a4a9c1c1fe244 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 20 Sep 2018 19:47:02 +0300 Subject: [PATCH] Rename General->Advanced in Settings. --- .../{settings_general.png => settings_advanced.png} | Bin ...ings_general@2x.png => settings_advanced@2x.png} | Bin Telegram/SourceFiles/core/update_checker.cpp | 2 +- Telegram/SourceFiles/info/info_top_bar.cpp | 2 +- Telegram/SourceFiles/settings/settings.style | 2 +- .../{settings_general.cpp => settings_advanced.cpp} | 2 +- .../{settings_general.h => settings_advanced.h} | 4 ++-- Telegram/SourceFiles/settings/settings_common.cpp | 6 +++--- Telegram/SourceFiles/settings/settings_common.h | 2 +- Telegram/SourceFiles/settings/settings_intro.cpp | 2 +- Telegram/SourceFiles/settings/settings_main.cpp | 2 +- Telegram/gyp/telegram_sources.txt | 4 ++-- 12 files changed, 14 insertions(+), 14 deletions(-) rename Telegram/Resources/icons/{settings_general.png => settings_advanced.png} (100%) rename Telegram/Resources/icons/{settings_general@2x.png => settings_advanced@2x.png} (100%) rename Telegram/SourceFiles/settings/{settings_general.cpp => settings_advanced.cpp} (99%) rename Telegram/SourceFiles/settings/{settings_general.h => settings_advanced.h} (86%) diff --git a/Telegram/Resources/icons/settings_general.png b/Telegram/Resources/icons/settings_advanced.png similarity index 100% rename from Telegram/Resources/icons/settings_general.png rename to Telegram/Resources/icons/settings_advanced.png diff --git a/Telegram/Resources/icons/settings_general@2x.png b/Telegram/Resources/icons/settings_advanced@2x.png similarity index 100% rename from Telegram/Resources/icons/settings_general@2x.png rename to Telegram/Resources/icons/settings_advanced@2x.png diff --git a/Telegram/SourceFiles/core/update_checker.cpp b/Telegram/SourceFiles/core/update_checker.cpp index e2bfcb69ff..31f8e5adc1 100644 --- a/Telegram/SourceFiles/core/update_checker.cpp +++ b/Telegram/SourceFiles/core/update_checker.cpp @@ -2132,7 +2132,7 @@ void UpdateApplication() { controller->showSection( Info::Memento( Info::Settings::Tag{ Auth().user() }, - Info::Section::SettingsType::General), + Info::Section::SettingsType::Advanced), Window::SectionShow()); } else { window->showSpecialLayer( diff --git a/Telegram/SourceFiles/info/info_top_bar.cpp b/Telegram/SourceFiles/info/info_top_bar.cpp index af8f614476..952ab34ebf 100644 --- a/Telegram/SourceFiles/info/info_top_bar.cpp +++ b/Telegram/SourceFiles/info/info_top_bar.cpp @@ -608,7 +608,7 @@ rpl::producer TitleValue( return lng_settings_section_notify; case Section::SettingsType::PrivacySecurity: return lng_settings_section_privacy; - case Section::SettingsType::General: + case Section::SettingsType::Advanced: return lng_settings_advanced; case Section::SettingsType::Chat: return lng_settings_section_chat_settings; diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style index bd46b2d7da..05a93207a7 100644 --- a/Telegram/SourceFiles/settings/settings.style +++ b/Telegram/SourceFiles/settings/settings.style @@ -48,7 +48,7 @@ settingsDividerLabelPadding: margins(22px, 10px, 22px, 19px); settingsIconInformation: icon {{ "settings_information", menuIconFg }}; settingsIconNotifications: icon {{ "settings_notifications", menuIconFg }}; settingsIconChat: icon {{ "settings_chat", menuIconFg }}; -settingsIconGeneral: icon {{ "settings_general", menuIconFg }}; +settingsIconGeneral: icon {{ "settings_advanced", menuIconFg }}; settingsIconPrivacySecurity: icon {{ "settings_privacy_security", menuIconFg }}; settingsIconLanguage: icon {{ "settings_language", menuIconFg }}; settingsIconInterfaceScale: icon {{ "settings_interface_scale", menuIconFg }}; diff --git a/Telegram/SourceFiles/settings/settings_general.cpp b/Telegram/SourceFiles/settings/settings_advanced.cpp similarity index 99% rename from Telegram/SourceFiles/settings/settings_general.cpp rename to Telegram/SourceFiles/settings/settings_advanced.cpp index 94d9503d83..fcfdf9b04a 100644 --- a/Telegram/SourceFiles/settings/settings_general.cpp +++ b/Telegram/SourceFiles/settings/settings_advanced.cpp @@ -5,7 +5,7 @@ the official desktop application for the Telegram messaging service. For license and copyright information please follow this link: https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ -#include "settings/settings_general.h" +#include "settings/settings_advanced.h" #include "settings/settings_common.h" #include "settings/settings_chat.h" diff --git a/Telegram/SourceFiles/settings/settings_general.h b/Telegram/SourceFiles/settings/settings_advanced.h similarity index 86% rename from Telegram/SourceFiles/settings/settings_general.h rename to Telegram/SourceFiles/settings/settings_advanced.h index 62d303dc58..15f6a5ea55 100644 --- a/Telegram/SourceFiles/settings/settings_general.h +++ b/Telegram/SourceFiles/settings/settings_advanced.h @@ -18,9 +18,9 @@ void SetupUpdate(not_null container); bool HasTray(); void SetupTray(not_null container); -class General : public Section { +class Advanced : public Section { public: - explicit General(QWidget *parent, UserData *self = nullptr); + explicit Advanced(QWidget *parent, UserData *self = nullptr); private: void setupContent(); diff --git a/Telegram/SourceFiles/settings/settings_common.cpp b/Telegram/SourceFiles/settings/settings_common.cpp index 36188f7652..5e752664e1 100644 --- a/Telegram/SourceFiles/settings/settings_common.cpp +++ b/Telegram/SourceFiles/settings/settings_common.cpp @@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "settings/settings_common.h" #include "settings/settings_chat.h" -#include "settings/settings_general.h" +#include "settings/settings_advanced.h" #include "settings/settings_information.h" #include "settings/settings_main.h" #include "settings/settings_notifications.h" @@ -39,8 +39,8 @@ object_ptr
CreateSection( return object_ptr(parent, self); case Type::PrivacySecurity: return object_ptr(parent, self); - case Type::General: - return object_ptr(parent, self); + case Type::Advanced: + return object_ptr(parent, self); case Type::Chat: return object_ptr(parent, self); } diff --git a/Telegram/SourceFiles/settings/settings_common.h b/Telegram/SourceFiles/settings/settings_common.h index 9020a59bd7..e8d66d88b9 100644 --- a/Telegram/SourceFiles/settings/settings_common.h +++ b/Telegram/SourceFiles/settings/settings_common.h @@ -36,7 +36,7 @@ enum class Type { Information, Notifications, PrivacySecurity, - General, + Advanced, Chat, }; diff --git a/Telegram/SourceFiles/settings/settings_intro.cpp b/Telegram/SourceFiles/settings/settings_intro.cpp index 67d6d32c83..dc5f3ef25c 100644 --- a/Telegram/SourceFiles/settings/settings_intro.cpp +++ b/Telegram/SourceFiles/settings/settings_intro.cpp @@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "settings/settings_intro.h" #include "settings/settings_common.h" -#include "settings/settings_general.h" +#include "settings/settings_advanced.h" #include "settings/settings_main.h" #include "settings/settings_chat.h" #include "settings/settings_codes.h" diff --git a/Telegram/SourceFiles/settings/settings_main.cpp b/Telegram/SourceFiles/settings/settings_main.cpp index 2905cf0b87..71e016de17 100644 --- a/Telegram/SourceFiles/settings/settings_main.cpp +++ b/Telegram/SourceFiles/settings/settings_main.cpp @@ -76,7 +76,7 @@ void SetupSections( &st::settingsIconChat); addSection( lng_settings_advanced, - Type::General, + Type::Advanced, &st::settingsIconGeneral); SetupLanguageButton(container); diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt index 62a79a7c56..208d5092e9 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt @@ -534,14 +534,14 @@ <(src_loc)/profile/profile_channel_controllers.h <(src_loc)/profile/profile_cover_drop_area.cpp <(src_loc)/profile/profile_cover_drop_area.h +<(src_loc)/settings/settings_advanced.cpp +<(src_loc)/settings/settings_advanced.h <(src_loc)/settings/settings_chat.cpp <(src_loc)/settings/settings_chat.h <(src_loc)/settings/settings_codes.cpp <(src_loc)/settings/settings_codes.h <(src_loc)/settings/settings_common.cpp <(src_loc)/settings/settings_common.h -<(src_loc)/settings/settings_general.cpp -<(src_loc)/settings/settings_general.h <(src_loc)/settings/settings_information.cpp <(src_loc)/settings/settings_information.h <(src_loc)/settings/settings_intro.cpp