Help: Move settings category registration + resources to Core

This category is also used by the unrelated ScreenRecorder plugin.

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

13 files changed, 16 insertions, 15 deletions

diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc
index 239bd946121..1a991bd7e00 100644
--- a/src/plugins/coreplugin/core.qrc
+++ b/src/plugins/coreplugin/core.qrc
@@ -10,5 +10,7 @@
         <file>images/[email protected]</file>
         <file>images/qtlogo.png</file>
         <file>images/[email protected]</file>
+        <file>images/settingscategory_help.png</file>
+        <file>images/[email protected]</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h
index b1512082844..d381b3ce1f2 100644
--- a/src/plugins/coreplugin/coreconstants.h
+++ b/src/plugins/coreplugin/coreconstants.h
@@ -230,5 +230,7 @@ const int DEFAULT_MAX_CHAR_COUNT = 10000000;
 
 const char SETTINGS_MENU_HIDE_TOOLS[] = "Menu/HideTools";
 
+const char HELP_CATEGORY[] = "H.Help";
+
 } // namespace Constants
 } // namespace Core
diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp
index 36cd4463d0d..73c2079161f 100644
--- a/src/plugins/coreplugin/coreplugin.cpp
+++ b/src/plugins/coreplugin/coreplugin.cpp
@@ -278,6 +278,10 @@ bool CorePlugin::initialize(const QStringList &arguments, QString *errorMessage)
         Tr::tr("Environment"),
         ":/core/images/settingscategory_core.png");
 
+    // Shared by Help and ScreenRecorder
+    IOptionsPage::registerCategory(
+        Constants::HELP_CATEGORY, Tr::tr("Help"), ":/core/images/settingscategory_help.png");
+
     IWizardFactory::initialize();
 
     // Make sure we respect the process's umask when creating new files
diff --git a/src/plugins/help/images/settingscategory_help.png b/src/plugins/coreplugin/images/settingscategory_help.png
index 2786148f6ff..2786148f6ff 100644
--- a/src/plugins/help/images/settingscategory_help.png
+++ b/src/plugins/coreplugin/images/settingscategory_help.png
diff --git a/src/plugins/help/images/[email protected] b/src/plugins/coreplugin/images/[email protected]
index 60a33d735a4..60a33d735a4 100644
--- a/src/plugins/help/images/[email protected]
+++ b/src/plugins/coreplugin/images/[email protected]
diff --git a/src/plugins/help/docsettingspage.cpp b/src/plugins/help/docsettingspage.cpp
index 6408166958f..8663e6e93cd 100644
--- a/src/plugins/help/docsettingspage.cpp
+++ b/src/plugins/help/docsettingspage.cpp
@@ -3,10 +3,10 @@
 
 #include "docsettingspage.h"
 
-#include "helpconstants.h"
 #include "helpmanager.h"
 #include "helptr.h"
 
+#include <coreplugin/coreconstants.h>
 #include <coreplugin/icore.h>
 #include <utils/algorithm.h>
 #include <utils/fancylineedit.h>
@@ -356,7 +356,7 @@ DocSettingsPage::DocSettingsPage()
 {
     setId("B.Documentation");
     setDisplayName(Tr::tr("Documentation"));
-    setCategory(Help::Constants::HELP_CATEGORY);
+    setCategory(Core::Constants::HELP_CATEGORY);
     setWidgetCreator([] { return new DocSettingsPageWidget; });
 }
 
diff --git a/src/plugins/help/filtersettingspage.cpp b/src/plugins/help/filtersettingspage.cpp
index e227b025ef0..db7360f1e6b 100644
--- a/src/plugins/help/filtersettingspage.cpp
+++ b/src/plugins/help/filtersettingspage.cpp
@@ -3,10 +3,10 @@
 
 #include "filtersettingspage.h"
 
-#include "helpconstants.h"
 #include "helptr.h"
 #include "localhelpmanager.h"
 
+#include <coreplugin/coreconstants.h>
 #include <utils/layoutbuilder.h>
 
 #include <QHelpFilterEngine>
