Unite settings_main and settings_main_builder into settings/sections/settings_main.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Telegram/CMakeLists.txt

@@ -1576,8 +1576,8 @@ PRIVATE
     settings/settings_intro.h
     settings/settings_local_passcode.cpp
     settings/settings_local_passcode.h
-    settings/settings_main.cpp
-    settings/settings_main.h
+    settings/sections/settings_main.cpp
+    settings/sections/settings_main.h
     settings/settings_search.cpp
     settings/settings_search.h
     settings/builder/settings_advanced_builder.cpp
@@ -1586,8 +1586,6 @@ PRIVATE
     settings/builder/settings_builder.h
     settings/builder/settings_chat_builder.cpp
     settings/builder/settings_chat_builder.h
-    settings/builder/settings_main_builder.cpp
-    settings/builder/settings_main_builder.h
     settings/builder/settings_notifications_builder.cpp
     settings/builder/settings_notifications_builder.h
     settings/builder/settings_privacy_security_builder.cpp

Telegram/SourceFiles/core/deep_links/deep_links_settings.cpp

@@ -52,7 +52,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "settings/settings_global_ttl.h"
 #include "settings/settings_information.h"
 #include "settings/settings_local_passcode.h"
-#include "settings/settings_main.h"
+#include "settings/sections/settings_main.h"
 #include "settings/cloud_password/settings_cloud_password_email_confirm.h"
 #include "settings/cloud_password/settings_cloud_password_input.h"
 #include "settings/cloud_password/settings_cloud_password_start.h"

Telegram/SourceFiles/core/local_url_handlers.cpp

@@ -61,7 +61,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "settings/settings_information.h"
 #include "settings/settings_global_ttl.h"
 #include "settings/settings_folders.h"
-#include "settings/settings_main.h"
+#include "settings/sections/settings_main.h"
 #include "settings/settings_privacy_controllers.h"
 #include "settings/settings_privacy_security.h"
 #include "settings/settings_chat.h"

Telegram/SourceFiles/info/info_wrap_widget.cpp

@@ -18,7 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "settings/cloud_password/settings_cloud_password_email_confirm.h"
 #include "settings/settings_chat.h"
 #include "settings/settings_information.h"
-#include "settings/settings_main.h"
+#include "settings/sections/settings_main.h"
 #include "settings/settings_premium.h"
 #include "settings/settings_search.h"
 #include "ui/effects/ripple_animation.h" // MaskByDrawer.

Telegram/SourceFiles/info/settings/info_settings_widget.cpp

@@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/settings/info_settings_widget.h"
 
 #include "info/info_memento.h"
-#include "settings/settings_main.h"
+#include "settings/sections/settings_main.h"
 #include "settings/settings_information.h"
 #include "ui/ui_utility.h"
 

Telegram/SourceFiles/settings/builder/settings_advanced_builder.cpp

@@ -32,7 +32,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "settings/builder/settings_builder.h"
 #include "settings/settings_advanced.h"
 #include "settings/settings_chat.h"
-#include "settings/settings_main.h"
+#include "settings/sections/settings_main.h"
 #include "settings/settings_experimental.h"
 #include "settings/settings_power_saving.h"
 #include "ui/power_saving.h"

Telegram/SourceFiles/settings/builder/settings_chat_builder.cpp

@@ -17,7 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "settings/settings_advanced.h"
 #include "settings/settings_chat.h"
 #include "settings/settings_experimental.h"
-#include "settings/settings_main.h"
+#include "settings/sections/settings_main.h"
 #include "settings/settings_privacy_security.h"
 #include "settings/settings_shortcuts.h"
 #include "support/support_common.h"

Telegram/SourceFiles/settings/builder/settings_main_builder.cpp

@@ -1,346 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-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/builder/settings_main_builder.h"
-
-#include "api/api_credits.h"
-#include "boxes/language_box.h"
-#include "boxes/star_gift_box.h"
-#include "core/click_handler_types.h"
-#include "data/components/credits.h"
-#include "data/data_chat_filters.h"
-#include "data/data_session.h"
-#include "lang/lang_instance.h"
-#include "lang/lang_keys.h"
-#include "main/main_account.h"
-#include "main/main_app_config.h"
-#include "main/main_session.h"
-#include "main/main_session_settings.h"
-#include "settings/builder/settings_builder.h"
-#include "settings/settings_advanced.h"
-#include "settings/settings_business.h"
-#include "settings/settings_calls.h"
-#include "settings/settings_chat.h"
-#include "settings/settings_credits.h"
-#include "settings/settings_folders.h"
-#include "settings/settings_information.h"
-#include "settings/settings_main.h"
-#include "settings/settings_notifications.h"
-#include "settings/settings_power_saving.h"
-#include "ui/power_saving.h"
-#include "settings/settings_premium.h"
-#include "settings/settings_privacy_security.h"
-#include "ui/basic_click_handlers.h"
-#include "ui/layers/generic_box.h"
-#include "ui/new_badges.h"
-#include "ui/text/format_values.h"
-#include "ui/widgets/buttons.h"
-#include "ui/wrap/slide_wrap.h"
-#include "window/window_controller.h"
-#include "window/window_session_controller.h"
-#include "styles/style_menu_icons.h"
-#include "styles/style_settings.h"
-
-namespace Settings::Builder {
-namespace {
-
-void BuildSectionButtons(SectionBuilder &builder) {
-	const auto session = builder.session();
-	const auto controller = builder.controller();
-	const auto showOther = builder.showOther();
-
-	if (!session->supportMode()) {
-		builder.addSectionButton({
-			.id = u"main/account"_q,
-			.title = tr::lng_settings_my_account(),
-			.targetSection = Information::Id(),
-			.icon = { &st::menuIconProfile },
-			.keywords = { u"profile"_q, u"edit"_q, u"information"_q },
-		});
-	}
-
-	builder.addSectionButton({
-		.id = u"main/notifications"_q,
-		.title = tr::lng_settings_section_notify(),
-		.targetSection = Notifications::Id(),
-		.icon = { &st::menuIconNotifications },
-		.keywords = { u"alerts"_q, u"sounds"_q, u"badge"_q },
-	});
-
-	builder.addSectionButton({
-		.id = u"main/privacy"_q,
-		.title = tr::lng_settings_section_privacy(),
-		.targetSection = PrivacySecurity::Id(),
-		.icon = { &st::menuIconLock },
-		.keywords = { u"security"_q, u"passcode"_q, u"password"_q, u"2fa"_q },
-	});
-
-	builder.addSectionButton({
-		.id = u"main/chat"_q,
-		.title = tr::lng_settings_section_chat_settings(),
-		.targetSection = Chat::Id(),
-		.icon = { &st::menuIconChatBubble },
-		.keywords = { u"themes"_q, u"appearance"_q, u"stickers"_q },
-	});
-
-	{ // Folders
-		const auto preload = [=] {
-			session->data().chatsFilters().requestSuggested();
-		};
-		const auto hasFilters = session->data().chatsFilters().has()
-			|| session->settings().dialogsFiltersEnabled();
-
-		auto shownProducer = hasFilters
-			? rpl::single(true)
-			: (rpl::single(rpl::empty) | rpl::then(
-				session->appConfig().refreshed()
-			) | rpl::map([=] {
-			const auto enabled = session->appConfig().get<bool>(
-				u"dialog_filters_enabled"_q,
-				false);
-			if (enabled) {
-				preload();
-			}
-			return enabled;
-		}));
-
-		if (hasFilters) {
-			preload();
-		}
-
-		builder.addButton({
-			.id = u"main/folders"_q,
-			.title = tr::lng_settings_section_filters(),
-			.icon = { &st::menuIconShowInFolder },
-			.onClick = [=] { showOther(Folders::Id()); },
-			.keywords = { u"filters"_q, u"tabs"_q },
-			.shown = std::move(shownProducer),
-		});
-	}
-
-	builder.addSectionButton({
-		.id = u"main/advanced"_q,
-		.title = tr::lng_settings_advanced(),
-		.targetSection = Advanced::Id(),
-		.icon = { &st::menuIconManage },
-		.keywords = { u"performance"_q, u"proxy"_q, u"experimental"_q },
-	});
-
-	builder.addSectionButton({
-		.id = u"main/devices"_q,
-		.title = tr::lng_settings_section_devices(),
-		.targetSection = Calls::Id(),
-		.icon = { &st::menuIconUnmute },
-		.keywords = { u"sessions"_q, u"calls"_q },
-	});
-
-	builder.addButton({
-		.id = u"main/power"_q,
-		.title = tr::lng_settings_power_menu(),
-		.icon = { &st::menuIconPowerUsage },
-		.onClick = [=] {
-			controller->show(Box(PowerSavingBox, PowerSaving::Flags()));
-		},
-		.keywords = { u"battery"_q, u"animations"_q, u"power"_q, u"saving"_q },
-	});
-
-	builder.addButton({
-		.id = u"main/language"_q,
-		.title = tr::lng_settings_language(),
-		.icon = { &st::menuIconTranslate },
-		.label = rpl::single(
-			Lang::GetInstance().id()
-		) | rpl::then(
-			Lang::GetInstance().idChanges()
-		) | rpl::map([] { return Lang::GetInstance().nativeName(); }),
-		.onClick = [=] {
-			static auto Guard = base::binary_guard();
-			Guard = LanguageBox::Show(controller);
-		},
-		.keywords = { u"translate"_q, u"localization"_q, u"language"_q },
-	});
-}
-
-void BuildInterfaceScale(SectionBuilder &builder) {
-	if (!HasInterfaceScale()) {
-		return;
-	}
-
-	builder.addDivider();
-	builder.addSkip();
-
-	builder.add([](const WidgetContext &ctx) {
-		const auto window = &ctx.controller->window();
-		auto wrap = object_ptr<Ui::VerticalLayout>(ctx.container);
-		SetupInterfaceScale(window, wrap.data());
-		return SectionBuilder::WidgetToAdd{ .widget = std::move(wrap) };
-	}, [] {
-		return SearchEntry{
-			.id = u"main/scale"_q,
-			.title = tr::lng_settings_default_scale(tr::now),
-			.keywords = { u"zoom"_q, u"size"_q, u"interface"_q, u"ui"_q },
-		};
-	});
-
-	builder.addSkip();
-}
-
-void BuildPremiumSection(SectionBuilder &builder) {
-	const auto session = builder.session();
-	const auto controller = builder.controller();
-	const auto showOther = builder.showOther();
-
-	if (!session->premiumPossible()) {
-		return;
-	}
-
-	builder.addDivider();
-	builder.addSkip();
-
-	builder.addPremiumButton({
-		.id = u"main/premium"_q,
-		.title = tr::lng_premium_summary_title(),
-		.onClick = [=] {
-			controller->setPremiumRef("settings");
-			showOther(PremiumId());
-		},
-		.keywords = { u"subscription"_q },
-	});
-
-	session->credits().load();
-	builder.addPremiumButton({
-		.id = u"main/credits"_q,
-		.title = tr::lng_settings_credits(),
-		.label = session->credits().balanceValue(
-		) | rpl::map([](CreditsAmount c) {
-			return c
-				? Lang::FormatCreditsAmountToShort(c).string
-				: QString();
-		}),
-		.credits = true,
-		.onClick = [=] {
-			controller->setPremiumRef("settings");
-			showOther(CreditsId());
-		},
-		.keywords = { u"stars"_q, u"balance"_q },
-	});
-
-	session->credits().tonLoad();
-	builder.addButton({
-		.id = u"main/currency"_q,
-		.title = tr::lng_settings_currency(),
-		.icon = { &st::menuIconTon },
-		.label = session->credits().tonBalanceValue(
-		) | rpl::map([](CreditsAmount c) {
-			return c ? Lang::FormatCreditsAmountToShort(c).string : u""_q;
-		}),
-		.onClick = [=] {
-			controller->setPremiumRef("settings");
-			showOther(CurrencyId());
-		},
-		.keywords = { u"ton"_q, u"crypto"_q, u"wallet"_q },
-		.shown = session->credits().tonBalanceValue(
-		) | rpl::map([](CreditsAmount c) { return !c.empty(); }),
-	});
-
-	builder.addButton({
-		.id = u"main/business"_q,
-		.title = tr::lng_business_title(),
-		.icon = { .icon = &st::menuIconShop },
-		.onClick = [=] { showOther(BusinessId()); },
-		.keywords = { u"work"_q, u"company"_q },
-	});
-
-	if (session->premiumCanBuy()) {
-		builder.addButton({
-			.id = u"main/send-gift"_q,
-			.title = tr::lng_settings_gift_premium(),
-			.icon = { .icon = &st::menuIconGiftPremium, .newBadge = true },
-			.onClick = [=] { Ui::ChooseStarGiftRecipient(controller); },
-			.keywords = { u"present"_q, u"send"_q },
-		});
-	}
-
-	builder.addSkip();
-}
-
-void BuildHelpSection(SectionBuilder &builder) {
-	builder.addDivider();
-	builder.addSkip();
-
-	const auto controller = builder.controller();
-	builder.addButton({
-		.id = u"main/faq"_q,
-		.title = tr::lng_settings_faq(),
-		.icon = { &st::menuIconFaq },
-		.onClick = [=] { OpenFaq(controller); },
-		.keywords = { u"help"_q, u"support"_q, u"questions"_q },
-	});
-
-	builder.addButton({
-		.id = u"main/features"_q,
-		.title = tr::lng_settings_features(),
-		.icon = { &st::menuIconEmojiObjects },
-		.onClick = [] {
-			UrlClickHandler::Open(tr::lng_telegram_features_url(tr::now));
-		},
-		.keywords = { u"tips"_q, u"tutorial"_q },
-	});
-
-	builder.addButton({
-		.id = u"main/ask-question"_q,
-		.title = tr::lng_settings_ask_question(),
-		.icon = { &st::menuIconDiscussion },
-		.onClick = [=] { OpenAskQuestionConfirm(controller); },
-		.keywords = { u"contact"_q, u"feedback"_q },
-	});
-
-	builder.addSkip();
-}
-
-void BuildValidationSuggestions(SectionBuilder &builder) {
-	builder.add([](const WidgetContext &ctx) {
-		const auto controller = ctx.controller.get();
-		const auto showOther = ctx.showOther;
-		auto wrap = object_ptr<Ui::VerticalLayout>(ctx.container);
-		SetupValidatePhoneNumberSuggestion(controller, wrap.data(), showOther);
-		return SectionBuilder::WidgetToAdd{ .widget = std::move(wrap) };
-	});
-
-	builder.add([](const WidgetContext &ctx) {
-		const auto controller = ctx.controller.get();
-		const auto showOther = ctx.showOther;
-		auto wrap = object_ptr<Ui::VerticalLayout>(ctx.container);
-		SetupValidatePasswordSuggestion(controller, wrap.data(), showOther);
-		return SectionBuilder::WidgetToAdd{ .widget = std::move(wrap) };
-	});
-}
-
-const auto kMeta = BuildHelper({
-	.id = Main::Id(),
-	.parentId = nullptr,
-	.title = &tr::lng_menu_settings,
-	.icon = &st::menuIconSettings,
-}, [](SectionBuilder &builder) {
-	builder.addDivider();
-	builder.addSkip();
-
-	BuildValidationSuggestions(builder);
-	BuildSectionButtons(builder);
-
-	builder.addSkip();
-
-	BuildInterfaceScale(builder);
-	BuildPremiumSection(builder);
-	BuildHelpSection(builder);
-});
-
-} // namespace
-
-SectionBuildMethod MainSection = kMeta.build;
-
-} // namespace Settings::Builder

