summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@nokia.com>2011-06-24 16:38:28 +0200
committerThomas Hartmann <Thomas.Hartmann@nokia.com>2011-06-24 16:40:04 +0200
commit6e778df219aa5e235b40486b8325e65fdadd826f (patch)
tree7d58aff943c95aa764c0112f7d9147d27952a9e4 /src
parent6b8ffcfca810be760f9a665ae855042a040c1215 (diff)
downloadqt-creator-6e778df219aa5e235b40486b8325e65fdadd826f.tar.gz
QmlDesigner.QtQuickPlugin: update for views
ListView/GridView and PathView are now populated with code Change-Id: I66356be4f4c49c11177e6aefca3f013aa0d5937c Reviewed-on: http://codereview.qt.nokia.com/717 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qrc3
-rw-r--r--src/plugins/qmldesigner/qtquickplugin/quick.metainfo9
-rw-r--r--src/plugins/qmldesigner/qtquickplugin/source/gridview.qml56
-rw-r--r--src/plugins/qmldesigner/qtquickplugin/source/listview.qml39
-rw-r--r--src/plugins/qmldesigner/qtquickplugin/source/pathview.qml49
5 files changed, 150 insertions, 6 deletions
diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qrc b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qrc
index 32c454e8d2..0965d77c03 100644
--- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qrc
+++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.qrc
@@ -31,5 +31,8 @@
<file>images/text-edit-icon16.png</file>
<file>images/text-input-icon16.png</file>
<file>images/webview-icon16.png</file>
+ <file>source/listview.qml</file>
+ <file>source/gridview.qml</file>
+ <file>source/pathview.qml</file>
</qresource>
</RCC>
diff --git a/src/plugins/qmldesigner/qtquickplugin/quick.metainfo b/src/plugins/qmldesigner/qtquickplugin/quick.metainfo
index 6e4159e1cd..34dc7b2c82 100644
--- a/src/plugins/qmldesigner/qtquickplugin/quick.metainfo
+++ b/src/plugins/qmldesigner/qtquickplugin/quick.metainfo
@@ -68,22 +68,19 @@
</node>
<node name="QtQuick.GridView" icon=":/qtquickplugin/images/gridview-icon16.png">
<itemlibraryentry name="Grid View" category="Qt Quick - Views" libraryIcon=":/qtquickplugin/images/gridview-icon.png" version="1.0">
- <property name="width" type="int" value="300"/>
- <property name="height" type="int" value="300"/>
+ <qml source=":/qtquickplugin/source/gridview.qml"/>
</itemlibraryentry>
</node>
<node name="QtQuick.ListView" icon=":/qtquickplugin/images/listview-icon16.png">
<itemlibraryentry name="List View" category="Qt Quick - Views" libraryIcon=":/qtquickplugin/images/listview-icon.png" version="1.0">
- <property name="width" type="int" value="300"/>
- <property name="height" type="int" value="300"/>
+ <qml source=":/qtquickplugin/source/listview.qml"/>
</itemlibraryentry>
</node>
<node name="QtQuick.PathView" icon=":/qtquickplugin/images/pathview-icon16.png">
<itemlibraryentry name="Path View" category="Qt Quick - Views" libraryIcon=":/qtquickplugin/images/pathview-icon.png" version="1.0">
- <property name="width" type="int" value="300"/>
- <property name="height" type="int" value="300"/>
+ <qml source=":/qtquickplugin/source/pathview.qml"/>
</itemlibraryentry>
</node>
diff --git a/src/plugins/qmldesigner/qtquickplugin/source/gridview.qml b/src/plugins/qmldesigner/qtquickplugin/source/gridview.qml
new file mode 100644
index 0000000000..508edc8b83
--- /dev/null
+++ b/src/plugins/qmldesigner/qtquickplugin/source/gridview.qml
@@ -0,0 +1,56 @@
+import QtQuick 1.0
+
+GridView {
+ width: 200
+ height: 200
+
+ model: ListModel {
+
+ ListElement {
+ name: "Grey"
+ colorCode: "grey"
+
+ }
+
+ ListElement {
+ name: "Red"
+ colorCode: "red"
+
+ }
+
+ ListElement {
+ name: "Blue"
+ colorCode: "blue"
+
+ }
+
+ ListElement {
+ name: "Green"
+ colorCode: "green"
+
+ }
+ }
+
+ delegate: Item {
+ height: 50
+ x: 5
+
+ Column {
+ spacing: 5
+ Rectangle {
+ width: 40
+ height: 40
+ color: colorCode
+ anchors.horizontalCenter: parent.horizontalCenter
+ }
+
+ Text {
+ x: 5
+ text: name
+ anchors.horizontalCenter: parent.horizontalCenter
+ font.bold: true
+ }
+
+ }
+ }
+}
diff --git a/src/plugins/qmldesigner/qtquickplugin/source/listview.qml b/src/plugins/qmldesigner/qtquickplugin/source/listview.qml
new file mode 100644
index 0000000000..3f4f90abd3
--- /dev/null
+++ b/src/plugins/qmldesigner/qtquickplugin/source/listview.qml
@@ -0,0 +1,39 @@
+import QtQuick 1.0
+
+ListView {
+ width: 160
+ height: 160
+ model: ListModel {
+ ListElement {
+ name: "Grey"
+ colorCode: "grey"
+ }
+ ListElement {
+ name: "Red"
+ colorCode: "red"
+ }
+ ListElement {
+ name: "Blue"
+ colorCode: "blue"
+ }
+ ListElement {
+ name: "Green"
+ colorCode: "green"
+ }
+ }
+
+ delegate: Item {
+ height: 40
+ x: 5
+ Row {
+ id: row1
+ spacing: 10
+ Rectangle { width: 40; height: 40; color: colorCode; }
+ Text {
+ text: name
+ anchors.verticalCenter: parent.verticalCenter
+ font.bold: true
+ }
+ }
+ }
+}
diff --git a/src/plugins/qmldesigner/qtquickplugin/source/pathview.qml b/src/plugins/qmldesigner/qtquickplugin/source/pathview.qml
new file mode 100644
index 0000000000..13b3f543c5
--- /dev/null
+++ b/src/plugins/qmldesigner/qtquickplugin/source/pathview.qml
@@ -0,0 +1,49 @@
+import QtQuick 1.0
+
+PathView {
+ width: 250
+ height: 200
+
+ path: Path {
+ startX: 120
+ startY: 100
+ PathQuad { x: 120; y: 25; controlX: 260; controlY: 75 }
+ PathQuad { x: 120; y: 100; controlX: -20; controlY: 75 }
+ }
+ model: ListModel {
+ ListElement {
+ name: "Grey"
+ colorCode: "grey"
+ }
+ ListElement {
+ name: "Red"
+ colorCode: "red"
+ }
+ ListElement {
+ name: "Blue"
+ colorCode: "blue"
+ }
+ ListElement {
+ name: "Green"
+ colorCode: "green"
+ }
+ }
+ delegate: Component {
+ Column {
+ spacing: 5
+ Rectangle {
+ width: 40
+ height: 40
+ color: colorCode
+ anchors.horizontalCenter: parent.horizontalCenter
+ }
+ Text {
+ x: 5
+ text: name
+ anchors.horizontalCenter: parent.horizontalCenter
+ font.bold: true
+ }
+ }
+ }
+}
+