From 3d42c2b73963dcefbba0101acbd64846dea18b6e Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@digia.com>
Date: Mon, 2 Jun 2014 12:56:02 +0200
Subject: [PATCH] Help: Move Help icons from Core to Help
These three images are only used in the Help plugin,
therefore they fit better into the Help resources.
Change-Id: I597494cc804e751d4f653bd7eb837a5f2f2e3b4b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
---
src/plugins/coreplugin/core.qrc | 1 -
src/plugins/coreplugin/fancyactionbar.qrc | 2 --
src/plugins/help/help.qrc | 3 +++
src/plugins/help/helpconstants.h | 2 +-
src/plugins/help/helpmode.cpp | 2 +-
.../{coreplugin => help}/images/category_help.png | Bin
.../images/mode_help.png} | Bin
.../images/mode_help@2x.png} | Bin
8 files changed, 5 insertions(+), 5 deletions(-)
rename src/plugins/{coreplugin => help}/images/category_help.png (100%)
rename src/plugins/{coreplugin/images/mode_Reference.png => help/images/mode_help.png} (100%)
rename src/plugins/{coreplugin/images/mode_Reference@2x.png => help/images/mode_help@2x.png} (100%)
diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc
index bceed34202e..b13641a7149 100644
--- a/src/plugins/coreplugin/core.qrc
+++ b/src/plugins/coreplugin/core.qrc
@@ -53,7 +53,6 @@
<file>images/darkclosebutton@2x.png</file>
<file>images/category_core.png</file>
<file>images/category_texteditor.png</file>
- <file>images/category_help.png</file>
<file>images/category_design.png</file>
<file>editormanager/BinFiles.mimetypes.xml</file>
<file>images/progressbar.png</file>
diff --git a/src/plugins/coreplugin/fancyactionbar.qrc b/src/plugins/coreplugin/fancyactionbar.qrc
index aa461de6e7e..38d02edd466 100644
--- a/src/plugins/coreplugin/fancyactionbar.qrc
+++ b/src/plugins/coreplugin/fancyactionbar.qrc
@@ -3,8 +3,6 @@
<file>images/mode_Edit.png</file>
<file>images/mode_Edit@2x.png</file>
<file>images/mode_Output.png</file>
- <file>images/mode_Reference.png</file>
- <file>images/mode_Reference@2x.png</file>
<file>images/mode_Design.png</file>
<file>images/mode_Design@2x.png</file>
</qresource>
diff --git a/src/plugins/help/help.qrc b/src/plugins/help/help.qrc
index 0b529633f80..f3e038b5940 100644
--- a/src/plugins/help/help.qrc
+++ b/src/plugins/help/help.qrc
@@ -6,6 +6,9 @@
<file>images/next.png</file>
<file>images/home.png</file>
<file>images/bookmark.png</file>
+ <file>images/category_help.png</file>
+ <file>images/mode_help.png</file>
+ <file>images/mode_help@2x.png</file>
</qresource>
<qresource prefix="/trolltech/assistant" >
<file>images/mac/addtab.png</file>
diff --git a/src/plugins/help/helpconstants.h b/src/plugins/help/helpconstants.h
index f9cfdf70f2a..58499948b18 100644
--- a/src/plugins/help/helpconstants.h
+++ b/src/plugins/help/helpconstants.h
@@ -59,7 +59,7 @@ static const QLatin1String FontKey("font");
const int P_MODE_HELP = 70;
const char ID_MODE_HELP [] = "Help";
const char HELP_CATEGORY[] = "H.Help";
-const char HELP_CATEGORY_ICON[] = ":/core/images/category_help.png";
+const char HELP_CATEGORY_ICON[] = ":/help/images/category_help.png";
const char HELP_TR_CATEGORY[] = QT_TRANSLATE_NOOP("Help", "Help");
const char C_MODE_HELP [] = "Help Mode";
diff --git a/src/plugins/help/helpmode.cpp b/src/plugins/help/helpmode.cpp
index b0cb81662b0..44c1af3a6e0 100644
--- a/src/plugins/help/helpmode.cpp
+++ b/src/plugins/help/helpmode.cpp
@@ -40,7 +40,7 @@ HelpMode::HelpMode(QObject *parent)
{
setObjectName(QLatin1String("HelpMode"));
setContext(Core::Context(Constants::C_MODE_HELP));
- setIcon(QIcon(QLatin1String(":/fancyactionbar/images/mode_Reference.png")));
+ setIcon(QIcon(QLatin1String(":/help/images/mode_help.png")));
setDisplayName(QCoreApplication::translate("Help::Internal::HelpMode", "Help"));
setPriority(Constants::P_MODE_HELP);
setId(Constants::ID_MODE_HELP);
diff --git a/src/plugins/coreplugin/images/category_help.png b/src/plugins/help/images/category_help.png
similarity index 100%
rename from src/plugins/coreplugin/images/category_help.png
rename to src/plugins/help/images/category_help.png
diff --git a/src/plugins/coreplugin/images/mode_Reference.png b/src/plugins/help/images/mode_help.png
similarity index 100%
rename from src/plugins/coreplugin/images/mode_Reference.png
rename to src/plugins/help/images/mode_help.png
diff --git a/src/plugins/coreplugin/images/mode_Reference@2x.png b/src/plugins/help/images/mode_help@2x.png
similarity index 100%
rename from src/plugins/coreplugin/images/mode_Reference@2x.png
rename to src/plugins/help/images/mode_help@2x.png
--
GitLab