RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-01-03 21:32:16 +00:00
Code Issues Projects Releases Wiki Activity

Rename General->Advanced in Settings.

Browse Source
This commit is contained in:
John Preston 2018-09-20 19:47:02 +03:00
parent 1ffbec0215
commit 04dd4e30a8
12 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
Telegram/Resources/icons/settings_general.png → Telegram/Resources/icons/settings_advanced.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 290 B

After

Width:  |  Height:  |  Size: 290 B

0
Telegram/Resources/icons/settings_general@2x.png → Telegram/Resources/icons/settings_advanced@2x.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 566 B

After

Width:  |  Height:  |  Size: 566 B

2
Telegram/SourceFiles/core/update_checker.cpp
View File

@ -2132,7 +2132,7 @@ void UpdateApplication() {
controller->showSection( controller->showSection(
Info::Memento( Info::Memento(
Info::Settings::Tag{ Auth().user() }, Info::Settings::Tag{ Auth().user() },
Info::Section::SettingsType::General), Info::Section::SettingsType::Advanced),
Window::SectionShow()); Window::SectionShow());
} else { } else {
window->showSpecialLayer( window->showSpecialLayer(

2
Telegram/SourceFiles/info/info_top_bar.cpp
View File

@ -608,7 +608,7 @@ rpl::producer<QString> TitleValue(
return lng_settings_section_notify; return lng_settings_section_notify;
case Section::SettingsType::PrivacySecurity: case Section::SettingsType::PrivacySecurity:
return lng_settings_section_privacy; return lng_settings_section_privacy;
case Section::SettingsType::General: case Section::SettingsType::Advanced:
return lng_settings_advanced; return lng_settings_advanced;
case Section::SettingsType::Chat: case Section::SettingsType::Chat:
return lng_settings_section_chat_settings; return lng_settings_section_chat_settings;

2
Telegram/SourceFiles/settings/settings.style
View File

@ -48,7 +48,7 @@ settingsDividerLabelPadding: margins(22px, 10px, 22px, 19px);
settingsIconInformation: icon {{ "settings_information", menuIconFg }}; settingsIconInformation: icon {{ "settings_information", menuIconFg }};
settingsIconNotifications: icon {{ "settings_notifications", menuIconFg }}; settingsIconNotifications: icon {{ "settings_notifications", menuIconFg }};
settingsIconChat: icon {{ "settings_chat", menuIconFg }}; settingsIconChat: icon {{ "settings_chat", menuIconFg }};
settingsIconGeneral: icon {{ "settings_general", menuIconFg }}; settingsIconGeneral: icon {{ "settings_advanced", menuIconFg }};
settingsIconPrivacySecurity: icon {{ "settings_privacy_security", menuIconFg }}; settingsIconPrivacySecurity: icon {{ "settings_privacy_security", menuIconFg }};
settingsIconLanguage: icon {{ "settings_language", menuIconFg }}; settingsIconLanguage: icon {{ "settings_language", menuIconFg }};
settingsIconInterfaceScale: icon {{ "settings_interface_scale", menuIconFg }}; settingsIconInterfaceScale: icon {{ "settings_interface_scale", menuIconFg }};

2
Telegram/SourceFiles/settings/settings_general.cpp → Telegram/SourceFiles/settings/settings_advanced.cpp
View File

@ -5,7 +5,7 @@ the official desktop application for the Telegram messaging service.
For license and copyright information please follow this link: For license and copyright information please follow this link:
https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL 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_common.h"
#include "settings/settings_chat.h" #include "settings/settings_chat.h"

4
Telegram/SourceFiles/settings/settings_general.h → Telegram/SourceFiles/settings/settings_advanced.h
View File

@ -18,9 +18,9 @@ void SetupUpdate(not_null<Ui::VerticalLayout*> container);
bool HasTray(); bool HasTray();
void SetupTray(not_null<Ui::VerticalLayout*> container); void SetupTray(not_null<Ui::VerticalLayout*> container);
class General : public Section { class Advanced : public Section {
public: public:
explicit General(QWidget *parent, UserData *self = nullptr); explicit Advanced(QWidget *parent, UserData *self = nullptr);
private: private:
void setupContent(); void setupContent();

6
Telegram/SourceFiles/settings/settings_common.cpp
View File

@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "settings/settings_common.h" #include "settings/settings_common.h"
#include "settings/settings_chat.h" #include "settings/settings_chat.h"
#include "settings/settings_general.h" #include "settings/settings_advanced.h"
#include "settings/settings_information.h" #include "settings/settings_information.h"
#include "settings/settings_main.h" #include "settings/settings_main.h"
#include "settings/settings_notifications.h" #include "settings/settings_notifications.h"
@ -39,8 +39,8 @@ object_ptr<Section> CreateSection(
return object_ptr<Notifications>(parent, self); return object_ptr<Notifications>(parent, self);
case Type::PrivacySecurity: case Type::PrivacySecurity:
return object_ptr<PrivacySecurity>(parent, self); return object_ptr<PrivacySecurity>(parent, self);
case Type::General: case Type::Advanced:
return object_ptr<General>(parent, self); return object_ptr<Advanced>(parent, self);
case Type::Chat: case Type::Chat:
return object_ptr<Chat>(parent, self); return object_ptr<Chat>(parent, self);
} }

2
Telegram/SourceFiles/settings/settings_common.h
View File

@ -36,7 +36,7 @@ enum class Type {
Information, Information,
Notifications, Notifications,
PrivacySecurity, PrivacySecurity,
General, Advanced,
Chat, Chat,
}; };

2
Telegram/SourceFiles/settings/settings_intro.cpp
View File

@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "settings/settings_intro.h" #include "settings/settings_intro.h"
#include "settings/settings_common.h" #include "settings/settings_common.h"
#include "settings/settings_general.h" #include "settings/settings_advanced.h"
#include "settings/settings_main.h" #include "settings/settings_main.h"
#include "settings/settings_chat.h" #include "settings/settings_chat.h"
#include "settings/settings_codes.h" #include "settings/settings_codes.h"

2
Telegram/SourceFiles/settings/settings_main.cpp
View File

@ -76,7 +76,7 @@ void SetupSections(
&st::settingsIconChat); &st::settingsIconChat);
addSection( addSection(
lng_settings_advanced, lng_settings_advanced,
Type::General, Type::Advanced,
&st::settingsIconGeneral); &st::settingsIconGeneral);
SetupLanguageButton(container); SetupLanguageButton(container);

4
Telegram/gyp/telegram_sources.txt
View File

@ -534,14 +534,14 @@
<(src_loc)/profile/profile_channel_controllers.h <(src_loc)/profile/profile_channel_controllers.h
<(src_loc)/profile/profile_cover_drop_area.cpp <(src_loc)/profile/profile_cover_drop_area.cpp
<(src_loc)/profile/profile_cover_drop_area.h <(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.cpp
<(src_loc)/settings/settings_chat.h <(src_loc)/settings/settings_chat.h
<(src_loc)/settings/settings_codes.cpp <(src_loc)/settings/settings_codes.cpp
<(src_loc)/settings/settings_codes.h <(src_loc)/settings/settings_codes.h
<(src_loc)/settings/settings_common.cpp <(src_loc)/settings/settings_common.cpp
<(src_loc)/settings/settings_common.h <(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.cpp
<(src_loc)/settings/settings_information.h <(src_loc)/settings/settings_information.h
<(src_loc)/settings/settings_intro.cpp <(src_loc)/settings/settings_intro.cpp