@@ -55,7 +55,7 @@ FilterSettingsPage::FilterSettingsPage(const std::function<void ()> &onChanged)
 {
     setId("D.Filters");
     setDisplayName(Tr::tr("Filters"));
-    setCategory(Help::Constants::HELP_CATEGORY);
+    setCategory(Core::Constants::HELP_CATEGORY);
     setWidgetCreator([onChanged] { return new FilterSettingsPageWidget(onChanged); });
 }
 
diff --git a/src/plugins/help/generalsettingspage.cpp b/src/plugins/help/generalsettingspage.cpp
index 4188bbcdb31..384752d4c19 100644
--- a/src/plugins/help/generalsettingspage.cpp
+++ b/src/plugins/help/generalsettingspage.cpp
@@ -500,7 +500,7 @@ GeneralSettingsPage::GeneralSettingsPage()
 {
     setId("A.General settings");
     setDisplayName(Tr::tr("General"));
-    setCategory(Help::Constants::HELP_CATEGORY);
+    setCategory(Core::Constants::HELP_CATEGORY);
     setWidgetCreator([] { return new GeneralSettingsPageWidget; });
 }
 
diff --git a/src/plugins/help/help.qrc b/src/plugins/help/help.qrc
index 84b6776caaa..7510e65e7a9 100644
--- a/src/plugins/help/help.qrc
+++ b/src/plugins/help/help.qrc
@@ -1,7 +1,5 @@
 <RCC>
     <qresource prefix="/help">
-        <file>images/settingscategory_help.png</file>
-        <file>images/[email protected]</file>
         <file>images/mode_help.png</file>
         <file>images/[email protected]</file>
         <file>images/mode_help_mask.png</file>
diff --git a/src/plugins/help/helpconstants.h b/src/plugins/help/helpconstants.h
index 5acb6281056..2cf94222361 100644
--- a/src/plugins/help/helpconstants.h
+++ b/src/plugins/help/helpconstants.h
@@ -13,7 +13,6 @@ const QLatin1String AboutBlank("about:blank");
 
 const int  P_MODE_HELP    = 70;
 const char ID_MODE_HELP  [] = "Help";
-const char HELP_CATEGORY[] = "H.Help";
 
 const char C_MODE_HELP   [] = "Help Mode";
 const char C_HELP_SIDEBAR[] = "Help Sidebar";
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp
index 92540a02f93..1b70196a20a 100644
--- a/src/plugins/help/helpplugin.cpp
+++ b/src/plugins/help/helpplugin.cpp
@@ -651,9 +651,6 @@ private:
     void initialize() final
     {
         dd = new HelpPluginPrivate;
-
-        IOptionsPage::registerCategory(
-            Constants::HELP_CATEGORY, Tr::tr("Help"), ":/help/images/settingscategory_help.png");
     }
 
     void extensionsInitialized() final
diff --git a/src/plugins/screenrecorder/screenrecordersettings.cpp b/src/plugins/screenrecorder/screenrecordersettings.cpp
index 35ba138faad..94436646367 100644
--- a/src/plugins/screenrecorder/screenrecordersettings.cpp
+++ b/src/plugins/screenrecorder/screenrecordersettings.cpp
@@ -6,11 +6,10 @@
 #include "screenrecorderconstants.h"
 #include "screenrecordertr.h"
 
+#include <coreplugin/coreconstants.h>
 #include <coreplugin/dialogs/ioptionspage.h>
 #include <coreplugin/icore.h>
 
-#include <help/helpconstants.h>
-
 #include <utils/fileutils.h>
 #include <utils/environment.h>
 #include <utils/layoutbuilder.h>
@@ -263,7 +262,7 @@ public:
     {
         setId(Constants::TOOLSSETTINGSPAGE_ID);
         setDisplayName(Tr::tr("Screen Recording"));
-        setCategory(Help::Constants::HELP_CATEGORY);
+        setCategory(Core::Constants::HELP_CATEGORY);
         setSettingsProvider([] { return &settings(); });
     }
 };
diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index b98508da4d3..d299279052b 100644
--- a/src/tools/icons/qtcreatoricons.svg
+++ b/src/tools/icons/qtcreatoricons.svg
@@ -2668,7 +2668,7 @@
          inkscape:connector-curvature="0" />
     </g>
     <g
-       id="src/plugins/help/images/settingscategory_help"
+       id="src/plugins/coreplugin/images/settingscategory_help"
        transform="translate(-337,-84)">
       <use
          style="display:inline"