Merge pull request #1835

515bb16 fix various QML warnings (xiphon)
pull/2/head
luigi1111 6 years ago
commit 4c3f84a695
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010

@ -57,7 +57,6 @@ RowLayout {
height: label.height
width: (label.width + indicatorRect.width + checkBox.textMargin)
color: "transparent"
anchors.left: parent.left
Text {
id: label

@ -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

@ -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

@ -95,7 +95,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
@ -108,7 +107,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
@ -120,7 +118,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

@ -247,7 +247,6 @@ Rectangle {
StandardButton {
id: resolveButton
anchors.left: parent.left
width: 80
text: qsTr("Resolve") + translationManager.emptyString
visible: isValidOpenAliasAddress(addressLine.text)

@ -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

@ -351,11 +351,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
MoneroComponents.StandardButton {

@ -66,7 +66,7 @@ Rectangle {
ColumnLayout {
Layout.fillWidth: true
anchors.verticalCenter: parent.verticalCenter
Layout.alignment: Qt.AlignVCenter
spacing: 0
Text {
@ -131,7 +131,7 @@ Rectangle {
ColumnLayout {
Layout.fillWidth: true
anchors.verticalCenter: parent.verticalCenter
Layout.alignment: Qt.AlignVCenter
spacing: 0
Text {
@ -196,7 +196,7 @@ Rectangle {
ColumnLayout {
Layout.fillWidth: true
anchors.verticalCenter: parent.verticalCenter
Layout.alignment: Qt.AlignVCenter
spacing: 0
Text {
@ -261,7 +261,7 @@ Rectangle {
ColumnLayout {
Layout.fillWidth: true
anchors.verticalCenter: parent.verticalCenter
Layout.alignment: Qt.AlignVCenter
spacing: 0
Text {

@ -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: {