diff --git a/share/qtcreator/templates/wizards/qml-runtime/lib.png b/share/qtcreator/templates/wizards/qml-runtime/lib.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4e818d986d09d2168199f9326861cb7afa8d3d6
Binary files /dev/null and b/share/qtcreator/templates/wizards/qml-runtime/lib.png differ
diff --git a/share/qtcreator/templates/wizards/qml-runtime/wizard.xml b/share/qtcreator/templates/wizards/qml-runtime/wizard.xml
index 4f7576f445fcea37e2e69fc16228caaa8d6b1da8..5800b8ef5d69f8b6ea32b04d84f350de07bf75e8 100644
--- a/share/qtcreator/templates/wizards/qml-runtime/wizard.xml
+++ b/share/qtcreator/templates/wizards/qml-runtime/wizard.xml
@@ -37,6 +37,7 @@ leave room for the Qt 4 target page.
<wizard version="1" kind="project"
class="qt4project" firstpage="10"
id="QmlRuntimePlugin" category="F.Projects">
+ <icon>lib.png</icon>
<description>Creates a C++ plugin to extend the funtionality of the QML runtime.</description>
<displayname>QML Runtime Plug-in</displayname>
<displaycategory>QML Runtime Plug-in</displaycategory>
diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc
index a38f9d148c4cd8c5419932b4ad61c147751de17e..20e9cfb9a851d2b2bd567ad533d7353ea65d3d70 100644
--- a/src/plugins/coreplugin/core.qrc
+++ b/src/plugins/coreplugin/core.qrc
@@ -59,5 +59,11 @@
<file>images/darkclose.png</file>
<file>images/arrowdown.png</file>
<file>images/arrowup.png</file>
+ <file>images/category_fakevim.png</file>
+ <file>images/category_locator.png</file>
+ <file>images/category_cpaster.png</file>
+ <file>images/category_cpp.png</file>
+ <file>images/category_vcs.png</file>
+ <file>images/category_qml.png</file>
</qresource>
</RCC>
diff --git a/src/plugins/coreplugin/dialogs/newdialog.cpp b/src/plugins/coreplugin/dialogs/newdialog.cpp
index 823f306b3efc88f0e83c35326386f44d36b52414..75170a4de1398505d3d600b857e9d1f427124fdb 100644
--- a/src/plugins/coreplugin/dialogs/newdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/newdialog.cpp
@@ -50,6 +50,8 @@ Q_DECLARE_METATYPE(Core::IWizard*)
namespace {
+const int ICON_SIZE = 22;
+
class TwoLevelProxyModel : public QAbstractProxyModel
{
// Q_OBJECT
@@ -166,7 +168,7 @@ NewDialog::NewDialog(QWidget *parent) :
m_ui->templateCategoryView->setEditTriggers(QAbstractItemView::NoEditTriggers);
m_ui->templateCategoryView->setItemDelegate(new FancyTopLevelDelegate);
- m_ui->templatesView->setIconSize(QSize(22, 22));
+ m_ui->templatesView->setIconSize(QSize(ICON_SIZE, ICON_SIZE));
connect(m_ui->templateCategoryView, SIGNAL(clicked(const QModelIndex&)),
this, SLOT(currentCategoryChanged(const QModelIndex&)));
@@ -218,7 +220,7 @@ void NewDialog::setWizards(QList<IWizard*> wizards)
parentItem->appendRow(filesClassesKindItem);
if (m_dummyIcon.isNull()) {
- m_dummyIcon = QPixmap(22, 22);
+ m_dummyIcon = QPixmap(ICON_SIZE, ICON_SIZE);
m_dummyIcon.fill(Qt::transparent);
}
@@ -251,10 +253,11 @@ void NewDialog::setWizards(QList<IWizard*> wizards)
QIcon wizardIcon;
// spacing hack. Add proper icons instead
- if (wizard->icon().isNull())
+ if (wizard->icon().isNull()) {
wizardIcon = m_dummyIcon;
- else
+ } else {
wizardIcon = wizard->icon();
+ }
wizardItem->setIcon(wizardIcon);
wizardItem->setData(QVariant::fromValue(wizard), Qt::UserRole);
wizardItem->setFlags(Qt::ItemIsEnabled|Qt::ItemIsSelectable);
diff --git a/src/plugins/coreplugin/images/category_core.png b/src/plugins/coreplugin/images/category_core.png
index 89745b3bc7e002866658a9d2951e2c39ba4d59d4..aaa9464535529bb3cef7e3eede71e3e76fd4dea5 100644
Binary files a/src/plugins/coreplugin/images/category_core.png and b/src/plugins/coreplugin/images/category_core.png differ
diff --git a/src/plugins/coreplugin/images/category_cpaster.png b/src/plugins/coreplugin/images/category_cpaster.png
new file mode 100644
index 0000000000000000000000000000000000000000..eef221c830a861853cde023325ddd5cf2a05a94c
Binary files /dev/null and b/src/plugins/coreplugin/images/category_cpaster.png differ
diff --git a/src/plugins/coreplugin/images/category_cpp.png b/src/plugins/coreplugin/images/category_cpp.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a3408dae374647c6764163ef1ee995f2185c9ea
Binary files /dev/null and b/src/plugins/coreplugin/images/category_cpp.png differ
diff --git a/src/plugins/coreplugin/images/category_debug.png b/src/plugins/coreplugin/images/category_debug.png
index f8c040c744c326d42409e7bf8c59740cff483a1a..5e74d867c0a62eece4fd0986d950572814551e16 100644
Binary files a/src/plugins/coreplugin/images/category_debug.png and b/src/plugins/coreplugin/images/category_debug.png differ
diff --git a/src/plugins/coreplugin/images/category_design.png b/src/plugins/coreplugin/images/category_design.png
index fb9203565eab34a400d169057798db18582ae28e..5a4111a3457d3f748c1e48252ccae1fc646d9c85 100644
Binary files a/src/plugins/coreplugin/images/category_design.png and b/src/plugins/coreplugin/images/category_design.png differ
diff --git a/src/plugins/coreplugin/images/category_fakevim.png b/src/plugins/coreplugin/images/category_fakevim.png
new file mode 100644
index 0000000000000000000000000000000000000000..92b03a34596df106bb2c699b1de9523b861cead7
Binary files /dev/null and b/src/plugins/coreplugin/images/category_fakevim.png differ
diff --git a/src/plugins/coreplugin/images/category_help.png b/src/plugins/coreplugin/images/category_help.png
index 5cc973c53114f7de3530c66511a2d8c79e26c66f..7736b0a32d6976e7c5801fe3947f5d4591fa9b74 100644
Binary files a/src/plugins/coreplugin/images/category_help.png and b/src/plugins/coreplugin/images/category_help.png differ
diff --git a/src/plugins/coreplugin/images/category_locator.png b/src/plugins/coreplugin/images/category_locator.png
new file mode 100644
index 0000000000000000000000000000000000000000..98aa5049a632835a23397124b2e66020194e70c1
Binary files /dev/null and b/src/plugins/coreplugin/images/category_locator.png differ
diff --git a/src/plugins/coreplugin/images/category_project.png b/src/plugins/coreplugin/images/category_project.png
index 18d157e971f0864175274cfcdca540f9a5424e1b..a29396b2f8c5d1a01e23e3ab6bdf6dee317afc52 100644
Binary files a/src/plugins/coreplugin/images/category_project.png and b/src/plugins/coreplugin/images/category_project.png differ
diff --git a/src/plugins/coreplugin/images/category_qml.png b/src/plugins/coreplugin/images/category_qml.png
new file mode 100644
index 0000000000000000000000000000000000000000..131a4b381e9c53c6d08a8348fb7fe8fd74e820cc
Binary files /dev/null and b/src/plugins/coreplugin/images/category_qml.png differ
diff --git a/src/plugins/coreplugin/images/category_qt.png b/src/plugins/coreplugin/images/category_qt.png
index 3731d351d4d81761481bb5142f53bc38b3e0b438..bbd4dc681e16b5d41a7b0aed90830bc77acd6412 100644
Binary files a/src/plugins/coreplugin/images/category_qt.png and b/src/plugins/coreplugin/images/category_qt.png differ
diff --git a/src/plugins/coreplugin/images/category_texteditor.png b/src/plugins/coreplugin/images/category_texteditor.png
index c4798e04148c1bb1c46fe9958cfc28dd423587cf..bdde584db4811ee83f589859bd9ddbcf50be2063 100644
Binary files a/src/plugins/coreplugin/images/category_texteditor.png and b/src/plugins/coreplugin/images/category_texteditor.png differ
diff --git a/src/plugins/coreplugin/images/category_vcs.png b/src/plugins/coreplugin/images/category_vcs.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b04fa747d04b5ee2883147a95531b4e1c0468a6
Binary files /dev/null and b/src/plugins/coreplugin/images/category_vcs.png differ
diff --git a/src/plugins/coreplugin/images/mode_Design.png b/src/plugins/coreplugin/images/mode_Design.png
index 0bda5e5b87c36794b2eeb5f080b8c921c2a2e822..268376e5fe745a6e69f7f9c835f3785ba0a8cf71 100644
Binary files a/src/plugins/coreplugin/images/mode_Design.png and b/src/plugins/coreplugin/images/mode_Design.png differ
diff --git a/src/plugins/coreplugin/images/mode_Reference.png b/src/plugins/coreplugin/images/mode_Reference.png
index 0bc7bf23b378393dfafff68bd44fb570f7fd7898..7247e639eb8154b8e25d36565c200316b0a33a71 100644
Binary files a/src/plugins/coreplugin/images/mode_Reference.png and b/src/plugins/coreplugin/images/mode_Reference.png differ
diff --git a/src/plugins/cpaster/codepastersettings.cpp b/src/plugins/cpaster/codepastersettings.cpp
index 7c6b4d62df088319c0b21dc3bf3f9d0902bc6aa5..759a33b409edc7501fa38d9e69c9061d258c2ef7 100644
--- a/src/plugins/cpaster/codepastersettings.cpp
+++ b/src/plugins/cpaster/codepastersettings.cpp
@@ -79,7 +79,7 @@ QString CodePasterSettingsPage::displayCategory() const
QIcon CodePasterSettingsPage::categoryIcon() const
{
- return QIcon(); // TODO: Add icon for code paster category
+ return QIcon();
}
QWidget *CodePasterSettingsPage::createPage(QWidget *parent)
diff --git a/src/plugins/cpaster/cpasterconstants.h b/src/plugins/cpaster/cpasterconstants.h
index 31f84f263a2cbce36ac798ce120341fda0ec886f..a76905a1f48f471668b20d25f70ab66e6259c7c3 100644
--- a/src/plugins/cpaster/cpasterconstants.h
+++ b/src/plugins/cpaster/cpasterconstants.h
@@ -36,6 +36,7 @@ namespace CodePaster {
namespace Constants {
const char * const CPASTER_SETTINGS_CATEGORY = "X.CPaster";
const char * const CPASTER_SETTINGS_TR_CATEGORY = QT_TRANSLATE_NOOP("CodePaster", "Code Pasting");
+const char * const SETTINGS_CATEGORY_CPASTER_ICON = ":/core/images/category_cpaster.png";
}
}
diff --git a/src/plugins/cpaster/settingspage.cpp b/src/plugins/cpaster/settingspage.cpp
index 2d16327da61ddb33ad12c3d8d1651e2d0b408ab8..3d59b7ac07550706e7fa3f77791bf66f51f3280d 100644
--- a/src/plugins/cpaster/settingspage.cpp
+++ b/src/plugins/cpaster/settingspage.cpp
@@ -106,7 +106,7 @@ QString SettingsPage::displayCategory() const
QIcon SettingsPage::categoryIcon() const
{
- return QIcon(); // TODO: Icon for CodePaster
+ return QIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CPASTER_ICON));
}
QWidget *SettingsPage::createPage(QWidget *parent)
diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp
index 2a10677cb3106182e6eadaeaaefc539712cc8061..b3833e016fe13c6260406d4b585c6a716cad6e52 100644
--- a/src/plugins/cpptools/cppfilesettingspage.cpp
+++ b/src/plugins/cpptools/cppfilesettingspage.cpp
@@ -321,7 +321,7 @@ QString CppFileSettingsPage::displayCategory() const
QIcon CppFileSettingsPage::categoryIcon() const
{
- return QIcon(); // TODO: Icon for C++ or move into category
+ return QIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CPP_ICON));
}
QWidget *CppFileSettingsPage::createPage(QWidget *parent)
diff --git a/src/plugins/cpptools/cpptoolsconstants.h b/src/plugins/cpptools/cpptoolsconstants.h
index 514624c7bea0f7b8de517ecb0f645b719fe8b477..791915f31cd422cad4168d38651fe61db4d7a851 100644
--- a/src/plugins/cpptools/cpptoolsconstants.h
+++ b/src/plugins/cpptools/cpptoolsconstants.h
@@ -54,6 +54,7 @@ const char * const CPP_SETTINGS_ID = "File Naming";
const char * const CPP_SETTINGS_NAME = QT_TRANSLATE_NOOP("CppTools", "File Naming");
const char * const CPP_SETTINGS_CATEGORY = "I.C++";
const char * const CPP_SETTINGS_TR_CATEGORY = QT_TRANSLATE_NOOP("CppTools", "C++");
+const char * const SETTINGS_CATEGORY_CPP_ICON = ":/core/images/category_cpp.png";
} // namespace Constants
} // namespace CppTools
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index c560318b76a5ca4a70fc3af6570aad1adf7198db..a698cb01aa2ccb221c0363f8f2297890ad7cac7c 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -97,14 +97,15 @@ using namespace ProjectExplorer;
namespace FakeVim {
namespace Constants {
-const char * const INSTALL_HANDLER = "TextEditor.FakeVimHandler";
-const char * const MINI_BUFFER = "TextEditor.FakeVimMiniBuffer";
-const char * const INSTALL_KEY = "Alt+V,Alt+V";
-const char * const SETTINGS_CATEGORY = "D.FakeVim";
-const char * const SETTINGS_ID = "A.General";
-const char * const SETTINGS_EX_CMDS_ID = "B.ExCommands";
-const char * const CMD_FILE_NEXT = "FakeVim.SwitchFileNext";
-const char * const CMD_FILE_PREV = "FakeVim.SwitchFilePrev";
+const char * const INSTALL_HANDLER = "TextEditor.FakeVimHandler";
+const char * const MINI_BUFFER = "TextEditor.FakeVimMiniBuffer";
+const char * const INSTALL_KEY = "Alt+V,Alt+V";
+const char * const SETTINGS_CATEGORY = "D.FakeVim";
+const char * const SETTINGS_CATEGORY_FAKEVIM_ICON = ":/core/images/category_fakevim.png";
+const char * const SETTINGS_ID = "A.General";
+const char * const SETTINGS_EX_CMDS_ID = "B.ExCommands";
+const char * const CMD_FILE_NEXT = "FakeVim.SwitchFileNext";
+const char * const CMD_FILE_PREV = "FakeVim.SwitchFilePrev";
} // namespace Constants
} // namespace FakeVim
@@ -131,7 +132,7 @@ public:
QString displayName() const { return tr("General"); }
QString category() const { return QLatin1String(Constants::SETTINGS_CATEGORY); }
QString displayCategory() const { return tr("FakeVim"); }
- QIcon categoryIcon() const { return QIcon(); } // TODO: Add an icon or move into another category
+ QIcon categoryIcon() const { return QIcon(QLatin1String(Constants::SETTINGS_CATEGORY_FAKEVIM_ICON)); }
QWidget *createPage(QWidget *parent);
void apply() { m_group.apply(ICore::instance()->settings()); }
diff --git a/src/plugins/genericprojectmanager/genericprojectwizard.cpp b/src/plugins/genericprojectmanager/genericprojectwizard.cpp
index 25eea3fb5a7c9a7232e94b16b10ca935e108dd35..b7f184e3e41f7f22285435b7930e188e2d5ba904 100644
--- a/src/plugins/genericprojectmanager/genericprojectwizard.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectwizard.cpp
@@ -38,6 +38,11 @@
#include <QtGui/QIcon>
+#include <QtGui/QApplication>
+#include <QtGui/QStyle>
+#include <QtGui/QPainter>
+#include <QtGui/QPixmap>
+
#include <QtCore/QDir>
#include <QtCore/QFileInfo>
#include <QtCore/QtDebug>
@@ -93,7 +98,14 @@ GenericProjectWizard::~GenericProjectWizard()
Core::BaseFileWizardParameters GenericProjectWizard::parameters()
{
Core::BaseFileWizardParameters parameters(ProjectWizard);
- parameters.setIcon(QIcon(QLatin1String(":/wizards/images/console.png")));
+ // TODO do something about the ugliness of standard icons in sizes different than 16, 32, 64, 128
+ {
+ QPixmap icon(22, 22);
+ icon.fill(Qt::transparent);
+ QPainter p(&icon);
+ p.drawPixmap(3, 3, 16, 16, qApp->style()->standardIcon(QStyle::SP_DirIcon).pixmap(16));
+ parameters.setIcon(icon);
+ }
parameters.setDisplayName(tr("Import Existing Project"));
parameters.setId(QLatin1String("Z.Makefile"));
parameters.setDescription(tr("Imports existing projects that do not use qmake or CMake. "
diff --git a/src/plugins/locator/locatorconstants.h b/src/plugins/locator/locatorconstants.h
index 74d40a146c5d1181df87f5fdf0dca988cf20bd08..ffc5d1e27f4eddb41bc18f0626ee8eef05399cc2 100644
--- a/src/plugins/locator/locatorconstants.h
+++ b/src/plugins/locator/locatorconstants.h
@@ -38,6 +38,7 @@ namespace Constants {
const char * const FILTER_OPTIONS_PAGE = QT_TRANSLATE_NOOP("Locator", "Filters");
const char * const LOCATOR_CATEGORY = "G.Locator";
const char * const LOCATOR_TR_CATEGORY = QT_TRANSLATE_NOOP("Locator", "Locator");
+const char * const SETTINGS_CATEGORY_LOCATOR_ICON = ":/core/images/category_locator.png";
const char * const TASK_INDEX = "Locator.Task.Index";
} // namespace Constants
diff --git a/src/plugins/locator/settingspage.cpp b/src/plugins/locator/settingspage.cpp
index 1f913c144bc39d4604b5a93473771fe5b313dc71..cc3e4383a0b658ef4e6daf3fec46d4d5daef00c5 100644
--- a/src/plugins/locator/settingspage.cpp
+++ b/src/plugins/locator/settingspage.cpp
@@ -71,7 +71,7 @@ QString SettingsPage::displayCategory() const
QIcon SettingsPage::categoryIcon() const
{
- return QIcon(); // TODO: Icon for Locator
+ return QIcon(QLatin1String(Locator::Constants::SETTINGS_CATEGORY_LOCATOR_ICON));
}
QWidget *SettingsPage::createPage(QWidget *parent)
diff --git a/src/plugins/qmldesigner/qmldesignerconstants.h b/src/plugins/qmldesigner/qmldesignerconstants.h
index d1880493bf24889278a11f45456b3adeacbea901..d2e14a5bc3d7f19330ee882d3e14db0fee7d64ad 100644
--- a/src/plugins/qmldesigner/qmldesignerconstants.h
+++ b/src/plugins/qmldesigner/qmldesignerconstants.h
@@ -63,6 +63,8 @@ const char * const QML_ITEMSPACING_KEY = "ItemSpacing";
const char * const QML_SNAPMARGIN_KEY = "SnapMargin";
enum { QML_OPENDESIGNMODE_DEFAULT = 0 }; // 0 for text mode, 1 for design mode
+const char * const SETTINGS_CATEGORY_QML_ICON = ":/core/images/category_qml.png";
+
namespace Internal {
enum { debug = 0 };
}
diff --git a/src/plugins/qmldesigner/settingspage.cpp b/src/plugins/qmldesigner/settingspage.cpp
index adc8d772bef2e6a8bbff9df7c8f9c76fd6025e94..c0275419dd67f3526c81ecebd39b3aa1fc317034 100644
--- a/src/plugins/qmldesigner/settingspage.cpp
+++ b/src/plugins/qmldesigner/settingspage.cpp
@@ -95,7 +95,7 @@ QString SettingsPage::displayCategory() const
QIcon SettingsPage::categoryIcon() const
{
- return QIcon(); // TODO: Icon for QML or move into other category (Designer?)
+ return QIcon(QLatin1String(Constants::SETTINGS_CATEGORY_QML_ICON));
}
QWidget *SettingsPage::createPage(QWidget *parent)
diff --git a/src/plugins/qmlprojectmanager/images/qml_wizard.png b/src/plugins/qmlprojectmanager/images/qml_wizard.png
new file mode 100644
index 0000000000000000000000000000000000000000..5355c80bf85200e33abfa50ee2837dffe4cf77ee
Binary files /dev/null and b/src/plugins/qmlprojectmanager/images/qml_wizard.png differ
diff --git a/src/plugins/qmlprojectmanager/qmlproject.qrc b/src/plugins/qmlprojectmanager/qmlproject.qrc
index 82f0873a092bf191ecfb9857d7ce5f09749f93a9..21338b6a545c42dd2363d51089465b4af45129ca 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.qrc
+++ b/src/plugins/qmlprojectmanager/qmlproject.qrc
@@ -3,5 +3,6 @@
<file>QmlProject.mimetypes.xml</file>
<file>images/qmlfolder.png</file>
<file>images/qmlproject.png</file>
+ <file>images/qml_wizard.png</file>
</qresource>
</RCC>
diff --git a/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp b/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
index 30215eb12d0774e7b9cfb21d485c3d9b081b26d8..4edc8857c27cf8fd5635f05dfa6bbd71e6ad1f88 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
@@ -35,6 +35,9 @@
#include <QtGui/QIcon>
+#include <QtGui/QPainter>
+#include <QtGui/QPixmap>
+
#include <QtCore/QTextStream>
#include <QtCore/QCoreApplication>
@@ -58,7 +61,14 @@ QmlProjectApplicationWizard::~QmlProjectApplicationWizard()
Core::BaseFileWizardParameters QmlProjectApplicationWizard::parameters()
{
Core::BaseFileWizardParameters parameters(ProjectWizard);
- parameters.setIcon(QIcon(QLatin1String(":/wizards/images/console.png")));
+ // TODO: provide icons in correct size
+ {
+ QPixmap icon(22, 22);
+ icon.fill(Qt::transparent);
+ QPainter p(&icon);
+ p.drawPixmap(3, 3, 16, 16, QPixmap(QLatin1String(Constants::QML_WIZARD_ICON)));
+ parameters.setIcon(icon);
+ }
parameters.setDisplayName(tr("Qt QML Application"));
parameters.setId(QLatin1String("QA.QML Application"));
parameters.setDescription(tr("Creates a Qt QML application project with a single QML file containing the main view.\n\n"
diff --git a/src/plugins/qmlprojectmanager/qmlprojectconstants.h b/src/plugins/qmlprojectmanager/qmlprojectconstants.h
index a92e15aa04b7b4ef8c958903e9f35540da35dc98..1fd04264a0f9be2a570cb2751a3898ddbdfc3aac 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectconstants.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectconstants.h
@@ -53,6 +53,7 @@ const char *const TASK_CATEGORY_QML = "Task.Category.Qml";
const char * const QML_WIZARD_CATEGORY = "F.Projects"; // (after Qt)
const char * const QML_WIZARD_TR_SCOPE = "QmlProjectManager";
const char * const QML_WIZARD_TR_CATEGORY = QT_TRANSLATE_NOOP("QmlProjectManager", "Qt Quick Project");
+const char * const QML_WIZARD_ICON = ":/qmlproject/images/qml_wizard.png";
// Env variables for inspector
const char * const E_QML_DEBUG_SERVER_PORT = "QML_DEBUG_SERVER_PORT";
diff --git a/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp b/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp
index b7165143d00f8bfb3363737d5da89f204a990429..a8d1349ac7bac70de7f0144e899092fad774608f 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectimportwizard.cpp
@@ -40,6 +40,11 @@
#include <QtGui/QIcon>
+#include <QtGui/QApplication>
+#include <QtGui/QStyle>
+#include <QtGui/QPainter>
+#include <QtGui/QPixmap>
+
#include <QtCore/QDir>
#include <QtCore/QtDebug>
#include <QtCore/QCoreApplication>
@@ -100,7 +105,14 @@ QmlProjectImportWizard::~QmlProjectImportWizard()
Core::BaseFileWizardParameters QmlProjectImportWizard::parameters()
{
Core::BaseFileWizardParameters parameters(ProjectWizard);
- parameters.setIcon(QIcon(QLatin1String(":/wizards/images/console.png")));
+ // TODO do something about the ugliness of standard icons in sizes different than 16, 32, 64, 128
+ {
+ QPixmap icon(22, 22);
+ icon.fill(Qt::transparent);
+ QPainter p(&icon);
+ p.drawPixmap(3, 3, 16, 16, qApp->style()->standardIcon(QStyle::SP_DirIcon).pixmap(16));
+ parameters.setIcon(icon);
+ }
parameters.setDisplayName(tr("Import Existing Qt QML Directory"));
parameters.setId(QLatin1String("QI.QML Import"));
parameters.setDescription(tr("Creates a QML project from an existing directory of QML files."));
diff --git a/src/plugins/vcsbase/vcsbaseconstants.h b/src/plugins/vcsbase/vcsbaseconstants.h
index c9d27f50ee2ca4a79a649977e64fe7494c64a33d..50bf63d6fc1adbc082504b9fc29c39605ad76a17 100644
--- a/src/plugins/vcsbase/vcsbaseconstants.h
+++ b/src/plugins/vcsbase/vcsbaseconstants.h
@@ -37,6 +37,7 @@ namespace Constants {
const char * const VCS_SETTINGS_CATEGORY = "V.Version Control";
const char * const VCS_SETTINGS_TR_CATEGORY = QT_TRANSLATE_NOOP("VCSBase", "Version Control");
+const char * const SETTINGS_CATEGORY_VCS_ICON = ":/core/images/category_vcs.png";
const char * const VCS_COMMON_SETTINGS_ID = "A.Common";
const char * const VCS_COMMON_SETTINGS_NAME = QT_TRANSLATE_NOOP("VCSBase", "Common");
diff --git a/src/plugins/vcsbase/vcsbaseoptionspage.cpp b/src/plugins/vcsbase/vcsbaseoptionspage.cpp
index d5a025b7226f2f6a3e0a6dd5faa2376add2b9848..2964a34f5a09df50d06ef1c33b2c9636224e8aae 100644
--- a/src/plugins/vcsbase/vcsbaseoptionspage.cpp
+++ b/src/plugins/vcsbase/vcsbaseoptionspage.cpp
@@ -52,7 +52,7 @@ QString VCSBaseOptionsPage::displayCategory() const
QIcon VCSBaseOptionsPage::categoryIcon() const
{
- return QIcon(); // TODO: Icon for Version Control
+ return QIcon(QLatin1String(Constants::SETTINGS_CATEGORY_VCS_ICON));
}
} // namespace VCSBase