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

20 files changed, 101 insertions, 137 deletions

diff --git a/examples/declarative/aspectratio/face_fit.qml b/examples/declarative/aspectratio/face_fit.qml
index 3d1451c..482d1b7 100644
--- a/examples/declarative/aspectratio/face_fit.qml
+++ b/examples/declarative/aspectratio/face_fit.qml
@@ -15,6 +15,7 @@ Rectangle {
 
     Image {
         id: face
+        smooth: true
         source: "pics/face.png"
         x: (parent.width-width*scale)/2
         y: (parent.height-height*scale)/2
diff --git a/examples/declarative/aspectratio/face_fit_animated.qml b/examples/declarative/aspectratio/face_fit_animated.qml
index f004a6c..80a762b 100644
--- a/examples/declarative/aspectratio/face_fit_animated.qml
+++ b/examples/declarative/aspectratio/face_fit_animated.qml
@@ -13,6 +13,7 @@ Rectangle {
 
     Image {
         id: face
+        smooth: true
         source: "pics/face.png"
         x: (parent.width-width*scale)/2
         y: (parent.height-height*scale)/2
diff --git a/examples/declarative/aspectratio/pics/face.png b/examples/declarative/aspectratio/pics/face.png
index 9623b1a..3d66d72 100644
--- a/examples/declarative/aspectratio/pics/face.png
+++ b/examples/declarative/aspectratio/pics/face.png
diff --git a/examples/declarative/aspectratio/scale_and_crop.qml b/examples/declarative/aspectratio/scale_and_crop.qml
index 2c9477e..283e24b 100644
--- a/examples/declarative/aspectratio/scale_and_crop.qml
+++ b/examples/declarative/aspectratio/scale_and_crop.qml
@@ -11,6 +11,7 @@ Rectangle {
 
     Image {
         id: face
+        smooth: true
         source: "pics/face.png"
         x: (parent.width-width*scale)/2
         y: (parent.height-height*scale)/2
diff --git a/examples/declarative/aspectratio/scale_and_crop_simple.qml b/examples/declarative/aspectratio/scale_and_crop_simple.qml
index 9cc9c19..e720ce7 100644
--- a/examples/declarative/aspectratio/scale_and_crop_simple.qml
+++ b/examples/declarative/aspectratio/scale_and_crop_simple.qml
@@ -12,8 +12,9 @@ Rectangle {
 
     Image {
         id: face
+        smooth: true
         source: "pics/face.png"
-        fillMode: "PreserveAspectCrop"
+        fillMode: Image.PreserveAspectCrop
         anchors.fill: parent
     }
 }
diff --git a/examples/declarative/aspectratio/scale_and_sidecrop.qml b/examples/declarative/aspectratio/scale_and_sidecrop.qml
index 67c7e29..c3ef859 100644
--- a/examples/declarative/aspectratio/scale_and_sidecrop.qml
+++ b/examples/declarative/aspectratio/scale_and_sidecrop.qml
@@ -12,6 +12,7 @@ Rectangle {
 
     Image {
         id: face
+        smooth: true
         source: "pics/face.png"
         x: (parent.width-width*scale)/2
         y: (parent.height-height*scale)/2
diff --git a/examples/declarative/aspectratio/scale_to_fit.qml b/examples/declarative/aspectratio/scale_to_fit.qml
index c4efc29..961ac04 100644
--- a/examples/declarative/aspectratio/scale_to_fit.qml
+++ b/examples/declarative/aspectratio/scale_to_fit.qml
@@ -12,6 +12,7 @@ Rectangle {
 
     Image {
         id: face
+        smooth: true
         source: "pics/face.png"
         x: (parent.width-width*scale)/2
         y: (parent.height-height*scale)/2
diff --git a/examples/declarative/aspectratio/scale_to_fit_simple.qml b/examples/declarative/aspectratio/scale_to_fit_simple.qml
index f7fcd8b..7389581 100644
--- a/examples/declarative/aspectratio/scale_to_fit_simple.qml
+++ b/examples/declarative/aspectratio/scale_to_fit_simple.qml
@@ -12,8 +12,9 @@ Rectangle {
 
     Image {
         id: face
+        smooth: true
         source: "pics/face.png"
-        fillMode: "PreserveAspectFit"
+        fillMode: Image.PreserveAspectFit
         anchors.fill: parent
     }
 }
diff --git a/examples/declarative/dynamic/dynamic.qml b/examples/declarative/dynamic/dynamic.qml
index e083a5b..885e037 100644
--- a/examples/declarative/dynamic/dynamic.qml
+++ b/examples/declarative/dynamic/dynamic.qml
@@ -68,14 +68,12 @@ Item {
             Text{ text: "Drag an item into the scene." }
             Row{ id: toolRow
                 spacing: 8; 
-                height: childrenRect.height//TODO: Put bug in JIRA when it comes back up
                 PaletteItem{ 
                     anchors.verticalCenter: parent.verticalCenter
                     file: "Sun.qml";
                     image: "images/sun.png"
                 }
                 PaletteItem{ 
-                    anchors.verticalCenter: parent.verticalCenter
                     file: "GenericItem.qml"
                     image: "images/moon.png"
                 }
diff --git a/examples/declarative/fillmode/fillmode.qml b/examples/declarative/fillmode/fillmode.qml
index 0fdacbf..d3a28e2 100644
--- a/examples/declarative/fillmode/fillmode.qml
+++ b/examples/declarative/fillmode/fillmode.qml
@@ -7,22 +7,22 @@ Image {
     fillMode: SequentialAnimation {
         running: true
         repeat: true
-        PropertyAction { value: "Stretch" }
+        PropertyAction { value: Image.Stretch }
         PropertyAction { target: label; property: "text"; value: "Stretch" }
         PauseAnimation { duration: 1000 }
-        PropertyAction { value: "PreserveAspectFit" }
+        PropertyAction { value: Image.PreserveAspectFit }
         PropertyAction { target: label; property: "text"; value: "PreserveAspectFit" }
         PauseAnimation { duration: 1000 }
-        PropertyAction { value: "PreserveAspectCrop" }
+        PropertyAction { value: Image.PreserveAspectCrop }
         PropertyAction { target: label; property: "text"; value: "PreserveAspectCrop" }
         PauseAnimation { duration: 1000 }
-        PropertyAction { value: "Tile" }
+        PropertyAction { value: Image.Tile }
         PropertyAction { target: label; property: "text"; value: "Tile" }
         PauseAnimation { duration: 1000 }
-        PropertyAction { value: "TileHorizontally" }
+        PropertyAction { value: Image.TileHorizontally }
         PropertyAction { target: label; property: "text"; value: "TileHorizontally" }
         PauseAnimation { duration: 1000 }
-        PropertyAction { value: "TileVertically" }
+        PropertyAction { value: Image.TileVertically }
         PropertyAction { target: label; property: "text"; value: "TileVertically" }
         PauseAnimation { duration: 1000 }
     }
@@ -30,7 +30,7 @@ Image {
         id: label
         font.pointSize: 24
         color: "blue"
-        style: "Outline"
+        style: Text.Outline
         styleColor: "white"
         anchors { centerIn: parent }
     }
diff --git a/examples/declarative/fonts/fonts.qml b/examples/declarative/fonts/fonts.qml
index 4029f8b..e68bdb6 100644
--- a/examples/declarative/fonts/fonts.qml
+++ b/examples/declarative/fonts/fonts.qml
@@ -22,21 +22,21 @@ Rectangle {
         Text {
             text: myText
             color: palette.windowText
-            width: parent.width; elide: "ElideRight"
+            width: parent.width; elide: Text.ElideRight
             font.family: "Times"
             font.pointSize: 32
         }
         Text {
             text: myText
             color: palette.windowText
-            width: parent.width; elide: "ElideRight"
+            width: parent.width; elide: Text.ElideRight
             font.family: fixedFont.name
             font.pointSize: 32
         }
         Text {
             text: myText
             color: palette.windowText
-            width: parent.width; elide: "ElideRight"
+            width: parent.width; elide: Text.ElideRight
             font.family: localFont.name
             font.pointSize: 32
         }
@@ -47,7 +47,7 @@ Rectangle {
                 else if (webFont.status == 3) "Error loading font"
             }
             color: palette.windowText
-            width: parent.width; elide: "ElideRight"
+            width: parent.width; elide: Text.ElideRight
             font.family: webFont.name
             font.pointSize: 32
         }
@@ -58,7 +58,7 @@ Rectangle {
                 else if (webFont2.status == 3) "Error loading font"
             }
             color: palette.windowText
-            width: parent.width; elide: "ElideRight"
+            width: parent.width; elide: Text.ElideRight
             font.family: webFont2.name
             font.pointSize: 32
         }
diff --git a/examples/declarative/loader/Browser.qml b/examples/declarative/loader/Browser.qml
index 9e54758..f2cbd3d 100644
--- a/examples/declarative/loader/Browser.qml
+++ b/examples/declarative/loader/Browser.qml
@@ -81,7 +81,7 @@ Rectangle {
             }
             Text {
                 id: nameText
-                anchors.fill: parent; verticalAlignment: "AlignVCenter"
+                anchors.fill: parent; verticalAlignment: Text.AlignVCenter
                 text: fileName; anchors.leftMargin: 48
                 font.pixelSize: 32
                 color: wrapper.isCurrentItem ? palette.highlightedText : palette.text
@@ -225,7 +225,7 @@ Rectangle {
             anchors.left: upButton.right; anchors.right: parent.right; height: parent.height
             anchors.leftMargin: 4; anchors.rightMargin: 4
             text: folders.folder; color: "white"
-            elide: "ElideLeft"; horizontalAlignment: "AlignRight"; verticalAlignment: "AlignVCenter"
+            elide: Text.ElideLeft; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignVCenter
             font.pixelSize: 32
         }
     }
diff --git a/examples/declarative/snow/ImageBatch.qml b/examples/declarative/snow/ImageBatch.qml
index dfe2a46..95b9b97 100644
--- a/examples/declarative/snow/ImageBatch.qml
+++ b/examples/declarative/snow/ImageBatch.qml
@@ -41,7 +41,7 @@ GridView {
         transformOrigin: Item.Center
         width: grid.imageWidth; height: grid.imageHeight;
 
-        Image { id: flickrImage; source: url; fillMode: "PreserveAspectFit"; smooth: true; anchors.fill: parent;
+        Image { id: flickrImage; source: url; fillMode: Image.PreserveAspectFit; smooth: true; anchors.fill: parent;
                 opacity: (status == Image.Ready)?1:0; opacity: Behavior { NumberAnimation { properties: "opacity" } } }
         Loading { anchors.centerIn: parent; visible: flickrImage.status!=1 }
 
diff --git a/examples/declarative/tutorials/samegame/samegame1/samegame.qml b/examples/declarative/tutorials/samegame/samegame1/samegame.qml
index 8b32cae..b5546d0 100644
--- a/examples/declarative/tutorials/samegame/samegame1/samegame.qml
+++ b/examples/declarative/tutorials/samegame/samegame1/samegame.qml
@@ -13,7 +13,7 @@ Rectangle {
         Image {
             id: background
             anchors.fill: parent; source: "pics/background.png"
-            fillMode: "PreserveAspectCrop"
+            fillMode: Image.PreserveAspectCrop
         }
     }
 
diff --git a/examples/declarative/tutorials/samegame/samegame2/samegame.qml b/examples/declarative/tutorials/samegame/samegame2/samegame.qml
index 63431b1..257e0de 100644
--- a/examples/declarative/tutorials/samegame/samegame2/samegame.qml
+++ b/examples/declarative/tutorials/samegame/samegame2/samegame.qml
@@ -15,7 +15,7 @@ Rectangle {
         Image {
             id: background
             anchors.fill: parent; source: "pics/background.png"
-            fillMode: "PreserveAspectCrop"
+            fillMode: Image.PreserveAspectCrop
         }
     }
 
diff --git a/examples/declarative/tutorials/samegame/samegame3/samegame.qml b/examples/declarative/tutorials/samegame/samegame3/samegame.qml
index 5b98f48..0a7ec0f 100644
--- a/examples/declarative/tutorials/samegame/samegame3/samegame.qml
+++ b/examples/declarative/tutorials/samegame/samegame3/samegame.qml
@@ -14,7 +14,7 @@ Rectangle {
         Image {
             id: background
             anchors.fill: parent; source: "pics/background.png"
-            fillMode: "PreserveAspectCrop"
+            fillMode: Image.PreserveAspectCrop
         }
 
 //![1]
diff --git a/examples/declarative/tutorials/samegame/samegame4/samegame.qml b/examples/declarative/tutorials/samegame/samegame4/samegame.qml
index ede4362..e519912 100644
--- a/examples/declarative/tutorials/samegame/samegame4/samegame.qml
+++ b/examples/declarative/tutorials/samegame/samegame4/samegame.qml
@@ -15,7 +15,7 @@ Rectangle {
         Image {
             id: background
             anchors.fill: parent; source: "content/pics/background.png"
-            fillMode: "PreserveAspectCrop"
+            fillMode: Image.PreserveAspectCrop
         }
 
         Item {
diff --git a/examples/declarative/velocity/Day.qml b/examples/declarative/velocity/Day.qml
index b0d4dd9..030fa13 100644
--- a/examples/declarative/velocity/Day.qml
+++ b/examples/declarative/velocity/Day.qml
@@ -1,65 +1,48 @@
 import Qt 4.6
 
 Rectangle {
-    property string day
+    property alias day: dayText.text
     property var stickies
 
-    width: 400
-    height: 500
-    radius: 7
-    border.color: "black"
     id: page
-    Image {
-        x: 10
-        y: 10
-        source: "cork.jpg"
-    }
+    width: 400; height: 500; radius: 7
+    border.color: "black"
+
+    Image { x: 10; y: 10; source: "cork.jpg" }
+
     Text {
-        x: 20
-        y: 20
-        height: 40
-        font.pointSize: 14
-        font.bold: true
-        width: 370
-        text: day
-        style: "Outline"
-        styleColor: "#dedede"
+        id: dayText; x: 20; y: 20
+        height: 40; width: 370
+        font.pointSize: 14; font.bold: true
+        style: Text.Outline; styleColor: "#dedede"
     }
+
     Repeater {
         model: page.stickies
+
         Item {
+            id: stickyPage
             x: Math.random() * 200 + 100
             y: Math.random() * 300 + 50
-            id: stickyPage
             rotation: SpringFollow {
                 source: -flickable.horizontalVelocity / 100
-                spring: 2.0
-                damping: 0.1
+                spring: 2.0; damping: 0.1
             }
+
             Item {
                 id: sticky
                 scale: 0.5
                 Image {
-                    id: stickyImage
-                    source: "sticky.png"
-                    smooth: true
-                    y: -20
-                    x: 8 + -width * 0.6 / 2
-                    scale: 0.6
+                    id: stickyImage; source: "sticky.png"
+                    smooth: true; y: -20; x: 8 + -width * 0.6 / 2; scale: 0.6
                 }
+
                 TextEdit {
-                    id: myText
-                    smooth: true
-                    font.pointSize: 28
-                    readOnly: false
-                    x: -104
-                    y: 36
-                    wrap: true
-                    rotation: -8
-                    text: noteText
-                    width: 195
-                    height: 172
+                    id: myText; smooth: true; font.pointSize: 28
+                    readOnly: false; x: -104; y: 36; wrap: true
+                    rotation: -8; text: noteText; width: 195; height: 172
                 }
+
                 Item {
                     y: -20
                     x: stickyImage.x
@@ -69,44 +52,27 @@ Rectangle {
                         id: mouse
                         onClicked: { myText.focus = true }
                         anchors.fill: parent
-                        drag.target: stickyPage
-                        drag.axis: "XandYAxis"
-                        drag.minimumY: 0
-                        drag.maximumY: 500
-                        drag.minimumX: 0
-                        drag.maximumX: 400
+                        drag.target: stickyPage; drag.axis: "XandYAxis"; drag.minimumY: 0; drag.maximumY: 500
+                        drag.minimumX: 0; drag.maximumX: 400
                     }
                 }
             }
+
             Image {
                 source: "tack.png"
-                x: -width / 2
-                y: -height * 0.7 / 2
-                scale: 0.7
+                x: -width / 2; y: -height * 0.7 / 2; scale: 0.7
+            }
+
+            states: State {
+                name: "pressed"
+                when: mouse.pressed
+                PropertyChanges { target: sticky; rotation: 8; scale: 1 }
+                PropertyChanges { target: page; z: 8 }
+            }
+
+            transitions: Transition {
+                NumberAnimation { properties: "rotation,scale"; duration: 200 }
             }
-            states: [
-                State {
-                    name: "pressed"
-                    when: mouse.pressed
-                    PropertyChanges {
-                        target: sticky
-                        rotation: 8
-                        scale: 1
-                    }
-                    PropertyChanges {
-                        target: page
-                        z: 8
-                    }
-                }
-            ]
-            transitions: [
-                Transition {
-                    NumberAnimation {
-                        properties: "rotation,scale"
-                        duration: 200
-                    }
-                }
-            ]
         }
     }
 }
diff --git a/examples/declarative/velocity/velocity.qml b/examples/declarative/velocity/velocity.qml
index b132965..50d69d8 100644
--- a/examples/declarative/velocity/velocity.qml
+++ b/examples/declarative/velocity/velocity.qml
@@ -2,8 +2,8 @@ import Qt 4.6
 
 Rectangle {
     color: "lightSteelBlue"
-    width: 800
-    height: 600
+    width: 800; height: 600
+
     ListModel {
         id: list
         ListElement {
@@ -12,10 +12,10 @@ Rectangle {
             notes: [
                 ListElement {
                     noteText: "Lunch"
-                },
-                ListElement {
-                    noteText: "Party"
-                }
+                    },
+                    ListElement {
+                        noteText: "Party"
+                    }
             ]
         }
         ListElement {
@@ -24,13 +24,13 @@ Rectangle {
             notes: [
                 ListElement {
                     noteText: "Pickup kids"
-                },
-                ListElement {
-                    noteText: "Checkout kinetic"
-                },
-                ListElement {
-                    noteText: "Read email"
-                }
+                    },
+                    ListElement {
+                        noteText: "Checkout kinetic"
+                        },
+                        ListElement {
+                            noteText: "Read email"
+                        }
             ]
         }
         ListElement {
@@ -39,10 +39,10 @@ Rectangle {
             notes: [
                 ListElement {
                     noteText: "Walk dog"
-                },
-                ListElement {
-                    noteText: "Buy newspaper"
-                }
+                    },
+                    ListElement {
+                        noteText: "Buy newspaper"
+                    }
             ]
         }
         ListElement {
@@ -51,10 +51,10 @@ Rectangle {
             notes: [
                 ListElement {
                     noteText: "Cook dinner"
-                },
-                ListElement {
-                    noteText: "Eat dinner"
-                }
+                    },
+                    ListElement {
+                        noteText: "Eat dinner"
+                    }
             ]
         }
         ListElement {
@@ -63,10 +63,10 @@ Rectangle {
             notes: [
                 ListElement {
                     noteText: "5:30pm Meeting"
-                },
-                ListElement {
-                    noteText: "Weed garden"
-                }
+                    },
+                    ListElement {
+                        noteText: "Weed garden"
+                    }
             ]
         }
         ListElement {
@@ -75,10 +75,10 @@ Rectangle {
             notes: [
                 ListElement {
                     noteText: "Still work"
-                },
-                ListElement {
-                    noteText: "Drink"
-                }
+                    },
+                    ListElement {
+                        noteText: "Drink"
+                    }
             ]
         }
         ListElement {
@@ -87,28 +87,21 @@ Rectangle {
             notes: [
                 ListElement {
                     noteText: "Drink"
-                },
-                ListElement {
-                    noteText: "Drink"
-                }
+                    },
+                    ListElement {
+                        noteText: "Drink"
+                    }
             ]
         }
     }
     Flickable {
         id: flickable
-        anchors.fill: parent
-        viewportWidth: lay.width
+        anchors.fill: parent; viewportWidth: lay.width
         Row {
             id: lay
             Repeater {
                 model: list
-                Component {
-                    Day {
-                        day: name
-                        color: dayColor
-                        stickies: notes
-                    }
-                }
+                Component { Day { day: name; color: dayColor; stickies: notes } }
             }
         }
     }
diff --git a/examples/declarative/webview/content/FieldText.qml b/examples/declarative/webview/content/FieldText.qml
index 2adfbbf..b1c1938 100644
--- a/examples/declarative/webview/content/FieldText.qml
+++ b/examples/declarative/webview/content/FieldText.qml
@@ -79,7 +79,7 @@ Item {
         x: 5
         width: parent.width-10
         anchors.verticalCenter: parent.verticalCenter
-        horizontalAlignment: "AlignHCenter"
+        horizontalAlignment: Text.AlignHCenter
         color: fieldText.state == "editing" ? "#505050" : "#AAAAAA"
         font.italic: true
         font.bold: true