QmlDesigner: Replace redundant images + remove unused files

Replaces some redundant icons files with already available, themeble and
HighDPI-able Utils::Icons. The removed files are mostly images which
haven't been used since a while.

Change-Id: I1c17eb176a0d3d0a80335b43909012eab822c6b1
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>

23 files changed, 8 insertions, 39 deletions

diff --git a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp
index 86b83ef85a..3a7c929d30 100644
--- a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp
+++ b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.cpp
@@ -26,6 +26,7 @@
 #include "easingcontextpane.h"
 #include "ui_easingcontextpane.h"
 #include <qmljs/qmljspropertyreader.h>
+#include <utils/utilsicons.h>
 
 #include <QGraphicsPixmapItem>
 #include <QGraphicsScene>
@@ -124,9 +125,7 @@ EasingContextPane::EasingContextPane(QWidget *parent) :
     m_easingGraph->raise();
     setLinear();
 
-    ui->playButton->setIcon(QIcon(QLatin1String(":/playicon.png")));
-
-
+    ui->playButton->setIcon(Utils::Icons::RUN_SMALL.icon());
 
     setGraphDisplayMode(GraphMode);
 
@@ -228,14 +227,14 @@ void EasingContextPane::startAnimation()
         m_simulation->stop();
     } else {
         m_simulation->animate(ui->durationSpinBox->value(), m_easingGraph->easingCurve());
-        ui->playButton->setIcon(QIcon(QLatin1String(":/stopicon.png")));
+        ui->playButton->setIcon(Utils::Icons::STOP_SMALL.icon());
     }
 
 }
 
 void EasingContextPane::switchToGraph()
 {
-    ui->playButton->setIcon(QIcon(QLatin1String(":/playicon.png")));
+    ui->playButton->setIcon(Utils::Icons::RUN_SMALL.icon());
     setGraphDisplayMode(GraphMode);
 }
 
diff --git a/src/libs/qmleditorwidgets/easingpane/easingpane.qrc b/src/libs/qmleditorwidgets/easingpane/easingpane.qrc
index f6e6953680..f90ab25d14 100644
--- a/src/libs/qmleditorwidgets/easingpane/easingpane.qrc
+++ b/src/libs/qmleditorwidgets/easingpane/easingpane.qrc
@@ -1,7 +1,5 @@
 <RCC>
     <qresource prefix="/">
         <file>qt_logo.png</file>
-        <file>playicon.png</file>
-        <file>stopicon.png</file>
     </qresource>
 </RCC>
diff --git a/src/libs/qmleditorwidgets/easingpane/playicon.png b/src/libs/qmleditorwidgets/easingpane/playicon.png
deleted file mode 100644
index ba4f36b5bf..0000000000
--- a/src/libs/qmleditorwidgets/easingpane/playicon.png
+++ /dev/null
diff --git a/src/libs/qmleditorwidgets/easingpane/stopicon.png b/src/libs/qmleditorwidgets/easingpane/stopicon.png
deleted file mode 100644
index 74eb2ead32..0000000000
--- a/src/libs/qmleditorwidgets/easingpane/stopicon.png
+++ /dev/null
diff --git a/src/libs/qmleditorwidgets/images/hole.png b/src/libs/qmleditorwidgets/images/hole.png
deleted file mode 100644
index b75cca1ea3..0000000000
--- a/src/libs/qmleditorwidgets/images/hole.png
+++ /dev/null
diff --git a/src/libs/qmleditorwidgets/images/lock.png b/src/libs/qmleditorwidgets/images/lock.png
deleted file mode 100644
index 8f1b546c8d..0000000000
--- a/src/libs/qmleditorwidgets/images/lock.png
+++ /dev/null
diff --git a/src/libs/qmleditorwidgets/resources.qrc b/src/libs/qmleditorwidgets/resources.qrc
index 5c7164c7b8..5ac0786481 100644
--- a/src/libs/qmleditorwidgets/resources.qrc
+++ b/src/libs/qmleditorwidgets/resources.qrc
@@ -4,8 +4,6 @@
         <file>images/checkbox_indicator@2x.png</file>
         <file>images/tr.png</file>
         <file>images/tr@2x.png</file>
-        <file>images/lock.png</file>
-        <file>images/hole.png</file>
         <file>images/scrollbar-borderimage-horizontal.png</file>
         <file>images/scrollbar-borderimage-vertical.png</file>
         <file>images/aspectlockset.png</file>
diff --git a/src/plugins/qmldesigner/components/navigator/navigator.qrc b/src/plugins/qmldesigner/components/navigator/navigator.qrc
index 41599b77be..aa28a4aaee 100644
--- a/src/plugins/qmldesigner/components/navigator/navigator.qrc
+++ b/src/plugins/qmldesigner/components/navigator/navigator.qrc
@@ -12,6 +12,5 @@
         <file>export_checked@2x.png</file>
         <file>export_unchecked.png</file>
         <file>export_unchecked@2x.png</file>
-        <file>warning.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp
index 3db86f7009..107e2a9bdb 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp
@@ -102,8 +102,10 @@ NavigatorView::NavigatorView(QObject* parent) :
                                          Icons::EXPORT_UNCHECKED.pixmap());
 
 #ifdef _LOCK_ITEMS_
-    IconCheckboxItemDelegate *lockDelegate = new IconCheckboxItemDelegate(this,":/qmldesigner/images/lock.png",
-                                                                          ":/qmldesigner/images/hole.png",m_treeModel.data());
+    IconCheckboxItemDelegate *lockDelegate =
+            new IconCheckboxItemDelegate(this,
+                                         Utils::Icons::LOCKED_TOOLBAR.pixmap(),
+                                         Utils::Icons::UNLOCKED_TOOLBAR.pixmap());
 #endif
 
 
