aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmldesigner/componentsplugin
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@theqtcompany.com>2015-07-16 12:03:22 +0200
committerThomas Hartmann <Thomas.Hartmann@digia.com>2015-07-17 10:03:43 +0000
commit7a4a7933952884a6a3b86926fa2d840591180ef0 (patch)
tree696d6bf7d09b2589946c1eacbff8e19b78a62275 /src/plugins/qmldesigner/componentsplugin
parent6a1a198020dc6868cf80df1078229be12ce1bbac (diff)
QmlDesigner: Updating icons for item library
Change-Id: I9aff69864fc91e494bed0e710d78bbdacb8ddddd Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Diffstat (limited to 'src/plugins/qmldesigner/componentsplugin')
-rw-r--r--src/plugins/qmldesigner/componentsplugin/components.metainfo59
-rw-r--r--src/plugins/qmldesigner/componentsplugin/componentsplugin.qrc8
-rw-r--r--src/plugins/qmldesigner/componentsplugin/images/busyindicator.pngbin0 -> 1145 bytes
-rw-r--r--src/plugins/qmldesigner/componentsplugin/images/busyindicator16.pngbin0 -> 826 bytes
-rw-r--r--src/plugins/qmldesigner/componentsplugin/images/busyindicatora.pngbin0 -> 767 bytes
-rw-r--r--src/plugins/qmldesigner/componentsplugin/images/busyindicatora16.pngbin0 -> 670 bytes
-rw-r--r--src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon-16px.pngbin0 -> 1154 bytes
-rw-r--r--src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon.pngbin0 -> 1189 bytes
-rw-r--r--src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon-16px.pngbin0 -> 1191 bytes
-rw-r--r--src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon.pngbin0 -> 1222 bytes
-rw-r--r--src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon-16px.pngbin0 -> 1139 bytes
-rw-r--r--src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon.pngbin0 -> 1168 bytes
-rw-r--r--src/plugins/qmldesigner/componentsplugin/images/splitview-layouts-icon-16px.pngbin0 -> 1181 bytes
-rw-r--r--src/plugins/qmldesigner/componentsplugin/images/splitview-layouts-icon.pngbin0 -> 1208 bytes
-rw-r--r--src/plugins/qmldesigner/componentsplugin/images/tabbar.pngbin271 -> 385 bytes
-rw-r--r--src/plugins/qmldesigner/componentsplugin/images/tabbar16.pngbin152 -> 264 bytes
-rw-r--r--src/plugins/qmldesigner/componentsplugin/images/toolbar.pngbin226 -> 339 bytes
-rw-r--r--src/plugins/qmldesigner/componentsplugin/images/toolbar16.pngbin138 -> 255 bytes
18 files changed, 59 insertions, 8 deletions
diff --git a/src/plugins/qmldesigner/componentsplugin/components.metainfo b/src/plugins/qmldesigner/componentsplugin/components.metainfo
index 701b453c396..a94dae55800 100644
--- a/src/plugins/qmldesigner/componentsplugin/components.metainfo
+++ b/src/plugins/qmldesigner/componentsplugin/components.metainfo
@@ -280,12 +280,12 @@ MetaInfo {
Type {
name: "QtQuick.Layouts.RowLayout"
- icon: ":/qtquickplugin/images/item-icon16.png"
+ icon: ":/componentsplugin/images/row-layouts-icon-16px.png"
ItemLibraryEntry {
name: "Row Layout"
category: "Qt Quick - Layouts"
- libraryIcon: ":/qtquickplugin/images/item-icon.png"
+ libraryIcon: ":/componentsplugin/images/row-layouts-icon.png"
version: "1.0"
requiredImport: "QtQuick.Layouts"
@@ -296,12 +296,12 @@ MetaInfo {
Type {
name: "QtQuick.Layouts.ColumnLayout"
- icon: ":/qtquickplugin/images/item-icon16.png"
+ icon: ":/componentsplugin/images/column-layouts-icon-16px.png"
ItemLibraryEntry {
name: "Column Layout"
category: "Qt Quick - Layouts"
- libraryIcon: ":/qtquickplugin/images/item-icon.png"
+ libraryIcon: ":/componentsplugin/images/column-layouts-icon.png"
version: "1.0"
requiredImport: "QtQuick.Layouts"
@@ -312,12 +312,12 @@ MetaInfo {
Type {
name: "QtQuick.Layouts.GridLayout"
- icon: ":/qtquickplugin/images/item-icon16.png"
+ icon: ":/componentsplugin/images/grid-layouts-icon-16px.png"
ItemLibraryEntry {
name: "Grid Layout"
category: "Qt Quick - Layouts"
- libraryIcon: ":/qtquickplugin/images/item-icon.png"
+ libraryIcon: ":/componentsplugin/images/grid-layouts-icon.png"
version: "1.0"
requiredImport: "QtQuick.Layouts"
@@ -328,12 +328,12 @@ MetaInfo {
Type {
name: "QtQuick.Controls.SplitView"
- icon: ":/qtquickplugin/images/item-icon16.png"
+ icon: ":/componentsplugin/images/splitview-layouts-icon-16px.png"
ItemLibraryEntry {
name: "SplitView"
category: "Qt Quick - Layouts"
- libraryIcon: ":/qtquickplugin/images/item-icon.png"
+ libraryIcon: ":/componentsplugin/images/splitview-layouts-icon.png"
version: "1.0"
requiredImport: "QtQuick.Controls"
@@ -342,4 +342,47 @@ MetaInfo {
}
}
+ Type {
+ name: "QtQuick.Controls.TabView"
+ icon: ":/componentsplugin/images/window16.png"
+
+ ItemLibraryEntry {
+ name: "Tab View"
+ category: "Qt Quick - Controls"
+ libraryIcon: ":/componentsplugin/images/window.png"
+ version: "1.0"
+ requiredImport: "QtQuick.Controls"
+
+ Property { name: "width"; type: "int"; value: 360; }
+ Property { name: "height"; type: "int"; value: 300; }
+ }
+ }
+
+ Type {
+ name: "QtQuick.Controls.Calendar"
+ icon: ":/componentsplugin/images/window16.png"
+
+ ItemLibraryEntry {
+ name: "Calendar"
+ category: "Qt Quick - Controls"
+ libraryIcon: ":/componentsplugin/images/window.png"
+ version: "1.0"
+ requiredImport: "QtQuick.Controls"
+ }
+ }
+
+ Type {
+ name: "QtQuick.Controls.TableView"
+ icon: ":/componentsplugin/images/window16.png"
+
+ ItemLibraryEntry {
+ name: "TableView"
+ category: "Qt Quick - Controls"
+ libraryIcon: ":/componentsplugin/images/window.png"
+ version: "1.0"
+ requiredImport: "QtQuick.Controls"
+ }
+ }
+
+
}
diff --git a/src/plugins/qmldesigner/componentsplugin/componentsplugin.qrc b/src/plugins/qmldesigner/componentsplugin/componentsplugin.qrc
index d844567ea0a..dcc5f6eccfd 100644
--- a/src/plugins/qmldesigner/componentsplugin/componentsplugin.qrc
+++ b/src/plugins/qmldesigner/componentsplugin/componentsplugin.qrc
@@ -35,6 +35,14 @@
<file>images/toolbar16.png</file>
<file>images/window.png</file>
<file>images/window16.png</file>
+ <file>images/column-layouts-icon.png</file>
+ <file>images/column-layouts-icon-16px.png</file>
+ <file>images/grid-layouts-icon.png</file>
+ <file>images/grid-layouts-icon-16px.png</file>
+ <file>images/row-layouts-icon.png</file>
+ <file>images/row-layouts-icon-16px.png</file>
+ <file>images/splitview-layouts-icon.png</file>
+ <file>images/splitview-layouts-icon-16px.png</file>
</qresource>
<qresource prefix="/propertyEditorQmlSources/QtQuick">
<file>Controls/ButtonSpecifics.qml</file>
diff --git a/src/plugins/qmldesigner/componentsplugin/images/busyindicator.png b/src/plugins/qmldesigner/componentsplugin/images/busyindicator.png
new file mode 100644
index 00000000000..3cf3c11ddbe
--- /dev/null
+++ b/src/plugins/qmldesigner/componentsplugin/images/busyindicator.png
Binary files differ
diff --git a/src/plugins/qmldesigner/componentsplugin/images/busyindicator16.png b/src/plugins/qmldesigner/componentsplugin/images/busyindicator16.png
new file mode 100644
index 00000000000..15e7f442a6b
--- /dev/null
+++ b/src/plugins/qmldesigner/componentsplugin/images/busyindicator16.png
Binary files differ
diff --git a/src/plugins/qmldesigner/componentsplugin/images/busyindicatora.png b/src/plugins/qmldesigner/componentsplugin/images/busyindicatora.png
new file mode 100644
index 00000000000..4cd7ad590a4
--- /dev/null
+++ b/src/plugins/qmldesigner/componentsplugin/images/busyindicatora.png
Binary files differ
diff --git a/src/plugins/qmldesigner/componentsplugin/images/busyindicatora16.png b/src/plugins/qmldesigner/componentsplugin/images/busyindicatora16.png
new file mode 100644
index 00000000000..2e6083c1c81
--- /dev/null
+++ b/src/plugins/qmldesigner/componentsplugin/images/busyindicatora16.png
Binary files differ
diff --git a/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon-16px.png b/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon-16px.png
new file mode 100644
index 00000000000..474df84f6aa
--- /dev/null
+++ b/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon-16px.png
Binary files differ
diff --git a/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon.png b/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon.png
new file mode 100644
index 00000000000..0e2ac31feaf
--- /dev/null
+++ b/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon.png
Binary files differ
diff --git a/src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon-16px.png b/src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon-16px.png
new file mode 100644
index 00000000000..077cdbde7c0
--- /dev/null
+++ b/src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon-16px.png
Binary files differ
diff --git a/src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon.png b/src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon.png
new file mode 100644
index 00000000000..1e9178ff3e9
--- /dev/null
+++ b/src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon.png
Binary files differ
diff --git a/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon-16px.png b/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon-16px.png
new file mode 100644
index 00000000000..3a0f5c21863
--- /dev/null
+++ b/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon-16px.png
Binary files differ
diff --git a/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon.png b/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon.png
new file mode 100644
index 00000000000..1082f43b517
--- /dev/null
+++ b/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon.png
Binary files differ
diff --git a/src/plugins/qmldesigner/componentsplugin/images/splitview-layouts-icon-16px.png b/src/plugins/qmldesigner/componentsplugin/images/splitview-layouts-icon-16px.png
new file mode 100644
index 00000000000..479e312c117
--- /dev/null
+++ b/src/plugins/qmldesigner/componentsplugin/images/splitview-layouts-icon-16px.png
Binary files differ
diff --git a/src/plugins/qmldesigner/componentsplugin/images/splitview-layouts-icon.png b/src/plugins/qmldesigner/componentsplugin/images/splitview-layouts-icon.png
new file mode 100644
index 00000000000..3a368083bdd
--- /dev/null
+++ b/src/plugins/qmldesigner/componentsplugin/images/splitview-layouts-icon.png
Binary files differ
diff --git a/src/plugins/qmldesigner/componentsplugin/images/tabbar.png b/src/plugins/qmldesigner/componentsplugin/images/tabbar.png
index 5683dc4184e..2f44e62b3f5 100644
--- a/src/plugins/qmldesigner/componentsplugin/images/tabbar.png
+++ b/src/plugins/qmldesigner/componentsplugin/images/tabbar.png
Binary files differ
diff --git a/src/plugins/qmldesigner/componentsplugin/images/tabbar16.png b/src/plugins/qmldesigner/componentsplugin/images/tabbar16.png
index b91390fec96..57c7906982e 100644
--- a/src/plugins/qmldesigner/componentsplugin/images/tabbar16.png
+++ b/src/plugins/qmldesigner/componentsplugin/images/tabbar16.png
Binary files differ
diff --git a/src/plugins/qmldesigner/componentsplugin/images/toolbar.png b/src/plugins/qmldesigner/componentsplugin/images/toolbar.png
index 91b335082d1..e67c0424221 100644
--- a/src/plugins/qmldesigner/componentsplugin/images/toolbar.png
+++ b/src/plugins/qmldesigner/componentsplugin/images/toolbar.png
Binary files differ
diff --git a/src/plugins/qmldesigner/componentsplugin/images/toolbar16.png b/src/plugins/qmldesigner/componentsplugin/images/toolbar16.png
index dd2d5af1cb4..f4a0c5ef690 100644
--- a/src/plugins/qmldesigner/componentsplugin/images/toolbar16.png
+++ b/src/plugins/qmldesigner/componentsplugin/images/toolbar16.png
Binary files differ