Commit e809594f authored by Alessandro Portale's avatar Alessandro Portale

Core: Make IOptionsPage::categoryIcon a Utils::Icon

This is necessary for themable + HighDPI icons in the options dialog.

Change-Id: I8e3ff87a24591af40bb76b39cd970443d7678fae
Reviewed-by: default avatarhjk <hjk@qt.io>
parent c71c00cf
...@@ -45,7 +45,7 @@ AndroidSettingsPage::AndroidSettingsPage(QObject *parent) ...@@ -45,7 +45,7 @@ AndroidSettingsPage::AndroidSettingsPage(QObject *parent)
setCategory(Constants::ANDROID_SETTINGS_CATEGORY); setCategory(Constants::ANDROID_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("Android", setDisplayCategory(QCoreApplication::translate("Android",
Constants::ANDROID_SETTINGS_TR_CATEGORY)); Constants::ANDROID_SETTINGS_TR_CATEGORY));
setCategoryIcon(QLatin1String(Constants::ANDROID_SETTINGS_CATEGORY_ICON)); setCategoryIcon(Utils::Icon(Constants::ANDROID_SETTINGS_CATEGORY_ICON));
} }
QWidget *AndroidSettingsPage::widget() QWidget *AndroidSettingsPage::widget()
......
...@@ -179,7 +179,7 @@ TestSettingsPage::TestSettingsPage(const QSharedPointer<TestSettings> &settings) ...@@ -179,7 +179,7 @@ TestSettingsPage::TestSettingsPage(const QSharedPointer<TestSettings> &settings)
setDisplayName(tr("General")); setDisplayName(tr("General"));
setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY); setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY);
setDisplayCategory(tr("Test Settings")); setDisplayCategory(tr("Test Settings"));
setCategoryIcon(QLatin1String(":/images/autotest.png")); setCategoryIcon(Utils::Icon(":/images/autotest.png"));
} }
TestSettingsPage::~TestSettingsPage() TestSettingsPage::~TestSettingsPage()
......
...@@ -414,7 +414,7 @@ GdbServerProvidersSettingsPage::GdbServerProvidersSettingsPage(QObject *parent) ...@@ -414,7 +414,7 @@ GdbServerProvidersSettingsPage::GdbServerProvidersSettingsPage(QObject *parent)
setCategory(Constants::BAREMETAL_SETTINGS_CATEGORY); setCategory(Constants::BAREMETAL_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate( setDisplayCategory(QCoreApplication::translate(
"BareMetal", Constants::BAREMETAL_SETTINGS_TR_CATEGORY)); "BareMetal", Constants::BAREMETAL_SETTINGS_TR_CATEGORY));
setCategoryIcon(QLatin1String(Constants::BAREMETAL_SETTINGS_CATEGORY_ICON)); setCategoryIcon(Utils::Icon(Constants::BAREMETAL_SETTINGS_CATEGORY_ICON));
setId(Constants::GDB_PROVIDERS_SETTINGS_ID); setId(Constants::GDB_PROVIDERS_SETTINGS_ID);
setDisplayName(tr("GDB Server Providers")); setDisplayName(tr("GDB Server Providers"));
} }
......
...@@ -92,7 +92,7 @@ ArtisticStyleOptionsPage::ArtisticStyleOptionsPage(ArtisticStyleSettings *settin ...@@ -92,7 +92,7 @@ ArtisticStyleOptionsPage::ArtisticStyleOptionsPage(ArtisticStyleSettings *settin
setDisplayName(tr("Artistic Style")); setDisplayName(tr("Artistic Style"));
setCategory(Constants::OPTION_CATEGORY); setCategory(Constants::OPTION_CATEGORY);
setDisplayCategory(QCoreApplication::translate("Beautifier", Constants::OPTION_TR_CATEGORY)); setDisplayCategory(QCoreApplication::translate("Beautifier", Constants::OPTION_TR_CATEGORY));
setCategoryIcon(Constants::OPTION_CATEGORY_ICON); setCategoryIcon(Utils::Icon(Constants::OPTION_CATEGORY_ICON));
} }
QWidget *ArtisticStyleOptionsPage::widget() QWidget *ArtisticStyleOptionsPage::widget()
......
...@@ -98,7 +98,7 @@ ClangFormatOptionsPage::ClangFormatOptionsPage(ClangFormatSettings *settings, QO ...@@ -98,7 +98,7 @@ ClangFormatOptionsPage::ClangFormatOptionsPage(ClangFormatSettings *settings, QO
setDisplayName(tr("Clang Format")); setDisplayName(tr("Clang Format"));
setCategory(Constants::OPTION_CATEGORY); setCategory(Constants::OPTION_CATEGORY);
setDisplayCategory(QCoreApplication::translate("Beautifier", Constants::OPTION_TR_CATEGORY)); setDisplayCategory(QCoreApplication::translate("Beautifier", Constants::OPTION_TR_CATEGORY));
setCategoryIcon(Constants::OPTION_CATEGORY_ICON); setCategoryIcon(Utils::Icon(Constants::OPTION_CATEGORY_ICON));
} }
QWidget *ClangFormatOptionsPage::widget() QWidget *ClangFormatOptionsPage::widget()
......
...@@ -83,7 +83,7 @@ GeneralOptionsPage::GeneralOptionsPage(GeneralSettings *settings, const QStringL ...@@ -83,7 +83,7 @@ GeneralOptionsPage::GeneralOptionsPage(GeneralSettings *settings, const QStringL
setDisplayName(tr("General")); setDisplayName(tr("General"));
setCategory(Constants::OPTION_CATEGORY); setCategory(Constants::OPTION_CATEGORY);
setDisplayCategory(QCoreApplication::translate("Beautifier", Constants::OPTION_TR_CATEGORY)); setDisplayCategory(QCoreApplication::translate("Beautifier", Constants::OPTION_TR_CATEGORY));
setCategoryIcon(Constants::OPTION_CATEGORY_ICON); setCategoryIcon(Utils::Icon(Constants::OPTION_CATEGORY_ICON));
} }
QWidget *GeneralOptionsPage::widget() QWidget *GeneralOptionsPage::widget()
......
...@@ -96,7 +96,7 @@ UncrustifyOptionsPage::UncrustifyOptionsPage(UncrustifySettings *settings, QObje ...@@ -96,7 +96,7 @@ UncrustifyOptionsPage::UncrustifyOptionsPage(UncrustifySettings *settings, QObje
setDisplayName(tr("Uncrustify")); setDisplayName(tr("Uncrustify"));
setCategory(Constants::OPTION_CATEGORY); setCategory(Constants::OPTION_CATEGORY);
setDisplayCategory(QCoreApplication::translate("Beautifier", Constants::OPTION_TR_CATEGORY)); setDisplayCategory(QCoreApplication::translate("Beautifier", Constants::OPTION_TR_CATEGORY));
setCategoryIcon(Constants::OPTION_CATEGORY_ICON); setCategoryIcon(Utils::Icon(Constants::OPTION_CATEGORY_ICON));
} }
QWidget *UncrustifyOptionsPage::widget() QWidget *UncrustifyOptionsPage::widget()
......
...@@ -71,7 +71,7 @@ public: ...@@ -71,7 +71,7 @@ public:
"Clang Static Analyzer")); "Clang Static Analyzer"));
setCategory("T.Analyzer"); setCategory("T.Analyzer");
setDisplayCategory(QCoreApplication::translate("Analyzer", "Analyzer")); setDisplayCategory(QCoreApplication::translate("Analyzer", "Analyzer"));
setCategoryIcon(QLatin1String(":/images/analyzer_category.png")); setCategoryIcon(Utils::Icon(":/images/analyzer_category.png"));
} }
QWidget *widget() QWidget *widget()
......
...@@ -552,7 +552,7 @@ CMakeSettingsPage::CMakeSettingsPage() ...@@ -552,7 +552,7 @@ CMakeSettingsPage::CMakeSettingsPage()
setCategory(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY); setCategory(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("ProjectExplorer", setDisplayCategory(QCoreApplication::translate("ProjectExplorer",
ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY)); ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY));
setCategoryIcon(QLatin1String(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON)); setCategoryIcon(Utils::Icon(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON));
} }
QWidget *CMakeSettingsPage::widget() QWidget *CMakeSettingsPage::widget()
......
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
QIcon Core::IOptionsPage::categoryIcon() const QIcon Core::IOptionsPage::categoryIcon() const
{ {
return QIcon(m_categoryIcon); return m_categoryIcon.icon();
} }
/*! /*!
......
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
#include <coreplugin/id.h> #include <coreplugin/id.h>
#include <utils/icon.h>
#include <QObject> #include <QObject>
#include <QStringList> #include <QStringList>
...@@ -61,13 +63,13 @@ protected: ...@@ -61,13 +63,13 @@ protected:
void setDisplayName(const QString &displayName) { m_displayName = displayName; } void setDisplayName(const QString &displayName) { m_displayName = displayName; }
void setCategory(Id category) { m_category = category; } void setCategory(Id category) { m_category = category; }
void setDisplayCategory(const QString &displayCategory) { m_displayCategory = displayCategory; } void setDisplayCategory(const QString &displayCategory) { m_displayCategory = displayCategory; }
void setCategoryIcon(const QString &categoryIcon) { m_categoryIcon = categoryIcon; } void setCategoryIcon(const Utils::Icon &categoryIcon) { m_categoryIcon = categoryIcon; }
Id m_id; Id m_id;
Id m_category; Id m_category;
QString m_displayName; QString m_displayName;
QString m_displayCategory; QString m_displayCategory;
QString m_categoryIcon; Utils::Icon m_categoryIcon;
mutable bool m_keywordsInitialized; mutable bool m_keywordsInitialized;
mutable QStringList m_keywords; mutable QStringList m_keywords;
......
...@@ -290,7 +290,7 @@ ShortcutSettings::ShortcutSettings(QObject *parent) ...@@ -290,7 +290,7 @@ ShortcutSettings::ShortcutSettings(QObject *parent)
setDisplayName(tr("Keyboard")); setDisplayName(tr("Keyboard"));
setCategory(Constants::SETTINGS_CATEGORY_CORE); setCategory(Constants::SETTINGS_CATEGORY_CORE);
setDisplayCategory(QCoreApplication::translate("Core", Constants::SETTINGS_TR_CATEGORY_CORE)); setDisplayCategory(QCoreApplication::translate("Core", Constants::SETTINGS_TR_CATEGORY_CORE));
setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CORE_ICON)); setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_CORE_ICON));
} }
QWidget *ShortcutSettings::widget() QWidget *ShortcutSettings::widget()
......
...@@ -51,7 +51,7 @@ GeneralSettings::GeneralSettings() ...@@ -51,7 +51,7 @@ GeneralSettings::GeneralSettings()
setDisplayName(tr("Interface")); setDisplayName(tr("Interface"));
setCategory(Constants::SETTINGS_CATEGORY_CORE); setCategory(Constants::SETTINGS_CATEGORY_CORE);
setDisplayCategory(QCoreApplication::translate("Core", Constants::SETTINGS_TR_CATEGORY_CORE)); setDisplayCategory(QCoreApplication::translate("Core", Constants::SETTINGS_TR_CATEGORY_CORE));
setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CORE_ICON)); setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_CORE_ICON));
} }
static bool hasQmFilesForLocale(const QString &locale, const QString &creatorTrPath) static bool hasQmFilesForLocale(const QString &locale, const QString &creatorTrPath)
......
...@@ -167,7 +167,7 @@ LocatorSettingsPage::LocatorSettingsPage(Locator *plugin) ...@@ -167,7 +167,7 @@ LocatorSettingsPage::LocatorSettingsPage(Locator *plugin)
setDisplayName(QCoreApplication::translate("Locator", Constants::FILTER_OPTIONS_PAGE)); setDisplayName(QCoreApplication::translate("Locator", Constants::FILTER_OPTIONS_PAGE));
setCategory(Constants::SETTINGS_CATEGORY_CORE); setCategory(Constants::SETTINGS_CATEGORY_CORE);
setDisplayCategory(QCoreApplication::translate("Core", Constants::SETTINGS_TR_CATEGORY_CORE)); setDisplayCategory(QCoreApplication::translate("Core", Constants::SETTINGS_TR_CATEGORY_CORE));
setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CORE_ICON)); setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_CORE_ICON));
} }
QWidget *LocatorSettingsPage::widget() QWidget *LocatorSettingsPage::widget()
......
...@@ -565,7 +565,7 @@ MimeTypeSettings::MimeTypeSettings(QObject *parent) ...@@ -565,7 +565,7 @@ MimeTypeSettings::MimeTypeSettings(QObject *parent)
setCategory(Constants::SETTINGS_CATEGORY_CORE); setCategory(Constants::SETTINGS_CATEGORY_CORE);
setDisplayCategory(QCoreApplication::translate("Core", setDisplayCategory(QCoreApplication::translate("Core",
Constants::SETTINGS_TR_CATEGORY_CORE)); Constants::SETTINGS_TR_CATEGORY_CORE));
setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CORE_ICON)); setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_CORE_ICON));
} }
MimeTypeSettings::~MimeTypeSettings() MimeTypeSettings::~MimeTypeSettings()
......
...@@ -55,7 +55,7 @@ SystemSettings::SystemSettings() ...@@ -55,7 +55,7 @@ SystemSettings::SystemSettings()
setDisplayName(tr("System")); setDisplayName(tr("System"));
setCategory(Constants::SETTINGS_CATEGORY_CORE); setCategory(Constants::SETTINGS_CATEGORY_CORE);
setDisplayCategory(QCoreApplication::translate("Core", Constants::SETTINGS_TR_CATEGORY_CORE)); setDisplayCategory(QCoreApplication::translate("Core", Constants::SETTINGS_TR_CATEGORY_CORE));
setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CORE_ICON)); setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_CORE_ICON));
connect(VcsManager::instance(), &VcsManager::configurationChanged, connect(VcsManager::instance(), &VcsManager::configurationChanged,
this, &SystemSettings::updatePath); this, &SystemSettings::updatePath);
......
...@@ -48,7 +48,7 @@ ToolSettings::ToolSettings(QObject *parent) : ...@@ -48,7 +48,7 @@ ToolSettings::ToolSettings(QObject *parent) :
setDisplayName(tr("External Tools")); setDisplayName(tr("External Tools"));
setCategory(Constants::SETTINGS_CATEGORY_CORE); setCategory(Constants::SETTINGS_CATEGORY_CORE);
setDisplayCategory(QCoreApplication::translate("Core", Constants::SETTINGS_TR_CATEGORY_CORE)); setDisplayCategory(QCoreApplication::translate("Core", Constants::SETTINGS_TR_CATEGORY_CORE));
setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CORE_ICON)); setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_CORE_ICON));
} }
......
...@@ -70,7 +70,7 @@ SettingsPage::SettingsPage(const QSharedPointer<Settings> &settings) : ...@@ -70,7 +70,7 @@ SettingsPage::SettingsPage(const QSharedPointer<Settings> &settings) :
setCategory(Constants::CPASTER_SETTINGS_CATEGORY); setCategory(Constants::CPASTER_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("CodePaster", setDisplayCategory(QCoreApplication::translate("CodePaster",
Constants::CPASTER_SETTINGS_TR_CATEGORY)); Constants::CPASTER_SETTINGS_TR_CATEGORY));
setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CPASTER_ICON)); setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_CPASTER_ICON));
} }
SettingsPage::~SettingsPage() SettingsPage::~SettingsPage()
......
...@@ -167,7 +167,7 @@ CppCodeModelSettingsPage::CppCodeModelSettingsPage(QSharedPointer<CppCodeModelSe ...@@ -167,7 +167,7 @@ CppCodeModelSettingsPage::CppCodeModelSettingsPage(QSharedPointer<CppCodeModelSe
setDisplayName(QCoreApplication::translate("CppTools",Constants::CPP_CODE_MODEL_SETTINGS_NAME)); setDisplayName(QCoreApplication::translate("CppTools",Constants::CPP_CODE_MODEL_SETTINGS_NAME));
setCategory(Constants::CPP_SETTINGS_CATEGORY); setCategory(Constants::CPP_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("CppTools",Constants::CPP_SETTINGS_TR_CATEGORY)); setDisplayCategory(QCoreApplication::translate("CppTools",Constants::CPP_SETTINGS_TR_CATEGORY));
setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CPP_ICON)); setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_CPP_ICON));
} }
QWidget *CppCodeModelSettingsPage::widget() QWidget *CppCodeModelSettingsPage::widget()
......
...@@ -525,7 +525,7 @@ CppCodeStyleSettingsPage::CppCodeStyleSettingsPage(QWidget *parent) : ...@@ -525,7 +525,7 @@ CppCodeStyleSettingsPage::CppCodeStyleSettingsPage(QWidget *parent) :
setDisplayName(QCoreApplication::translate("CppTools", Constants::CPP_CODE_STYLE_SETTINGS_NAME)); setDisplayName(QCoreApplication::translate("CppTools", Constants::CPP_CODE_STYLE_SETTINGS_NAME));
setCategory(Constants::CPP_SETTINGS_CATEGORY); setCategory(Constants::CPP_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("CppTools", Constants::CPP_SETTINGS_TR_CATEGORY)); setDisplayCategory(QCoreApplication::translate("CppTools", Constants::CPP_SETTINGS_TR_CATEGORY));
setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CPP_ICON)); setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_CPP_ICON));
} }
QWidget *CppCodeStyleSettingsPage::widget() QWidget *CppCodeStyleSettingsPage::widget()
......
...@@ -363,7 +363,7 @@ CppFileSettingsPage::CppFileSettingsPage(QSharedPointer<CppFileSettings> &settin ...@@ -363,7 +363,7 @@ CppFileSettingsPage::CppFileSettingsPage(QSharedPointer<CppFileSettings> &settin
setDisplayName(QCoreApplication::translate("CppTools", Constants::CPP_FILE_SETTINGS_NAME)); setDisplayName(QCoreApplication::translate("CppTools", Constants::CPP_FILE_SETTINGS_NAME));
setCategory(Constants::CPP_SETTINGS_CATEGORY); setCategory(Constants::CPP_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("CppTools", Constants::CPP_SETTINGS_TR_CATEGORY)); setDisplayCategory(QCoreApplication::translate("CppTools", Constants::CPP_SETTINGS_TR_CATEGORY));
setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CPP_ICON)); setCategoryIcon(Utils::Icon(Constants::SETTINGS_CATEGORY_CPP_ICON));
} }
QWidget *CppFileSettingsPage::widget() QWidget *CppFileSettingsPage::widget()
......
...@@ -202,7 +202,7 @@ CdbOptionsPage::CdbOptionsPage() ...@@ -202,7 +202,7 @@ CdbOptionsPage::CdbOptionsPage()
setCategory(Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY); setCategory(Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("Debugger", setDisplayCategory(QCoreApplication::translate("Debugger",
Constants::DEBUGGER_SETTINGS_TR_CATEGORY)); Constants::DEBUGGER_SETTINGS_TR_CATEGORY));
setCategoryIcon(QLatin1String(Constants::DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)); setCategoryIcon(Utils::Icon(Constants::DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON));
} }
CdbOptionsPage::~CdbOptionsPage() CdbOptionsPage::~CdbOptionsPage()
...@@ -281,7 +281,7 @@ CdbPathsPage::CdbPathsPage() ...@@ -281,7 +281,7 @@ CdbPathsPage::CdbPathsPage()
setCategory(Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY); setCategory(Debugger::Constants::DEBUGGER_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("Debugger", setDisplayCategory(QCoreApplication::translate("Debugger",
Constants::DEBUGGER_SETTINGS_TR_CATEGORY)); Constants::DEBUGGER_SETTINGS_TR_CATEGORY));
setCategoryIcon(QLatin1String(Constants::DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)); setCategoryIcon(Utils::Icon(Constants::DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON));
} }
CdbPathsPage::~CdbPathsPage() CdbPathsPage::~CdbPathsPage()
......
...@@ -260,7 +260,7 @@ CommonOptionsPage::CommonOptionsPage(const QSharedPointer<GlobalDebuggerOptions> ...@@ -260,7 +260,7 @@ CommonOptionsPage::CommonOptionsPage(const QSharedPointer<GlobalDebuggerOptions>
setDisplayName(QCoreApplication::translate("Debugger", "General")); setDisplayName(QCoreApplication::translate("Debugger", "General"));
setCategory(DEBUGGER_SETTINGS_CATEGORY); setCategory(DEBUGGER_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("Debugger", DEBUGGER_SETTINGS_TR_CATEGORY)); setDisplayCategory(QCoreApplication::translate("Debugger", DEBUGGER_SETTINGS_TR_CATEGORY));
setCategoryIcon(QLatin1String(DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)); setCategoryIcon(Utils::Icon(DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON));
} }
CommonOptionsPage::~CommonOptionsPage() CommonOptionsPage::~CommonOptionsPage()
...@@ -331,7 +331,7 @@ LocalsAndExpressionsOptionsPage::LocalsAndExpressionsOptionsPage() ...@@ -331,7 +331,7 @@ LocalsAndExpressionsOptionsPage::LocalsAndExpressionsOptionsPage()
setDisplayName(QCoreApplication::translate("Debugger", "Locals && Expressions")); setDisplayName(QCoreApplication::translate("Debugger", "Locals && Expressions"));
setCategory(DEBUGGER_SETTINGS_CATEGORY); setCategory(DEBUGGER_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("Debugger", DEBUGGER_SETTINGS_TR_CATEGORY)); setDisplayCategory(QCoreApplication::translate("Debugger", DEBUGGER_SETTINGS_TR_CATEGORY));
setCategoryIcon(QLatin1String(DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)); setCategoryIcon(Utils::Icon(DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON));
} }
void LocalsAndExpressionsOptionsPage::apply() void LocalsAndExpressionsOptionsPage::apply()
......
...@@ -500,7 +500,7 @@ DebuggerOptionsPage::DebuggerOptionsPage() ...@@ -500,7 +500,7 @@ DebuggerOptionsPage::DebuggerOptionsPage()
setCategory(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY); setCategory(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("ProjectExplorer", setDisplayCategory(QCoreApplication::translate("ProjectExplorer",
ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY)); ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY));
setCategoryIcon(QLatin1String(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON)); setCategoryIcon(Utils::Icon(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON));
} }
QWidget *DebuggerOptionsPage::widget() QWidget *DebuggerOptionsPage::widget()
......
...@@ -302,7 +302,7 @@ GdbOptionsPage::GdbOptionsPage() ...@@ -302,7 +302,7 @@ GdbOptionsPage::GdbOptionsPage()
setDisplayName(tr("GDB")); setDisplayName(tr("GDB"));
setCategory(Constants::DEBUGGER_SETTINGS_CATEGORY); setCategory(Constants::DEBUGGER_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("Debugger", Constants::DEBUGGER_SETTINGS_TR_CATEGORY)); setDisplayCategory(QCoreApplication::translate("Debugger", Constants::DEBUGGER_SETTINGS_TR_CATEGORY));
setCategoryIcon(QLatin1String(Constants::DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)); setCategoryIcon(Utils::Icon(Constants::DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON));
} }
QWidget *GdbOptionsPage::widget() QWidget *GdbOptionsPage::widget()
...@@ -453,7 +453,7 @@ GdbOptionsPage2::GdbOptionsPage2() ...@@ -453,7 +453,7 @@ GdbOptionsPage2::GdbOptionsPage2()
setDisplayName(tr("GDB Extended")); setDisplayName(tr("GDB Extended"));
setCategory(Constants::DEBUGGER_SETTINGS_CATEGORY); setCategory(Constants::DEBUGGER_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("Debugger", Constants::DEBUGGER_SETTINGS_TR_CATEGORY)); setDisplayCategory(QCoreApplication::translate("Debugger", Constants::DEBUGGER_SETTINGS_TR_CATEGORY));
setCategoryIcon(QLatin1String(Constants::DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON)); setCategoryIcon(Utils::Icon(Constants::DEBUGGER_COMMON_SETTINGS_CATEGORY_ICON));
} }
QWidget *GdbOptionsPage2::widget() QWidget *GdbOptionsPage2::widget()
......
...@@ -41,7 +41,7 @@ SettingsPage::SettingsPage(QDesignerOptionsPageInterface *designerPage) : ...@@ -41,7 +41,7 @@ SettingsPage::SettingsPage(QDesignerOptionsPageInterface *designerPage) :
setCategory(Designer::Constants::SETTINGS_CATEGORY); setCategory(Designer::Constants::SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("Designer", setDisplayCategory(QCoreApplication::translate("Designer",
Designer::Constants::SETTINGS_TR_CATEGORY)); Designer::Constants::SETTINGS_TR_CATEGORY));
setCategoryIcon(QLatin1String(Designer::Constants::SETTINGS_CATEGORY_ICON)); setCategoryIcon(Utils::Icon(Designer::Constants::SETTINGS_CATEGORY_ICON));
} }
QWidget *SettingsPage::widget() QWidget *SettingsPage::widget()
......
...@@ -362,7 +362,7 @@ public: ...@@ -362,7 +362,7 @@ public:
setDisplayName(Tr::tr("General")); setDisplayName(Tr::tr("General"));
setCategory(SETTINGS_CATEGORY); setCategory(SETTINGS_CATEGORY);
setDisplayCategory(Tr::tr("FakeVim")); setDisplayCategory(Tr::tr("FakeVim"));
setCategoryIcon(SETTINGS_CATEGORY_FAKEVIM_ICON); setCategoryIcon(Utils::Icon(SETTINGS_CATEGORY_FAKEVIM_ICON));
} }
QWidget *widget(); QWidget *widget();
...@@ -596,7 +596,7 @@ public: ...@@ -596,7 +596,7 @@ public:
setDisplayName(Tr::tr("Ex Command Mapping")); setDisplayName(Tr::tr("Ex Command Mapping"));
setCategory(SETTINGS_CATEGORY); setCategory(SETTINGS_CATEGORY);
setDisplayCategory(Tr::tr("FakeVim")); setDisplayCategory(Tr::tr("FakeVim"));
setCategoryIcon(SETTINGS_CATEGORY_FAKEVIM_ICON); setCategoryIcon(Utils::Icon(SETTINGS_CATEGORY_FAKEVIM_ICON));
} }
QWidget *widget() override; QWidget *widget() override;
...@@ -810,7 +810,7 @@ public: ...@@ -810,7 +810,7 @@ public:
setDisplayName(Tr::tr("User Command Mapping")); setDisplayName(Tr::tr("User Command Mapping"));
setCategory(SETTINGS_CATEGORY); setCategory(SETTINGS_CATEGORY);
setDisplayCategory(Tr::tr("FakeVim")); setDisplayCategory(Tr::tr("FakeVim"));
setCategoryIcon(SETTINGS_CATEGORY_FAKEVIM_ICON); setCategoryIcon(Utils::Icon(SETTINGS_CATEGORY_FAKEVIM_ICON));
} }
void apply(); void apply();
......
...@@ -135,7 +135,7 @@ DocSettingsPage::DocSettingsPage() ...@@ -135,7 +135,7 @@ DocSettingsPage::DocSettingsPage()
setDisplayName(tr("Documentation")); setDisplayName(tr("Documentation"));
setCategory(Help::Constants::HELP_CATEGORY); setCategory(Help::Constants::HELP_CATEGORY);
setDisplayCategory(QCoreApplication::translate("Help", Help::Constants::HELP_TR_CATEGORY)); setDisplayCategory(QCoreApplication::translate("Help", Help::Constants::HELP_TR_CATEGORY));
setCategoryIcon(Help::Constants::HELP_CATEGORY_ICON); setCategoryIcon(Utils::Icon(Help::Constants::HELP_CATEGORY_ICON));
} }
QWidget *DocSettingsPage::widget() QWidget *DocSettingsPage::widget()
......
...@@ -44,7 +44,7 @@ FilterSettingsPage::FilterSettingsPage() ...@@ -44,7 +44,7 @@ FilterSettingsPage::FilterSettingsPage()
setDisplayName(tr("Filters")); setDisplayName(tr("Filters"));
setCategory(Help::Constants::HELP_CATEGORY); setCategory(Help::Constants::HELP_CATEGORY);
setDisplayCategory(QCoreApplication::translate("Help", Help::Constants::HELP_TR_CATEGORY)); setDisplayCategory(QCoreApplication::translate("Help", Help::Constants::HELP_TR_CATEGORY));
setCategoryIcon(Help::Constants::HELP_CATEGORY_ICON); setCategoryIcon(Utils::Icon(Help::Constants::HELP_CATEGORY_ICON));
} }
QWidget *FilterSettingsPage::widget() QWidget *FilterSettingsPage::widget()
......
...@@ -56,7 +56,7 @@ GeneralSettingsPage::GeneralSettingsPage() ...@@ -56,7 +56,7 @@ GeneralSettingsPage::GeneralSettingsPage()
setDisplayName(tr("General")); setDisplayName(tr("General"));
setCategory(Help::Constants::HELP_CATEGORY); setCategory(Help::Constants::HELP_CATEGORY);
setDisplayCategory(QCoreApplication::translate("Help", Help::Constants::HELP_TR_CATEGORY)); setDisplayCategory(QCoreApplication::translate("Help", Help::Constants::HELP_TR_CATEGORY));
setCategoryIcon(Help::Constants::HELP_CATEGORY_ICON); setCategoryIcon(Utils::Icon(Help::Constants::HELP_CATEGORY_ICON));
} }
QWidget *GeneralSettingsPage::widget() QWidget *GeneralSettingsPage::widget()
......
...@@ -41,7 +41,7 @@ IosSettingsPage::IosSettingsPage(QObject *parent) ...@@ -41,7 +41,7 @@ IosSettingsPage::IosSettingsPage(QObject *parent)
setCategory(Constants::IOS_SETTINGS_CATEGORY); setCategory(Constants::IOS_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("iOS", setDisplayCategory(QCoreApplication::translate("iOS",
Constants::IOS_SETTINGS_TR_CATEGORY)); Constants::IOS_SETTINGS_TR_CATEGORY));
setCategoryIcon(QLatin1String(Constants::IOS_SETTINGS_CATEGORY_ICON)); setCategoryIcon(Utils::Icon(QLatin1String(Constants::IOS_SETTINGS_CATEGORY_ICON)));
} }
QWidget *IosSettingsPage::widget() QWidget *IosSettingsPage::widget()
......
...@@ -51,7 +51,7 @@ NimCodeStyleSettingsPage::NimCodeStyleSettingsPage(QWidget *parent) ...@@ -51,7 +51,7 @@ NimCodeStyleSettingsPage::NimCodeStyleSettingsPage(QWidget *parent)
setDisplayName(tr(Nim::Constants::C_NIMCODESTYLESETTINGSPAGE_DISPLAY)); setDisplayName(tr(Nim::Constants::C_NIMCODESTYLESETTINGSPAGE_DISPLAY));
setCategory(Nim::Constants::C_NIMCODESTYLESETTINGSPAGE_CATEGORY); setCategory(Nim::Constants::C_NIMCODESTYLESETTINGSPAGE_CATEGORY);
setDisplayCategory(tr(Nim::Constants::C_NIMCODESTYLESETTINGSPAGE_CATEGORY_DISPLAY)); setDisplayCategory(tr(Nim::Constants::C_NIMCODESTYLESETTINGSPAGE_CATEGORY_DISPLAY));
setCategoryIcon(QLatin1String(Nim::Constants::C_NIM_ICON_PATH)); setCategoryIcon(Utils::Icon(Nim::Constants::C_NIM_ICON_PATH));
} }
NimCodeStyleSettingsPage::~NimCodeStyleSettingsPage() NimCodeStyleSettingsPage::~NimCodeStyleSettingsPage()
......
...@@ -42,7 +42,7 @@ DeviceSettingsPage::DeviceSettingsPage(QObject *parent) ...@@ -42,7 +42,7 @@ DeviceSettingsPage::DeviceSettingsPage(QObject *parent)
setDisplayName(tr("Devices")); setDisplayName(tr("Devices"));
setCategory(Constants::DEVICE_SETTINGS_CATEGORY); setCategory(Constants::DEVICE_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("ProjectExplorer", "Devices")); setDisplayCategory(QCoreApplication::translate("ProjectExplorer", "Devices"));
setCategoryIcon(QLatin1String(":/projectexplorer/images/MaemoDevice.png")); setCategoryIcon(Utils::Icon(":/projectexplorer/images/MaemoDevice.png"));
} }
QWidget *DeviceSettingsPage::widget() QWidget *DeviceSettingsPage::widget()
......
...@@ -241,7 +241,7 @@ KitOptionsPage::KitOptionsPage() ...@@ -241,7 +241,7 @@ KitOptionsPage::KitOptionsPage()
setCategory(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY); setCategory(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY);
setDisplayCategory(QCoreApplication::translate("ProjectExplorer", setDisplayCategory(QCoreApplication::translate("ProjectExplorer",
Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY)); Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY));
setCategoryIcon(QLatin1String(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON)); setCategoryIcon(Utils::Icon(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON));
} }
QWidget *KitOptionsPage::widget() QWidget *KitOptionsPage::widget()
......
...@@ -188,7 +188,7 @@ ProjectExplorerSettingsPage::ProjectExplorerSettingsPage() ...@@ -188,7 +188,7 @@ ProjectExplorerSettingsPage::ProjectExplorerSettingsPage()
setCategory(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY); setCategory(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY);