From ba5e4b7eff81bf84eb359df3bf5730d7a2a04588 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 8 Nov 2024 13:56:24 +0100 Subject: Core: Provide settings categories centrally It was conceptually wrong that an options page was supposed to set its category's display name and icon. Instead, categories are now explicitly registered with name and icon. Change-Id: Ic10b3791c8068176f55470e6845ab4832160b8e7 Reviewed-by: Eike Ziller --- src/plugins/nim/nimplugin.cpp | 11 +++++++++++ src/plugins/nim/settings/nimcodestylesettingspage.cpp | 2 -- src/plugins/nim/settings/nimsettings.cpp | 2 -- 3 files changed, 11 insertions(+), 4 deletions(-) (limited to 'src/plugins/nim') diff --git a/src/plugins/nim/nimplugin.cpp b/src/plugins/nim/nimplugin.cpp index 10ac5567bdb..577f464a958 100644 --- a/src/plugins/nim/nimplugin.cpp +++ b/src/plugins/nim/nimplugin.cpp @@ -77,6 +77,17 @@ class NimPlugin final : public ExtensionSystem::IPlugin { d = new NimPluginPrivate; + Core::IOptionsPage::registerCategory( + Constants::C_NIMTOOLSSETTINGSPAGE_CATEGORY, + Tr::tr("Nim"), + ":/nim/images/settingscategory_nim.png"); + + // ??? + Core::IOptionsPage::registerCategory( + Constants::C_NIMCODESTYLESETTINGSPAGE_CATEGORY, + Tr::tr("Nim"), + ":/nim/images/settingscategory_nim.png"); + setupNimProject(); setupNimbleProject(); diff --git a/src/plugins/nim/settings/nimcodestylesettingspage.cpp b/src/plugins/nim/settings/nimcodestylesettingspage.cpp index 270097508f8..42e4f7832b1 100644 --- a/src/plugins/nim/settings/nimcodestylesettingspage.cpp +++ b/src/plugins/nim/settings/nimcodestylesettingspage.cpp @@ -125,8 +125,6 @@ NimCodeStyleSettingsPage::NimCodeStyleSettingsPage() setId(Nim::Constants::C_NIMCODESTYLESETTINGSPAGE_ID); setDisplayName(Tr::tr("Code Style")); setCategory(Nim::Constants::C_NIMCODESTYLESETTINGSPAGE_CATEGORY); - setDisplayCategory(Tr::tr("Nim")); - setCategoryIconPath(":/nim/images/settingscategory_nim.png"); setWidgetCreator([] { return new NimCodeStyleSettingsWidget; }); createGlobalCodeStyle(); diff --git a/src/plugins/nim/settings/nimsettings.cpp b/src/plugins/nim/settings/nimsettings.cpp index ce5f406f5be..c140f72c95d 100644 --- a/src/plugins/nim/settings/nimsettings.cpp +++ b/src/plugins/nim/settings/nimsettings.cpp @@ -54,8 +54,6 @@ public: setId(Nim::Constants::C_NIMTOOLSSETTINGSPAGE_ID); setDisplayName(Tr::tr("Tools")); setCategory(Nim::Constants::C_NIMTOOLSSETTINGSPAGE_CATEGORY); - setDisplayCategory(Tr::tr("Nim")); - setCategoryIconPath(":/nim/images/settingscategory_nim.png"); setSettingsProvider([] { return &settings(); }); } }; -- cgit v1.2.3