diff --git a/Telegram/SourceFiles/ayu/ui/boxes/theme_selector_box.cpp b/Telegram/SourceFiles/ayu/ui/boxes/theme_selector_box.cpp index be26679bfc..f4eb844381 100644 --- a/Telegram/SourceFiles/ayu/ui/boxes/theme_selector_box.cpp +++ b/Telegram/SourceFiles/ayu/ui/boxes/theme_selector_box.cpp @@ -13,7 +13,7 @@ #include "data/data_file_origin.h" #include "data/data_session.h" #include "main/main_session.h" -#include "settings/settings_chat.h" +#include "settings/sections/settings_chat.h" #include "styles/style_layers.h" #include "styles/style_settings.h" #include "ui/vertical_list.h" diff --git a/Telegram/SourceFiles/ayu/ui/settings/filters/settings_filters_list.cpp b/Telegram/SourceFiles/ayu/ui/settings/filters/settings_filters_list.cpp index f86deff802..3256d8b9c9 100644 --- a/Telegram/SourceFiles/ayu/ui/settings/filters/settings_filters_list.cpp +++ b/Telegram/SourceFiles/ayu/ui/settings/filters/settings_filters_list.cpp @@ -65,7 +65,7 @@ rpl::producer AyuFiltersList::title() { AyuFiltersList::AyuFiltersList( QWidget *parent, not_null controller) - : Section(parent), _controller(controller), _content(Ui::CreateChild(this)), + : Section(parent, controller), _controller(controller), _content(Ui::CreateChild(this)), shadowBan(_controller->shadowBan) { if (_controller->dialogId.has_value()) { dialogId = _controller->dialogId.value(); diff --git a/Telegram/SourceFiles/ayu/ui/settings/settings_appearance.cpp b/Telegram/SourceFiles/ayu/ui/settings/settings_appearance.cpp index bd1a4fd218..8ccd65f34e 100644 --- a/Telegram/SourceFiles/ayu/ui/settings/settings_appearance.cpp +++ b/Telegram/SourceFiles/ayu/ui/settings/settings_appearance.cpp @@ -49,7 +49,7 @@ rpl::producer AyuAppearance::title() { AyuAppearance::AyuAppearance( QWidget *parent, not_null controller) - : Section(parent) { + : Section(parent, controller) { setupContent(controller); } diff --git a/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp b/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp index 603a22f63d..b70c7bc33c 100644 --- a/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp +++ b/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp @@ -500,7 +500,7 @@ rpl::producer AyuGhost::title() { AyuGhost::AyuGhost( QWidget *parent, not_null controller) - : Section(parent) + : Section(parent, controller) , _controller(controller) { setupContent(controller); } diff --git a/Telegram/SourceFiles/ayu/ui/settings/settings_chats.cpp b/Telegram/SourceFiles/ayu/ui/settings/settings_chats.cpp index 21706d6f00..7cfbbf5dcd 100644 --- a/Telegram/SourceFiles/ayu/ui/settings/settings_chats.cpp +++ b/Telegram/SourceFiles/ayu/ui/settings/settings_chats.cpp @@ -35,7 +35,7 @@ rpl::producer AyuChats::title() { AyuChats::AyuChats( QWidget *parent, not_null controller) - : Section(parent) { + : Section(parent, controller) { setupContent(controller); } diff --git a/Telegram/SourceFiles/ayu/ui/settings/settings_filters.cpp b/Telegram/SourceFiles/ayu/ui/settings/settings_filters.cpp index 1eb7c65b6c..e5f96b389f 100644 --- a/Telegram/SourceFiles/ayu/ui/settings/settings_filters.cpp +++ b/Telegram/SourceFiles/ayu/ui/settings/settings_filters.cpp @@ -118,7 +118,7 @@ void AyuFilters::fillTopBarMenu(const Ui::Menu::MenuCallback &addAction) { AyuFilters::AyuFilters( QWidget *parent, not_null controller) - : Section(parent) { + : Section(parent, controller) { setupContent(controller); } diff --git a/Telegram/SourceFiles/ayu/ui/settings/settings_general.cpp b/Telegram/SourceFiles/ayu/ui/settings/settings_general.cpp index 7a334f0a2e..f149984180 100644 --- a/Telegram/SourceFiles/ayu/ui/settings/settings_general.cpp +++ b/Telegram/SourceFiles/ayu/ui/settings/settings_general.cpp @@ -28,7 +28,7 @@ rpl::producer AyuGeneral::title() { AyuGeneral::AyuGeneral( QWidget *parent, not_null controller) - : Section(parent) { + : Section(parent, controller) { setupContent(controller); } diff --git a/Telegram/SourceFiles/ayu/ui/settings/settings_main.cpp b/Telegram/SourceFiles/ayu/ui/settings/settings_main.cpp index 81f713c953..befb4f9b38 100644 --- a/Telegram/SourceFiles/ayu/ui/settings/settings_main.cpp +++ b/Telegram/SourceFiles/ayu/ui/settings/settings_main.cpp @@ -43,7 +43,7 @@ rpl::producer AyuMain::title() { AyuMain::AyuMain( QWidget *parent, not_null controller) - : Section(parent) { + : Section(parent, controller) { setupContent(controller); } diff --git a/Telegram/SourceFiles/ayu/ui/settings/settings_other.cpp b/Telegram/SourceFiles/ayu/ui/settings/settings_other.cpp index d6e22356ab..0a20280124 100644 --- a/Telegram/SourceFiles/ayu/ui/settings/settings_other.cpp +++ b/Telegram/SourceFiles/ayu/ui/settings/settings_other.cpp @@ -140,7 +140,7 @@ rpl::producer AyuOther::title() { AyuOther::AyuOther( QWidget *parent, not_null controller) - : Section(parent) { + : Section(parent, controller) { setupContent(controller); } diff --git a/Telegram/SourceFiles/settings/settings_common_session.cpp b/Telegram/SourceFiles/settings/settings_common_session.cpp index 98723491bd..e7744c1904 100644 --- a/Telegram/SourceFiles/settings/settings_common_session.cpp +++ b/Telegram/SourceFiles/settings/settings_common_session.cpp @@ -11,12 +11,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "settings/sections/settings_chat.h" #include "settings/sections/settings_main.h" +// AyuGram includes +#include "ayu/ui/settings/settings_filters.h" + + namespace Settings { bool HasMenu(Type type) { return (type == ::Settings::CloudPasswordEmailConfirmId()) || (type == MainId()) - || (type == ChatId()); + || (type == ChatId()) + || (type == AyuFilters::Id()); } } // namespace Settings diff --git a/Telegram/lib_tl b/Telegram/lib_tl index 6a1bf6bb45..1bd2939915 160000 --- a/Telegram/lib_tl +++ b/Telegram/lib_tl @@ -1 +1 @@ -Subproject commit 6a1bf6bb45ba803d2a9be76db8aead45cb4732d5 +Subproject commit 1bd29399153654b8d4179e96eed0127289a5bbe3 diff --git a/Telegram/lib_ui b/Telegram/lib_ui index bd0dd90b29..d4b56d1496 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit bd0dd90b298a01eec41eb08fa2a734fc952750e6 +Subproject commit d4b56d1496cb6ef42c5ed4ffc1ad1c58400791da