From e50223e507ed5a70406a6aa7bbb2c3b369482022 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Tinkl?= Date: Thu, 14 Jul 2022 16:40:06 +0200 Subject: [PATCH] fix(Onboarding): align the 'Before you get started' popup with design port to StatusDialog --- .../popups/BeforeGetStartedModal.qml | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/ui/app/AppLayouts/Onboarding/popups/BeforeGetStartedModal.qml b/ui/app/AppLayouts/Onboarding/popups/BeforeGetStartedModal.qml index 06633be2d4..c0e98137b1 100644 --- a/ui/app/AppLayouts/Onboarding/popups/BeforeGetStartedModal.qml +++ b/ui/app/AppLayouts/Onboarding/popups/BeforeGetStartedModal.qml @@ -1,32 +1,46 @@ import QtQuick 2.13 import QtQuick.Controls 2.13 import QtQuick.Layouts 1.14 +import QtQml.Models 2.14 import utils 1.0 import StatusQ.Core 0.1 import StatusQ.Core.Theme 0.1 import StatusQ.Controls 0.1 -import StatusQ.Popups 0.1 +import StatusQ.Popups.Dialog 0.1 -StatusModal { +StatusDialog { id: popup width: 480 height: 318 anchors.centerIn: parent - header.title: qsTr("Before you get started...") - hasCloseButton: false closePolicy: Popup.NoAutoClose + header: StatusDialogHeader { + headline.title: qsTr("Before you get started...") + actions.closeButton.visible: false + } + + footer: StatusDialogFooter { + rightButtons: ObjectModel { + StatusButton { + objectName: "getStartedStatusButton" + enabled: acknowledge.checked && termsOfUse.checked + size: StatusBaseButton.Size.Large + font.weight: Font.Medium + text: qsTr("Get Started") + onClicked: popup.close() + } + } + } + contentItem: Item { Column { - spacing: 12 - anchors.fill: parent - anchors.leftMargin: 32 - anchors.rightMargin: 32 - anchors.topMargin: 24 - anchors.bottomMargin: 24 + width: 416 + spacing: 16 + anchors.centerIn: parent StatusCheckBox { id: acknowledge @@ -106,18 +120,4 @@ StatusModal { } } } - - rightButtons: [ - StatusButton { - id: getStartedButton - objectName: "getStartedStatusButton" - enabled: acknowledge.checked && termsOfUse.checked - size: StatusBaseButton.Size.Large - font.weight: Font.Medium - text: qsTr("Get Started") - onClicked: { - popup.close() - } - } - ] }