Skip to content
Snippets Groups Projects
Commit 564b82cb authored by akiraohgaki's avatar akiraohgaki
Browse files

Fix for dialog open/close action

parent b00a4e91
No related branches found
No related tags found
No related merge requests found
...@@ -22,6 +22,7 @@ Window { ...@@ -22,6 +22,7 @@ Window {
function init() { function init() {
var metadata = ocsUrlHandler.metadata(); var metadata = ocsUrlHandler.metadata();
var primaryMessages = { var primaryMessages = {
"success_download": qsTr("Download successfull"), "success_download": qsTr("Download successfull"),
"success_install": qsTr("Installation successfull"), "success_install": qsTr("Installation successfull"),
...@@ -32,7 +33,6 @@ Window { ...@@ -32,7 +33,6 @@ Window {
}; };
ocsUrlHandler.started.connect(function() { ocsUrlHandler.started.connect(function() {
confirmDialog.close();
progressDialog.open(); progressDialog.open();
}); });
...@@ -86,9 +86,15 @@ Window { ...@@ -86,9 +86,15 @@ Window {
id: confirmDialog id: confirmDialog
//icon: StandardIcon.Question //icon: StandardIcon.Question
acceptButton.text: qsTr("OK") acceptButton.text: qsTr("OK")
acceptButton.onClicked: ocsUrlHandler.process() acceptButton.onClicked: {
close();
ocsUrlHandler.process();
}
rejectButton.text: qsTr("Cancel") rejectButton.text: qsTr("Cancel")
rejectButton.onClicked: Qt.quit() rejectButton.onClicked: {
close();
Qt.quit();
}
} }
Ui.Dialog { Ui.Dialog {
...@@ -96,25 +102,30 @@ Window { ...@@ -96,25 +102,30 @@ Window {
//icon: StandardIcon.Information //icon: StandardIcon.Information
acceptButton.text: qsTr("Open") acceptButton.text: qsTr("Open")
acceptButton.onClicked: { acceptButton.onClicked: {
close();
ocsUrlHandler.openDestination(); ocsUrlHandler.openDestination();
Qt.quit(); Qt.quit();
} }
rejectButton.text: qsTr("Close") rejectButton.text: qsTr("Close")
rejectButton.onClicked: Qt.quit() rejectButton.onClicked: {
close();
Qt.quit();
}
} }
Ui.Dialog { Ui.Dialog {
id: errorDialog id: errorDialog
//icon: StandardIcon.Warning //icon: StandardIcon.Warning
rejectButton.text: qsTr("Close") rejectButton.text: qsTr("Close")
rejectButton.onClicked: Qt.quit() rejectButton.onClicked: {
close();
Qt.quit();
}
} }
Ui.Dialog { Ui.Dialog {
id: progressDialog id: progressDialog
//icon: StandardIcon.NoIcon //icon: StandardIcon.NoIcon
rejectButton.text: qsTr("Cancel")
rejectButton.onClicked: Qt.quit()
property alias progress: progressBar.value property alias progress: progressBar.value
property alias progressText: progressText.text property alias progressText: progressText.text
content: ColumnLayout { content: ColumnLayout {
...@@ -133,6 +144,11 @@ Window { ...@@ -133,6 +144,11 @@ Window {
anchors.right: parent.right anchors.right: parent.right
} }
} }
rejectButton.text: qsTr("Cancel")
rejectButton.onClicked: {
close();
Qt.quit();
}
} }
Component.onCompleted: { Component.onCompleted: {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment