Merge branch 'master' of git@gitorious.org:stuff/qml-dashboard

Conflicts:
	multilayer-dashboard/RotatableImage.qml

6 files changed, 276 insertions, 14 deletions

diff --git a/multilayer-dashboard/ColumnFour.qml b/multilayer-dashboard/ColumnFour.qml
index 0812ef5..5de2fda 100644
--- a/multilayer-dashboard/ColumnFour.qml
+++ b/multilayer-dashboard/ColumnFour.qml
@@ -77,6 +77,27 @@ Item {
                 fullScreenWidget: myRow.reparentWidget
             }
         }
+        ExpandableWidget {
+            id: firstWidget
+            widget: Rectangle {
+                anchors.fill: parent
+                Text {
+                    anchors.centerIn: parent
+                    text: "Quit"
+                    font.pointSize: 16
+
+                }
+            }
+            GestureArea {
+                anchors.fill: parent
+                Tap {
+                    onFinished: {
+                        Qt.quit()
+                    }
+                }
+            }
+            fullScreenWidget: myRow.reparentWidget
+        }
 
         property int maxY : (tapWidgetContainer.childrenRect.height > topLevel.height) ?
                                 0 :
diff --git a/multilayer-dashboard/ColumnThree.qml b/multilayer-dashboard/ColumnThree.qml
index cf3d172..74e4b2d 100644
--- a/multilayer-dashboard/ColumnThree.qml
+++ b/multilayer-dashboard/ColumnThree.qml
@@ -61,30 +61,33 @@ Item {
             color: "green"
             reparentWidget: myRow.reparentWidget
         }
