Icon update.

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>

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>

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);

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)

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";
 }
 }
 

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)

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)

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

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()); }

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. "

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

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)

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 };
 }

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)

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>

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"

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";

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."));

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");
 

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