summaryrefslogtreecommitdiffstats
path: root/demos/declarative
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-02-22 05:10:37 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-02-22 05:10:37 (GMT)
commit1ad3918809ea6c4ac3c1b185581f1c8e76f02aca (patch)
tree79c712286b530383b90ef426a560bed93208b1d5 /demos/declarative
parentbffef59bcefd73a5474f3c3052c951977b60eb27 (diff)
downloadQt-1ad3918809ea6c4ac3c1b185581f1c8e76f02aca.zip
Qt-1ad3918809ea6c4ac3c1b185581f1c8e76f02aca.tar.gz
Qt-1ad3918809ea6c4ac3c1b185581f1c8e76f02aca.tar.bz2
Rename MouseRegion -> MouseArea
Diffstat (limited to 'demos/declarative')
-rw-r--r--demos/declarative/calculator/CalcButton.qml2
-rw-r--r--demos/declarative/flickr/common/MediaButton.qml2
-rw-r--r--demos/declarative/flickr/common/MediaLineEdit.qml2
-rw-r--r--demos/declarative/flickr/common/Slider.qml2
-rw-r--r--demos/declarative/flickr/common/Star.qml2
-rw-r--r--demos/declarative/flickr/flickr-desktop.qml2
-rw-r--r--demos/declarative/flickr/mobile/Button.qml2
-rw-r--r--demos/declarative/flickr/mobile/GridDelegate.qml2
-rw-r--r--demos/declarative/minehunt/Description.qml2
-rw-r--r--demos/declarative/minehunt/minehunt.qml4
-rw-r--r--demos/declarative/samegame/content/Button.qml2
-rw-r--r--demos/declarative/samegame/content/Dialog.qml2
-rw-r--r--demos/declarative/samegame/samegame.qml2
-rw-r--r--demos/declarative/snake/content/Button.qml2
-rw-r--r--demos/declarative/snake/snake.qml2
-rw-r--r--demos/declarative/twitter/content/Button.qml2
-rw-r--r--demos/declarative/webbrowser/content/fieldtext/FieldText.qml6
-rw-r--r--demos/declarative/webbrowser/webbrowser.qml6
18 files changed, 23 insertions, 23 deletions
diff --git a/demos/declarative/calculator/CalcButton.qml b/demos/declarative/calculator/CalcButton.qml
index 08851d0..6210e46 100644
--- a/demos/declarative/calculator/CalcButton.qml
+++ b/demos/declarative/calculator/CalcButton.qml
@@ -15,7 +15,7 @@ Rectangle {
Text { id: label; anchors.centerIn: parent; color: palette.buttonText }
- MouseRegion {
+ MouseArea {
id: clickRegion
anchors.fill: parent
onClicked: {
diff --git a/demos/declarative/flickr/common/MediaButton.qml b/demos/declarative/flickr/common/MediaButton.qml
index c12b642..86ac948 100644
--- a/demos/declarative/flickr/common/MediaButton.qml
+++ b/demos/declarative/flickr/common/MediaButton.qml
@@ -16,7 +16,7 @@ Item {
source: "pics/button-pressed.png"
opacity: 0
}
- MouseRegion {
+ MouseArea {
id: mouseRegion
anchors.fill: buttonImage
onClicked: { container.clicked(); }
diff --git a/demos/declarative/flickr/common/MediaLineEdit.qml b/demos/declarative/flickr/common/MediaLineEdit.qml
index b24b296..3dfd1f3 100644
--- a/demos/declarative/flickr/common/MediaLineEdit.qml
+++ b/demos/declarative/flickr/common/MediaLineEdit.qml
@@ -62,7 +62,7 @@ Item {
anchors.right: container.right
}
- MouseRegion {
+ MouseArea {
id: mouseRegion
anchors.fill: buttonImage
onClicked: { container.state = container.state=="Edit" ? "" : "Edit" }
diff --git a/demos/declarative/flickr/common/Slider.qml b/demos/declarative/flickr/common/Slider.qml
index fa1645c..05a87e7 100644
--- a/demos/declarative/flickr/common/Slider.qml
+++ b/demos/declarative/flickr/common/Slider.qml
@@ -27,7 +27,7 @@ Item {
GradientStop { position: 1.0; color: "gray" }
}
- MouseRegion {
+ MouseArea {
anchors.fill: parent; drag.target: parent
drag.axis: "XAxis"; drag.minimumX: 2; drag.maximumX: slider.xMax+2
onPositionChanged: { value = (maximum - minimum) * (handle.x-2) / slider.xMax + minimum; }
diff --git a/demos/declarative/flickr/common/Star.qml b/demos/declarative/flickr/common/Star.qml
index 173021b..8cd47b4 100644
--- a/demos/declarative/flickr/common/Star.qml
+++ b/demos/declarative/flickr/common/Star.qml
@@ -17,7 +17,7 @@ Item {
opacity: 0.4
scale: 0.5
}
- MouseRegion {
+ MouseArea {
anchors.fill: container
onClicked: { container.clicked() }
}
diff --git a/demos/declarative/flickr/flickr-desktop.qml b/demos/declarative/flickr/flickr-desktop.qml
index 3848f12..1ca3cdc 100644
--- a/demos/declarative/flickr/flickr-desktop.qml
+++ b/demos/declarative/flickr/flickr-desktop.qml
@@ -61,7 +61,7 @@ Item {
}
}
- MouseRegion { anchors.fill: wrapper; onClicked: { photoClicked() } }
+ MouseArea { anchors.fill: wrapper; onClicked: { photoClicked() } }
states: [
State {
diff --git a/demos/declarative/flickr/mobile/Button.qml b/demos/declarative/flickr/mobile/Button.qml
index 770330c..4ba6b19 100644
--- a/demos/declarative/flickr/mobile/Button.qml
+++ b/demos/declarative/flickr/mobile/Button.qml
@@ -18,7 +18,7 @@ Item {
source: "images/toolbutton.sci"
width: container.width; height: container.height
}
- MouseRegion {
+ MouseArea {
id: mouseRegion
anchors.fill: buttonImage
onClicked: { container.clicked(); }
diff --git a/demos/declarative/flickr/mobile/GridDelegate.qml b/demos/declarative/flickr/mobile/GridDelegate.qml
index 6c12896..0f5b69c 100644
--- a/demos/declarative/flickr/mobile/GridDelegate.qml
+++ b/demos/declarative/flickr/mobile/GridDelegate.qml
@@ -67,6 +67,6 @@
}
]
}
- MouseRegion { anchors.fill: wrapper; onClicked: { photoClicked() } }
+ MouseArea { anchors.fill: wrapper; onClicked: { photoClicked() } }
}
}
diff --git a/demos/declarative/minehunt/Description.qml b/demos/declarative/minehunt/Description.qml
index 440dd2e..cc4d3b2 100644
--- a/demos/declarative/minehunt/Description.qml
+++ b/demos/declarative/minehunt/Description.qml
@@ -4,7 +4,7 @@ Item {
id: page
height: myText.height + 20
property var text
- MouseRegion {
+ MouseArea {
anchors.fill: parent
drag.target: page
drag.axis: "XandYAxis"
diff --git a/demos/declarative/minehunt/minehunt.qml b/demos/declarative/minehunt/minehunt.qml
index 18e8195..92555c2 100644
--- a/demos/declarative/minehunt/minehunt.qml
+++ b/demos/declarative/minehunt/minehunt.qml
@@ -101,7 +101,7 @@ Item {
}
}
]
- MouseRegion {
+ MouseArea {
anchors.fill: parent
acceptedButtons: Qt.LeftButton | Qt.RightButton
onPressed: {
@@ -188,7 +188,7 @@ Item {
anchors.right: field.right
anchors.rightMargin: 20
source: isPlaying ? 'pics/face-smile.png' : hasWon ? 'pics/face-smile-big.png': 'pics/face-sad.png'
- MouseRegion {
+ MouseArea {
anchors.fill: parent
onPressed: { reset() }
}
diff --git a/demos/declarative/samegame/content/Button.qml b/demos/declarative/samegame/content/Button.qml
index 63cd555..6629302 100644
--- a/demos/declarative/samegame/content/Button.qml
+++ b/demos/declarative/samegame/content/Button.qml
@@ -17,7 +17,7 @@ Rectangle {
GradientStop { position: 1.0; color: activePalette.button }
}
- MouseRegion { id: mr; anchors.fill: parent; onClicked: container.clicked() }
+ MouseArea { id: mr; anchors.fill: parent; onClicked: container.clicked() }
Text {
id: txtItem; text: container.text; anchors.centerIn: container; color: activePalette.buttonText
diff --git a/demos/declarative/samegame/content/Dialog.qml b/demos/declarative/samegame/content/Dialog.qml
index 5bd1123..7769328 100644
--- a/demos/declarative/samegame/content/Dialog.qml
+++ b/demos/declarative/samegame/content/Dialog.qml
@@ -18,5 +18,5 @@ Rectangle {
NumberAnimation { duration: 1000 }
}
Text { id: myText; anchors.centerIn: parent; text: "Hello World!" }
- MouseRegion { id: mr; anchors.fill: parent; onClicked: forceClose(); }
+ MouseArea { id: mr; anchors.fill: parent; onClicked: forceClose(); }
}
diff --git a/demos/declarative/samegame/samegame.qml b/demos/declarative/samegame/samegame.qml
index f5c4fc5..50f6293 100644
--- a/demos/declarative/samegame/samegame.qml
+++ b/demos/declarative/samegame/samegame.qml
@@ -28,7 +28,7 @@ Rectangle {
width: parent.width - (parent.width % getTileSize());
height: parent.height - (parent.height % getTileSize());
- MouseRegion {
+ MouseArea {
id: gameMR
anchors.fill: parent; onClicked: handleClick(mouse.x,mouse.y);
}
diff --git a/demos/declarative/snake/content/Button.qml b/demos/declarative/snake/content/Button.qml
index 63cd555..6629302 100644
--- a/demos/declarative/snake/content/Button.qml
+++ b/demos/declarative/snake/content/Button.qml
@@ -17,7 +17,7 @@ Rectangle {
GradientStop { position: 1.0; color: activePalette.button }
}
- MouseRegion { id: mr; anchors.fill: parent; onClicked: container.clicked() }
+ MouseArea { id: mr; anchors.fill: parent; onClicked: container.clicked() }
Text {
id: txtItem; text: container.text; anchors.centerIn: container; color: activePalette.buttonText
diff --git a/demos/declarative/snake/snake.qml b/demos/declarative/snake/snake.qml
index 58827a7..3bec747 100644
--- a/demos/declarative/snake/snake.qml
+++ b/demos/declarative/snake/snake.qml
@@ -101,7 +101,7 @@ Rectangle {
id: skull
}
- MouseRegion {
+ MouseArea {
anchors.fill: parent
onPressed: {
if (!head || !heartbeat.running) {
diff --git a/demos/declarative/twitter/content/Button.qml b/demos/declarative/twitter/content/Button.qml
index 09d471c..4cba8c3 100644
--- a/demos/declarative/twitter/content/Button.qml
+++ b/demos/declarative/twitter/content/Button.qml
@@ -19,7 +19,7 @@ Item {
source: "images/toolbutton.sci"
width: container.width; height: container.height
}
- MouseRegion {
+ MouseArea {
id: mouseRegion
anchors.fill: buttonImage
onClicked: { container.clicked(); }
diff --git a/demos/declarative/webbrowser/content/fieldtext/FieldText.qml b/demos/declarative/webbrowser/content/fieldtext/FieldText.qml
index b1c1938..19b6acc 100644
--- a/demos/declarative/webbrowser/content/fieldtext/FieldText.qml
+++ b/demos/declarative/webbrowser/content/fieldtext/FieldText.qml
@@ -93,17 +93,17 @@ Item {
}
}
- MouseRegion {
+ MouseArea {
anchors.fill: cancelIcon
onClicked: { reset() }
}
- MouseRegion {
+ MouseArea {
anchors.fill: confirmIcon
onClicked: { confirm() }
}
- MouseRegion {
+ MouseArea {
id: editRegion
anchors.fill: textEdit
onClicked: { edit() }
diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml
index 8de13d5..934593c 100644
--- a/demos/declarative/webbrowser/webbrowser.qml
+++ b/demos/declarative/webbrowser/webbrowser.qml
@@ -103,7 +103,7 @@ Item {
}
}
]
- MouseRegion {
+ MouseArea {
anchors.fill: back_e
onClicked: { if (webView.back.enabled) webView.back.trigger() }
}
@@ -114,7 +114,7 @@ Item {
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
}
- MouseRegion {
+ MouseArea {
anchors.fill: reload
onClicked: { webView.reload.trigger() }
}
@@ -159,7 +159,7 @@ Item {
}
}
]
- MouseRegion {
+ MouseArea {
anchors.fill: parent
onClicked: { if (webView.forward.enabled) webView.forward.trigger() }
}