Public/monero-gui
1
0
Fork 1
mirror of https://github.com/monero-project/monero-gui.git synced 2026-04-18 10:07:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix blackball section to conform to format change

Browse Source
This commit is contained in:
moneromooo-monero
2018-09-30 09:12:44 +01:00
parent 3fd37b96a0
commit 59a63e7725
3 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
pages/SharedRingDB.qml
View File

@@ -50,6 +50,15 @@ Rectangle {
return true
}
function validUnsigned(s) {
if (s.length == 0)
return false
for (var i = 0; i < s.length; ++i)
if ("0123456789".indexOf(s[i]) == -1)
return false
return true
}
function validRing(str, relative) {
var outs = str.split(" ");
if (outs.length == 0)
@@ -199,15 +208,24 @@ Rectangle {
RowLayout {
LineEdit {
id: blackballOutputLine
id: blackballOutputAmountLine
fontSize: mainLayout.lineEditFontSize
labelFontSize: 14 * scaleRatio
labelText: qsTr("Or manually blackball/unblackball a single output:") + translationManager.emptyString
placeholderText: qsTr("Paste output public key") + "..." + translationManager.emptyString
placeholderText: qsTr("Paste output amount") + "..." + translationManager.emptyString
readOnly: false
copyButton: true
width: mainLayout.editWidth
Layout.fillWidth: true
width: mainLayout.editWidth / 2
validator: IntValidator { bottom: 0 }
}
LineEdit {
id: blackballOutputOffsetLine
fontSize: mainLayout.lineEditFontSize
labelFontSize: 14 * scaleRatio
labelText: " "
placeholderText: qsTr("Paste output offset") + "..." + translationManager.emptyString
readOnly: false
width: mainLayout.editWidth / 2
validator: IntValidator { bottom: 0 }
}
}
@@ -219,8 +237,8 @@ Rectangle {
id: blackballButton
text: qsTr("Blackball") + translationManager.emptyString
small: true
enabled: !!appWindow.currentWallet && validHex32(blackballOutputLine.text)
onClicked: appWindow.currentWallet.blackballOutput(blackballOutputLine.text)
enabled: !!appWindow.currentWallet && validUnsigned(blackballOutputAmountLine.text) && validUnsigned(blackballOutputOffsetLine.text)
onClicked: appWindow.currentWallet.blackballOutput(blackballOutputAmountLine.text, blackballOutputOffsetLine.text)
}
StandardButton {
@@ -228,8 +246,8 @@ Rectangle {
anchors.right: parent.right
text: qsTr("Unblackball") + translationManager.emptyString
small: true
enabled: !!appWindow.currentWallet && validHex32(blackballOutputLine.text)
onClicked: appWindow.currentWallet.unblackballOutput(blackballOutputLine.text)
enabled: !!appWindow.currentWallet && validUnsigned(blackballOutputAmountLine.text) && validUnsigned(blackballOutputOffsetLine.text)
onClicked: appWindow.currentWallet.unblackballOutput(blackballOutputAmountLine.text, blackballOutputOffsetLine.text)
}
}
}