Skip to content
Snippets Groups Projects
Commit 5999b7eb authored by akiraohgaki's avatar akiraohgaki
Browse files

Fix for dialog

parent 2de4176d
No related branches found
No related tags found
No related merge requests found
// Still support Qt 5.2
import QtQuick 2.0 import QtQuick 2.0
import QtQuick.Layouts 1.0 import QtQuick.Layouts 1.0
import QtQuick.Controls 1.0 import QtQuick.Controls 1.0
...@@ -14,11 +13,11 @@ ApplicationWindow { ...@@ -14,11 +13,11 @@ ApplicationWindow {
visible: true visible: true
width: 400 width: 400
minimumWidth: 400 minimumWidth: width
maximumWidth: 400 maximumWidth: width
height: 200 height: 200
minimumHeight: 200 minimumHeight: height
maximumHeight: 400 maximumHeight: height
function init() { function init() {
var metadata = ocsUrlHandler.metadata(); var metadata = ocsUrlHandler.metadata();
...@@ -33,6 +32,7 @@ ApplicationWindow { ...@@ -33,6 +32,7 @@ ApplicationWindow {
}; };
ocsUrlHandler.started.connect(function() { ocsUrlHandler.started.connect(function() {
confirmDialog.close();
progressDialog.open(); progressDialog.open();
}); });
...@@ -55,8 +55,8 @@ ApplicationWindow { ...@@ -55,8 +55,8 @@ ApplicationWindow {
ocsUrlHandler.downloadProgress.connect(function(id, bytesReceived, bytesTotal) { ocsUrlHandler.downloadProgress.connect(function(id, bytesReceived, bytesTotal) {
progressDialog.primaryText = qsTr("Downloading"); progressDialog.primaryText = qsTr("Downloading");
progressDialog.informativeText = metadata.filename; progressDialog.informativeText = metadata.filename;
progressDialog.progress = bytesReceived / bytesTotal; progressDialog.detailedContentLoader.item.progressBar = bytesReceived / bytesTotal;
progressDialog.progressText progressDialog.detailedContentLoader.item.progressText
= Utility.convertByteToHumanReadable(bytesReceived) = Utility.convertByteToHumanReadable(bytesReceived)
+ " / " + Utility.convertByteToHumanReadable(bytesTotal); + " / " + Utility.convertByteToHumanReadable(bytesTotal);
}); });
...@@ -82,53 +82,57 @@ ApplicationWindow { ...@@ -82,53 +82,57 @@ ApplicationWindow {
} }
} }
function fixWindowSize(dialog) {
if (dialog.visible) {
app.height = dialog.implicitHeight + (dialog.anchors.margins * 2);
}
}
Ui.Dialog { Ui.Dialog {
id: confirmDialog id: confirmDialog
icon: "qrc:/images/icons/dialog-information.svg" icon: "qrc:/images/icons/dialog-information.svg"
actionButton.text: qsTr("Details")
actionButton.onClicked: toggleDetails()
acceptButton.text: qsTr("OK") acceptButton.text: qsTr("OK")
acceptButton.onClicked: { acceptButton.onClicked: ocsUrlHandler.process()
close();
ocsUrlHandler.process();
}
rejectButton.text: qsTr("Cancel") rejectButton.text: qsTr("Cancel")
rejectButton.onClicked: { rejectButton.onClicked: Qt.quit()
close(); onVisibleChanged: app.fixWindowSize(confirmDialog)
Qt.quit(); onImplicitHeightChanged: app.fixWindowSize(confirmDialog)
}
} }
Ui.Dialog { Ui.Dialog {
id: infoDialog id: infoDialog
icon: "qrc:/images/icons/emblem-default.svg" icon: "qrc:/images/icons/emblem-default.svg"
actionButton.text: qsTr("Details")
actionButton.onClicked: toggleDetails()
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: { rejectButton.onClicked: Qt.quit()
close(); onVisibleChanged: app.fixWindowSize(infoDialog)
Qt.quit(); onImplicitHeightChanged: app.fixWindowSize(infoDialog)
}
} }
Ui.Dialog { Ui.Dialog {
id: errorDialog id: errorDialog
icon: "qrc:/images/icons/dialog-warning.svg" icon: "qrc:/images/icons/dialog-warning.svg"
actionButton.text: qsTr("Details")
actionButton.onClicked: toggleDetails()
rejectButton.text: qsTr("Close") rejectButton.text: qsTr("Close")
rejectButton.onClicked: { rejectButton.onClicked: Qt.quit()
close(); onVisibleChanged: app.fixWindowSize(errorDialog)
Qt.quit(); onImplicitHeightChanged: app.fixWindowSize(errorDialog)
}
} }
Ui.Dialog { Component {
id: progressDialog id: progressComponent
icon: "qrc:/images/icons/emblem-downloads.svg" ColumnLayout {
property alias progress: progressBar.value property alias progressBar: progressBar.value
property alias progressText: progressText.text property alias progressText: progressText.text
content: ColumnLayout {
anchors.fill: parent anchors.fill: parent
spacing: 4 spacing: 4
ProgressBar { ProgressBar {
...@@ -144,11 +148,17 @@ ApplicationWindow { ...@@ -144,11 +148,17 @@ ApplicationWindow {
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
} }
} }
}
Ui.Dialog {
id: progressDialog
icon: "qrc:/images/icons/emblem-downloads.svg"
detailsVisible: true
detailedContentLoader.sourceComponent: progressComponent
rejectButton.text: qsTr("Cancel") rejectButton.text: qsTr("Cancel")
rejectButton.onClicked: { rejectButton.onClicked: Qt.quit()
close(); onVisibleChanged: app.fixWindowSize(progressDialog)
Qt.quit(); onImplicitHeightChanged: app.fixWindowSize(progressDialog)
}
} }
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