mirror of
https://github.com/monero-project/monero-gui.git
synced 2024-12-23 03:59:38 +00:00
Merge pull request #1855
55c3d07
Transfer: hide PaymentId and Description by default (xiphon)
This commit is contained in:
commit
b88ac2baa9
6 changed files with 60 additions and 14 deletions
BIN
images/minus-white.png
Normal file
BIN
images/minus-white.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 170 B |
BIN
images/minus-white@2x.png
Normal file
BIN
images/minus-white@2x.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 170 B |
BIN
images/plus-white.png
Normal file
BIN
images/plus-white.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 193 B |
BIN
images/plus-white@2x.png
Normal file
BIN
images/plus-white@2x.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 195 B |
|
@ -63,17 +63,27 @@ Rectangle {
|
|||
function updateFromQrCode(address, payment_id, amount, tx_description, recipient_name) {
|
||||
console.log("updateFromQrCode")
|
||||
addressLine.text = address
|
||||
paymentIdLine.text = payment_id
|
||||
setPaymentId(payment_id);
|
||||
amountLine.text = amount
|
||||
descriptionLine.text = recipient_name + " " + tx_description
|
||||
setDescription(recipient_name + " " + tx_description);
|
||||
cameraUi.qrcode_decoded.disconnect(updateFromQrCode)
|
||||
}
|
||||
|
||||
function setDescription(value) {
|
||||
descriptionLine.text = value;
|
||||
descriptionCheckbox.checked = descriptionLine.text != "";
|
||||
}
|
||||
|
||||
function setPaymentId(value) {
|
||||
paymentIdLine.text = value;
|
||||
paymentIdCheckbox.checked = paymentIdLine.text != "";
|
||||
}
|
||||
|
||||
function clearFields() {
|
||||
addressLine.text = ""
|
||||
paymentIdLine.text = ""
|
||||
setPaymentId("");
|
||||
amountLine.text = ""
|
||||
descriptionLine.text = ""
|
||||
setDescription("");
|
||||
priorityDropdown.currentIndex = 0
|
||||
updatePriorityDropdown()
|
||||
}
|
||||
|
@ -215,9 +225,9 @@ Rectangle {
|
|||
const parsed = walletManager.parse_uri_to_object(clipboardText);
|
||||
if (!parsed.error) {
|
||||
addressLine.text = parsed.address;
|
||||
paymentIdLine.text = parsed.payment_id;
|
||||
setPaymentId(parsed.payment_id);
|
||||
amountLine.text = parsed.amount;
|
||||
descriptionLine.text = parsed.tx_description;
|
||||
setDescription(parsed.tx_description);
|
||||
} else {
|
||||
addressLine.text = clipboardText;
|
||||
}
|
||||
|
@ -282,25 +292,57 @@ Rectangle {
|
|||
}
|
||||
}
|
||||
|
||||
RowLayout {
|
||||
ColumnLayout {
|
||||
CheckBox {
|
||||
id: paymentIdCheckbox
|
||||
border: false
|
||||
checkedIcon: "qrc:///images/minus-white.png"
|
||||
uncheckedIcon: "qrc:///images/plus-white.png"
|
||||
fontSize: paymentIdLine.labelFontSize
|
||||
iconOnTheLeft: false
|
||||
Layout.fillWidth: true
|
||||
text: qsTr("Payment ID <font size='2'>( Optional )</font>") + translationManager.emptyString
|
||||
onClicked: {
|
||||
if (!paymentIdCheckbox.checked) {
|
||||
paymentIdLine.text = "";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// payment id input
|
||||
LineEditMulti {
|
||||
id: paymentIdLine
|
||||
fontBold: true
|
||||
labelText: qsTr("Payment ID <font size='2'>( Optional )</font>") + translationManager.emptyString
|
||||
placeholderText: qsTr("16 or 64 hexadecimal characters") + translationManager.emptyString
|
||||
Layout.fillWidth: true
|
||||
wrapMode: Text.WrapAnywhere
|
||||
addressValidation: false
|
||||
visible: paymentIdCheckbox.checked
|
||||
}
|
||||
}
|
||||
|
||||
RowLayout {
|
||||
ColumnLayout {
|
||||
CheckBox {
|
||||
id: descriptionCheckbox
|
||||
border: false
|
||||
checkedIcon: "qrc:///images/minus-white.png"
|
||||
uncheckedIcon: "qrc:///images/plus-white.png"
|
||||
fontSize: descriptionLine.labelFontSize
|
||||
iconOnTheLeft: false
|
||||
Layout.fillWidth: true
|
||||
text: qsTr("Description <font size='2'>( Optional )</font>") + translationManager.emptyString
|
||||
onClicked: {
|
||||
if (!descriptionCheckbox.checked) {
|
||||
descriptionLine.text = "";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
LineEditMulti {
|
||||
id: descriptionLine
|
||||
labelText: qsTr("Description <font size='2'>( Optional )</font>") + translationManager.emptyString
|
||||
placeholderText: qsTr("Saved to local wallet history") + translationManager.emptyString
|
||||
Layout.fillWidth: true
|
||||
visible: descriptionCheckbox.checked
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -347,7 +389,7 @@ Rectangle {
|
|||
console.log("priority: " + priority)
|
||||
console.log("amount: " + amountLine.text)
|
||||
addressLine.text = addressLine.text.trim()
|
||||
paymentIdLine.text = paymentIdLine.text.trim()
|
||||
setPaymentId(paymentIdLine.text.trim());
|
||||
root.paymentClicked(addressLine.text, paymentIdLine.text, amountLine.text, root.mixin, priority, descriptionLine.text)
|
||||
}
|
||||
}
|
||||
|
@ -428,7 +470,7 @@ Rectangle {
|
|||
console.log("priority: " + priority)
|
||||
console.log("amount: " + amountLine.text)
|
||||
addressLine.text = addressLine.text.trim()
|
||||
paymentIdLine.text = paymentIdLine.text.trim()
|
||||
setPaymentId(paymentIdLine.text.trim());
|
||||
root.paymentClicked(addressLine.text, paymentIdLine.text, amountLine.text, root.mixin, priority, descriptionLine.text)
|
||||
|
||||
}
|
||||
|
@ -661,7 +703,7 @@ Rectangle {
|
|||
// Popuplate fields from addressbook.
|
||||
function sendTo(address, paymentId, description){
|
||||
addressLine.text = address
|
||||
paymentIdLine.text = paymentId
|
||||
descriptionLine.text = description
|
||||
setPaymentId(paymentId);
|
||||
setDescription(description);
|
||||
}
|
||||
}
|
||||
|
|
4
qml.qrc
4
qml.qrc
|
@ -8,7 +8,11 @@
|
|||
<file>images/helpIcon.png</file>
|
||||
<file>images/maximizeIcon.png</file>
|
||||
<file>images/minimizeIcon.png</file>
|
||||
<file>images/minus-white.png</file>
|
||||
<file>images/minus-white@2x.png</file>
|
||||
<file>images/moneroLogo.png</file>
|
||||
<file>images/plus-white.png</file>
|
||||
<file>images/plus-white@2x.png</file>
|
||||
<file>components/Label.qml</file>
|
||||
<file>images/whatIsIcon.png</file>
|
||||
<file>images/lockIcon.png</file>
|
||||
|
|
Loading…
Reference in a new issue