-        TapWidget {
+        VolumeControl {
             x:10
             id: secondWidget
-            color: "blue"
             reparentWidget: myRow.reparentWidget
         }
         TapWidget {
             x:10
             id: thirdWidget
+            color: "blue"
             reparentWidget: myRow.reparentWidget
         }
         TapWidget {
             x:10
             id: fourthWidget
+            color: "red"
             reparentWidget: myRow.reparentWidget
         }
         TapWidget {
             x:10
             id: fifthWidget
+            color: "yellow"
             reparentWidget: myRow.reparentWidget
         }
         TapWidget {
             x:10
             id: sixthWidget
+            color: "orange"
             reparentWidget: myRow.reparentWidget
         }
 
diff --git a/multilayer-dashboard/RotatableImage.qml b/multilayer-dashboard/RotatableImage.qml
index 9d389e6..a6e1481 100644
--- a/multilayer-dashboard/RotatableImage.qml
+++ b/multilayer-dashboard/RotatableImage.qml
@@ -68,17 +68,6 @@ Item {
         y:10
     }
 
-    function pinch(gesture) {
-        if (gesture.changeFlags & PinchGesture.RotationAngleChanged)
-            img.rotation += gesture.rotationAngle - gesture.lastRotationAngle
-        if (gesture.changeFlags & PinchGesture.ScaleFactorChanged)
-            img.scale *= gesture.scaleFactor
-        if (gesture.changeFlags & PinchGesture.CenterPointChanged) {
-            img.x += gesture.centerPoint.x - gesture.lastCenterPoint.x
-            img.y += gesture.centerPoint.y - gesture.lastCenterPoint.y
-        }
-    }
-
     states: State {
         name: "collapsed"
         when:!parent.fullScreen
diff --git a/multilayer-dashboard/StrokeList.qml b/multilayer-dashboard/StrokeList.qml
index a4c96f9..0ee8bb8 100644
--- a/multilayer-dashboard/StrokeList.qml
+++ b/multilayer-dashboard/StrokeList.qml
@@ -15,7 +15,7 @@ BorderImage {
         clip: true
 
         function foo(index) {
-            var colors = ["#4477bb", "#44bb77", "#eeeeee", "bbeedd", "lightgreen"];
+            var colors = ["#4477bb", "#44bb77", "#eeeeee", "#bbeedd", "lightgreen"];
             return colors[index % colors.length]
         }
 
diff --git a/multilayer-dashboard/VolumeChannel.qml b/multilayer-dashboard/VolumeChannel.qml
new file mode 100644
index 0000000..3749d5c
--- /dev/null
+++ b/multilayer-dashboard/VolumeChannel.qml
@@ -0,0 +1,116 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import Qt 4.7
+import Qt.labs.gestures 1.0
+
+
+
+Rectangle {
+    id: volume
+    gradient: Gradient {
+        GradientStop { position: 0.0; color: "red" }
+        GradientStop { position: 0.33; color: "yellow" }
+        GradientStop { position: 1.0; color: "green" }
+    }
+    property int volumeValue : 0
+
+    Rectangle {
+        id: leftBorder
+        color: "blue"
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
+        anchors.left: parent.left
+        width: volume.width/50
+    }
+
+    Rectangle {
+        id: volumeDrag
+        color: "grey"
+        anchors.top:parent.top
+        anchors.right: rightBorder.left
+        anchors.left: leftBorder.right
+        height: 100
+    }
+
+    Text {
+        id: label
+        anchors.bottom: parent.bottom
+        anchors.horizontalCenter: parent.horizontalCenter
+        text: volumeValue + "%"
+        font.pointSize: 8
+
+    }
+
+    Rectangle {
+        id: rightBorder
+        color: "blue"
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
+        anchors.right: parent.right
+        width: volume.width/50
+    }
+
+    function updateDrag() {
+        volumeDrag.height = parent.height - (parent.height / 100 * volumeValue)
+    }
+
+    function updateFontSize(size){
+        label.font.pointSize = size
+    }
+
+
+    onHeightChanged: updateDrag()
+
+    GestureArea {
+        id: volumeGA
+        anchors.fill: parent
+        Pan {
+            onUpdated: {
+                volumeValue = 100 / parent.height * (parent.height - volumeDrag.height - gesture.delta.y)
+                if(volumeValue > 100)
+                    volumeValue = 100
+                else if(volumeValue < 0)
+                    volumeValue = 0
+                updateDrag()
+            }
+        }
+    }
+}
diff --git a/multilayer-dashboard/VolumeControl.qml b/multilayer-dashboard/VolumeControl.qml
new file mode 100644
index 0000000..d5023c3
--- /dev/null
+++ b/multilayer-dashboard/VolumeControl.qml
@@ -0,0 +1,133 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import Qt 4.7
+import Qt.labs.gestures 1.0
+
+Rectangle {
+    id: testWidget
+    width: 160
+    height: 160
+    property alias color: innerWidget.color
+    property variant reparentWidget : testWidget
+
+    Rectangle {
+        id: innerWidget
+        color: "steelblue"
+        radius: 10
+        anchors.fill: testWidget
+
+        property bool fullScreen : false
+
+        VolumeChannel {
+            id: vol1
+            anchors.top: parent.top
+            anchors.bottom: parent.bottom
+            anchors.left: parent.left
+            width: parent.width/5
+            volumeValue: 30
+        }
+        VolumeChannel {
+            id:vol2
+            anchors.top: parent.top
+            anchors.bottom: parent.bottom
+            anchors.left: vol1.right
+            width: parent.width/5
+            volumeValue: 40
+        }
+        VolumeChannel {
+            id:vol3
+            anchors.top: parent.top
+            anchors.bottom: parent.bottom
+            anchors.left: vol2.right
+            width: parent.width/5
+            volumeValue: 60
+        }
+        VolumeChannel {
+            id:vol4
+            anchors.top: parent.top
+            anchors.bottom: parent.bottom
+            anchors.left: vol3.right
+            width: parent.width/5
+            volumeValue: 20
+        }
+        VolumeChannel {
+            id:vol5
+            anchors.top: parent.top
+            anchors.bottom: parent.bottom
+            anchors.left: vol4.right
+            width: parent.width/5
+            volumeValue: 50
+        }
+
+
+
+
+        GestureArea {
+            id: tapGestureArea
+            anchors.fill: parent
+            Tap {
+                onFinished: {
+                    if (!innerWidget.fullScreen) {
+                        innerWidget.fullScreen = true
+                        innerWidget.parent = testWidget.reparentWidget
+                        innerWidget.anchors.fill = testWidget.reparentWidget
+                        vol1.updateFontSize(16)
+                        vol2.updateFontSize(16)
+                        vol3.updateFontSize(16)
+                        vol4.updateFontSize(16)
+                        vol5.updateFontSize(16)
+
+                    }
+                    else {
+                        innerWidget.parent = testWidget
+                        innerWidget.anchors.fill = testWidget
+                        innerWidget.fullScreen = false
+                        vol1.updateFontSize(8)
+                        vol2.updateFontSize(8)
+                        vol3.updateFontSize(8)
+                        vol4.updateFontSize(8)
+                        vol5.updateFontSize(8)
+                    }
+                }
+            }
+        }
+    }
+}