diff options
author | Thomas Hartmann <Thomas.Hartmann@theqtcompany.com> | 2015-07-16 12:03:22 +0200 |
---|---|---|
committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2015-07-17 10:03:43 +0000 |
commit | 7a4a7933952884a6a3b86926fa2d840591180ef0 (patch) | |
tree | 696d6bf7d09b2589946c1eacbff8e19b78a62275 | |
parent | 6a1a198020dc6868cf80df1078229be12ce1bbac (diff) | |
download | qt-creator-7a4a7933952884a6a3b86926fa2d840591180ef0.tar.gz |
QmlDesigner: Updating icons for item library
Change-Id: I9aff69864fc91e494bed0e710d78bbdacb8ddddd
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
18 files changed, 59 insertions, 8 deletions
diff --git a/src/plugins/qmldesigner/componentsplugin/components.metainfo b/src/plugins/qmldesigner/componentsplugin/components.metainfo index 701b453c39..a94dae5580 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 d844567ea0..dcc5f6eccf 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 Binary files differnew file mode 100644 index 0000000000..3cf3c11ddb --- /dev/null +++ b/src/plugins/qmldesigner/componentsplugin/images/busyindicator.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/busyindicator16.png b/src/plugins/qmldesigner/componentsplugin/images/busyindicator16.png Binary files differnew file mode 100644 index 0000000000..15e7f442a6 --- /dev/null +++ b/src/plugins/qmldesigner/componentsplugin/images/busyindicator16.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/busyindicatora.png b/src/plugins/qmldesigner/componentsplugin/images/busyindicatora.png Binary files differnew file mode 100644 index 0000000000..4cd7ad590a --- /dev/null +++ b/src/plugins/qmldesigner/componentsplugin/images/busyindicatora.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/busyindicatora16.png b/src/plugins/qmldesigner/componentsplugin/images/busyindicatora16.png Binary files differnew file mode 100644 index 0000000000..2e6083c1c8 --- /dev/null +++ b/src/plugins/qmldesigner/componentsplugin/images/busyindicatora16.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon-16px.png b/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon-16px.png Binary files differnew file mode 100644 index 0000000000..474df84f6a --- /dev/null +++ b/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon-16px.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon.png b/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon.png Binary files differnew file mode 100644 index 0000000000..0e2ac31fea --- /dev/null +++ b/src/plugins/qmldesigner/componentsplugin/images/column-layouts-icon.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon-16px.png b/src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon-16px.png Binary files differnew file mode 100644 index 0000000000..077cdbde7c --- /dev/null +++ b/src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon-16px.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon.png b/src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon.png Binary files differnew file mode 100644 index 0000000000..1e9178ff3e --- /dev/null +++ b/src/plugins/qmldesigner/componentsplugin/images/grid-layouts-icon.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon-16px.png b/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon-16px.png Binary files differnew file mode 100644 index 0000000000..3a0f5c2186 --- /dev/null +++ b/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon-16px.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon.png b/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon.png Binary files differnew file mode 100644 index 0000000000..1082f43b51 --- /dev/null +++ b/src/plugins/qmldesigner/componentsplugin/images/row-layouts-icon.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/splitview-layouts-icon-16px.png b/src/plugins/qmldesigner/componentsplugin/images/splitview-layouts-icon-16px.png Binary files differnew file mode 100644 index 0000000000..479e312c11 --- /dev/null +++ b/src/plugins/qmldesigner/componentsplugin/images/splitview-layouts-icon-16px.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/splitview-layouts-icon.png b/src/plugins/qmldesigner/componentsplugin/images/splitview-layouts-icon.png Binary files differnew file mode 100644 index 0000000000..3a368083bd --- /dev/null +++ b/src/plugins/qmldesigner/componentsplugin/images/splitview-layouts-icon.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/tabbar.png b/src/plugins/qmldesigner/componentsplugin/images/tabbar.png Binary files differindex 5683dc4184..2f44e62b3f 100644 --- a/src/plugins/qmldesigner/componentsplugin/images/tabbar.png +++ b/src/plugins/qmldesigner/componentsplugin/images/tabbar.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/tabbar16.png b/src/plugins/qmldesigner/componentsplugin/images/tabbar16.png Binary files differindex b91390fec9..57c7906982 100644 --- a/src/plugins/qmldesigner/componentsplugin/images/tabbar16.png +++ b/src/plugins/qmldesigner/componentsplugin/images/tabbar16.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/toolbar.png b/src/plugins/qmldesigner/componentsplugin/images/toolbar.png Binary files differindex 91b335082d..e67c042422 100644 --- a/src/plugins/qmldesigner/componentsplugin/images/toolbar.png +++ b/src/plugins/qmldesigner/componentsplugin/images/toolbar.png diff --git a/src/plugins/qmldesigner/componentsplugin/images/toolbar16.png b/src/plugins/qmldesigner/componentsplugin/images/toolbar16.png Binary files differindex dd2d5af1cb..f4a0c5ef69 100644 --- a/src/plugins/qmldesigner/componentsplugin/images/toolbar16.png +++ b/src/plugins/qmldesigner/componentsplugin/images/toolbar16.png |