monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-23 03:59:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2307

Browse source 
f20ab12 QML: fix various warnings (selsta)
This commit is contained in:
luigi1111 2019-07-22 13:29:31 -05:00
commit 25e56ee8fb
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
9 changed files with 14 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
LeftPanel.qml
View file

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

2
components/LabelSubheader.qml
View file

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

2
pages/Account.qml
View file

@ -177,7 +177,7 @@ Rectangle {
ListView {
id: subaddressAccountListView
Layout.fillWidth: true
anchors.fill: parent
Layout.fillHeight: true
clip: true
boundsBehavior: ListView.StopAtBounds
interactive: false

3
pages/History.qml
View file

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

2
pages/Receive.qml
View file

@ -101,7 +101,7 @@ Rectangle {
ListView {
id: subaddressListView
Layout.fillWidth: true
anchors.fill: parent
Layout.fillHeight: true
clip: true
boundsBehavior: ListView.StopAtBounds
interactive: false

11
pages/merchant/Merchant.qml
View file

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

15
wizard/WizardAskPassword.qml
View file

@ -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: "*"
}

2
wizard/WizardHeader.qml
View file

@ -69,7 +69,7 @@ ColumnLayout {
TextArea {
Layout.fillWidth: true
anchors.horizontalCenter: parent.horizontalCenter
Layout.alignment: Qt.AlignCenter
visible: parent.subtitle !== ""
color: MoneroComponents.Style.dimmedFontColor

8
wizard/WizardLanguage.qml
View file

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