diff --git a/src/plugins/qmldesigner/components/navigator/warning.png b/src/plugins/qmldesigner/components/navigator/warning.png
deleted file mode 100644
index 38a80acc1e..0000000000
--- a/src/plugins/qmldesigner/components/navigator/warning.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/components/propertyeditor/images/button2_hovered.png b/src/plugins/qmldesigner/components/propertyeditor/images/button2_hovered.png
deleted file mode 100644
index b82f1fd006..0000000000
--- a/src/plugins/qmldesigner/components/propertyeditor/images/button2_hovered.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/components/propertyeditor/images/button2_normal.png b/src/plugins/qmldesigner/components/propertyeditor/images/button2_normal.png
deleted file mode 100644
index 4fef115d3e..0000000000
--- a/src/plugins/qmldesigner/components/propertyeditor/images/button2_normal.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/components/propertyeditor/images/button2_pressed.png b/src/plugins/qmldesigner/components/propertyeditor/images/button2_pressed.png
deleted file mode 100644
index 305530afaf..0000000000
--- a/src/plugins/qmldesigner/components/propertyeditor/images/button2_pressed.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/components/propertyeditor/images/button_hovered.png b/src/plugins/qmldesigner/components/propertyeditor/images/button_hovered.png
deleted file mode 100644
index 2dc66ec3e3..0000000000
--- a/src/plugins/qmldesigner/components/propertyeditor/images/button_hovered.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/components/propertyeditor/images/button_normal.png b/src/plugins/qmldesigner/components/propertyeditor/images/button_normal.png
deleted file mode 100644
index ca29772319..0000000000
--- a/src/plugins/qmldesigner/components/propertyeditor/images/button_normal.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/components/propertyeditor/images/button_pressed.png b/src/plugins/qmldesigner/components/propertyeditor/images/button_pressed.png
deleted file mode 100644
index 7cf55d718d..0000000000
--- a/src/plugins/qmldesigner/components/propertyeditor/images/button_pressed.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/components/propertyeditor/images/frame.png b/src/plugins/qmldesigner/components/propertyeditor/images/frame.png
deleted file mode 100644
index a951609018..0000000000
--- a/src/plugins/qmldesigner/components/propertyeditor/images/frame.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/components/propertyeditor/images/gradient.png b/src/plugins/qmldesigner/components/propertyeditor/images/gradient.png
deleted file mode 100644
index ae48afbd7a..0000000000
--- a/src/plugins/qmldesigner/components/propertyeditor/images/gradient.png
+++ /dev/null
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.pri b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.pri
index 5336225b11..d822fbb70d 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.pri
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.pri
@@ -27,5 +27,3 @@ HEADERS += propertyeditorview.h \
     qmlmodelnodeproxy.h
 
 QT += qml quick
-
-RESOURCES += propertyeditor.qrc
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.qrc b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.qrc
deleted file mode 100644
index 61d22611ba..0000000000
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.qrc
+++ /dev/null
@@ -1,12 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>images/button_hovered.png</file>
-        <file>images/button_normal.png</file>
-        <file>images/button_pressed.png</file>
-        <file>images/button2_hovered.png</file>
-        <file>images/button2_normal.png</file>
-        <file>images/button2_pressed.png</file>
-        <file>images/frame.png</file>
-        <file>images/gradient.png</file>
-    </qresource>
-</RCC>
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
index 80b3dc2924..4fa195b3c5 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
@@ -94,8 +94,6 @@ PropertyEditorQmlBackend::PropertyEditorQmlBackend(PropertyEditorView *propertyE
         m_view(new Quick2PropertyEditorView), m_propertyEditorTransaction(new PropertyEditorTransaction(propertyEditor)), m_dummyPropertyEditorValue(new PropertyEditorValue()),
         m_contextObject(new PropertyEditorContextObject())
 {
-    Q_ASSERT(QFileInfo(QLatin1String(":/images/button_normal.png")).exists());
-
     m_view->engine()->setOutputWarningsToStandardError(QmlDesignerPlugin::instance()
         ->settings().value(DesignerSettingsKey::SHOW_PROPERTYEDITOR_WARNINGS).toBool());
 
diff --git a/src/plugins/qmldesigner/components/resources/resources.qrc b/src/plugins/qmldesigner/components/resources/resources.qrc
index 5b75f585a2..4100b9da6b 100644
--- a/src/plugins/qmldesigner/components/resources/resources.qrc
+++ b/src/plugins/qmldesigner/components/resources/resources.qrc
@@ -1,6 +1,5 @@
 <RCC>
     <qresource prefix="/qmldesigner">
-        <file>templates/Standard/Form.xml</file>
         <file>stylesheet.css</file>
         <file>scrollbar.css</file>
         <file>formeditorstylesheet.css</file>
diff --git a/src/plugins/qmldesigner/components/resources/templates/Standard/Form.xml b/src/plugins/qmldesigner/components/resources/templates/Standard/Form.xml
deleted file mode 100644
index 4a9aa660d5..0000000000
--- a/src/plugins/qmldesigner/components/resources/templates/Standard/Form.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<QWidget objectName="Form" width="186" height="141">
-    <windowTitle><?i18n?>Form</windowTitle>
-    <QVBoxLayout objectName="verticalLayout">
-        <!--Start of QLayoutItem 1--><QLabel objectName="label">
-            <text><?i18n?>Hello world</text>
-        </QLabel>
-        <!--End of QLayoutItem 1--><!--Start of QLayoutItem 1--><QPlainTextEdit objectName="plainTextEdit"/>
-        <!--End of QLayoutItem 1--></QVBoxLayout>
-</QWidget>