Telegram/SourceFiles/settings/builder/settings_main_builder.h

@@ -1,28 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-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
-*/
-#pragma once
-
-#include "settings/settings_common.h"
-
-#include <vector>
-
-namespace Ui {
-class RpWidget;
-class SettingsButton;
-class VerticalLayout;
-} // namespace Ui
-
-namespace Window {
-class SessionController;
-} // namespace Window
-
-namespace Settings::Builder {
-
-extern SectionBuildMethod MainSection;
-
-} // namespace Settings::Builder

Telegram/SourceFiles/settings/builder/settings_notifications_builder.cpp

@@ -25,7 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "platform/platform_notifications_manager.h"
 #include "platform/platform_specific.h"
 #include "settings/builder/settings_builder.h"
-#include "settings/settings_main.h"
+#include "settings/sections/settings_main.h"
 #include "settings/settings_notifications.h"
 #include "settings/settings_notifications_common.h"
 #include "settings/settings_notifications_type.h"

Telegram/SourceFiles/settings/builder/settings_privacy_security_builder.cpp

@@ -39,7 +39,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "settings/settings_blocked_peers.h"
 #include "settings/settings_global_ttl.h"
 #include "settings/settings_local_passcode.h"
-#include "settings/settings_main.h"
+#include "settings/sections/settings_main.h"
 #include "settings/settings_passkeys.h"
 #include "settings/settings_privacy_controllers.h"
 #include "settings/settings_privacy_security.h"

