Core: Introduce a settings category for AI-related settingsHEADmaster

... and move the Copilot settings page there.

Change-Id: Ic1211eda0f12f16f6e7ff263a4498403b2297733
Reviewed-by: Alessandro Portale <[email protected]>

12 files changed, 20 insertions, 24 deletions

diff --git a/src/plugins/copilot/copilot.qrc b/src/plugins/copilot/copilot.qrc
index 65d481b92ac..defc53270c6 100644
--- a/src/plugins/copilot/copilot.qrc
+++ b/src/plugins/copilot/copilot.qrc
@@ -1,8 +1,6 @@
 <RCC>
-  <qresource prefix="/copilot">
-    <file>images/settingscategory_copilot.png</file>
-    <file>images/[email protected]</file>
-    <file>images/copilot.png</file>
-    <file>images/[email protected]</file>
-  </qresource>
+    <qresource prefix="/copilot">
+        <file>images/copilot.png</file>
+        <file>images/[email protected]</file>
+    </qresource>
 </RCC>
diff --git a/src/plugins/copilot/copilotconstants.h b/src/plugins/copilot/copilotconstants.h
index 1b557556ad4..e2183309562 100644
--- a/src/plugins/copilot/copilotconstants.h
+++ b/src/plugins/copilot/copilotconstants.h
@@ -16,7 +16,5 @@ const char COPILOT_NEXT_SUGGESTION[] = "Copilot.NextSuggestion";
 const char COPILOT_PREVIOUS_SUGGESTION[] = "Copilot.PreviousSuggestion";
 
 const char COPILOT_GENERAL_OPTIONS_ID[] = "Copilot.General";
-const char COPILOT_GENERAL_OPTIONS_CATEGORY[] = "ZY.Copilot";
-const char COPILOT_GENERAL_OPTIONS_DISPLAY_CATEGORY[] = "Copilot";
 
 } // namespace Copilot::Constants
