diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2018-12-18 09:52:02 -0600 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2018-12-18 09:52:02 -0600 |
| commit | 4c3f84a69501764015a00a3dd5497f11325354b6 (patch) | |
| tree | f3cda2dfe00d685259518a403eb16992df96bf36 /wizard | |
| parent | 9b3a0d5b13bcc3e9c1b388c5a16b1805892dbce9 (diff) | |
| parent | 515bb16418564ff3990b489d37c115a5f82f3e72 (diff) | |
| download | monzero-gui-4c3f84a69501764015a00a3dd5497f11325354b6.tar.gz monzero-gui-4c3f84a69501764015a00a3dd5497f11325354b6.tar.xz monzero-gui-4c3f84a69501764015a00a3dd5497f11325354b6.zip | |
Merge pull request #1835
515bb16 fix various QML warnings (xiphon)
Diffstat (limited to 'wizard')
| -rw-r--r-- | wizard/WizardMain.qml | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/wizard/WizardMain.qml b/wizard/WizardMain.qml index ae94ed38..48a6b8f9 100644 --- a/wizard/WizardMain.qml +++ b/wizard/WizardMain.qml @@ -328,10 +328,9 @@ ColumnLayout { Rectangle { id: prevButton - anchors.verticalCenter: wizard.verticalCenter - anchors.left: parent.left - anchors.leftMargin: isMobile ? 20 : 50 - anchors.bottomMargin: isMobile ? 20 * scaleRatio : 50 + Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft + Layout.leftMargin: isMobile ? 20 : 50 + Layout.bottomMargin: isMobile ? 20 * scaleRatio : 50 visible: parent.currentPage > 0 width: 50 * scaleRatio; height: 50 * scaleRatio @@ -354,10 +353,9 @@ ColumnLayout { Rectangle { id: nextButton - anchors.verticalCenter: wizard.verticalCenter - anchors.right: parent.right - anchors.rightMargin: isMobile ? 20 * scaleRatio : 50 - anchors.bottomMargin: isMobile ? 20 * scaleRatio : 50 + Layout.alignment: Qt.AlignVCenter | Qt.AlignRight + Layout.rightMargin: isMobile ? 20 * scaleRatio : 50 + Layout.bottomMargin: isMobile ? 20 * scaleRatio : 50 visible: currentPage > 1 && currentPage < pages.length - 1 width: 50 * scaleRatio; height: 50 * scaleRatio radius: 25 @@ -380,9 +378,8 @@ ColumnLayout { StandardButton { id: sendButton - anchors.right: parent.right - anchors.bottom: parent.bottom - anchors.margins: (isMobile) ? 20 * scaleRatio : 50 * scaleRatio + Layout.alignment: Qt.AlignBottom | Qt.AlignRight + Layout.margins: (isMobile) ? 20 * scaleRatio : 50 * scaleRatio text: qsTr("USE MONERO") + translationManager.emptyString visible: parent.paths[currentPath][currentPage] === finishPage onClicked: { @@ -393,9 +390,8 @@ ColumnLayout { StandardButton { id: createViewOnlyWalletButton - anchors.right: parent.right - anchors.bottom: parent.bottom - anchors.margins: (isMobile) ? 20 * scaleRatio : 50 + Layout.alignment: Qt.AlignBottom | Qt.AlignRight + Layout.margins: (isMobile) ? 20 * scaleRatio : 50 text: qsTr("Create wallet") + translationManager.emptyString visible: currentPath === "create_view_only_wallet" && parent.paths[currentPath][currentPage] === passwordPage enabled: passwordPage.passwordsMatch @@ -421,9 +417,8 @@ ColumnLayout { StandardButton { id: abortViewOnlyButton - anchors.right: createViewOnlyWalletButton.left - anchors.bottom: parent.bottom - anchors.margins: (isMobile) ? 20 * scaleRatio : 50 + Layout.alignment: Qt.AlignBottom | Qt.AlignRight + Layout.margins: (isMobile) ? 20 * scaleRatio : 50 text: qsTr("Abort") + translationManager.emptyString visible: currentPath === "create_view_only_wallet" && parent.paths[currentPath][currentPage] === passwordPage onClicked: { |