diff --git a/app/qml/main.qml b/app/qml/main.qml index f1c9f56d77a9edfa190682a1427d76a4dbcb0312..682da6566865083485b2178dd487825616eddd0a 100644 --- a/app/qml/main.qml +++ b/app/qml/main.qml @@ -142,7 +142,7 @@ Window { Label { id: progressText text: "" - anchors.right: parent.right + Layout.alignment: Qt.AlignRight } } rejectButton.text: qsTr("Cancel") diff --git a/app/qml/ui/Dialog.qml b/app/qml/ui/Dialog.qml index d81a339340cb43051aa4a26bf5e54ea84ab484d4..ef94e20764935ccd0ba4896c0c0e81b5d3382637 100644 --- a/app/qml/ui/Dialog.qml +++ b/app/qml/ui/Dialog.qml @@ -2,7 +2,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 import QtQuick.Controls 1.0 -ColumnLayout { +RowLayout { id: dialog visible: false @@ -26,66 +26,66 @@ ColumnLayout { dialog.visible = false; } - RowLayout { + Image { + id: icon + source: "" + visible: source.toString() ? true : false + Layout.preferredWidth: 32 + Layout.preferredHeight: 32 + } + + ColumnLayout { Layout.fillWidth: true - Layout.fillHeight: true spacing: parent.spacing - Image { - id: icon - source: "" - visible: source.toString() ? true : false - Layout.preferredWidth: 32 - Layout.preferredHeight: 32 + Label { + id: primaryText + text: "" + visible: text ? true : false + Layout.fillWidth: true + wrapMode: Text.WrapAnywhere + font.bold: true } - ColumnLayout { + Label { + id: informativeText + text: "" + visible: text ? true : false + Layout.fillWidth: true + wrapMode: Text.WrapAnywhere + } + Item { + Layout.fillHeight: true + } + Label { + id: detailedText + text: "" + visible: text ? true : false + Layout.fillWidth: true + wrapMode: Text.WrapAnywhere + color: "#444444" + } + Item { + id: content + Layout.fillWidth: true + } + Item { + Layout.fillHeight: true + } + RowLayout { Layout.fillWidth: true spacing: parent.spacing - Label { - id: primaryText - text: "" - visible: text ? true : false + Item { Layout.fillWidth: true - wrapMode: Text.WrapAnywhere - font.bold: true } - Label { - id: informativeText + Button { + id: acceptButton text: "" visible: text ? true : false - Layout.fillWidth: true - wrapMode: Text.WrapAnywhere } - Label { - id: detailedText + Button { + id: rejectButton text: "" visible: text ? true : false - Layout.fillWidth: true - wrapMode: Text.WrapAnywhere - font.pixelSize: 11 - } - Item { - id: content - Layout.fillWidth: true - Layout.fillHeight: true } } } - - RowLayout { - Layout.fillWidth: true - spacing: parent.spacing - Item { - Layout.fillWidth: true - } - Button { - id: acceptButton - text: "" - visible: text ? true : false - } - Button { - id: rejectButton - text: "" - visible: text ? true : false - } - } }