diff --git a/components/CheckBox2.qml b/components/CheckBox2.qml index cb367079..39494001 100644 --- a/components/CheckBox2.qml +++ b/components/CheckBox2.qml @@ -57,7 +57,6 @@ RowLayout { height: label.height width: (label.width + indicatorRect.width + checkBox.textMargin) color: "transparent" - anchors.left: parent.left Text { id: label diff --git a/components/LineEditMulti.qml b/components/LineEditMulti.qml index 63b2dee2..191498f5 100644 --- a/components/LineEditMulti.qml +++ b/components/LineEditMulti.qml @@ -149,7 +149,6 @@ ColumnLayout { id: input readOnly: false addressValidation: false - anchors.top: item.showingHeader ? inputLabelRect.bottom : item.top Layout.fillWidth: true topPadding: item.showingHeader ? 10 * scaleRatio : 0 bottomPadding: 10 * scaleRatio diff --git a/components/NetworkStatusItem.qml b/components/NetworkStatusItem.qml index e9b1b3ae..edc22595 100644 --- a/components/NetworkStatusItem.qml +++ b/components/NetworkStatusItem.qml @@ -57,7 +57,6 @@ Rectangle { Item { id: iconItem - anchors.top: parent.top width: 40 * scaleRatio height: 40 * scaleRatio opacity: { @@ -84,8 +83,6 @@ Rectangle { } Item { - anchors.top: parent.top - anchors.left: iconItem.right height: 40 * scaleRatio width: 260 * scaleRatio diff --git a/components/PasswordDialog.qml b/components/PasswordDialog.qml index d0f442e4..a6d2b53a 100644 --- a/components/PasswordDialog.qml +++ b/components/PasswordDialog.qml @@ -91,7 +91,6 @@ Item { Label { text: root.walletName.length > 0 ? qsTr("Please enter wallet password for: ") + root.walletName : qsTr("Please enter wallet password") - anchors.left: parent.left Layout.fillWidth: true font.pixelSize: 16 * scaleRatio @@ -104,7 +103,6 @@ Item { text: root.errorText visible: root.errorText - anchors.left: parent.left color: MoneroComponents.Style.errorColor font.pixelSize: 16 * scaleRatio font.family: MoneroComponents.Style.fontLight.name @@ -116,7 +114,6 @@ Item { id : passwordInput Layout.topMargin: 6 Layout.fillWidth: true - anchors.left: parent.left horizontalAlignment: TextInput.AlignLeft verticalAlignment: TextInput.AlignVCenter font.family: MoneroComponents.Style.fontLight.name diff --git a/pages/Transfer.qml b/pages/Transfer.qml index f766bc72..0f88b4b3 100644 --- a/pages/Transfer.qml +++ b/pages/Transfer.qml @@ -244,7 +244,6 @@ Rectangle { StandardButton { id: resolveButton - anchors.left: parent.left width: 80 text: qsTr("Resolve") + translationManager.emptyString visible: isValidOpenAliasAddress(addressLine.text) diff --git a/pages/TxKey.qml b/pages/TxKey.qml index 52d4ad74..22174f3e 100644 --- a/pages/TxKey.qml +++ b/pages/TxKey.qml @@ -55,9 +55,6 @@ Rectangle { // solo ColumnLayout { id: soloBox - anchors.left: parent.left - anchors.right: parent.right - anchors.top: parent.top spacing: 20 * scaleRatio Label { @@ -114,8 +111,7 @@ Rectangle { } StandardButton { - anchors.left: parent.left - anchors.topMargin: 17 * scaleRatio + Layout.topMargin: 17 * scaleRatio width: 60 * scaleRatio small: true text: qsTr("Generate") + translationManager.emptyString @@ -204,8 +200,7 @@ Rectangle { } StandardButton { - anchors.left: parent.left - anchors.topMargin: 17 * scaleRatio + Layout.topMargin: 17 * scaleRatio width: 60 small: true text: qsTr("Check") + translationManager.emptyString diff --git a/pages/settings/SettingsNode.qml b/pages/settings/SettingsNode.qml index 8a7b3926..69e36318 100644 --- a/pages/settings/SettingsNode.qml +++ b/pages/settings/SettingsNode.qml @@ -374,11 +374,8 @@ Rectangle{ ColumnLayout { id: localNodeLayout - anchors.margins: 0 spacing: 20 * scaleRatio Layout.topMargin: 40 - anchors.left: parent.left - anchors.right: parent.right visible: !isMobile && !persistentSettings.useRemoteNode Rectangle { diff --git a/pages/settings/SettingsWallet.qml b/pages/settings/SettingsWallet.qml index f3cf0a21..02763842 100644 --- a/pages/settings/SettingsWallet.qml +++ b/pages/settings/SettingsWallet.qml @@ -66,7 +66,7 @@ Rectangle { ColumnLayout { Layout.fillWidth: true - anchors.verticalCenter: parent.verticalCenter + Layout.alignment: Qt.AlignVCenter spacing: 0 Text { @@ -157,7 +157,7 @@ Rectangle { ColumnLayout { Layout.fillWidth: true - anchors.verticalCenter: parent.verticalCenter + Layout.alignment: Qt.AlignVCenter spacing: 0 Text { @@ -248,7 +248,7 @@ Rectangle { ColumnLayout { Layout.fillWidth: true - anchors.verticalCenter: parent.verticalCenter + Layout.alignment: Qt.AlignVCenter spacing: 0 Text { @@ -337,7 +337,7 @@ Rectangle { ColumnLayout { Layout.fillWidth: true - anchors.verticalCenter: parent.verticalCenter + Layout.alignment: Qt.AlignVCenter spacing: 0 Text { 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: {