Telegram/SourceFiles/settings/sections/settings_main.cpp

@@ -5,22 +5,25 @@ 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_main.h"
+#include "settings/sections/settings_main.h"
 
-#include "settings/builder/settings_main_builder.h"
-#include "apiwrap.h"
 #include "api/api_cloud_password.h"
+#include "api/api_credits.h"
 #include "api/api_global_privacy.h"
 #include "api/api_peer_photo.h"
 #include "api/api_premium.h"
 #include "api/api_sensitive_content.h"
+#include "apiwrap.h"
 #include "base/call_delayed.h"
 #include "base/platform/base_platform_info.h"
 #include "boxes/language_box.h"
+#include "boxes/star_gift_box.h"
 #include "boxes/username_box.h"
 #include "core/application.h"
 #include "core/click_handler_types.h"
+#include "data/components/credits.h"
 #include "data/components/promo_suggestions.h"
+#include "data/data_chat_filters.h"
 #include "data/data_cloud_themes.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
@@ -31,25 +34,42 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_instance.h"
 #include "lang/lang_keys.h"
 #include "lottie/lottie_icon.h"
+#include "main/main_account.h"
+#include "main/main_app_config.h"
 #include "main/main_domain.h"
 #include "main/main_session.h"
+#include "main/main_session_settings.h"
+#include "settings/builder/settings_builder.h"
 #include "settings/cloud_password/settings_cloud_password_input.h"