diff --git a/src/plugins/copilot/copilotplugin.cpp b/src/plugins/copilot/copilotplugin.cpp
index 231a149a30c..8742771c9b1 100644
--- a/src/plugins/copilot/copilotplugin.cpp
+++ b/src/plugins/copilot/copilotplugin.cpp
@@ -58,11 +58,6 @@ class CopilotPlugin final : public ExtensionSystem::IPlugin
 public:
     void initialize() final
     {
-        IOptionsPage::registerCategory(
-            Constants::COPILOT_GENERAL_OPTIONS_CATEGORY,
-            Constants::COPILOT_GENERAL_OPTIONS_DISPLAY_CATEGORY,
-            ":/copilot/images/settingscategory_copilot.png");
-
         ActionBuilder requestAction(this,  Constants::COPILOT_REQUEST_SUGGESTION);
         requestAction.setText(Tr::tr("Request Copilot Suggestion"));
         requestAction.setToolTip(Tr::tr(
diff --git a/src/plugins/copilot/copilotsettings.cpp b/src/plugins/copilot/copilotsettings.cpp
index 942c8e30451..922db24f313 100644
--- a/src/plugins/copilot/copilotsettings.cpp
+++ b/src/plugins/copilot/copilotsettings.cpp
@@ -7,12 +7,12 @@
 #include "copilotconstants.h"
 #include "copilottr.h"
 
+#include <coreplugin/coreconstants.h>
 #include <coreplugin/dialogs/ioptionspage.h>
 
 #include <projectexplorer/project.h>
 
 #include <utils/algorithm.h>
-#include <utils/environment.h>
 #include <utils/layoutbuilder.h>
 #include <utils/pathchooser.h>
 
@@ -285,7 +285,7 @@ public:
     {
         setId(Constants::COPILOT_GENERAL_OPTIONS_ID);
         setDisplayName("Copilot");
-        setCategory(Constants::COPILOT_GENERAL_OPTIONS_CATEGORY);
+        setCategory(Core::Constants::SETTINGS_CATEGORY_AI);
         setSettingsProvider([] { return &settings(); });
     }
 };
diff --git a/src/plugins/copilot/images/settingscategory_copilot.png b/src/plugins/copilot/images/settingscategory_copilot.png
deleted file mode 100644
index 9a47fb24135..00000000000
--- a/src/plugins/copilot/images/settingscategory_copilot.png
+++ /dev/null
diff --git a/src/plugins/copilot/images/[email protected] b/src/plugins/copilot/images/[email protected]
deleted file mode 100644
index 0437465aff3..00000000000
--- a/src/plugins/copilot/images/[email protected]
+++ /dev/null
diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc
index 1a991bd7e00..2d5c7875c22 100644
--- a/src/plugins/coreplugin/core.qrc
+++ b/src/plugins/coreplugin/core.qrc
@@ -12,5 +12,7 @@
         <file>images/[email protected]</file>
         <file>images/settingscategory_help.png</file>
         <file>images/[email protected]</file>
+        <file>images/settingscategory_ai.png</file>
+        <file>images/[email protected]</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h
index 07162dafe95..3398a293ab6 100644
--- a/src/plugins/coreplugin/coreconstants.h
+++ b/src/plugins/coreplugin/coreconstants.h
@@ -209,6 +209,7 @@ const char WIZARD_KIND_PROJECT[] = "project";
 const char WIZARD_KIND_FILE[] = "file";
 
 const char SETTINGS_CATEGORY_CORE[] = "B.Core";
+const char SETTINGS_CATEGORY_AI[] = "ZY.AI";
 const char SETTINGS_ID_INTERFACE[] = "A.Interface";
 const char SETTINGS_ID_SYSTEM[] = "B.Core.System";
 const char SETTINGS_ID_SHORTCUTS[] = "C.Keyboard";
diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp
index 5b1fa260516..57d4b202a13 100644
--- a/src/plugins/coreplugin/coreplugin.cpp
+++ b/src/plugins/coreplugin/coreplugin.cpp
@@ -275,6 +275,10 @@ Result<> CorePlugin::initialize(const QStringList &arguments)
         Constants::SETTINGS_CATEGORY_CORE,
         Tr::tr("Environment"),
         ":/core/images/settingscategory_core.png");
+    IOptionsPage::registerCategory(
+        Constants::SETTINGS_CATEGORY_AI,
+        Tr::tr("AI"),
+        ":/core/images/settingscategory_ai.png");
 
     // Shared by Help and ScreenRecorder
     IOptionsPage::registerCategory(
diff --git a/src/plugins/coreplugin/images/settingscategory_ai.png b/src/plugins/coreplugin/images/settingscategory_ai.png
new file mode 100644
index 00000000000..528a848c19f
--- /dev/null
+++ b/src/plugins/coreplugin/images/settingscategory_ai.png
diff --git a/src/plugins/coreplugin/images/[email protected] b/src/plugins/coreplugin/images/[email protected]
new file mode 100644
index 00000000000..505388ee4e4
--- /dev/null
+++ b/src/plugins/coreplugin/images/[email protected]
diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index ead79ae25f0..9e74cb94265 100644
--- a/src/tools/icons/qtcreatoricons.svg
+++ b/src/tools/icons/qtcreatoricons.svg
@@ -2925,7 +2925,7 @@
          d="m 1100,488.5 h 3 m -5.75,-5.25 2.25,2.25 -2.25,2.25" />
     </g>
     <g
-       id="src/plugins/copilot/images/settingscategory_copilot">
+       id="src/plugins/coreplugin/images/settingscategory_ai">
       <use
          x="0"
          y="0"
@@ -2933,14 +2933,12 @@
          id="use4838-1"
          width="100%"
          height="100%"
-         transform="translate(1141,64)" />
-      <use
-         x="0"
-         y="0"
-         xlink:href="#src/plugins/copilot/images/copilot"
-         id="use13883"
-         style="display:inline"
-         transform="matrix(1.3271416,0,0,1.27511,-1468.1838,-246.66424)" />
+         transform="translate(1166,64)" />
+      <path
+         id="path158-6"
+         style="fill:#000000;stroke:#000000;stroke-linejoin:round"
+         d="m 1155.5,492.5 c 2,0 3,-1 3,-3 0,2 1,3 3,3 -2,0 -3,1 -3,3 0,-2 -1,-3 -3,-3 z m -9,-6 c 4,0 6,-2 6,-6 0,4 2,6 6,6 -4,0 -6,2 -6,6 0,-4 -2,-6 -6,-6 z"
+         sodipodi:nodetypes="cccccccccc" />
     </g>
     <g
        id="src/plugins/extensionmanager/images/settingscategory_extensionmanager">