diff options
Diffstat (limited to 'src/plugins')
92 files changed, 119 insertions, 42 deletions
diff --git a/src/plugins/autotest/autotest.qrc b/src/plugins/autotest/autotest.qrc index 580958b1f6e..f4f6892d47d 100644 --- a/src/plugins/autotest/autotest.qrc +++ b/src/plugins/autotest/autotest.qrc @@ -1,6 +1,7 @@ <RCC> <qresource prefix="/autotest"> - <file>images/autotest.png</file> + <file>images/settingscategory_autotest.png</file> + <file>images/settingscategory_autotest@2x.png</file> <file>images/sort.png</file> <file>images/sort@2x.png</file> <file>images/leafsort.png</file> diff --git a/src/plugins/autotest/images/autotest.png b/src/plugins/autotest/images/autotest.png Binary files differdeleted file mode 100644 index 3f52e9bf08f..00000000000 --- a/src/plugins/autotest/images/autotest.png +++ /dev/null diff --git a/src/plugins/autotest/images/settingscategory_autotest.png b/src/plugins/autotest/images/settingscategory_autotest.png Binary files differnew file mode 100644 index 00000000000..d3adebd2ba7 --- /dev/null +++ b/src/plugins/autotest/images/settingscategory_autotest.png diff --git a/src/plugins/autotest/images/settingscategory_autotest@2x.png b/src/plugins/autotest/images/settingscategory_autotest@2x.png Binary files differnew file mode 100644 index 00000000000..df6c13c7159 --- /dev/null +++ b/src/plugins/autotest/images/settingscategory_autotest@2x.png diff --git a/src/plugins/autotest/testsettingspage.cpp b/src/plugins/autotest/testsettingspage.cpp index 4c3b4654e74..bb24281f166 100644 --- a/src/plugins/autotest/testsettingspage.cpp +++ b/src/plugins/autotest/testsettingspage.cpp @@ -282,7 +282,8 @@ TestSettingsPage::TestSettingsPage(const QSharedPointer<TestSettings> &settings) setDisplayName(tr("General")); setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("AutoTest", Constants::AUTOTEST_SETTINGS_TR)); - setCategoryIcon(Utils::Icon(":/autotest/images/autotest.png")); + setCategoryIcon(Utils::Icon({{":/autotest/images/settingscategory_autotest.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint)); } TestSettingsPage::~TestSettingsPage() diff --git a/src/plugins/beautifier/beautifier.qrc b/src/plugins/beautifier/beautifier.qrc index cab6cb4740d..6a5621d4c5d 100644 --- a/src/plugins/beautifier/beautifier.qrc +++ b/src/plugins/beautifier/beautifier.qrc @@ -1,6 +1,6 @@ <RCC> <qresource prefix="/beautifier"> - <file>images/beautifier.png</file> - <file>images/beautifier@2x.png</file> + <file>images/settingscategory_beautifier.png</file> + <file>images/settingscategory_beautifier@2x.png</file> </qresource> </RCC> diff --git a/src/plugins/beautifier/generaloptionspage.cpp b/src/plugins/beautifier/generaloptionspage.cpp index d431a290573..c2bec707404 100644 --- a/src/plugins/beautifier/generaloptionspage.cpp +++ b/src/plugins/beautifier/generaloptionspage.cpp @@ -83,7 +83,8 @@ GeneralOptionsPage::GeneralOptionsPage(const QSharedPointer<GeneralSettings> &se setDisplayName(tr("General")); setCategory(Constants::OPTION_CATEGORY); setDisplayCategory(QCoreApplication::translate("Beautifier", "Beautifier")); - setCategoryIcon(Utils::Icon(":/beautifier/images/beautifier.png")); + setCategoryIcon(Utils::Icon({{":/beautifier/images/settingscategory_beautifier.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint)); } QWidget *GeneralOptionsPage::widget() diff --git a/src/plugins/beautifier/images/beautifier.png b/src/plugins/beautifier/images/beautifier.png Binary files differdeleted file mode 100644 index 69b25dd6b96..00000000000 --- a/src/plugins/beautifier/images/beautifier.png +++ /dev/null diff --git a/src/plugins/beautifier/images/beautifier@2x.png b/src/plugins/beautifier/images/beautifier@2x.png Binary files differdeleted file mode 100644 index d44edef21d0..00000000000 --- a/src/plugins/beautifier/images/beautifier@2x.png +++ /dev/null diff --git a/src/plugins/beautifier/images/settingscategory_beautifier.png b/src/plugins/beautifier/images/settingscategory_beautifier.png Binary files differnew file mode 100644 index 00000000000..0cc3a76328f --- /dev/null +++ b/src/plugins/beautifier/images/settingscategory_beautifier.png diff --git a/src/plugins/beautifier/images/settingscategory_beautifier@2x.png b/src/plugins/beautifier/images/settingscategory_beautifier@2x.png Binary files differnew file mode 100644 index 00000000000..77ff6cf7880 --- /dev/null +++ b/src/plugins/beautifier/images/settingscategory_beautifier@2x.png diff --git a/src/plugins/clangtools/clangtoolsplugin.cpp b/src/plugins/clangtools/clangtoolsplugin.cpp index 604981a839b..9ce1af6de64 100644 --- a/src/plugins/clangtools/clangtoolsplugin.cpp +++ b/src/plugins/clangtools/clangtoolsplugin.cpp @@ -36,6 +36,8 @@ #include "clangstaticanalyzerunittests.h" #endif +#include <debugger/analyzer/analyzericons.h> + #include <utils/qtcassert.h> #include <coreplugin/icore.h> @@ -74,7 +76,7 @@ public: "Clang Static Analyzer")); setCategory("T.Analyzer"); setDisplayCategory(QCoreApplication::translate("Analyzer", "Analyzer")); - setCategoryIcon(Utils::Icon(":/images/analyzer_category.png")); + setCategoryIcon(Analyzer::Icons::SETTINGSCATEGORY_ANALYZER); } QWidget *widget() diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc index cfbbc2e85e4..5bd3d568832 100644 --- a/src/plugins/coreplugin/core.qrc +++ b/src/plugins/coreplugin/core.qrc @@ -2,8 +2,9 @@ <qresource prefix="/core"> <file alias="images/qtcreatorlogo-big.png">images/logo/128/QtProject-qtcreator.png</file> <file alias="images/qtcreatorlogo-big@2x.png">images/logo/256/QtProject-qtcreator.png</file> - <file>images/category_core.png</file> - <file>images/category_design.png</file> - <file>images/category_texteditor.png</file> + <file>images/settingscategory_core.png</file> + <file>images/settingscategory_core@2x.png</file> + <file>images/settingscategory_design.png</file> + <file>images/settingscategory_design@2x.png</file> </qresource> </RCC> diff --git a/src/plugins/coreplugin/generalsettings.cpp b/src/plugins/coreplugin/generalsettings.cpp index 8d2623b13c5..b4eedbb0d9c 100644 --- a/src/plugins/coreplugin/generalsettings.cpp +++ b/src/plugins/coreplugin/generalsettings.cpp @@ -54,7 +54,8 @@ GeneralSettings::GeneralSettings() setDisplayName(tr("Interface")); setCategory(Constants::SETTINGS_CATEGORY_CORE); setDisplayCategory(QCoreApplication::translate("Core", "Environment")); - setCategoryIcon(Utils::Icon(":/core/images/category_core.png")); + setCategoryIcon(Utils::Icon({{":/core/images/settingscategory_core.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint)); } static bool hasQmFilesForLocale(const QString &locale, const QString &creatorTrPath) diff --git a/src/plugins/coreplugin/images/category_design.png b/src/plugins/coreplugin/images/category_design.png Binary files differdeleted file mode 100644 index 5a4111a3457..00000000000 --- a/src/plugins/coreplugin/images/category_design.png +++ /dev/null diff --git a/src/plugins/coreplugin/images/category_texteditor.png b/src/plugins/coreplugin/images/category_texteditor.png Binary files differdeleted file mode 100644 index bdde584db48..00000000000 --- a/src/plugins/coreplugin/images/category_texteditor.png +++ /dev/null diff --git a/src/plugins/coreplugin/images/settingscategory_core.png b/src/plugins/coreplugin/images/settingscategory_core.png Binary files differnew file mode 100644 index 00000000000..fdfa267ff0a --- /dev/null +++ b/src/plugins/coreplugin/images/settingscategory_core.png diff --git a/src/plugins/coreplugin/images/settingscategory_core@2x.png b/src/plugins/coreplugin/images/settingscategory_core@2x.png Binary files differnew file mode 100644 index 00000000000..d378517d838 --- /dev/null +++ b/src/plugins/coreplugin/images/settingscategory_core@2x.png diff --git a/src/plugins/coreplugin/images/settingscategory_design.png b/src/plugins/coreplugin/images/settingscategory_design.png Binary files differnew file mode 100644 index 00000000000..fc6e2b969b8 --- /dev/null +++ b/src/plugins/coreplugin/images/settingscategory_design.png diff --git a/src/plugins/coreplugin/images/settingscategory_design@2x.png b/src/plugins/coreplugin/images/settingscategory_design@2x.png Binary files differnew file mode 100644 index 00000000000..7fd6504b938 --- /dev/null +++ b/src/plugins/coreplugin/images/settingscategory_design@2x.png diff --git a/src/plugins/cpaster/cpaster.qrc b/src/plugins/cpaster/cpaster.qrc index f73d6bb204d..92a7f67322b 100644 --- a/src/plugins/cpaster/cpaster.qrc +++ b/src/plugins/cpaster/cpaster.qrc @@ -1,5 +1,6 @@ <RCC> <qresource prefix="/cpaster"> - <file>images/category_cpaster.png</file> + <file>images/settingscategory_cpaster.png</file> + <file>images/settingscategory_cpaster@2x.png</file> </qresource> </RCC> diff --git a/src/plugins/cpaster/images/category_cpaster.png b/src/plugins/cpaster/images/category_cpaster.png Binary files differdeleted file mode 100644 index eef221c830a..00000000000 --- a/src/plugins/cpaster/images/category_cpaster.png +++ /dev/null diff --git a/src/plugins/cpaster/images/settingscategory_cpaster.png b/src/plugins/cpaster/images/settingscategory_cpaster.png Binary files differnew file mode 100644 index 00000000000..007f06d0343 --- /dev/null +++ b/src/plugins/cpaster/images/settingscategory_cpaster.png diff --git a/src/plugins/cpaster/images/settingscategory_cpaster@2x.png b/src/plugins/cpaster/images/settingscategory_cpaster@2x.png Binary files differnew file mode 100644 index 00000000000..5f6954374a1 --- /dev/null +++ b/src/plugins/cpaster/images/settingscategory_cpaster@2x.png diff --git a/src/plugins/cpaster/settingspage.cpp b/src/plugins/cpaster/settingspage.cpp index 2872c166b9b..4f50ebda0f5 100644 --- a/src/plugins/cpaster/settingspage.cpp +++ b/src/plugins/cpaster/settingspage.cpp @@ -69,7 +69,8 @@ SettingsPage::SettingsPage(const QSharedPointer<Settings> &settings, QObject *pa setDisplayName(tr("General")); setCategory(Constants::CPASTER_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("CodePaster", "Code Pasting")); - setCategoryIcon(Utils::Icon(":/cpaster/images/category_cpaster.png")); + setCategoryIcon(Utils::Icon({{":/cpaster/images/settingscategory_cpaster.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint)); } SettingsPage::~SettingsPage() diff --git a/src/plugins/cpptools/cppcodemodelsettingspage.cpp b/src/plugins/cpptools/cppcodemodelsettingspage.cpp index 8bf57668ab1..df0a0f924c2 100644 --- a/src/plugins/cpptools/cppcodemodelsettingspage.cpp +++ b/src/plugins/cpptools/cppcodemodelsettingspage.cpp @@ -165,7 +165,8 @@ CppCodeModelSettingsPage::CppCodeModelSettingsPage(QSharedPointer<CppCodeModelSe setDisplayName(QCoreApplication::translate("CppTools",Constants::CPP_CODE_MODEL_SETTINGS_NAME)); setCategory(Constants::CPP_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("CppTools", "C++")); - setCategoryIcon(Utils::Icon(":/cpptools/images/category_cpp.png")); + setCategoryIcon(Utils::Icon({{":/cpptools/images/settingscategory_cpp.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint)); } QWidget *CppCodeModelSettingsPage::widget() diff --git a/src/plugins/cpptools/cpptools.qrc b/src/plugins/cpptools/cpptools.qrc index d637f34c1c5..7ba72439754 100644 --- a/src/plugins/cpptools/cpptools.qrc +++ b/src/plugins/cpptools/cpptools.qrc @@ -1,5 +1,6 @@ <RCC> <qresource prefix="/cpptools"> - <file>images/category_cpp.png</file> + <file>images/settingscategory_cpp.png</file> + <file>images/settingscategory_cpp@2x.png</file> </qresource> </RCC> diff --git a/src/plugins/cpptools/images/category_cpp.png b/src/plugins/cpptools/images/category_cpp.png Binary files differdeleted file mode 100644 index 2a3408dae37..00000000000 --- a/src/plugins/cpptools/images/category_cpp.png +++ /dev/null diff --git a/src/plugins/cpptools/images/settingscategory_cpp.png b/src/plugins/cpptools/images/settingscategory_cpp.png Binary files differnew file mode 100644 index 00000000000..fe39d2663c5 --- /dev/null +++ b/src/plugins/cpptools/images/settingscategory_cpp.png diff --git a/src/plugins/cpptools/images/settingscategory_cpp@2x.png b/src/plugins/cpptools/images/settingscategory_cpp@2x.png Binary files differnew file mode 100644 index 00000000000..92078c4281e --- /dev/null +++ b/src/plugins/cpptools/images/settingscategory_cpp@2x.png diff --git a/src/plugins/debugger/analyzer/analyzer.pri b/src/plugins/debugger/analyzer/analyzer.pri index 6a0af3ab27e..cc11fc8b501 100644 --- a/src/plugins/debugger/analyzer/analyzer.pri +++ b/src/plugins/debugger/analyzer/analyzer.pri @@ -12,6 +12,7 @@ SOURCES += \ HEADERS += \ $$PWD/analyzerconstants.h \ + $$PWD/analyzericons.h \ $$PWD/analyzermanager.h \ $$PWD/analyzerrunconfigwidget.h \ $$PWD/analyzerutils.h \ diff --git a/src/plugins/debugger/analyzer/analyzerbase.qrc b/src/plugins/debugger/analyzer/analyzerbase.qrc index 57e529f246e..db973e7b5a4 100644 --- a/src/plugins/debugger/analyzer/analyzerbase.qrc +++ b/src/plugins/debugger/analyzer/analyzerbase.qrc @@ -1,5 +1,6 @@ <RCC> <qresource prefix="/"> - <file>images/analyzer_category.png</file> + <file>images/settingscategory_analyzer.png</file> + <file>images/settingscategory_analyzer@2x.png</file> </qresource> </RCC> diff --git a/src/plugins/debugger/analyzer/analyzericons.h b/src/plugins/debugger/analyzer/analyzericons.h new file mode 100644 index 00000000000..0720f44db54 --- /dev/null +++ b/src/plugins/debugger/analyzer/analyzericons.h @@ -0,0 +1,37 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Creator. +** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +****************************************************************************/ + +#pragma once + +#include <utils/icon.h> + +namespace Analyzer { +namespace Icons { + +const Utils::Icon SETTINGSCATEGORY_ANALYZER({ + {":/images/settingscategory_analyzer.png", Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint); + +} // namespace Icons +} // namespace Analyzer diff --git a/src/plugins/debugger/analyzer/images/analyzer_category.png b/src/plugins/debugger/analyzer/images/analyzer_category.png Binary files differdeleted file mode 100644 index fdfe8ed2319..00000000000 --- a/src/plugins/debugger/analyzer/images/analyzer_category.png +++ /dev/null diff --git a/src/plugins/debugger/analyzer/images/settingscategory_analyzer.png b/src/plugins/debugger/analyzer/images/settingscategory_analyzer.png Binary files differnew file mode 100644 index 00000000000..8fb04dc4166 --- /dev/null +++ b/src/plugins/debugger/analyzer/images/settingscategory_analyzer.png diff --git a/src/plugins/debugger/analyzer/images/settingscategory_analyzer@2x.png b/src/plugins/debugger/analyzer/images/settingscategory_analyzer@2x.png Binary files differnew file mode 100644 index 00000000000..4f28cfc1fd8 --- /dev/null +++ b/src/plugins/debugger/analyzer/images/settingscategory_analyzer@2x.png diff --git a/src/plugins/debugger/commonoptionspage.cpp b/src/plugins/debugger/commonoptionspage.cpp index 149caec5057..81c64118d3d 100644 --- a/src/plugins/debugger/commonoptionspage.cpp +++ b/src/plugins/debugger/commonoptionspage.cpp @@ -68,7 +68,8 @@ CommonOptionsPage::CommonOptionsPage(const QSharedPointer<GlobalDebuggerOptions> setDisplayName(QCoreApplication::translate("Debugger", "General")); setCategory(DEBUGGER_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("Debugger", "Debugger")); - setCategoryIcon(Icon(":/debugger/images/category_debug.png")); + setCategoryIcon(Utils::Icon({{":/debugger/images/settingscategory_debugger.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint)); } void CommonOptionsPage::apply() diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs index 9a69fb289af..4f53499ee7f 100644 --- a/src/plugins/debugger/debugger.qbs +++ b/src/plugins/debugger/debugger.qbs @@ -230,6 +230,7 @@ Project { files: [ "analyzerbase.qrc", "analyzerconstants.h", + "analyzericons.h", "analyzermanager.h", "analyzerrunconfigwidget.cpp", "analyzerrunconfigwidget.h", diff --git a/src/plugins/debugger/debugger.qrc b/src/plugins/debugger/debugger.qrc index 0031175a1cb..33577e6d237 100644 --- a/src/plugins/debugger/debugger.qrc +++ b/src/plugins/debugger/debugger.qrc @@ -1,6 +1,7 @@ <RCC> <qresource prefix="/debugger"> - <file>images/category_debug.png</file> + <file>images/settingscategory_debugger.png</file> + <file>images/settingscategory_debugger@2x.png</file> <file>images/debugger_breakpoints.png</file> <file>images/debugger_continue.png</file> <file>images/debugger_continue@2x.png</file> diff --git a/src/plugins/debugger/images/category_debug.png b/src/plugins/debugger/images/category_debug.png Binary files differdeleted file mode 100644 index 5e74d867c0a..00000000000 --- a/src/plugins/debugger/images/category_debug.png +++ /dev/null diff --git a/src/plugins/debugger/images/settingscategory_debugger.png b/src/plugins/debugger/images/settingscategory_debugger.png Binary files differnew file mode 100644 index 00000000000..38f1d87ea0d --- /dev/null +++ b/src/plugins/debugger/images/settingscategory_debugger.png diff --git a/src/plugins/debugger/images/settingscategory_debugger@2x.png b/src/plugins/debugger/images/settingscategory_debugger@2x.png Binary files differnew file mode 100644 index 00000000000..95f8d99d725 --- /dev/null +++ b/src/plugins/debugger/images/settingscategory_debugger@2x.png diff --git a/src/plugins/designer/settingspage.cpp b/src/plugins/designer/settingspage.cpp index 078c8e0bda2..4dfa8bc550c 100644 --- a/src/plugins/designer/settingspage.cpp +++ b/src/plugins/designer/settingspage.cpp @@ -72,7 +72,8 @@ SettingsPageProvider::SettingsPageProvider(QObject *parent) setCategory(Designer::Constants::SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("Designer", Designer::Constants::SETTINGS_TR_CATEGORY)); - setCategoryIcon(Utils::Icon(":/core/images/category_design.png")); + setCategoryIcon(Utils::Icon({{":/core/images/settingscategory_design.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint)); } QList<Core::IOptionsPage *> SettingsPageProvider::pages() const diff --git a/src/plugins/fakevim/fakevim.qrc b/src/plugins/fakevim/fakevim.qrc index 73813881986..c3d5b93360b 100644 --- a/src/plugins/fakevim/fakevim.qrc +++ b/src/plugins/fakevim/fakevim.qrc @@ -1,5 +1,6 @@ <RCC> <qresource prefix="/fakevim"> - <file>images/category_fakevim.png</file> + <file>images/settingscategory_fakevim.png</file> + <file>images/settingscategory_fakevim@2x.png</file> </qresource> </RCC> diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp index 8e6e4713ba1..5c267e2b8b7 100644 --- a/src/plugins/fakevim/fakevimplugin.cpp +++ b/src/plugins/fakevim/fakevimplugin.cpp @@ -364,7 +364,8 @@ public: setDisplayName(Tr::tr("General")); setCategory(SETTINGS_CATEGORY); setDisplayCategory(Tr::tr("FakeVim")); - setCategoryIcon(Utils::Icon(":/fakevim/images/category_fakevim.png")); + setCategoryIcon(Utils::Icon({{":/fakevim/images/settingscategory_fakevim.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint)); } QWidget *widget(); diff --git a/src/plugins/fakevim/images/category_fakevim.png b/src/plugins/fakevim/images/category_fakevim.png Binary files differdeleted file mode 100644 index eb72cfebc9c..00000000000 --- a/src/plugins/fakevim/images/category_fakevim.png +++ /dev/null diff --git a/src/plugins/fakevim/images/settingscategory_fakevim.png b/src/plugins/fakevim/images/settingscategory_fakevim.png Binary files differnew file mode 100644 index 00000000000..13dcee6cfce --- /dev/null +++ b/src/plugins/fakevim/images/settingscategory_fakevim.png diff --git a/src/plugins/fakevim/images/settingscategory_fakevim@2x.png b/src/plugins/fakevim/images/settingscategory_fakevim@2x.png Binary files differnew file mode 100644 index 00000000000..97862cd8287 --- /dev/null +++ b/src/plugins/fakevim/images/settingscategory_fakevim@2x.png diff --git a/src/plugins/help/generalsettingspage.cpp b/src/plugins/help/generalsettingspage.cpp index a87b098a30a..fc8fa3d3215 100644 --- a/src/plugins/help/generalsettingspage.cpp +++ b/src/plugins/help/generalsettingspage.cpp @@ -55,7 +55,8 @@ GeneralSettingsPage::GeneralSettingsPage() setDisplayName(tr("General")); setCategory(Help::Constants::HELP_CATEGORY); setDisplayCategory(QCoreApplication::translate("Help", "Help")); - setCategoryIcon(Utils::Icon(":/help/images/category_help.png")); + setCategoryIcon(Utils::Icon({{":/help/images/settingscategory_help.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint)); } QWidget *GeneralSettingsPage::widget() diff --git a/src/plugins/help/help.qrc b/src/plugins/help/help.qrc index 228b15689c1..78909bb8b34 100644 --- a/src/plugins/help/help.qrc +++ b/src/plugins/help/help.qrc @@ -1,6 +1,7 @@ <RCC> <qresource prefix="/help"> - <file>images/category_help.png</file> + <file>images/settingscategory_help.png</file> + <file>images/settingscategory_help@2x.png</file> <file>images/mode_help.png</file> <file>images/mode_help@2x.png</file> <file>images/mode_help_mask.png</file> diff --git a/src/plugins/help/images/category_help.png b/src/plugins/help/images/category_help.png Binary files differdeleted file mode 100644 index 7736b0a32d6..00000000000 --- a/src/plugins/help/images/category_help.png +++ /dev/null diff --git a/src/plugins/help/images/settingscategory_help.png b/src/plugins/help/images/settingscategory_help.png Binary files differnew file mode 100644 index 00000000000..2786148f6ff --- /dev/null +++ b/src/plugins/help/images/settingscategory_help.png diff --git a/src/plugins/help/images/settingscategory_help@2x.png b/src/plugins/help/images/settingscategory_help@2x.png Binary files differnew file mode 100644 index 00000000000..60a33d735a4 --- /dev/null +++ b/src/plugins/help/images/settingscategory_help@2x.png diff --git a/src/plugins/nim/images/nim.png b/src/plugins/nim/images/nim.png Binary files differdeleted file mode 100644 index a08e474e6dc..00000000000 --- a/src/plugins/nim/images/nim.png +++ /dev/null diff --git a/src/plugins/nim/images/settingscategory_nim.png b/src/plugins/nim/images/settingscategory_nim.png Binary files differnew file mode 100644 index 00000000000..016c570eb49 --- /dev/null +++ b/src/plugins/nim/images/settingscategory_nim.png diff --git a/src/plugins/nim/images/settingscategory_nim@2x.png b/src/plugins/nim/images/settingscategory_nim@2x.png Binary files differnew file mode 100644 index 00000000000..4fb9c101887 --- /dev/null +++ b/src/plugins/nim/images/settingscategory_nim@2x.png diff --git a/src/plugins/nim/nim.qrc b/src/plugins/nim/nim.qrc index edbdcd0058f..c8f3ad2359a 100644 --- a/src/plugins/nim/nim.qrc +++ b/src/plugins/nim/nim.qrc @@ -1,5 +1,6 @@ <RCC> <qresource prefix="/nim"> - <file>images/nim.png</file> + <file>images/settingscategory_nim.png</file> + <file>images/settingscategory_nim@2x.png</file> </qresource> </RCC> diff --git a/src/plugins/nim/nimconstants.h b/src/plugins/nim/nimconstants.h index 985a676786b..c56217b0516 100644 --- a/src/plugins/nim/nimconstants.h +++ b/src/plugins/nim/nimconstants.h @@ -34,7 +34,6 @@ namespace Constants { const char C_NIMPROJECT_ID[] = "Nim.NimProject"; const char C_NIMEDITOR_ID[] = "Nim.NimEditor"; const char C_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("OpenWith::Editors", "Nim Editor"); -const char C_NIM_ICON_PATH[] = ":/nim/images/nim.png"; // NimToolChain const char C_NIMTOOLCHAIN_TYPEID[] = "Nim.NimToolChain"; diff --git a/src/plugins/nim/nimplugin.cpp b/src/plugins/nim/nimplugin.cpp index 24e13dfe346..9421cdc1ac9 100644 --- a/src/plugins/nim/nimplugin.cpp +++ b/src/plugins/nim/nimplugin.cpp @@ -91,7 +91,8 @@ bool NimPlugin::initialize(const QStringList &arguments, QString *errorMessage) void NimPlugin::extensionsInitialized() { // Add MIME overlay icons (these icons displayed at Project dock panel) - const QIcon icon((QLatin1String(Constants::C_NIM_ICON_PATH))); + const QIcon icon = Utils::Icon({{":/nim/images/settingscategory_nim.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint).icon(); if (!icon.isNull()) { Core::FileIconProvider::registerIconOverlayForMimeType(icon, Constants::C_NIM_MIMETYPE); Core::FileIconProvider::registerIconOverlayForMimeType(icon, Constants::C_NIM_SCRIPT_MIMETYPE); diff --git a/src/plugins/nim/settings/nimcodestylesettingspage.cpp b/src/plugins/nim/settings/nimcodestylesettingspage.cpp index 78247c8e421..0c3d6dd0f21 100644 --- a/src/plugins/nim/settings/nimcodestylesettingspage.cpp +++ b/src/plugins/nim/settings/nimcodestylesettingspage.cpp @@ -51,7 +51,8 @@ NimCodeStyleSettingsPage::NimCodeStyleSettingsPage(QWidget *parent) setDisplayName(tr(Nim::Constants::C_NIMCODESTYLESETTINGSPAGE_DISPLAY)); setCategory(Nim::Constants::C_NIMCODESTYLESETTINGSPAGE_CATEGORY); setDisplayCategory(tr("Nim")); - setCategoryIcon(Utils::Icon(Nim::Constants::C_NIM_ICON_PATH)); + setCategoryIcon(Utils::Icon({{":/nim/images/settingscategory_nim.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint)); } NimCodeStyleSettingsPage::~NimCodeStyleSettingsPage() diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp b/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp index 3958b9d3857..26d3f968e71 100644 --- a/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp @@ -42,7 +42,8 @@ DeviceSettingsPage::DeviceSettingsPage(QObject *parent) setDisplayName(tr("Devices")); setCategory(Constants::DEVICE_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("ProjectExplorer", "Devices")); - setCategoryIcon(Utils::Icon(":/projectexplorer/images/MaemoDevice.png")); + setCategoryIcon(Utils::Icon({{":/projectexplorer/images/settingscategory_devices.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint)); } QWidget *DeviceSettingsPage::widget() diff --git a/src/plugins/projectexplorer/images/category_buildrun.png b/src/plugins/projectexplorer/images/category_buildrun.png Binary files differdeleted file mode 100644 index 8401b419516..00000000000 --- a/src/plugins/projectexplorer/images/category_buildrun.png +++ /dev/null diff --git a/src/plugins/projectexplorer/images/settingscategory_buildrun.png b/src/plugins/projectexplorer/images/settingscategory_buildrun.png Binary files differnew file mode 100644 index 00000000000..52a5d2d9a11 --- /dev/null +++ b/src/plugins/projectexplorer/images/settingscategory_buildrun.png diff --git a/src/plugins/projectexplorer/images/settingscategory_buildrun@2x.png b/src/plugins/projectexplorer/images/settingscategory_buildrun@2x.png Binary files differnew file mode 100644 index 00000000000..83351f7ce81 --- /dev/null +++ b/src/plugins/projectexplorer/images/settingscategory_buildrun@2x.png diff --git a/src/plugins/projectexplorer/images/settingscategory_devices.png b/src/plugins/projectexplorer/images/settingscategory_devices.png Binary files differnew file mode 100644 index 00000000000..25fb2d5064b --- /dev/null +++ b/src/plugins/projectexplorer/images/settingscategory_devices.png diff --git a/src/plugins/projectexplorer/images/settingscategory_devices@2x.png b/src/plugins/projectexplorer/images/settingscategory_devices@2x.png Binary files differnew file mode 100644 index 00000000000..d2af2a48d88 --- /dev/null +++ b/src/plugins/projectexplorer/images/settingscategory_devices@2x.png diff --git a/src/plugins/projectexplorer/images/settingscategory_kits.png b/src/plugins/projectexplorer/images/settingscategory_kits.png Binary files differnew file mode 100644 index 00000000000..7ba898f7b6a --- /dev/null +++ b/src/plugins/projectexplorer/images/settingscategory_kits.png diff --git a/src/plugins/projectexplorer/images/settingscategory_kits@2x.png b/src/plugins/projectexplorer/images/settingscategory_kits@2x.png Binary files differnew file mode 100644 index 00000000000..ca7e9de202a --- /dev/null +++ b/src/plugins/projectexplorer/images/settingscategory_kits@2x.png diff --git a/src/plugins/projectexplorer/kitoptionspage.cpp b/src/plugins/projectexplorer/kitoptionspage.cpp index f37687c5866..24535eb57c8 100644 --- a/src/plugins/projectexplorer/kitoptionspage.cpp +++ b/src/plugins/projectexplorer/kitoptionspage.cpp @@ -240,14 +240,12 @@ static KitOptionsPage *theKitOptionsPage = nullptr; KitOptionsPage::KitOptionsPage() { theKitOptionsPage = this; - static const Utils::Icon categoryIcon({{":/projectexplorer/images/mode_project_mask.png", - Utils::Theme::PanelTextColorDark}}, - Utils::Icon::Tint); setId(Constants::KITS_SETTINGS_PAGE_ID); setDisplayName(tr("Kits")); setCategory(Constants::KITS_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("ProjectExplorer", "Kits")); - setCategoryIcon(categoryIcon); + setCategoryIcon(Utils::Icon({{":/projectexplorer/images/settingscategory_kits.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint)); } QWidget *KitOptionsPage::widget() diff --git a/src/plugins/projectexplorer/projectexplorer.qrc b/src/plugins/projectexplorer/projectexplorer.qrc index 6b64ba4d568..9eb42e7ebcd 100644 --- a/src/plugins/projectexplorer/projectexplorer.qrc +++ b/src/plugins/projectexplorer/projectexplorer.qrc @@ -1,6 +1,5 @@ <RCC> <qresource prefix="/projectexplorer"> - <file>images/category_buildrun.png</file> <file>images/closetab.png</file> <file>images/debugger_start.png</file> <file>images/debugger_start@2x.png</file> @@ -78,5 +77,11 @@ <file>images/fileoverlay_unknown@2x.png</file> <file>images/cancelbuild_overlay.png</file> <file>images/cancelbuild_overlay@2x.png</file> + <file>images/settingscategory_buildrun.png</file> + <file>images/settingscategory_buildrun@2x.png</file> + <file>images/settingscategory_devices.png</file> + <file>images/settingscategory_devices@2x.png</file> + <file>images/settingscategory_kits.png</file> + <file>images/settingscategory_kits@2x.png</file> </qresource> </RCC> diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.cpp b/src/plugins/projectexplorer/projectexplorersettingspage.cpp index 5a8f2bc1cab..cd7e6db4808 100644 --- a/src/plugins/projectexplorer/projectexplorersettingspage.cpp +++ b/src/plugins/projectexplorer/projectexplorersettingspage.cpp @@ -191,7 +191,8 @@ ProjectExplorerSettingsPage::ProjectExplorerSettingsPage() setDisplayName(tr("General")); setCategory(Constants::BUILD_AND_RUN_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("ProjectExplorer", "Build & Run")); - setCategoryIcon(Utils::Icon(":/projectexplorer/images/category_buildrun.png")); + setCategoryIcon(Utils::Icon({{":/projectexplorer/images/settingscategory_buildrun.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint)); } QWidget *ProjectExplorerSettingsPage::widget() diff --git a/src/plugins/qmljstools/images/category_qml.png b/src/plugins/qmljstools/images/category_qml.png Binary files differdeleted file mode 100644 index 131a4b381e9..00000000000 --- a/src/plugins/qmljstools/images/category_qml.png +++ /dev/null diff --git a/src/plugins/qmljstools/images/settingscategory_qml.png b/src/plugins/qmljstools/images/settingscategory_qml.png Binary files differnew file mode 100644 index 00000000000..6c61e8f76c6 --- /dev/null +++ b/src/plugins/qmljstools/images/settingscategory_qml.png diff --git a/src/plugins/qmljstools/images/settingscategory_qml@2x.png b/src/plugins/qmljstools/images/settingscategory_qml@2x.png Binary files differnew file mode 100644 index 00000000000..3e30bf7bd57 --- /dev/null +++ b/src/plugins/qmljstools/images/settingscategory_qml@2x.png diff --git a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp index 38ea19451d2..c6d66a9ebd1 100644 --- a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp +++ b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp @@ -132,7 +132,8 @@ QmlJSCodeStyleSettingsPage::QmlJSCodeStyleSettingsPage(/*QSharedPointer<CppFileS setDisplayName(QCoreApplication::translate("QmlJSTools", Constants::QML_JS_CODE_STYLE_SETTINGS_NAME)); setCategory(QmlJSEditor::Constants::SETTINGS_CATEGORY_QML); setDisplayCategory(QCoreApplication::translate("QmlJSEditor", "Qt Quick")); - setCategoryIcon(Utils::Icon(":/qmljstools/images/category_qml.png")); + setCategoryIcon(Utils::Icon({{":/qmljstools/images/settingscategory_qml.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint)); } QWidget *QmlJSCodeStyleSettingsPage::widget() diff --git a/src/plugins/qmljstools/qmljstools.qrc b/src/plugins/qmljstools/qmljstools.qrc index d663b7c095f..9f51a077c2f 100644 --- a/src/plugins/qmljstools/qmljstools.qrc +++ b/src/plugins/qmljstools/qmljstools.qrc @@ -1,5 +1,6 @@ <RCC> <qresource prefix="/qmljstools"> - <file>images/category_qml.png</file> + <file>images/settingscategory_qml.png</file> + <file>images/settingscategory_qml@2x.png</file> </qresource> </RCC> diff --git a/src/plugins/qmlprofiler/qmlprofileroptionspage.cpp b/src/plugins/qmlprofiler/qmlprofileroptionspage.cpp index 0d638740379..9bc52867c0c 100644 --- a/src/plugins/qmlprofiler/qmlprofileroptionspage.cpp +++ b/src/plugins/qmlprofiler/qmlprofileroptionspage.cpp @@ -28,6 +28,8 @@ #include "qmlprofilerplugin.h" #include "qmlprofilerconstants.h" +#include <debugger/analyzer/analyzericons.h> + namespace QmlProfiler { namespace Internal { @@ -37,7 +39,7 @@ QmlProfilerOptionsPage::QmlProfilerOptionsPage() setDisplayName(tr("QML Profiler")); setCategory("T.Analyzer"); setDisplayCategory(tr("Analyzer")); - setCategoryIcon(Utils::Icon(":/images/analyzer_category.png")); + setCategoryIcon(Analyzer::Icons::SETTINGSCATEGORY_ANALYZER); } QWidget *QmlProfilerOptionsPage::widget() diff --git a/src/plugins/texteditor/images/settingscategory_texteditor.png b/src/plugins/texteditor/images/settingscategory_texteditor.png Binary files differnew file mode 100644 index 00000000000..20fafdb375a --- /dev/null +++ b/src/plugins/texteditor/images/settingscategory_texteditor.png diff --git a/src/plugins/texteditor/images/settingscategory_texteditor@2x.png b/src/plugins/texteditor/images/settingscategory_texteditor@2x.png Binary files differnew file mode 100644 index 00000000000..8ef22788760 --- /dev/null +++ b/src/plugins/texteditor/images/settingscategory_texteditor@2x.png diff --git a/src/plugins/texteditor/texteditor.qrc b/src/plugins/texteditor/texteditor.qrc index 83e4497630d..d4735183a8e 100644 --- a/src/plugins/texteditor/texteditor.qrc +++ b/src/plugins/texteditor/texteditor.qrc @@ -2,5 +2,7 @@ <qresource prefix="/texteditor"> <file>images/finddocuments.png</file> <file>images/snippet.png</file> + <file>images/settingscategory_texteditor.png</file> + <file>images/settingscategory_texteditor@2x.png</file> </qresource> </RCC> diff --git a/src/plugins/texteditor/texteditoroptionspage.cpp b/src/plugins/texteditor/texteditoroptionspage.cpp index a028593e9ab..05a10ec8a13 100644 --- a/src/plugins/texteditor/texteditoroptionspage.cpp +++ b/src/plugins/texteditor/texteditoroptionspage.cpp @@ -36,5 +36,6 @@ TextEditorOptionsPage::TextEditorOptionsPage(QObject *parent) : { setCategory(Constants::TEXT_EDITOR_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("TextEditor", "Text Editor")); - setCategoryIcon(Utils::Icon(":/core/images/category_texteditor.png")); + setCategoryIcon(Utils::Icon({{":/texteditor/images/settingscategory_texteditor.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint)); } diff --git a/src/plugins/todo/images/settingscategory_todo.png b/src/plugins/todo/images/settingscategory_todo.png Binary files differnew file mode 100644 index 00000000000..e0eeab33c80 --- /dev/null +++ b/src/plugins/todo/images/settingscategory_todo.png diff --git a/src/plugins/todo/images/settingscategory_todo@2x.png b/src/plugins/todo/images/settingscategory_todo@2x.png Binary files differnew file mode 100644 index 00000000000..69e02ac8f7f --- /dev/null +++ b/src/plugins/todo/images/settingscategory_todo@2x.png diff --git a/src/plugins/todo/images/todo.png b/src/plugins/todo/images/todo.png Binary files differdeleted file mode 100644 index 80b4257017f..00000000000 --- a/src/plugins/todo/images/todo.png +++ /dev/null diff --git a/src/plugins/todo/optionspage.cpp b/src/plugins/todo/optionspage.cpp index adce5dc44e0..ff3c0ed83a7 100644 --- a/src/plugins/todo/optionspage.cpp +++ b/src/plugins/todo/optionspage.cpp @@ -49,7 +49,8 @@ OptionsPage::OptionsPage(const Settings &settings, QObject *parent) : setDisplayName(tr("To-Do")); setCategory("To-Do"); setDisplayCategory(tr("To-Do")); - setCategoryIcon(Utils::Icon(":/todoplugin/images/todo.png")); + setCategoryIcon(Utils::Icon({{":/todoplugin/images/settingscategory_todo.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint)); } void OptionsPage::setSettings(const Settings &settings) diff --git a/src/plugins/todo/todoplugin.qrc b/src/plugins/todo/todoplugin.qrc index b9e44626664..73d941d4a9d 100644 --- a/src/plugins/todo/todoplugin.qrc +++ b/src/plugins/todo/todoplugin.qrc @@ -1,6 +1,7 @@ <RCC> <qresource prefix="/todoplugin"> - <file>images/todo.png</file> + <file>images/settingscategory_todo.png</file> + <file>images/settingscategory_todo@2x.png</file> <file>images/tasklist@2x.png</file> <file>images/tasklist.png</file> <file>images/bug@2x.png</file> diff --git a/src/plugins/valgrind/valgrindplugin.cpp b/src/plugins/valgrind/valgrindplugin.cpp index d43c26f1f43..e739ceccbc7 100644 --- a/src/plugins/valgrind/valgrindplugin.cpp +++ b/src/plugins/valgrind/valgrindplugin.cpp @@ -40,6 +40,7 @@ #include <coreplugin/icontext.h> #include <coreplugin/icore.h> #include <debugger/analyzer/analyzerrunconfigwidget.h> +#include <debugger/analyzer/analyzericons.h> #include <projectexplorer/projectexplorer.h> @@ -64,7 +65,7 @@ public: setDisplayName(QCoreApplication::translate("Valgrind::Internal::ValgrindOptionsPage", "Valgrind")); setCategory("T.Analyzer"); setDisplayCategory(QCoreApplication::translate("Analyzer", "Analyzer")); - setCategoryIcon(Utils::Icon(":/images/analyzer_category.png")); + setCategoryIcon(Analyzer::Icons::SETTINGSCATEGORY_ANALYZER); } QWidget *widget() diff --git a/src/plugins/vcsbase/images/category_vcs.png b/src/plugins/vcsbase/images/category_vcs.png Binary files differdeleted file mode 100644 index 2b04fa747d0..00000000000 --- a/src/plugins/vcsbase/images/category_vcs.png +++ /dev/null diff --git a/src/plugins/vcsbase/images/settingscategory_vcs.png b/src/plugins/vcsbase/images/settingscategory_vcs.png Binary files differnew file mode 100644 index 00000000000..1523948dbad --- /dev/null +++ b/src/plugins/vcsbase/images/settingscategory_vcs.png diff --git a/src/plugins/vcsbase/images/settingscategory_vcs@2x.png b/src/plugins/vcsbase/images/settingscategory_vcs@2x.png Binary files differnew file mode 100644 index 00000000000..b597ac883aa --- /dev/null +++ b/src/plugins/vcsbase/images/settingscategory_vcs@2x.png diff --git a/src/plugins/vcsbase/vcsbase.qrc b/src/plugins/vcsbase/vcsbase.qrc index 101764d9f21..450f8d6e6cc 100644 --- a/src/plugins/vcsbase/vcsbase.qrc +++ b/src/plugins/vcsbase/vcsbase.qrc @@ -1,6 +1,7 @@ <RCC> <qresource prefix="/vcsbase"> - <file>images/category_vcs.png</file> + <file>images/settingscategory_vcs.png</file> + <file>images/settingscategory_vcs@2x.png</file> <file>images/diff_arrows.png</file> <file>images/diff_arrows@2x.png</file> <file>images/diff_documents.png</file> diff --git a/src/plugins/vcsbase/vcsbaseoptionspage.cpp b/src/plugins/vcsbase/vcsbaseoptionspage.cpp index 6ca261c9ee8..ce0b67ed424 100644 --- a/src/plugins/vcsbase/vcsbaseoptionspage.cpp +++ b/src/plugins/vcsbase/vcsbaseoptionspage.cpp @@ -48,7 +48,8 @@ VcsBaseOptionsPage::VcsBaseOptionsPage(QObject *parent) : Core::IOptionsPage(par { setCategory(Constants::VCS_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("VcsBase", "Version Control")); - setCategoryIcon(Utils::Icon(":/vcsbase/images/category_vcs.png")); + setCategoryIcon(Utils::Icon({{":/vcsbase/images/settingscategory_vcs.png", + Utils::Theme::PanelTextColorDark}}, Utils::Icon::Tint)); } VcsBaseOptionsPage::~VcsBaseOptionsPage() = default; |