+#include "settings/settings_advanced.h"
+#include "settings/settings_business.h"
+#include "settings/settings_calls.h"
+#include "settings/settings_chat.h"
 #include "settings/settings_codes.h"
+#include "settings/settings_credits.h"
+#include "settings/settings_folders.h"
 #include "settings/settings_information.h"
+#include "settings/settings_notifications.h"
+#include "settings/settings_power_saving.h"
+#include "settings/settings_premium.h"
+#include "settings/settings_privacy_security.h"
 #include "settings/settings_scale_preview.h"
 #include "storage/localstorage.h"
 #include "ui/basic_click_handlers.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/boxes/peer_qr_box.h"
 #include "ui/controls/userpic_button.h"
+#include "ui/layers/generic_box.h"
+#include "ui/new_badges.h"
+#include "ui/power_saving.h"
 #include "ui/rect.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
 #include "ui/vertical_list.h"
-#include "ui/widgets/menu/menu_add_action_callback.h"
-#include "ui/widgets/menu/menu_item_base.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/continuous_sliders.h"
+#include "ui/widgets/menu/menu_add_action_callback.h"
+#include "ui/widgets/menu/menu_item_base.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/wrap/slide_wrap.h"
 #include "window/window_controller.h"
@@ -59,13 +79,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_menu_icons.h"
 #include "styles/style_settings.h"
 
-#include <QtGui/QGuiApplication>
 #include <QtGui/QClipboard>
