From 403f90e0bed0de16fae098d740e69ad18be79c58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=EA=A6=AB=EA=A6=B6=EA=A6=8F=EA=A7=80=EA=A6=A6?= =?UTF-8?q?=EA=A6=BF=EA=A6=A7=EA=A6=AE=EA=A6=91=EA=A6=A9=EA=A6=AD=EA=A7=80?= Date: Tue, 7 Feb 2023 12:39:12 +0800 Subject: Change order completed UI to flickable --- OrderCompletedColumnLayout.ui.qml | 41 ------------------------------- OrderCompletedFlickable.ui.qml | 51 +++++++++++++++++++++++++++++++++++++++ QShopper.qmlproject | 2 +- 3 files changed, 52 insertions(+), 42 deletions(-) delete mode 100644 OrderCompletedColumnLayout.ui.qml create mode 100644 OrderCompletedFlickable.ui.qml diff --git a/OrderCompletedColumnLayout.ui.qml b/OrderCompletedColumnLayout.ui.qml deleted file mode 100644 index 4bf79fe..0000000 --- a/OrderCompletedColumnLayout.ui.qml +++ /dev/null @@ -1,41 +0,0 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 - -ColumnLayout { - property string orderCompletedText: "673290789" - property alias orderCompletedButton: button - - ColumnLayout { - Layout.topMargin: 96 - Layout.leftMargin: 16 - Layout.rightMargin: 16 - Layout.bottomMargin: 96 - - Label { - text: qsTr("Your Order is Completed!") - font.pixelSize: 30 - Layout.alignment: Qt.AlignHCenter - Layout.bottomMargin: 20 - } - - Label { - text: qsTr("Your order ") + orderCompletedText - + qsTr(" has been completed. Your order details" - + " are shown for your personal account.") - font.pixelSize: 16 - wrapMode: Text.Wrap - horizontalAlignment: Text.AlignHCenter - Layout.fillWidth: true - Layout.alignment: Qt.AlignHCenter - Layout.bottomMargin: 32 - } - - Button { - id: button - text: qsTr("View My Orders") - font.pixelSize: 16 - Layout.alignment: Qt.AlignHCenter - } - } -} diff --git a/OrderCompletedFlickable.ui.qml b/OrderCompletedFlickable.ui.qml new file mode 100644 index 0000000..1b96e7d --- /dev/null +++ b/OrderCompletedFlickable.ui.qml @@ -0,0 +1,51 @@ +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 + +Flickable { + property string orderCompletedText: "673290789" + property alias orderCompletedButton: button + contentHeight: body.height + + ColumnLayout { + id: body + anchors { + top: parent.top + left: parent.left + right: parent.right + } + + ColumnLayout { + Layout.topMargin: 96 + Layout.leftMargin: 16 + Layout.rightMargin: 16 + Layout.bottomMargin: 96 + + Label { + text: qsTr("Your Order is Completed!") + font.pixelSize: 30 + Layout.alignment: Qt.AlignHCenter + Layout.bottomMargin: 20 + } + + Label { + text: qsTr("Your order ") + orderCompletedText + + qsTr(" has been completed. Your order details" + + " are shown for your personal account.") + font.pixelSize: 16 + wrapMode: Text.Wrap + horizontalAlignment: Text.AlignHCenter + Layout.fillWidth: true + Layout.alignment: Qt.AlignHCenter + Layout.bottomMargin: 32 + } + + Button { + id: button + text: qsTr("View My Orders") + font.pixelSize: 16 + Layout.alignment: Qt.AlignHCenter + } + } + } +} diff --git a/QShopper.qmlproject b/QShopper.qmlproject index 96f95f7..9ff52c8 100644 --- a/QShopper.qmlproject +++ b/QShopper.qmlproject @@ -1,7 +1,7 @@ import QmlProject 1.1 Project { - mainFile: "OrderCompletedColumnLayout.ui.qml" + mainFile: "OrderCompletedFlickable.ui.qml" QmlFiles { directory: "." -- cgit v1.2.3