procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Move old settings to old_settings.

This commit is contained in:
John Preston 2018-09-02 17:23:52 +03:00
parent 689aed7258
commit 4f16ad6757
37 changed files with 124 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "mtproto/session.h" #include "mtproto/session.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "core/click_handler_types.h" #include "core/click_handler_types.h"
#include "settings/settings_widget.h" #include "old_settings/settings_widget.h"
extern "C" { extern "C" {
#include <openssl/rsa.h> #include <openssl/rsa.h>
@ -2127,7 +2127,7 @@ void UpdateApplication() {
cSetLastUpdateCheck(0); cSetLastUpdateCheck(0);
Core::UpdateChecker().start(); Core::UpdateChecker().start();
if (const auto window = App::wnd()) { if (const auto window = App::wnd()) {
auto settings = Box<Settings::Widget>(); auto settings = Box<OldSettings::Widget>();
const auto weak = make_weak(settings.data()); const auto weak = make_weak(settings.data());
window->showSpecialLayer(std::move(settings), anim::type::normal); window->showSpecialLayer(std::move(settings), anim::type::normal);
if (weak) { if (weak) {

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

@ -19,7 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "window/main_window.h" #include "window/main_window.h"
#include "auth_session.h" #include "auth_session.h"
#include "styles/style_info.h" #include "styles/style_info.h"
#include "styles/style_settings.h" #include "styles/style_old_settings.h"
#include "styles/style_window.h" #include "styles/style_window.h"
#include "styles/style_boxes.h" #include "styles/style_boxes.h"

4
Telegram/SourceFiles/mainwindow.cpp
View File

@ -33,7 +33,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "mediaview.h" #include "mediaview.h"
#include "storage/localstorage.h" #include "storage/localstorage.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "settings/settings_widget.h" #include "old_settings/settings_widget.h"
#include "platform/platform_notifications_manager.h" #include "platform/platform_notifications_manager.h"
#include "window/layer_widget.h" #include "window/layer_widget.h"
#include "window/notifications_manager.h" #include "window/notifications_manager.h"
@ -302,7 +302,7 @@ void MainWindow::setupMain(const MTPUser *self) {
void MainWindow::showSettings() { void MainWindow::showSettings() {
if (isHidden()) showFromTray(); if (isHidden()) showFromTray();
controller()->showSpecialLayer(Box<Settings::Widget>()); controller()->showSpecialLayer(Box<OldSettings::Widget>());
} }
void MainWindow::showSpecialLayer( void MainWindow::showSpecialLayer(

0
Telegram/SourceFiles/settings/settings.style → Telegram/SourceFiles/old_settings/old_settings.style
View File

6
Telegram/SourceFiles/settings/settings_advanced_widget.cpp → Telegram/SourceFiles/old_settings/settings_advanced_widget.cpp
View File

@ -5,9 +5,9 @@ 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_advanced_widget.h" #include "old_settings/settings_advanced_widget.h"
#include "styles/style_settings.h" #include "styles/style_old_settings.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "boxes/connection_box.h" #include "boxes/connection_box.h"
#include "boxes/confirm_box.h" #include "boxes/confirm_box.h"
@ -20,7 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "storage/localstorage.h" #include "storage/localstorage.h"
#include "window/themes/window_theme.h" #include "window/themes/window_theme.h"
namespace Settings { namespace OldSettings {
AdvancedWidget::AdvancedWidget(QWidget *parent, UserData *self) : BlockWidget(parent, self, lang(lng_settings_section_advanced_settings)) { AdvancedWidget::AdvancedWidget(QWidget *parent, UserData *self) : BlockWidget(parent, self, lang(lng_settings_section_advanced_settings)) {
createControls(); createControls();

6
Telegram/SourceFiles/settings/settings_advanced_widget.h → Telegram/SourceFiles/old_settings/settings_advanced_widget.h
View File

@ -7,10 +7,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/ */
#pragma once #pragma once
#include "settings/settings_block_widget.h" #include "old_settings/settings_block_widget.h"
#include "settings/settings_chat_settings_widget.h" #include "old_settings/settings_chat_settings_widget.h"
namespace Settings { namespace OldSettings {
class AdvancedWidget : public BlockWidget, public RPCSender { class AdvancedWidget : public BlockWidget, public RPCSender {
Q_OBJECT Q_OBJECT

6
Telegram/SourceFiles/settings/settings_background_widget.cpp → Telegram/SourceFiles/old_settings/settings_background_widget.cpp
View File

@ -5,9 +5,9 @@ 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_background_widget.h" #include "old_settings/settings_background_widget.h"
#include "styles/style_settings.h" #include "styles/style_old_settings.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "mainwidget.h" #include "mainwidget.h"
#include "boxes/background_box.h" #include "boxes/background_box.h"
@ -20,7 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "window/themes/window_theme_editor.h" #include "window/themes/window_theme_editor.h"
#include "core/file_utilities.h" #include "core/file_utilities.h"
namespace Settings { namespace OldSettings {
BackgroundRow::BackgroundRow(QWidget *parent) : RpWidget(parent) BackgroundRow::BackgroundRow(QWidget *parent) : RpWidget(parent)
, _chooseFromGallery(this, lang(lng_settings_bg_from_gallery), st::boxLinkButton) , _chooseFromGallery(this, lang(lng_settings_bg_from_gallery), st::boxLinkButton)

4
Telegram/SourceFiles/settings/settings_background_widget.h → Telegram/SourceFiles/old_settings/settings_background_widget.h
View File

@ -7,11 +7,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/ */
#pragma once #pragma once
#include "settings/settings_block_widget.h" #include "old_settings/settings_block_widget.h"
#include "ui/effects/radial_animation.h" #include "ui/effects/radial_animation.h"
#include "ui/rp_widget.h" #include "ui/rp_widget.h"
namespace Settings { namespace OldSettings {
class BackgroundRow : public Ui::RpWidget, private base::Subscriber { class BackgroundRow : public Ui::RpWidget, private base::Subscriber {
Q_OBJECT Q_OBJECT

6
Telegram/SourceFiles/settings/settings_block_widget.cpp → Telegram/SourceFiles/old_settings/settings_block_widget.cpp
View File

@ -5,14 +5,14 @@ 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_block_widget.h" #include "old_settings/settings_block_widget.h"
#include "styles/style_settings.h" #include "styles/style_old_settings.h"
#include "ui/widgets/checkbox.h" #include "ui/widgets/checkbox.h"
#include "ui/widgets/buttons.h" #include "ui/widgets/buttons.h"
#include "ui/wrap/vertical_layout.h" #include "ui/wrap/vertical_layout.h"
namespace Settings { namespace OldSettings {
BlockWidget::BlockWidget(QWidget *parent, UserData *self, const QString &title) : RpWidget(parent) BlockWidget::BlockWidget(QWidget *parent, UserData *self, const QString &title) : RpWidget(parent)
, _content(this) , _content(this)

2
Telegram/SourceFiles/settings/settings_block_widget.h → Telegram/SourceFiles/old_settings/settings_block_widget.h
View File

@ -25,7 +25,7 @@ class SlideWrap;
class VerticalLayout; class VerticalLayout;
} // namespace Ui } // namespace Ui
namespace Settings { namespace OldSettings {
class BlockWidget : public Ui::RpWidget, protected base::Subscriber { class BlockWidget : public Ui::RpWidget, protected base::Subscriber {
public: public:

6
Telegram/SourceFiles/settings/settings_chat_settings_widget.cpp → Telegram/SourceFiles/old_settings/settings_chat_settings_widget.cpp
View File

@ -5,9 +5,9 @@ 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_chat_settings_widget.h" #include "old_settings/settings_chat_settings_widget.h"
#include "styles/style_settings.h" #include "styles/style_old_settings.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "ui/wrap/slide_wrap.h" #include "ui/wrap/slide_wrap.h"
#include "ui/widgets/checkbox.h" #include "ui/widgets/checkbox.h"
@ -21,7 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "boxes/connection_box.h" #include "boxes/connection_box.h"
#include "boxes/confirm_box.h" #include "boxes/confirm_box.h"
namespace Settings { namespace OldSettings {
LabeledLink::LabeledLink(QWidget *parent, const QString &label, const QString &text, Type type, const char *slot) : RpWidget(parent) LabeledLink::LabeledLink(QWidget *parent, const QString &label, const QString &text, Type type, const char *slot) : RpWidget(parent)
, _label(this, label, Ui::FlatLabel::InitType::Simple, (type == Type::Primary) ? st::settingsPrimaryLabel : st::defaultFlatLabel) , _label(this, label, Ui::FlatLabel::InitType::Simple, (type == Type::Primary) ? st::settingsPrimaryLabel : st::defaultFlatLabel)

4
Telegram/SourceFiles/settings/settings_chat_settings_widget.h → Telegram/SourceFiles/old_settings/settings_chat_settings_widget.h
View File

@ -7,14 +7,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/ */
#pragma once #pragma once
#include "settings/settings_block_widget.h" #include "old_settings/settings_block_widget.h"
#include "ui/rp_widget.h" #include "ui/rp_widget.h"
namespace Ui { namespace Ui {
class FlatLabel; class FlatLabel;
} // namespace Ui } // namespace Ui
namespace Settings { namespace OldSettings {
class LabeledLink : public Ui::RpWidget { class LabeledLink : public Ui::RpWidget {
public: public:

6
Telegram/SourceFiles/settings/settings_cover.cpp → Telegram/SourceFiles/old_settings/settings_cover.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_cover.h" #include "old_settings/settings_cover.h"
#include "data/data_photo.h" #include "data/data_photo.h"
#include "data/data_session.h" #include "data/data_session.h"
@ -22,11 +22,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "boxes/confirm_box.h" #include "boxes/confirm_box.h"
#include "boxes/photo_crop_box.h" #include "boxes/photo_crop_box.h"
#include "boxes/add_contact_box.h" #include "boxes/add_contact_box.h"
#include "styles/style_settings.h" #include "styles/style_old_settings.h"
#include "styles/style_profile.h" // for divider #include "styles/style_profile.h" // for divider
#include "platform/platform_file_utilities.h" #include "platform/platform_file_utilities.h"
namespace Settings { namespace OldSettings {
CoverWidget::CoverWidget(QWidget *parent, UserData *self) CoverWidget::CoverWidget(QWidget *parent, UserData *self)
: BlockWidget(parent, self, QString()) : BlockWidget(parent, self, QString())

4
Telegram/SourceFiles/settings/settings_cover.h → Telegram/SourceFiles/old_settings/settings_cover.h
View File

@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#pragma once #pragma once
#include "base/observer.h" #include "base/observer.h"
#include "settings/settings_block_widget.h" #include "old_settings/settings_block_widget.h"
namespace Ui { namespace Ui {
class FlatLabel; class FlatLabel;
@ -25,7 +25,7 @@ namespace Profile {
class CoverDropArea; class CoverDropArea;
} // namespace Profile } // namespace Profile
namespace Settings { namespace OldSettings {
class CoverWidget : public BlockWidget { class CoverWidget : public BlockWidget {
public: public:

6
Telegram/SourceFiles/settings/settings_fixed_bar.cpp → Telegram/SourceFiles/old_settings/settings_fixed_bar.cpp
View File

@ -5,13 +5,13 @@ 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_fixed_bar.h" #include "old_settings/settings_fixed_bar.h"
#include "styles/style_settings.h" #include "styles/style_old_settings.h"
#include "styles/style_boxes.h" #include "styles/style_boxes.h"
#include "mainwindow.h" #include "mainwindow.h"
namespace Settings { namespace OldSettings {
FixedBar::FixedBar(QWidget *parent) : TWidget(parent) { FixedBar::FixedBar(QWidget *parent) : TWidget(parent) {
setAttribute(Qt::WA_OpaquePaintEvent); setAttribute(Qt::WA_OpaquePaintEvent);

2
Telegram/SourceFiles/settings/settings_fixed_bar.h → Telegram/SourceFiles/old_settings/settings_fixed_bar.h
View File

@ -11,7 +11,7 @@ namespace Ui {
class IconButton; class IconButton;
} // namespace Ui } // namespace Ui
namespace Settings { namespace OldSettings {
class FixedBar : public TWidget { class FixedBar : public TWidget {
public: public:

6
Telegram/SourceFiles/settings/settings_general_widget.cpp → Telegram/SourceFiles/old_settings/settings_general_widget.cpp
View File

@ -5,9 +5,9 @@ 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_widget.h" #include "old_settings/settings_general_widget.h"
#include "styles/style_settings.h" #include "styles/style_old_settings.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "ui/wrap/slide_wrap.h" #include "ui/wrap/slide_wrap.h"
#include "ui/widgets/checkbox.h" #include "ui/widgets/checkbox.h"
@ -25,7 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "messenger.h" #include "messenger.h"
#include "core/update_checker.h" #include "core/update_checker.h"
namespace Settings { namespace OldSettings {
UpdateStateRow::UpdateStateRow(QWidget *parent) : RpWidget(parent) UpdateStateRow::UpdateStateRow(QWidget *parent) : RpWidget(parent)
, _check(this, lang(lng_settings_check_now)) , _check(this, lang(lng_settings_check_now))

4
Telegram/SourceFiles/settings/settings_general_widget.h → Telegram/SourceFiles/old_settings/settings_general_widget.h
View File

@ -7,10 +7,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/ */
#pragma once #pragma once
#include "settings/settings_block_widget.h" #include "old_settings/settings_block_widget.h"
#include "ui/rp_widget.h" #include "ui/rp_widget.h"
namespace Settings { namespace OldSettings {
class UpdateStateRow : public Ui::RpWidget { class UpdateStateRow : public Ui::RpWidget {
Q_OBJECT Q_OBJECT

6
Telegram/SourceFiles/settings/settings_info_widget.cpp → Telegram/SourceFiles/old_settings/settings_info_widget.cpp
View File

@ -5,9 +5,9 @@ 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_info_widget.h" #include "old_settings/settings_info_widget.h"
#include "styles/style_settings.h" #include "styles/style_old_settings.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "ui/widgets/labels.h" #include "ui/widgets/labels.h"
#include "ui/wrap/slide_wrap.h" #include "ui/wrap/slide_wrap.h"
@ -19,7 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "messenger.h" #include "messenger.h"
#include "auth_session.h" #include "auth_session.h"
namespace Settings { namespace OldSettings {
using UpdateFlag = Notify::PeerUpdate::Flag; using UpdateFlag = Notify::PeerUpdate::Flag;

4
Telegram/SourceFiles/settings/settings_info_widget.h → Telegram/SourceFiles/old_settings/settings_info_widget.h
View File

@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/ */
#pragma once #pragma once
#include "settings/settings_block_widget.h" #include "old_settings/settings_block_widget.h"
#include "ui/rp_widget.h" #include "ui/rp_widget.h"
namespace Ui { namespace Ui {
@ -18,7 +18,7 @@ namespace Notify {
struct PeerUpdate; struct PeerUpdate;
} // namespace Notify } // namespace Notify
namespace Settings { namespace OldSettings {
class InfoWidget : public BlockWidget { class InfoWidget : public BlockWidget {
public: public:

26
Telegram/SourceFiles/settings/settings_inner_widget.cpp → Telegram/SourceFiles/old_settings/settings_inner_widget.cpp
View File

@ -5,22 +5,22 @@ 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_inner_widget.h" #include "old_settings/settings_inner_widget.h"
#include "lang/lang_instance.h" #include "lang/lang_instance.h"
#include "styles/style_settings.h" #include "styles/style_old_settings.h"
#include "settings/settings_cover.h" #include "old_settings/settings_cover.h"
#include "settings/settings_block_widget.h" #include "old_settings/settings_block_widget.h"
#include "settings/settings_info_widget.h" #include "old_settings/settings_info_widget.h"
#include "settings/settings_notifications_widget.h" #include "old_settings/settings_notifications_widget.h"
#include "settings/settings_general_widget.h" #include "old_settings/settings_general_widget.h"
#include "settings/settings_chat_settings_widget.h" #include "old_settings/settings_chat_settings_widget.h"
#include "settings/settings_scale_widget.h" #include "old_settings/settings_scale_widget.h"
#include "settings/settings_background_widget.h" #include "old_settings/settings_background_widget.h"
#include "settings/settings_privacy_widget.h" #include "old_settings/settings_privacy_widget.h"
#include "settings/settings_advanced_widget.h" #include "old_settings/settings_advanced_widget.h"
namespace Settings { namespace OldSettings {
InnerWidget::InnerWidget(QWidget *parent) : LayerInner(parent) InnerWidget::InnerWidget(QWidget *parent) : LayerInner(parent)
, _blocks(this) , _blocks(this)

4
Telegram/SourceFiles/settings/settings_inner_widget.h → Telegram/SourceFiles/old_settings/settings_inner_widget.h
View File

@ -7,10 +7,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/ */
#pragma once #pragma once
#include "settings/settings_layer.h" #include "old_settings/settings_layer.h"
#include "ui/wrap/vertical_layout.h" #include "ui/wrap/vertical_layout.h"
namespace Settings { namespace OldSettings {
class CoverWidget; class CoverWidget;
class BlockWidget; class BlockWidget;

10
Telegram/SourceFiles/settings/settings_layer.cpp → Telegram/SourceFiles/old_settings/settings_layer.cpp
View File

@ -5,12 +5,12 @@ 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_layer.h" #include "old_settings/settings_layer.h"
#include <rpl/mappers.h> #include <rpl/mappers.h>
#include "settings/settings_inner_widget.h" #include "old_settings/settings_inner_widget.h"
#include "settings/settings_fixed_bar.h" #include "old_settings/settings_fixed_bar.h"
#include "styles/style_settings.h" #include "styles/style_old_settings.h"
#include "styles/style_window.h" #include "styles/style_window.h"
#include "styles/style_boxes.h" #include "styles/style_boxes.h"
#include "ui/widgets/scroll_area.h" #include "ui/widgets/scroll_area.h"
@ -25,7 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "core/file_utilities.h" #include "core/file_utilities.h"
#include "window/themes/window_theme.h" #include "window/themes/window_theme.h"
namespace Settings { namespace OldSettings {
Layer::Layer() Layer::Layer()
: _scroll(this, st::settingsScroll) : _scroll(this, st::settingsScroll)

2
Telegram/SourceFiles/settings/settings_layer.h → Telegram/SourceFiles/old_settings/settings_layer.h
View File

@ -16,7 +16,7 @@ class IconButton;
class FadeShadow; class FadeShadow;
} // namespace Ui } // namespace Ui
namespace Settings { namespace OldSettings {
class FixedBar; class FixedBar;
class LayerInner : public Ui::RpWidget { class LayerInner : public Ui::RpWidget {

6
Telegram/SourceFiles/settings/settings_notifications_widget.cpp → Telegram/SourceFiles/old_settings/settings_notifications_widget.cpp
View File

@ -5,9 +5,9 @@ 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_notifications_widget.h" #include "old_settings/settings_notifications_widget.h"
#include "styles/style_settings.h" #include "styles/style_old_settings.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "storage/localstorage.h" #include "storage/localstorage.h"
#include "ui/wrap/slide_wrap.h" #include "ui/wrap/slide_wrap.h"
@ -19,7 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "platform/platform_notifications_manager.h" #include "platform/platform_notifications_manager.h"
#include "auth_session.h" #include "auth_session.h"
namespace Settings { namespace OldSettings {
namespace { namespace {
using ChangeType = Window::Notifications::ChangeType; using ChangeType = Window::Notifications::ChangeType;

4
Telegram/SourceFiles/settings/settings_notifications_widget.h → Telegram/SourceFiles/old_settings/settings_notifications_widget.h
View File

@ -7,9 +7,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/ */
#pragma once #pragma once
#include "settings/settings_block_widget.h" #include "old_settings/settings_block_widget.h"
namespace Settings { namespace OldSettings {
class NotificationsWidget : public BlockWidget { class NotificationsWidget : public BlockWidget {
Q_OBJECT Q_OBJECT

4
Telegram/SourceFiles/settings/settings_privacy_controllers.cpp → Telegram/SourceFiles/old_settings/settings_privacy_controllers.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_privacy_controllers.h" #include "old_settings/settings_privacy_controllers.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "apiwrap.h" #include "apiwrap.h"
@ -17,7 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "boxes/peer_list_controllers.h" #include "boxes/peer_list_controllers.h"
#include "boxes/confirm_box.h" #include "boxes/confirm_box.h"
namespace Settings { namespace OldSettings {
namespace { namespace {
constexpr auto kBlockedPerPage = 40; constexpr auto kBlockedPerPage = 40;

2
Telegram/SourceFiles/settings/settings_privacy_controllers.h → Telegram/SourceFiles/old_settings/settings_privacy_controllers.h
View File

@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "boxes/edit_privacy_box.h" #include "boxes/edit_privacy_box.h"
#include "mtproto/sender.h" #include "mtproto/sender.h"
namespace Settings { namespace OldSettings {
class BlockedBoxController : public PeerListController, private base::Subscriber, private MTP::Sender { class BlockedBoxController : public PeerListController, private base::Subscriber, private MTP::Sender {
public: public:

8
Telegram/SourceFiles/settings/settings_privacy_widget.cpp → Telegram/SourceFiles/old_settings/settings_privacy_widget.cpp
View File

@ -5,11 +5,11 @@ 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_privacy_widget.h" #include "old_settings/settings_privacy_widget.h"
#include "ui/wrap/slide_wrap.h" #include "ui/wrap/slide_wrap.h"
#include "ui/widgets/buttons.h" #include "ui/widgets/buttons.h"
#include "styles/style_settings.h" #include "styles/style_old_settings.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "application.h" #include "application.h"
#include "auth_session.h" #include "auth_session.h"
@ -24,9 +24,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "boxes/peer_list_box.h" #include "boxes/peer_list_box.h"
#include "boxes/edit_privacy_box.h" #include "boxes/edit_privacy_box.h"
#include "boxes/self_destruction_box.h" #include "boxes/self_destruction_box.h"
#include "settings/settings_privacy_controllers.h" #include "old_settings/settings_privacy_controllers.h"
namespace Settings { namespace OldSettings {
LocalPasscodeState::LocalPasscodeState(QWidget *parent) : RpWidget(parent) LocalPasscodeState::LocalPasscodeState(QWidget *parent) : RpWidget(parent)
, _edit(this, GetEditPasscodeText(), st::boxLinkButton) , _edit(this, GetEditPasscodeText(), st::boxLinkButton)

6
Telegram/SourceFiles/settings/settings_privacy_widget.h → Telegram/SourceFiles/old_settings/settings_privacy_widget.h
View File

@ -7,12 +7,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/ */
#pragma once #pragma once
#include "settings/settings_block_widget.h" #include "old_settings/settings_block_widget.h"
#include "settings/settings_chat_settings_widget.h" #include "old_settings/settings_chat_settings_widget.h"
#include "core/core_cloud_password.h" #include "core/core_cloud_password.h"
#include "ui/rp_widget.h" #include "ui/rp_widget.h"
namespace Settings { namespace OldSettings {
class LocalPasscodeState : public Ui::RpWidget, private base::Subscriber { class LocalPasscodeState : public Ui::RpWidget, private base::Subscriber {
Q_OBJECT Q_OBJECT

6
Telegram/SourceFiles/settings/settings_scale_widget.cpp → Telegram/SourceFiles/old_settings/settings_scale_widget.cpp
View File

@ -5,10 +5,10 @@ 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_scale_widget.h" #include "old_settings/settings_scale_widget.h"
#include "styles/style_boxes.h" #include "styles/style_boxes.h"
#include "styles/style_settings.h" #include "styles/style_old_settings.h"
#include "ui/widgets/checkbox.h" #include "ui/widgets/checkbox.h"
#include "lang/lang_keys.h" #include "lang/lang_keys.h"
#include "storage/localstorage.h" #include "storage/localstorage.h"
@ -17,7 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "application.h" #include "application.h"
#include "ui/widgets/discrete_sliders.h" #include "ui/widgets/discrete_sliders.h"
namespace Settings { namespace OldSettings {
namespace { namespace {
QString scaleLabel(DBIScale scale) { QString scaleLabel(DBIScale scale) {

4
Telegram/SourceFiles/settings/settings_scale_widget.h → Telegram/SourceFiles/old_settings/settings_scale_widget.h
View File

@ -7,14 +7,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/ */
#pragma once #pragma once
#include "settings/settings_block_widget.h" #include "old_settings/settings_block_widget.h"
namespace Ui { namespace Ui {
class Checkbox; class Checkbox;
class SettingsSlider; class SettingsSlider;
} // namespace Ui } // namespace Ui
namespace Settings { namespace OldSettings {
class ScaleWidget : public BlockWidget { class ScaleWidget : public BlockWidget {
Q_OBJECT Q_OBJECT

10
Telegram/SourceFiles/settings/settings_widget.cpp → Telegram/SourceFiles/old_settings/settings_widget.cpp
View File

@ -5,10 +5,10 @@ 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_widget.h" #include "old_settings/settings_widget.h"
#include "settings/settings_inner_widget.h" #include "old_settings/settings_inner_widget.h"
#include "settings/settings_fixed_bar.h" #include "old_settings/settings_fixed_bar.h"
#include "platform/platform_specific.h" #include "platform/platform_specific.h"
#include "ui/widgets/scroll_area.h" #include "ui/widgets/scroll_area.h"
#include "ui/widgets/buttons.h" #include "ui/widgets/buttons.h"
@ -30,11 +30,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "media/media_audio_track.h" #include "media/media_audio_track.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "window/window_controller.h" #include "window/window_controller.h"
#include "styles/style_settings.h" #include "styles/style_old_settings.h"
#include "styles/style_window.h" #include "styles/style_window.h"
#include "styles/style_boxes.h" #include "styles/style_boxes.h"
namespace Settings { namespace OldSettings {
namespace { namespace {
QString SecretText; QString SecretText;

4
Telegram/SourceFiles/settings/settings_widget.h → Telegram/SourceFiles/old_settings/settings_widget.h
View File

@ -7,9 +7,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/ */
#pragma once #pragma once
#include "settings/settings_layer.h" #include "old_settings/settings_layer.h"
namespace Settings { namespace OldSettings {
class InnerWidget; class InnerWidget;

2
Telegram/SourceFiles/window/themes/window_theme_editor.cpp
View File

@ -14,7 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "storage/localstorage.h" #include "storage/localstorage.h"
#include "boxes/confirm_box.h" #include "boxes/confirm_box.h"
#include "styles/style_window.h" #include "styles/style_window.h"
#include "styles/style_settings.h" #include "styles/style_old_settings.h"
#include "styles/style_dialogs.h" #include "styles/style_dialogs.h"
#include "styles/style_boxes.h" #include "styles/style_boxes.h"
#include "ui/widgets/scroll_area.h" #include "ui/widgets/scroll_area.h"

2
Telegram/gyp/Telegram.gyp
View File

@ -36,7 +36,7 @@
'<(src_loc)/overview/overview.style', '<(src_loc)/overview/overview.style',
'<(src_loc)/passport/passport.style', '<(src_loc)/passport/passport.style',
'<(src_loc)/profile/profile.style', '<(src_loc)/profile/profile.style',
'<(src_loc)/settings/settings.style', '<(src_loc)/old_settings/old_settings.style',
'<(src_loc)/chat_helpers/chat_helpers.style', '<(src_loc)/chat_helpers/chat_helpers.style',
'<(src_loc)/ui/widgets/widgets.style', '<(src_loc)/ui/widgets/widgets.style',
'<(src_loc)/window/window.style', '<(src_loc)/window/window.style',

60
Telegram/gyp/telegram_sources.txt
View File

@ -532,36 +532,36 @@
<(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_widget.cpp <(src_loc)/old_settings/settings_advanced_widget.cpp
<(src_loc)/settings/settings_advanced_widget.h <(src_loc)/old_settings/settings_advanced_widget.h
<(src_loc)/settings/settings_background_widget.cpp <(src_loc)/old_settings/settings_background_widget.cpp
<(src_loc)/settings/settings_background_widget.h <(src_loc)/old_settings/settings_background_widget.h
<(src_loc)/settings/settings_block_widget.cpp <(src_loc)/old_settings/settings_block_widget.cpp
<(src_loc)/settings/settings_block_widget.h <(src_loc)/old_settings/settings_block_widget.h
<(src_loc)/settings/settings_chat_settings_widget.cpp <(src_loc)/old_settings/settings_chat_settings_widget.cpp
<(src_loc)/settings/settings_chat_settings_widget.h <(src_loc)/old_settings/settings_chat_settings_widget.h
<(src_loc)/settings/settings_cover.cpp <(src_loc)/old_settings/settings_cover.cpp
<(src_loc)/settings/settings_cover.h <(src_loc)/old_settings/settings_cover.h
<(src_loc)/settings/settings_fixed_bar.cpp <(src_loc)/old_settings/settings_fixed_bar.cpp
<(src_loc)/settings/settings_fixed_bar.h <(src_loc)/old_settings/settings_fixed_bar.h
<(src_loc)/settings/settings_general_widget.cpp <(src_loc)/old_settings/settings_general_widget.cpp
<(src_loc)/settings/settings_general_widget.h <(src_loc)/old_settings/settings_general_widget.h
<(src_loc)/settings/settings_info_widget.cpp <(src_loc)/old_settings/settings_info_widget.cpp
<(src_loc)/settings/settings_info_widget.h <(src_loc)/old_settings/settings_info_widget.h
<(src_loc)/settings/settings_inner_widget.cpp <(src_loc)/old_settings/settings_inner_widget.cpp
<(src_loc)/settings/settings_inner_widget.h <(src_loc)/old_settings/settings_inner_widget.h
<(src_loc)/settings/settings_layer.cpp <(src_loc)/old_settings/settings_layer.cpp
<(src_loc)/settings/settings_layer.h <(src_loc)/old_settings/settings_layer.h
<(src_loc)/settings/settings_notifications_widget.cpp <(src_loc)/old_settings/settings_notifications_widget.cpp
<(src_loc)/settings/settings_notifications_widget.h <(src_loc)/old_settings/settings_notifications_widget.h
<(src_loc)/settings/settings_privacy_controllers.cpp <(src_loc)/old_settings/settings_privacy_controllers.cpp
<(src_loc)/settings/settings_privacy_controllers.h <(src_loc)/old_settings/settings_privacy_controllers.h
<(src_loc)/settings/settings_privacy_widget.cpp <(src_loc)/old_settings/settings_privacy_widget.cpp
<(src_loc)/settings/settings_privacy_widget.h <(src_loc)/old_settings/settings_privacy_widget.h
<(src_loc)/settings/settings_scale_widget.cpp <(src_loc)/old_settings/settings_scale_widget.cpp
<(src_loc)/settings/settings_scale_widget.h <(src_loc)/old_settings/settings_scale_widget.h
<(src_loc)/settings/settings_widget.cpp <(src_loc)/old_settings/settings_widget.cpp
<(src_loc)/settings/settings_widget.h <(src_loc)/old_settings/settings_widget.h
<(src_loc)/storage/file_download.cpp <(src_loc)/storage/file_download.cpp
<(src_loc)/storage/file_download.h <(src_loc)/storage/file_download.h
<(src_loc)/storage/file_upload.cpp <(src_loc)/storage/file_upload.cpp