From f20ab12cf3bd7575e7c0043c64de3ab74c211218 Mon Sep 17 00:00:00 2001 From: selsta Date: Sun, 21 Jul 2019 21:51:47 +0200 Subject: [PATCH] QML: fix various warnings --- LeftPanel.qml | 4 +--- components/LabelSubheader.qml | 2 -- pages/Account.qml | 2 +- pages/History.qml | 3 --- pages/Receive.qml | 2 +- pages/merchant/Merchant.qml | 11 ++++------- wizard/WizardAskPassword.qml | 15 ++------------- wizard/WizardHeader.qml | 2 +- wizard/WizardLanguage.qml | 8 ++++---- 9 files changed, 14 insertions(+), 35 deletions(-) diff --git a/LeftPanel.qml b/LeftPanel.qml index e8052e6b..5e74260b 100644 --- a/LeftPanel.qml +++ b/LeftPanel.qml @@ -114,13 +114,12 @@ Rectangle { anchors.top: parent.top anchors.topMargin: (persistentSettings.customDecorations)? 50 : 0 - RowLayout { + Item { Item { anchors.left: parent.left anchors.top: parent.top anchors.topMargin: 20 anchors.leftMargin: 20 - anchors.verticalCenter: parent.verticalCenter height: 490 width: 260 @@ -230,7 +229,6 @@ Rectangle { anchors.top: parent.top anchors.topMargin: 20 anchors.leftMargin: 20 - anchors.verticalCenter: parent.verticalCenter height: 490 width: 50 diff --git a/components/LabelSubheader.qml b/components/LabelSubheader.qml index a9f9bc41..585d0027 100644 --- a/components/LabelSubheader.qml +++ b/components/LabelSubheader.qml @@ -34,8 +34,6 @@ import "../components/effects/" as MoneroEffects Label { id: item fontSize: 18 - anchors.left: parent.left - anchors.right: parent.right Rectangle { anchors.top: item.bottom diff --git a/pages/Account.qml b/pages/Account.qml index 4709aede..842a986d 100644 --- a/pages/Account.qml +++ b/pages/Account.qml @@ -177,7 +177,7 @@ Rectangle { ListView { id: subaddressAccountListView Layout.fillWidth: true - anchors.fill: parent + Layout.fillHeight: true clip: true boundsBehavior: ListView.StopAtBounds interactive: false diff --git a/pages/History.qml b/pages/History.qml index d35657a3..97b26fa2 100644 --- a/pages/History.qml +++ b/pages/History.qml @@ -251,7 +251,6 @@ Rectangle { font.pixelSize: 15 text: qsTr("Blockheight") + translationManager.emptyString color: root.sortBy === "blockheight" ? MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.dimmedFontColor - anchors.verticalCenter: parent.verticalCenter themeTransition: false } @@ -312,7 +311,6 @@ Rectangle { text: qsTr("Date") + translationManager.emptyString color: root.sortBy === "timestamp" ? MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.dimmedFontColor themeTransition: false - anchors.verticalCenter: parent.verticalCenter } MoneroEffects.ImageMask { @@ -372,7 +370,6 @@ Rectangle { text: qsTr("Amount") + translationManager.emptyString color: root.sortBy === "amount" ? MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.dimmedFontColor themeTransition: false - anchors.verticalCenter: parent.verticalCenter } MoneroEffects.ImageMask { diff --git a/pages/Receive.qml b/pages/Receive.qml index 630690ae..9586f942 100644 --- a/pages/Receive.qml +++ b/pages/Receive.qml @@ -101,7 +101,7 @@ Rectangle { ListView { id: subaddressListView Layout.fillWidth: true - anchors.fill: parent + Layout.fillHeight: true clip: true boundsBehavior: ListView.StopAtBounds interactive: false diff --git a/pages/merchant/Merchant.qml b/pages/merchant/Merchant.qml index 0f0630aa..4213b294 100644 --- a/pages/merchant/Merchant.qml +++ b/pages/merchant/Merchant.qml @@ -93,9 +93,8 @@ Item { anchors.right: parent.right Item { - height: 220 - anchors.left: parent.left - anchors.right: parent.right + Layout.preferredHeight: 220 + Layout.fillWidth: true Rectangle { id: tracker @@ -258,8 +257,7 @@ Item { Item { Layout.preferredHeight: 40 - anchors.left: parent.left - anchors.right: parent.right + Layout.fillWidth: true Item { width: (parent.width - qrImg.width) - (50) @@ -524,8 +522,7 @@ Item { Item { Layout.topMargin: 32 Layout.preferredHeight: 40 - anchors.left: parent.left - anchors.right: parent.right + Layout.fillWidth: true ColumnLayout { spacing: 16 diff --git a/wizard/WizardAskPassword.qml b/wizard/WizardAskPassword.qml index ce7fee49..49331c44 100644 --- a/wizard/WizardAskPassword.qml +++ b/wizard/WizardAskPassword.qml @@ -97,23 +97,12 @@ ColumnLayout { TextInput { id: progressText - anchors.top: parent.top - anchors.topMargin: 6 + Layout.topMargin: 6 + Layout.bottomMargin: 6 font.family: MoneroComponents.Style.fontMedium.name font.pixelSize: 14 font.bold: false color: MoneroComponents.Style.defaultFontColor - text: root.passwordStrengthText + '-' - height: 18 - passwordCharacter: "*" - } - - TextInput { - id: progressTextValue - font.family: MoneroComponents.Style.fontMedium.name - font.pixelSize: 13 - font.bold: true - color: MoneroComponents.Style.defaultFontColor height: 18 passwordCharacter: "*" } diff --git a/wizard/WizardHeader.qml b/wizard/WizardHeader.qml index 43ecbc7e..71061a5b 100644 --- a/wizard/WizardHeader.qml +++ b/wizard/WizardHeader.qml @@ -69,7 +69,7 @@ ColumnLayout { TextArea { Layout.fillWidth: true - anchors.horizontalCenter: parent.horizontalCenter + Layout.alignment: Qt.AlignCenter visible: parent.subtitle !== "" color: MoneroComponents.Style.dimmedFontColor diff --git a/wizard/WizardLanguage.qml b/wizard/WizardLanguage.qml index d839e196..d19f2bae 100644 --- a/wizard/WizardLanguage.qml +++ b/wizard/WizardLanguage.qml @@ -60,7 +60,7 @@ Rectangle { id: textWelcome opacity: 0 Layout.preferredWidth: parent.width / 1.3 - anchors.horizontalCenter: parent.horizontalCenter + Layout.alignment: Qt.AlignCenter color: MoneroComponents.Style.defaultFontColor text: "Welcome - Wilkommen - Bonvenon - Bienvenido - Bienvenue - Välkommen - Selamat datang - Benvenuto - 歡迎 - Welkom - Bem Vindo - добро пожаловать" @@ -97,7 +97,7 @@ Rectangle { } Layout.preferredWidth: size Layout.preferredHeight: size - anchors.horizontalCenter: parent.horizontalCenter + Layout.alignment: Qt.AlignCenter mipmap: true property bool animSlow: false @@ -149,7 +149,7 @@ Rectangle { id: buttonsGrid opacity: 0 columns: isMobile ? 1 : 2 - anchors.horizontalCenter: parent.horizontalCenter + Layout.alignment: Qt.AlignCenter Layout.topMargin: 20 Layout.fillWidth: true columnSpacing: 20 @@ -190,7 +190,7 @@ Rectangle { MoneroComponents.TextPlain { id: versionText opacity: 0 - anchors.horizontalCenter: parent.horizontalCenter + Layout.alignment: Qt.AlignCenter font.bold: true font.pixelSize: 12 font.family: MoneroComponents.Style.fontRegular.name