summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@nokia.com>2010-08-17 05:48:06 -0400
committerZeno Albisser <zeno.albisser@nokia.com>2010-08-17 05:49:14 -0400
commitbf6a57d4fd4d4ff5827a72dd6c624e7fe90deaa6 (patch)
tree3de566a3b655510d3da7273344ad55a075f53c98
parent2eab8277e57d887b8bb3795730c3af701b34d803 (diff)
added tapandholdwidget and started some resizing to fit device screen
-rw-r--r--multilayer-dashboard/Button.qml6
-rw-r--r--multilayer-dashboard/RowFour.qml2
-rw-r--r--multilayer-dashboard/RowOne.qml47
3 files changed, 36 insertions, 19 deletions
diff --git a/multilayer-dashboard/Button.qml b/multilayer-dashboard/Button.qml
index 0277854..3a04d86 100644
--- a/multilayer-dashboard/Button.qml
+++ b/multilayer-dashboard/Button.qml
@@ -11,8 +11,8 @@ Rectangle {
property bool enabled : state != "disabled"
- width: 160
- height: 40
+ width: 300
+ height: 80
radius: 10
Rectangle {
@@ -137,7 +137,7 @@ Rectangle {
}
Swipe {
- when: gesture.speed > 25
+// when: gesture.speed > 25
onStarted: button.handled = true
onFinished: {
if (isHorizontalSwipe(gesture.swipeAngle)) {
diff --git a/multilayer-dashboard/RowFour.qml b/multilayer-dashboard/RowFour.qml
index e3f2db6..49b03a8 100644
--- a/multilayer-dashboard/RowFour.qml
+++ b/multilayer-dashboard/RowFour.qml
@@ -42,7 +42,7 @@ import Qt 4.7
import Qt.labs.gestures 1.0
Rectangle {
- width: 200
+ width: 340
height: 340
id: myRow
property variant reparentWidget: myRow
diff --git a/multilayer-dashboard/RowOne.qml b/multilayer-dashboard/RowOne.qml
index 60badf3..9858972 100644
--- a/multilayer-dashboard/RowOne.qml
+++ b/multilayer-dashboard/RowOne.qml
@@ -42,7 +42,7 @@ import Qt 4.7
import Qt.labs.gestures 1.0
Rectangle {
- width: 200
+ width: 340
height: 340
id: myRow
property variant reparentWidget: myRow
@@ -51,33 +51,50 @@ Rectangle {
Rectangle {
id: tapWidgetContainer
- TapWidget {
- x: 10
+ TapAndHoldWidget {
id: firstWidget
color: "green"
- reparentWidget: myRow.reparentWidget
}
- TapWidget {
- x:10
+ TapAndHoldWidget {
anchors.top : firstWidget.bottom
anchors.topMargin : 2.0
id: secondWidget
color: "blue"
- reparentWidget: myRow.reparentWidget
}
- TapWidget {
- x:10
+ TapAndHoldWidget {
anchors.top : secondWidget.bottom
anchors.topMargin : 2.0
id: thirdWidget
- reparentWidget: myRow.reparentWidget
+ color: "green"
}
- StrokeList {
- x:10
+ TapAndHoldWidget {
anchors.top : thirdWidget.bottom
- anchors.topMargin: 2.0
- id: strokeList
-// reparentWidget: myRow.reparentWidget
+ anchors.topMargin : 2.0
+ id: fourthWidget
+ color: "blue"
+ }
+ TapAndHoldWidget {
+ anchors.top : fourthWidget.bottom
+ id: fifthWidget
+ color: "green"
+ }
+ TapAndHoldWidget {
+ anchors.top : fifthWidget.bottom
+ anchors.topMargin : 2.0
+ id: sixthWidget
+ color: "blue"
+ }
+ TapAndHoldWidget {
+ anchors.top : sixthWidget.bottom
+ anchors.topMargin : 2.0
+ id: seventhWidget
+ color: "green"
+ }
+ TapAndHoldWidget {
+ anchors.top : seventhWidget.bottom
+ anchors.topMargin : 2.0
+ id: eightWidget
+ color: "blue"
}