+#include <QtGui/QGuiApplication>
 #include <QtGui/QWindow>
 
 namespace Settings {
 namespace {
 
+using namespace Builder;
+
 constexpr auto kSugValidatePhone = "VALIDATE_PHONE_NUMBER"_cs;
 
 class Cover final : public Ui::FixedHeightWidget {
@@ -301,6 +323,297 @@ void Cover::refreshQrButtonGeometry(int newWidth) {
 	_qrButton->moveToRight(buttonRight - inset, buttonTop, newWidth);
 }
 
+void BuildSectionButtons(SectionBuilder &builder) {
+	const auto session = builder.session();
+	const auto controller = builder.controller();
+	const auto showOther = builder.showOther();
+
+	if (!session->supportMode()) {
+		builder.addSectionButton({
+			.id = u"main/account"_q,
+			.title = tr::lng_settings_my_account(),
+			.targetSection = Information::Id(),
+			.icon = { &st::menuIconProfile },
+			.keywords = { u"profile"_q, u"edit"_q, u"information"_q },
+		});
+	}
+
+	builder.addSectionButton({
+		.id = u"main/notifications"_q,
+		.title = tr::lng_settings_section_notify(),
+		.targetSection = Notifications::Id(),
+		.icon = { &st::menuIconNotifications },
+		.keywords = { u"alerts"_q, u"sounds"_q, u"badge"_q },
+	});
+
+	builder.addSectionButton({
+		.id = u"main/privacy"_q,
+		.title = tr::lng_settings_section_privacy(),
+		.targetSection = PrivacySecurity::Id(),
+		.icon = { &st::menuIconLock },
+		.keywords = { u"security"_q, u"passcode"_q, u"password"_q, u"2fa"_q },
+	});
+
+	builder.addSectionButton({
+		.id = u"main/chat"_q,
+		.title = tr::lng_settings_section_chat_settings(),
+		.targetSection = Chat::Id(),
+		.icon = { &st::menuIconChatBubble },
+		.keywords = { u"themes"_q, u"appearance"_q, u"stickers"_q },
+	});
+
+	{ // Folders
+		const auto preload = [=] {
+			session->data().chatsFilters().requestSuggested();
+		};
+		const auto hasFilters = session->data().chatsFilters().has()
+			|| session->settings().dialogsFiltersEnabled();
+
+		auto shownProducer = hasFilters
+			? rpl::single(true)
+			: (rpl::single(rpl::empty) | rpl::then(
+				session->appConfig().refreshed()
+			) | rpl::map([=] {
+			const auto enabled = session->appConfig().get<bool>(
+				u"dialog_filters_enabled"_q,
+				false);
+			if (enabled) {
+				preload();
+			}
+			return enabled;
+		}));
+
+		if (hasFilters) {
+			preload();
+		}
+
+		builder.addButton({
+			.id = u"main/folders"_q,
+			.title = tr::lng_settings_section_filters(),
+			.icon = { &st::menuIconShowInFolder },
+			.onClick = [=] { showOther(Folders::Id()); },
+			.keywords = { u"filters"_q, u"tabs"_q },
+			.shown = std::move(shownProducer),
+		});
+	}
+
+	builder.addSectionButton({
+		.id = u"main/advanced"_q,
+		.title = tr::lng_settings_advanced(),
+		.targetSection = Advanced::Id(),
+		.icon = { &st::menuIconManage },
+		.keywords = { u"performance"_q, u"proxy"_q, u"experimental"_q },
+	});
+
+	builder.addSectionButton({
+		.id = u"main/devices"_q,
+		.title = tr::lng_settings_section_devices(),
+		.targetSection = Calls::Id(),
+		.icon = { &st::menuIconUnmute },
+		.keywords = { u"sessions"_q, u"calls"_q },
+	});
+
+	builder.addButton({
+		.id = u"main/power"_q,
+		.title = tr::lng_settings_power_menu(),
+		.icon = { &st::menuIconPowerUsage },
+		.onClick = [=] {
+			controller->show(Box(PowerSavingBox, PowerSaving::Flags()));
+		},
+		.keywords = { u"battery"_q, u"animations"_q, u"power"_q, u"saving"_q },
+	});
+
+	builder.addButton({
+		.id = u"main/language"_q,
+		.title = tr::lng_settings_language(),
+		.icon = { &st::menuIconTranslate },
+		.label = rpl::single(
+			Lang::GetInstance().id()
+		) | rpl::then(
+			Lang::GetInstance().idChanges()
+		) | rpl::map([] { return Lang::GetInstance().nativeName(); }),
+		.onClick = [=] {
+			static auto Guard = base::binary_guard();
+			Guard = LanguageBox::Show(controller);
+		},
+		.keywords = { u"translate"_q, u"localization"_q, u"language"_q },
+	});
+}
+
+void BuildInterfaceScale(SectionBuilder &builder) {
+	if (!HasInterfaceScale()) {
+		return;
+	}
+
+	builder.addDivider();
+	builder.addSkip();
+
+	builder.add([](const WidgetContext &ctx) {
+		const auto window = &ctx.controller->window();
+		auto wrap = object_ptr<Ui::VerticalLayout>(ctx.container);
+		SetupInterfaceScale(window, wrap.data());
+		return SectionBuilder::WidgetToAdd{ .widget = std::move(wrap) };
+	}, [] {
+		return SearchEntry{
+			.id = u"main/scale"_q,
+			.title = tr::lng_settings_default_scale(tr::now),
+			.keywords = { u"zoom"_q, u"size"_q, u"interface"_q, u"ui"_q },
+		};
+	});
+
+	builder.addSkip();
+}
+
+void BuildPremiumSection(SectionBuilder &builder) {
+	const auto session = builder.session();
+	const auto controller = builder.controller();
+	const auto showOther = builder.showOther();
+
+	if (!session->premiumPossible()) {
+		return;
+	}
+
+	builder.addDivider();
+	builder.addSkip();
+
+	builder.addPremiumButton({
+		.id = u"main/premium"_q,
+		.title = tr::lng_premium_summary_title(),
+		.onClick = [=] {
+			controller->setPremiumRef("settings");
+			showOther(PremiumId());
+		},
+		.keywords = { u"subscription"_q },
+	});
+
+	session->credits().load();
+	builder.addPremiumButton({
+		.id = u"main/credits"_q,
+		.title = tr::lng_settings_credits(),
+		.label = session->credits().balanceValue(
+		) | rpl::map([](CreditsAmount c) {
+			return c
+				? Lang::FormatCreditsAmountToShort(c).string
+				: QString();
+		}),
+		.credits = true,
+		.onClick = [=] {
+			controller->setPremiumRef("settings");
+			showOther(CreditsId());
+		},
+		.keywords = { u"stars"_q, u"balance"_q },
+	});
+
+	session->credits().tonLoad();
+	builder.addButton({
+		.id = u"main/currency"_q,
+		.title = tr::lng_settings_currency(),
+		.icon = { &st::menuIconTon },
+		.label = session->credits().tonBalanceValue(
+		) | rpl::map([](CreditsAmount c) {
+			return c ? Lang::FormatCreditsAmountToShort(c).string : u""_q;
+		}),
+		.onClick = [=] {
+			controller->setPremiumRef("settings");
+			showOther(CurrencyId());
+		},
+		.keywords = { u"ton"_q, u"crypto"_q, u"wallet"_q },
+		.shown = session->credits().tonBalanceValue(
+		) | rpl::map([](CreditsAmount c) { return !c.empty(); }),
+	});
+
+	builder.addButton({
+		.id = u"main/business"_q,
+		.title = tr::lng_business_title(),
+		.icon = { .icon = &st::menuIconShop },
+		.onClick = [=] { showOther(BusinessId()); },
+		.keywords = { u"work"_q, u"company"_q },
+	});
+
+	if (session->premiumCanBuy()) {
+		builder.addButton({
+			.id = u"main/send-gift"_q,
+			.title = tr::lng_settings_gift_premium(),
+			.icon = { .icon = &st::menuIconGiftPremium, .newBadge = true },
+			.onClick = [=] { Ui::ChooseStarGiftRecipient(controller); },
+			.keywords = { u"present"_q, u"send"_q },
+		});
+	}
+
+	builder.addSkip();
+}
+
+void BuildHelpSection(SectionBuilder &builder) {
+	builder.addDivider();
+	builder.addSkip();
+
+	const auto controller = builder.controller();
+	builder.addButton({
+		.id = u"main/faq"_q,
+		.title = tr::lng_settings_faq(),
+		.icon = { &st::menuIconFaq },
+		.onClick = [=] { OpenFaq(controller); },
+		.keywords = { u"help"_q, u"support"_q, u"questions"_q },
+	});
+
+	builder.addButton({
+		.id = u"main/features"_q,
+		.title = tr::lng_settings_features(),
+		.icon = { &st::menuIconEmojiObjects },
+		.onClick = [] {
+			UrlClickHandler::Open(tr::lng_telegram_features_url(tr::now));
+		},
+		.keywords = { u"tips"_q, u"tutorial"_q },
+	});
+
+	builder.addButton({
+		.id = u"main/ask-question"_q,
+		.title = tr::lng_settings_ask_question(),
+		.icon = { &st::menuIconDiscussion },
+		.onClick = [=] { OpenAskQuestionConfirm(controller); },
+		.keywords = { u"contact"_q, u"feedback"_q },
+	});
+
+	builder.addSkip();
+}
+
+void BuildValidationSuggestions(SectionBuilder &builder) {
+	builder.add([](const WidgetContext &ctx) {
+		const auto controller = ctx.controller.get();
+		const auto showOther = ctx.showOther;
+		auto wrap = object_ptr<Ui::VerticalLayout>(ctx.container);
+		SetupValidatePhoneNumberSuggestion(controller, wrap.data(), showOther);
+		return SectionBuilder::WidgetToAdd{ .widget = std::move(wrap) };
+	});
+
+	builder.add([](const WidgetContext &ctx) {
+		const auto controller = ctx.controller.get();
+		const auto showOther = ctx.showOther;
+		auto wrap = object_ptr<Ui::VerticalLayout>(ctx.container);
+		SetupValidatePasswordSuggestion(controller, wrap.data(), showOther);
+		return SectionBuilder::WidgetToAdd{ .widget = std::move(wrap) };
+	});
+}
+
+const auto kMeta = BuildHelper({
+	.id = Main::Id(),
+	.parentId = nullptr,
+	.title = &tr::lng_menu_settings,
+	.icon = &st::menuIconSettings,
+}, [](SectionBuilder &builder) {
+	builder.addDivider();
+	builder.addSkip();
+
+	BuildValidationSuggestions(builder);
+	BuildSectionButtons(builder);
+
+	builder.addSkip();
+
+	BuildInterfaceScale(builder);
+	BuildPremiumSection(builder);
+	BuildHelpSection(builder);
+});
+
 } // namespace
 
 void SetupLanguageButton(
@@ -802,4 +1115,9 @@ void OpenAskQuestionConfirm(not_null<Window::SessionController*> window) {
 	}));
 }
 
