From b6575a31181a84ed700f6080e93f497b1a3a290c Mon Sep 17 00:00:00 2001
From: Alberto Mardegan <info@mardy.it>
Date: Sat, 5 Jan 2013 19:51:02 +0100
Subject: [PATCH] Make Dialog work again
Remove some non-working code, update property names and add missing
import statement.
Add a manual test.
Change-Id: Id6964ce7acca65088d10158493ed75db3fa05c83
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
---
src/qtdesktop/Dialog.qml | 8 ++---
tests/manual/Dialog.qml | 70 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 72 insertions(+), 6 deletions(-)
create mode 100644 tests/manual/Dialog.qml
diff --git a/src/qtdesktop/Dialog.qml b/src/qtdesktop/Dialog.qml
index 248f33e3a..abbda95e7 100644
--- a/src/qtdesktop/Dialog.qml
+++ b/src/qtdesktop/Dialog.qml
@@ -40,6 +40,7 @@
import QtQuick 2.0
import QtQuick.Window 2.0
+import QtDesktop 1.0
/*!
\qmltype Dialog
@@ -72,8 +73,6 @@ Window {
property int buttons: ok | cancel
- modal: false
-
default property alias data: content.data
Item {
@@ -86,9 +85,6 @@ Window {
anchors.bottom: buttonrow.top
}
- // Dialogs should center on parent
- onVisibleChanged: center()
-
Row {
property bool mac: (style.style == "mac")
anchors.bottom: parent.bottom
@@ -105,7 +101,7 @@ Window {
text: "Help"
focus: false
Component.onCompleted: if (style.isMac) width = 22
- delegate: style.isMac ? machelpdelegate : cancelbutton.background
+ style: style.isMac ? machelpdelegate : cancelbutton.background
onClicked: {
clickedButton = helpbutton
buttonClicked()
diff --git a/tests/manual/Dialog.qml b/tests/manual/Dialog.qml
new file mode 100644
index 000000000..18942b5a5
--- /dev/null
+++ b/tests/manual/Dialog.qml
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Components project.
+**
+** $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 Digia Plc 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 QtQuick 2.0
+import QtDesktop 1.0
+
+Rectangle {
+ width: 300
+ height: 200
+
+ Text {
+ anchors.fill: parent
+ text: "Click here"
+
+ MouseArea {
+ anchors.fill: parent
+ onClicked: testDialog.visible = true
+ }
+ }
+
+ Dialog {
+ id: testDialog
+ title: "Test dialog"
+ visible: false
+
+ Text {
+ text: "This is the dialog content"
+ }
+
+ onAccepted: console.log("Accepted")
+ onRejected: console.log("Rejected")
+ }
+}
--
GitLab