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-22 19:49:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1884

Browse source 
310679c QML: fix various warnings (xiphon)
This commit is contained in:
luigi1111 2019-01-21 14:51:43 -06:00
commit 8a4596ee47
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
6 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/InputDialog.qml
View file

@ -79,7 +79,6 @@ Item {
Label { Label {
id: label id: label
anchors.left: parent.left
Layout.fillWidth: true Layout.fillWidth: true
font.pixelSize: 16 * scaleRatio font.pixelSize: 16 * scaleRatio
@ -93,7 +92,6 @@ Item {
focus: true focus: true
Layout.topMargin: 6 Layout.topMargin: 6
Layout.fillWidth: true Layout.fillWidth: true
anchors.left: parent.left
horizontalAlignment: TextInput.AlignLeft horizontalAlignment: TextInput.AlignLeft
verticalAlignment: TextInput.AlignVCenter verticalAlignment: TextInput.AlignVCenter
font.family: MoneroComponents.Style.fontLight.name font.family: MoneroComponents.Style.fontLight.name

4
components/NewPasswordDialog.qml
View file

@ -96,7 +96,6 @@ Item {
Label { Label {
text: qsTr("Please enter new password") text: qsTr("Please enter new password")
anchors.left: parent.left
Layout.fillWidth: true Layout.fillWidth: true
font.pixelSize: 16 * scaleRatio font.pixelSize: 16 * scaleRatio
@ -109,7 +108,6 @@ Item {
id : passwordInput1 id : passwordInput1
Layout.topMargin: 6 Layout.topMargin: 6
Layout.fillWidth: true Layout.fillWidth: true
anchors.left: parent.left
horizontalAlignment: TextInput.AlignLeft horizontalAlignment: TextInput.AlignLeft
verticalAlignment: TextInput.AlignVCenter verticalAlignment: TextInput.AlignVCenter
font.family: MoneroComponents.Style.fontLight.name font.family: MoneroComponents.Style.fontLight.name
@ -154,7 +152,6 @@ Item {
Label { Label {
text: qsTr("Please confirm new password") text: qsTr("Please confirm new password")
anchors.left: parent.left
Layout.fillWidth: true Layout.fillWidth: true
font.pixelSize: 16 * scaleRatio font.pixelSize: 16 * scaleRatio
@ -167,7 +164,6 @@ Item {
id : passwordInput2 id : passwordInput2
Layout.topMargin: 6 Layout.topMargin: 6
Layout.fillWidth: true Layout.fillWidth: true
anchors.left: parent.left
horizontalAlignment: TextInput.AlignLeft horizontalAlignment: TextInput.AlignLeft
verticalAlignment: TextInput.AlignVCenter verticalAlignment: TextInput.AlignVCenter
font.family: MoneroComponents.Style.fontLight.name font.family: MoneroComponents.Style.fontLight.name

2
pages/Receive.qml
View file

@ -97,8 +97,8 @@ Rectangle {
ListView { ListView {
id: subaddressListView id: subaddressListView
Layout.fillHeight: true
Layout.fillWidth: true Layout.fillWidth: true
anchors.fill: parent
clip: true clip: true
boundsBehavior: ListView.StopAtBounds boundsBehavior: ListView.StopAtBounds
delegate: Rectangle { delegate: Rectangle {

7
pages/SharedRingDB.qml
View file

@ -194,7 +194,6 @@ Rectangle {
StandardButton { StandardButton {
id: loadBlackballFileButton id: loadBlackballFileButton
anchors.right: parent.right
text: qsTr("Load") + translationManager.emptyString text: qsTr("Load") + translationManager.emptyString
small: true small: true
enabled: !!appWindow.currentWallet && loadBlackballFileLine.text !== "" enabled: !!appWindow.currentWallet && loadBlackballFileLine.text !== ""
@ -243,7 +242,6 @@ Rectangle {
StandardButton { StandardButton {
id: unblackballButton id: unblackballButton
anchors.right: parent.right
text: qsTr("Mark as unspent") + translationManager.emptyString text: qsTr("Mark as unspent") + translationManager.emptyString
small: true small: true
enabled: !!appWindow.currentWallet && validUnsigned(blackballOutputAmountLine.text) && validUnsigned(blackballOutputOffsetLine.text) enabled: !!appWindow.currentWallet && validUnsigned(blackballOutputAmountLine.text) && validUnsigned(blackballOutputOffsetLine.text)
@ -415,9 +413,8 @@ Rectangle {
RowLayout { RowLayout {
id: segregationHeightRow id: segregationHeightRow
anchors.topMargin: 17 Layout.topMargin: 17 * scaleRatio
anchors.left: parent.left Layout.fillWidth: true
anchors.right: parent.right
LineEdit { LineEdit {
id: segregationHeightLine id: segregationHeightLine

2
pages/settings/Navbar.qml
View file

@ -51,7 +51,7 @@ Rectangle {
GridLayout { GridLayout {
id: grid id: grid
anchors.horizontalCenter: parent.horizontalCenter Layout.alignment: Qt.AlignHCenter
columnSpacing: 0 columnSpacing: 0
property string fontColor: "white" property string fontColor: "white"
property int fontSize: 13 * scaleRatio property int fontSize: 13 * scaleRatio

10
wizard/WizardManageWalletUI.qml
View file

@ -250,7 +250,7 @@ ColumnLayout {
Layout.minimumWidth: 200 * scaleRatio Layout.minimumWidth: 200 * scaleRatio
placeholderFontBold: true placeholderFontBold: true
placeholderFontFamily: "Arial" placeholderFontFamily: "Arial"
placeholderColor: Style.legacy_placeholderFontColor placeholderColor: MoneroComponents.Style.legacy_placeholderFontColor
placeholderText: qsTr("Account address (public)") + translationManager.emptyString placeholderText: qsTr("Account address (public)") + translationManager.emptyString
placeholderOpacity: 1.0 placeholderOpacity: 1.0
onTextUpdated: checkNextButton() onTextUpdated: checkNextButton()
@ -266,7 +266,7 @@ ColumnLayout {
Layout.minimumWidth: 200 * scaleRatio Layout.minimumWidth: 200 * scaleRatio
placeholderFontBold: true placeholderFontBold: true
placeholderFontFamily: "Arial" placeholderFontFamily: "Arial"
placeholderColor: Style.legacy_placeholderFontColor placeholderColor: MoneroComponents.Style.legacy_placeholderFontColor
placeholderText: qsTr("View key (private)") + translationManager.emptyString placeholderText: qsTr("View key (private)") + translationManager.emptyString
placeholderOpacity: 1.0 placeholderOpacity: 1.0
onTextUpdated: checkNextButton() onTextUpdated: checkNextButton()
@ -283,7 +283,7 @@ ColumnLayout {
id: spendKeyLine id: spendKeyLine
placeholderFontBold: true placeholderFontBold: true
placeholderFontFamily: "Arial" placeholderFontFamily: "Arial"
placeholderColor: Style.legacy_placeholderFontColor placeholderColor: MoneroComponents.Style.legacy_placeholderFontColor
placeholderText: qsTr("Spend key (private)") + translationManager.emptyString placeholderText: qsTr("Spend key (private)") + translationManager.emptyString
placeholderOpacity: 1.0 placeholderOpacity: 1.0
onTextUpdated: checkNextButton() onTextUpdated: checkNextButton()
@ -303,7 +303,7 @@ ColumnLayout {
Layout.minimumWidth: 200 * scaleRatio Layout.minimumWidth: 200 * scaleRatio
placeholderFontBold: true placeholderFontBold: true
placeholderFontFamily: "Arial" placeholderFontFamily: "Arial"
placeholderColor: Style.legacy_placeholderFontColor placeholderColor: MoneroComponents.Style.legacy_placeholderFontColor
placeholderText: qsTr("Restore height (optional)") + translationManager.emptyString placeholderText: qsTr("Restore height (optional)") + translationManager.emptyString
placeholderOpacity: 1.0 placeholderOpacity: 1.0
validator: IntValidator { validator: IntValidator {
@ -326,7 +326,7 @@ ColumnLayout {
Layout.minimumWidth: 200 * scaleRatio Layout.minimumWidth: 200 * scaleRatio
placeholderFontBold: true placeholderFontBold: true
placeholderFontFamily: "Arial" placeholderFontFamily: "Arial"
placeholderColor: Style.legacy_placeholderFontColor placeholderColor: MoneroComponents.Style.legacy_placeholderFontColor
placeholderText: qsTr("Subaddress lookahead (optional): <major>:<minor>") + translationManager.emptyString placeholderText: qsTr("Subaddress lookahead (optional): <major>:<minor>") + translationManager.emptyString
placeholderOpacity: 1.0 placeholderOpacity: 1.0
borderColor: Qt.rgba(0, 0, 0, 0.15) borderColor: Qt.rgba(0, 0, 0, 0.15)