QmlDesigner.ProjectExplorer: New icons for qml file types

8 files changed, 22 insertions, 2 deletions

diff --git a/src/plugins/qmljseditor/images/qmlfile.png b/src/plugins/qmljseditor/images/qmlfile.png
new file mode 100644
index 00000000000..568a6dd8509
--- /dev/null
+++ b/src/plugins/qmljseditor/images/qmlfile.png
diff --git a/src/plugins/qmljseditor/qmljseditor.qrc b/src/plugins/qmljseditor/qmljseditor.qrc
index 11ad582e93e..38e57bac808 100644
--- a/src/plugins/qmljseditor/qmljseditor.qrc
+++ b/src/plugins/qmljseditor/qmljseditor.qrc
@@ -1,5 +1,6 @@
 <RCC>
-    <qresource prefix="/qmljseditor" >
+    <qresource prefix="/qmljseditor">
         <file>QmlJSEditor.mimetypes.xml</file>
+        <file>images/qmlfile.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp
index 65e2835a8f7..e1171190cd8 100644
--- a/src/plugins/qmljseditor/qmljseditorplugin.cpp
+++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp
@@ -41,6 +41,7 @@
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/mimedatabase.h>
 #include <coreplugin/uniqueidmanager.h>
+#include <coreplugin/fileiconprovider.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/command.h>
@@ -147,6 +148,9 @@ bool QmlJSEditorPlugin::initialize(const QStringList & /*arguments*/, QString *e
 
     error_message->clear();
 
+    Core::FileIconProvider *iconProvider = Core::FileIconProvider::instance();
+    iconProvider->registerIconOverlayForSuffix(QIcon(":/qmljseditor/images/qmlfile.png"), "qml");
+
     return true;
 }
 
diff --git a/src/plugins/qmlprojectmanager/images/qmlfolder.png b/src/plugins/qmlprojectmanager/images/qmlfolder.png
new file mode 100644
index 00000000000..6192ff6c47a
--- /dev/null
+++ b/src/plugins/qmlprojectmanager/images/qmlfolder.png
diff --git a/src/plugins/qmlprojectmanager/images/qmlproject.png b/src/plugins/qmlprojectmanager/images/qmlproject.png
new file mode 100644
index 00000000000..e28bdc4d9a8
--- /dev/null
+++ b/src/plugins/qmlprojectmanager/images/qmlproject.png
diff --git a/src/plugins/qmlprojectmanager/qmlproject.qrc b/src/plugins/qmlprojectmanager/qmlproject.qrc
index 3a446209bf7..82f0873a092 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.qrc
+++ b/src/plugins/qmlprojectmanager/qmlproject.qrc
@@ -1,5 +1,7 @@
 <RCC>
-    <qresource prefix="/qmlproject" >
+    <qresource prefix="/qmlproject">
         <file>QmlProject.mimetypes.xml</file>
+        <file>images/qmlfolder.png</file>
+        <file>images/qmlproject.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp b/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp
index bbf344cfb44..2569b5a0c1c 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp
@@ -32,11 +32,13 @@
 #include "qmlproject.h"
 
 #include <coreplugin/ifile.h>
+#include <coreplugin/fileiconprovider.h>
 #include <projectexplorer/projectexplorer.h>
 
 #include <QFileInfo>
 #include <QDir>
 #include <QTextStream>
+#include <QStyle>
 
 namespace QmlProjectManager {
 namespace Internal {
@@ -47,6 +49,13 @@ QmlProjectNode::QmlProjectNode(QmlProject *project, Core::IFile *projectFile)
       m_projectFile(projectFile)
 {
     setDisplayName(QFileInfo(projectFile->fileName()).completeBaseName());
+    // make overlay
+    const QSize desiredSize = QSize(16, 16);
+    const QIcon projectBaseIcon(QLatin1String(":/qmlproject/images/qmlfolder.png"));
+    const QPixmap projectPixmap = Core::FileIconProvider::overlayIcon(QStyle::SP_DirIcon,
+                                                                      projectBaseIcon,
+                                                                      desiredSize);
+    setIcon(QIcon(projectPixmap));
 }
 
 QmlProjectNode::~QmlProjectNode()
diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
index ff4abcbc982..3077d69f06c 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
@@ -40,6 +40,7 @@
 
 #include <extensionsystem/pluginmanager.h>
 
+#include <coreplugin/fileiconprovider.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/mimedatabase.h>
 
@@ -85,6 +86,9 @@ bool QmlProjectPlugin::initialize(const QStringList &, QString *errorMessage)
 
     QmlProjectFileFormat::registerDeclarativeTypes();
 
+    Core::FileIconProvider *iconProvider = Core::FileIconProvider::instance();
+    iconProvider->registerIconOverlayForSuffix(QIcon(":/qmlproject/images/qmlproject.png"), "qmlproject");
+
     return true;
 }