+namespace Builder {
+
+SectionBuildMethod MainSection = kMeta.build;
+
+} // namespace Builder
 } // namespace Settings

Telegram/SourceFiles/settings/sections/settings_main.h

@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "settings/settings_common_session.h"
+#include "settings/settings_type.h"
 
 namespace Window {
 class Controller;
@@ -64,4 +65,9 @@ private:
 
 };
 
+namespace Builder {
+
+extern SectionBuildMethod MainSection;
+
+} // namespace Builder
 } // namespace Settings

Telegram/SourceFiles/settings/settings_common_session.cpp

@@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "settings/cloud_password/settings_cloud_password_email_confirm.h"
 #include "settings/settings_chat.h"
-#include "settings/settings_main.h"
+#include "settings/sections/settings_main.h"
 
 namespace Settings {
 

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_advanced.h"
-#include "settings/settings_main.h"
+#include "settings/sections/settings_main.h"
 #include "settings/settings_chat.h"
 #include "settings/settings_codes.h"
 #include "ui/basic_click_handlers.h"

Telegram/SourceFiles/window/window_session_controller.cpp

@@ -110,7 +110,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "settings/cloud_password/settings_cloud_password_input.h"
 #include "settings/cloud_password/settings_cloud_password_start.h"
 #include "settings/cloud_password/settings_cloud_password_email_confirm.h"
-#include "settings/settings_main.h"
+#include "settings/sections/settings_main.h"
 #include "settings/settings_premium.h"
 #include "settings/settings_privacy_security.h"
 #include "styles/style_window.h"