From 564b82cb941b273d98a58a5e69e1569d592f5ca5 Mon Sep 17 00:00:00 2001
From: Akira Ohgaki <akiraohgaki@gmail.com>
Date: Wed, 1 Mar 2017 14:38:47 +0900
Subject: [PATCH] Fix for dialog open/close action
---
app/qml/main.qml | 30 +++++++++++++++++++++++-------
1 file changed, 23 insertions(+), 7 deletions(-)
diff --git a/app/qml/main.qml b/app/qml/main.qml
index f52a3b9..6bcbf14 100644
--- a/app/qml/main.qml
+++ b/app/qml/main.qml
@@ -22,6 +22,7 @@ Window {
function init() {
var metadata = ocsUrlHandler.metadata();
+
var primaryMessages = {
"success_download": qsTr("Download successfull"),
"success_install": qsTr("Installation successfull"),
@@ -32,7 +33,6 @@ Window {
};
ocsUrlHandler.started.connect(function() {
- confirmDialog.close();
progressDialog.open();
});
@@ -86,9 +86,15 @@ Window {
id: confirmDialog
//icon: StandardIcon.Question
acceptButton.text: qsTr("OK")
- acceptButton.onClicked: ocsUrlHandler.process()
+ acceptButton.onClicked: {
+ close();
+ ocsUrlHandler.process();
+ }
rejectButton.text: qsTr("Cancel")
- rejectButton.onClicked: Qt.quit()
+ rejectButton.onClicked: {
+ close();
+ Qt.quit();
+ }
}
Ui.Dialog {
@@ -96,25 +102,30 @@ Window {
//icon: StandardIcon.Information
acceptButton.text: qsTr("Open")
acceptButton.onClicked: {
+ close();
ocsUrlHandler.openDestination();
Qt.quit();
}
rejectButton.text: qsTr("Close")
- rejectButton.onClicked: Qt.quit()
+ rejectButton.onClicked: {
+ close();
+ Qt.quit();
+ }
}
Ui.Dialog {
id: errorDialog
//icon: StandardIcon.Warning
rejectButton.text: qsTr("Close")
- rejectButton.onClicked: Qt.quit()
+ rejectButton.onClicked: {
+ close();
+ Qt.quit();
+ }
}
Ui.Dialog {
id: progressDialog
//icon: StandardIcon.NoIcon
- rejectButton.text: qsTr("Cancel")
- rejectButton.onClicked: Qt.quit()
property alias progress: progressBar.value
property alias progressText: progressText.text
content: ColumnLayout {
@@ -133,6 +144,11 @@ Window {
anchors.right: parent.right
}
}
+ rejectButton.text: qsTr("Cancel")
+ rejectButton.onClicked: {
+ close();
+ Qt.quit();
+ }
}
Component.onCompleted: {
--
GitLab