diff options
author | Juho Annunen <juho.annunen@qt.io> | 2018-06-06 13:28:30 +0300 |
---|---|---|
committer | Juho Annunen <juho.annunen@qt.io> | 2018-06-06 10:46:57 +0000 |
commit | 9f4a530c091fe098fa9ea79affb816cbbe2d05b6 (patch) | |
tree | 9821e1d32816b7e05af8c3608fd2b88b53edab2a | |
parent | b97aefc4961afd953ae698ac3cdd35f842c44b91 (diff) |
Remove boot2qt-launcher demo exit confirmation popup
Task-number: QTBUG-68677
Change-Id: Iec99969d36c84a30bb6e35d3e614bf147931190d
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
-rw-r--r-- | qml.qrc | 1 | ||||
-rw-r--r-- | qml/DemoClosePopup.qml | 98 | ||||
-rw-r--r-- | qml/MainWindow.qml | 7 |
3 files changed, 1 insertions, 105 deletions
@@ -14,7 +14,6 @@ <file>qml/GridViewIcon.qml</file> <file>qml/DetailViewIcon.qml</file> <file>qml/DemoHeader.qml</file> - <file>qml/DemoClosePopup.qml</file> <file>qml/DemoInfoPopup.qml</file> <file>qml/AboutQt.qml</file> <file>qml/LayoutSettings.qml</file> diff --git a/qml/DemoClosePopup.qml b/qml/DemoClosePopup.qml deleted file mode 100644 index c62c1e7..0000000 --- a/qml/DemoClosePopup.qml +++ /dev/null @@ -1,98 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Device Creation. -** -** $QT_BEGIN_LICENSE:GPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) any later version -** approved by the KDE Free Qt Foundation. The licenses are as published by -** the Free Software Foundation and appearing in the file LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -import QtQuick 2.0 -import QtDeviceUtilities.QtButtonImageProvider 1.0 - -Rectangle { - id: demoClosePopup - width: parent.width - height: parent.height - color: viewSettings.backgroundColor - opacity: 0.9 - - function open() - { - visible = true; - } - - function close() - { - visible = false; - } - - Rectangle { - id: frame - color: viewSettings.backgroundColor - border.color: viewSettings.borderColor - border.width: 3 - anchors.centerIn: parent - width: parent.width * 0.35 - height: parent.height * 0.4 - - Column { - anchors.centerIn: parent - spacing: viewSettings.pageMargin - - Text { - id: demoCloseConfirmText - width: frame.width * 0.75 - height: frame.height * 0.25 - horizontalAlignment: Text.AlignHCenter - anchors.horizontalCenter: parent.horizontalCenter - fontSizeMode: Text.Fit - minimumPixelSize: 1 - font.pixelSize: frame.width * 0.3 - color: "white" - font.family: viewSettings.appFont - font.styleName: "SemiBold" - text: qsTr("Close the demo?") - } - QtButton { - id: demoCloseConfirm - height: frame.height * 0.15 - width: frame.width * 0.45 - anchors.horizontalCenter: parent.horizontalCenter - text: qsTr("CONFIRM") - onClicked: { - root.closeApplication(); - demoClosePopup.close() - } - } - QtButton { - height: frame.height * 0.15 - width: frame.width * 0.45 - anchors.horizontalCenter: parent.horizontalCenter - borderColor: "transparent" - fillColor: viewSettings.buttonGrayColor - text: qsTr("CANCEL") - onClicked: demoClosePopup.close() - } - } - } -} diff --git a/qml/MainWindow.qml b/qml/MainWindow.qml index aa1e19c..7a83202 100644 --- a/qml/MainWindow.qml +++ b/qml/MainWindow.qml @@ -191,7 +191,7 @@ Item { DemoHeader { id: demoHeader onInfoClicked: demoInfoPopup.open() - onCloseClicked: demoClosePopup.open() + onCloseClicked: root.closeApplication(); } } @@ -204,11 +204,6 @@ Item { } } - DemoClosePopup { - id: demoClosePopup - visible: false - } - DemoInfoPopup { id: demoInfoPopup visible: false |