Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

8 files changed, 60 insertions, 0 deletions

diff --git a/examples/declarative/gridview/gridview.qml b/examples/declarative/gridview/gridview.qml
new file mode 100644
index 0000000..2e5110a
--- /dev/null
+++ b/examples/declarative/gridview/gridview.qml
@@ -0,0 +1,60 @@
+import Qt 4.6
+
+Rectangle {
+    width: 300; height: 400; color: "white"
+
+    ListModel {
+        id: AppModel
+        ListElement {
+            name: "Music"
+            icon: "AudioPlayer_48.png"
+        }
+        ListElement {
+            name: "Movies"
+            icon: "VideoPlayer_48.png"
+        }
+        ListElement {
+            name: "Camera"
+            icon: "Camera_48.png"
+        }
+        ListElement {
+            name: "Calendar"
+            icon: "DateBook_48.png"
+        }
+        ListElement {
+            name: "Messaging"
+            icon: "EMail_48.png"
+        }
+        ListElement {
+            name: "Todo List"
+            icon: "TodoList_48.png"
+        }
+        ListElement {
+            name: "Contacts"
+            icon: "AddressBook_48.png"
+        }
+    }
+
+    Component {
+        id: AppDelegate
+        Item {
+            width: 100; height: 100
+            Image { id: Icon; y: 20; anchors.horizontalCenter: parent.horizontalCenter; source: icon }
+            Text { anchors.top: Icon.bottom; anchors.horizontalCenter: parent.horizontalCenter; text: name }
+        }
+    }
+
+    Component {
+        id: AppHighlight
+        Rectangle { width: 80; height: 80; color: "#FFFF88" }
+    }
+
+    GridView {
+        id: List1
+        anchors.fill: parent
+        cellWidth: 100; cellHeight: 100
+        model: AppModel; delegate: AppDelegate
+        highlight: AppHighlight
+        focus: true
+    }
+}
diff --git a/examples/declarative/gridview/pics/AddressBook_48.png b/examples/declarative/gridview/pics/AddressBook_48.png
new file mode 100644
index 0000000..1ab7c8e
--- /dev/null
+++ b/examples/declarative/gridview/pics/AddressBook_48.png
diff --git a/examples/declarative/gridview/pics/AudioPlayer_48.png b/examples/declarative/gridview/pics/AudioPlayer_48.png
new file mode 100644
index 0000000..f4b8689
--- /dev/null
+++ b/examples/declarative/gridview/pics/AudioPlayer_48.png
diff --git a/examples/declarative/gridview/pics/Camera_48.png b/examples/declarative/gridview/pics/Camera_48.png
new file mode 100644
index 0000000..c76b524
--- /dev/null
+++ b/examples/declarative/gridview/pics/Camera_48.png
diff --git a/examples/declarative/gridview/pics/DateBook_48.png b/examples/declarative/gridview/pics/DateBook_48.png
new file mode 100644
index 0000000..58f5787
--- /dev/null
+++ b/examples/declarative/gridview/pics/DateBook_48.png
diff --git a/examples/declarative/gridview/pics/EMail_48.png b/examples/declarative/gridview/pics/EMail_48.png
new file mode 100644
index 0000000..d6d84a6
--- /dev/null
+++ b/examples/declarative/gridview/pics/EMail_48.png
diff --git a/examples/declarative/gridview/pics/TodoList_48.png b/examples/declarative/gridview/pics/TodoList_48.png
new file mode 100644
index 0000000..0988448
--- /dev/null
+++ b/examples/declarative/gridview/pics/TodoList_48.png
diff --git a/examples/declarative/gridview/pics/VideoPlayer_48.png b/examples/declarative/gridview/pics/VideoPlayer_48.png
new file mode 100644
index 0000000..52638c5
--- /dev/null
+++ b/examples/declarative/gridview/pics/VideoPlayer_48.png