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

5 files changed, 28 insertions, 27 deletions

diff --git a/demos/declarative/flickr/content/ImageDetails.qml b/demos/declarative/flickr/content/ImageDetails.qml
index d575be9..ccc91cb 100644
--- a/demos/declarative/flickr/content/ImageDetails.qml
+++ b/demos/declarative/flickr/content/ImageDetails.qml
@@ -12,6 +12,7 @@ Flipable {
     property string photoDate
     property string photoUrl
     property int rating: 2
+    property var prevScale: 1.0
 
     signal closed
 
@@ -88,12 +89,12 @@ Flipable {
                     // Center image if it is smaller than the flickable area.
                     x: ImageContainer.width > width*scale ? (ImageContainer.width - width*scale) / 2 : 0
                     y: ImageContainer.height > height*scale ? (ImageContainer.height - height*scale) / 2 : 0
-                    anchors.centeredIn: parent
                     onStatusChanged : {
                         // Default scale shows the entire image.
                         if (status == 0 && width != 0) {
                             Slider.minimum = Math.min(Flick.width / width, Flick.height / height);
-                            Slider.value = Math.min(Slider.minimum, 1);
+                            prevScale = Math.min(Slider.minimum, 1);
+                            Slider.value = prevScale;
                         }
                     }
                 }
@@ -109,7 +110,20 @@ Flipable {
             anchors.centeredIn: parent; color: "white"; font.bold: true
         }
 
-        Slider { id: Slider; x: 25; y: 374; visible: { BigImage.status == 0 && maximum > minimum } }
+        Slider {
+            id: Slider; x: 25; y: 374; visible: { BigImage.status == 0 && maximum > minimum }
+            onValueChanged: {
+                if (BigImage.width * value > Flick.width) {
+                    var xoff = (Flick.width/2 + Flick.xPosition) * value / prevScale;
+                    Flick.xPosition = xoff - Flick.width/2;
+                }
+                if (BigImage.height * value > Flick.height) {
+                    var yoff = (Flick.height/2 + Flick.yPosition) * value / prevScale;
+                    Flick.yPosition = yoff - Flick.height/2;
+                }
+                prevScale = value;
+            }
+        }
     }
 
     states: [
diff --git a/demos/declarative/flickr/content/Progress.qml b/demos/declarative/flickr/content/Progress.qml
index 92a232e..aa2a2e6 100644
--- a/demos/declarative/flickr/content/Progress.qml
+++ b/demos/declarative/flickr/content/Progress.qml
@@ -5,7 +5,7 @@ Item {
 
     Rect {
         id: Container; anchors.fill: parent; gradientColor: "#66000000";
-        pen.color: "white"; pen.width: 1;  color: "#66343434"; radius: height/2 - 2
+        pen.color: "white"; pen.width: 0;  color: "#66343434"; radius: height/2 - 2
     }
 
     Rect {
diff --git a/demos/declarative/flickr/content/Slider.qml b/demos/declarative/flickr/content/Slider.qml
index 92f4993..aae4631 100644
--- a/demos/declarative/flickr/content/Slider.qml
+++ b/demos/declarative/flickr/content/Slider.qml
@@ -3,25 +3,25 @@ Item {
 
     // value is read/write.
     property real value
-    onValueChanged: { Handle.x = (value - minimum) * Slider.xMax / (maximum - minimum); }
+    onValueChanged: { Handle.x = 2 + (value - minimum) * Slider.xMax / (maximum - minimum); }
     property real maximum: 1
     property real minimum: 1
-    property int xMax: Slider.width - Handle.width - 2
+    property int xMax: Slider.width - Handle.width - 4
 
     Rect {
         id: Container; anchors.fill: parent; gradientColor: "#66000000";
-        pen.color: "white"; pen.width: 1;  color: "#66343434"; radius: 8
+        pen.color: "white"; pen.width: 0;  color: "#66343434"; radius: 8
     }
 
     Rect {
         id: Handle
-        x: Slider.width / 2 - Handle.width / 2; y: 2; width: 30; height: 12
+        x: Slider.width / 2 - Handle.width / 2; y: 2; width: 30; height: Slider.height-4
         color: "lightgray"; gradientColor: "gray"; radius: 6
 
         MouseRegion {
             anchors.fill: parent; drag.target: parent
-            drag.axis: "x"; drag.xmin: 2; drag.xmax: Slider.xMax
-            onPositionChanged: { value = (maximum - minimum) * Handle.x / Slider.xMax + minimum; }
+            drag.axis: "x"; drag.xmin: 2; drag.xmax: Slider.xMax+2
+            onPositionChanged: { value = (maximum - minimum) * (Handle.x-2) / Slider.xMax + minimum; }
         }
     }
 }
diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml
index b113f56..da77d93 100644
--- a/demos/declarative/flickr/flickr.qml
+++ b/demos/declarative/flickr/flickr.qml
@@ -122,6 +122,8 @@ Item {
 
         Image { source: "content/pics/background.png"; opaque: true; anchors.fill: parent }
 
+        Loading { anchors.centeredIn: parent; visible: FeedModel.status != 0 }
+
         GridView {
             id: PhotoGridView; model: FeedModel; delegate: PhotoDelegate; cacheBuffer: 100
             cellWidth: 105; cellHeight: 105; x:32; y: 80; width: 800; height: 330; z: 1
diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml
index 4b03b63..a38d032 100644
--- a/demos/declarative/webbrowser/webbrowser.qml
+++ b/demos/declarative/webbrowser/webbrowser.qml
@@ -114,6 +114,7 @@ Item {
                             opacity: 1-Header.progressOff
                             clip: true
                         }
+                        
                         /*
                         KeyProxy {
                             id: proxy
@@ -134,30 +135,14 @@ Item {
                             wrap: false
                             font.size: 11
                             color: "#555555"
+                            focusOnPress: true
 
                             anchors.left: UrlBox.left
                             anchors.right: UrlBox.right
                             anchors.leftMargin: 6
                             anchors.verticalCenter: UrlBox.verticalCenter
                             anchors.verticalCenterOffset: 1
-
-                            opacity: 0
                         }
-                        Text {
-                            id: ShowUrl
-                            text: WebView.url == '' ? ' ' : WebView.url
-                            font.size: 11
-                            color: "#555555"
-                            anchors.left: UrlBox.left
-                            anchors.right: UrlBox.right
-                            anchors.leftMargin: 6
-                            anchors.verticalCenter: UrlBox.verticalCenter
-                            anchors.verticalCenterOffset: 1
-                        }
-                    }
-                    MouseRegion {
-                        anchors.fill: UrlBox
-                        onClicked: { proxy.focus=true }
                     }
                 }