Update wizard template icons

The icons have been redesigned to have a more consistent and clean look.
The colors work well with both dark and light themes. The dimensions of
the icons have been made larger in order to facilitate their use in an
icon grid.

A follow-up commit will add more wizard templates that make use of the
larger icons in order to depict various Qt Quick UI layouts.

Some icons (Qt Quick Application, Qt Quick Controls 2 Application) were
unchanged, as the follow-up commit will remove them in favor of
more specific templates.

Task-number: QTPM-395
Change-Id: I5804c3fb92c60e53e1380cfb05d4c7f14e877d8a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>

share/qtcreator/templates/wizards/autotest/wizard.json

@@ -6,7 +6,7 @@
     "trDescription": "Creates a new unit test project. Unit tests allow you to verify that the code is fit for use and that there are no regressions.",
     "trDisplayName": "Auto Test Project",
     "trDisplayCategory": "Other Project",
-    "icon": "autotest_24.png",
+    "icon": "autotest.png",
     "featuresRequired": [ "QtSupport.Wizards.FeatureQt", "QtSupport.Wizards.FeatureDesktop" ],
     "enabled": "%{JS: [ %{Plugins} ].indexOf('AutoTest') >= 0}",
 

share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json

@@ -6,7 +6,7 @@
     "trDescription": "Creates a Qt Quick 2 UI project with a QML entry point. To use it, you need to have a QML runtime environment such as qmlscene set up.\n\nUse this only if you are prototyping. You cannot create a full application with this. Consider using a Qt Quick Application project instead.",
     "trDisplayName": "Qt Quick UI Prototype",
     "trDisplayCategory": "Other Project",
-    "icon": "../qtquickapplication/qml_wizard.png",
+    "icon": "qtquickuiprototype.png",
     "enabled": "%{JS: [ %{Plugins} ].indexOf('QmlProjectManager') >= 0}",
     "featuresRequired": [ "QtSupport.Wizards.FeatureQtQuick.Controls.1.3", "QtSupport.Wizards.FeatureQtQuickProject", "QtSupport.Wizards.FeatureQt" ],
 

share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml

@@ -34,7 +34,7 @@ leave room for the Qt 4 target page.
         class="qmakeproject" firstpage="10"
         id="R.QtCreatorPlugin" category="G.Library"
         featuresRequired="QtSupport.Wizards.FeatureQt,QtSupport.Wizards.FeatureDesktop">
-    <icon>qtcreator_logo_24.png</icon>
+    <icon>qtcreatorplugin.png</icon>
     <description>Creates a custom Qt Creator plugin.</description>
     <displayname>Qt Creator Plugin</displayname>;
     <displaycategory>Library</displaycategory>

src/libs/utils/utils.qrc

@@ -176,5 +176,7 @@
         <file>images/filledcircle@2x.png</file>
         <file>images/pan.png</file>
         <file>images/pan@2x.png</file>
+        <file>images/wizardicon-file.png</file>
+        <file>images/wizardicon-file@2x.png</file>
     </qresource>
 </RCC>

src/plugins/coreplugin/dialogs/newdialog.cpp

@@ -47,7 +47,7 @@ Q_DECLARE_METATYPE(Core::IWizardFactory*)
 
 namespace {
 
-const int ICON_SIZE = 22;
+const int ICON_SIZE = 92;
 const char LAST_CATEGORY_KEY[] = "Core/NewDialog/LastCategory";
 const char LAST_PLATFORM_KEY[] = "Core/NewDialog/LastPlatform";
 
@@ -267,7 +267,7 @@ void NewDialog::setWizardFactories(QList<IWizardFactory *> factories,
     parentItem->appendRow(filesKindItem);
 
     if (m_dummyIcon.isNull())
-        m_dummyIcon = Utils::Icons::NEWFILE.icon();
+        m_dummyIcon = QIcon(":/utils/images/wizardicon-file.png");
 
     QSet<Id> availablePlatforms = IWizardFactory::allAvailablePlatforms();
     m_ui->comboBox->addItem(tr("All Templates"), Id().toSetting());

src/plugins/genericprojectmanager/genericprojectmanager.pro

@@ -23,3 +23,5 @@ equals(TEST, 1) {
     SOURCES += genericprojectplugin_test.cpp
     DEFINES += SRCDIR=\\\"$$PWD\\\"
 }
+
+RESOURCES += genericprojectmanager.qrc

src/plugins/genericprojectmanager/genericprojectmanager.qrc

+<RCC>
+    <qresource prefix="/genericprojectmanager">
+        <file>images/genericprojectmanager.png</file>
+        <file>images/genericprojectmanager@2x.png</file>
+    </qresource>
+</RCC>

src/plugins/genericprojectmanager/genericprojectwizard.cpp

@@ -111,14 +111,7 @@ QString GenericProjectWizardDialog::projectName() const
 GenericProjectWizard::GenericProjectWizard()
 {
     setSupportedProjectTypes({Constants::GENERICPROJECT_ID});
-    // 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, QApplication::style()->standardIcon(QStyle::SP_DirIcon).pixmap(16));
-        setIcon(icon);
-    }
+    setIcon(QIcon(QLatin1String(":/genericprojectmanager/images/genericprojectmanager.png")));
     setDisplayName(tr("Import Existing Project"));
     setId("Z.Makefile");
     setDescription(tr("Imports existing projects that do not use qmake, CMake or Autotools. "

src/plugins/qmakeprojectmanager/qmakeprojectmanager.qrc

@@ -3,5 +3,7 @@
         <file>images/dark_headers.png</file>
         <file>images/dark_sources.png</file>
         <file>images/dark_unknown.png</file>
+        <file>images/qmakeprojectmanager.png</file>
+        <file>images/qmakeprojectmanager@2x.png</file>
     </qresource>
 </RCC>

src/plugins/qmakeprojectmanager/wizards/simpleprojectwizard.cpp

@@ -130,14 +130,7 @@ void FilesSelectionWizardPage::initializePage()
 SimpleProjectWizard::SimpleProjectWizard()
 {
     setSupportedProjectTypes({Constants::PROJECT_ID});
-    // 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, QApplication::style()->standardIcon(QStyle::SP_DirIcon).pixmap(16));
-        setIcon(icon);
-    }
+    setIcon(QIcon(QLatin1String(":/qmakeprojectmanager/images/qmakeprojectmanager.png")));
     setDisplayName(tr("Import as qmake Project (Limited Functionality)"));
     setId("Z.DummyProFile");
     setDescription(tr("Imports existing projects that do not use qmake, CMake or Autotools.<p>"

src/plugins/qmakeprojectmanager/wizards/wizards.qrc

 <RCC>
     <qresource prefix="/wizards">
         <file>images/console.png</file>
+        <file>images/console@2x.png</file>
         <file>images/gui.png</file>
+        <file>images/gui@2x.png</file>
         <file>images/lib.png</file>
+        <file>images/lib@2x.png</file>
         <file>images/qtquickapp.png</file>
     </qresource>
 </RCC>