mirror of
https://github.com/monero-project/monero-gui.git
synced 2024-11-17 08:17:59 +00:00
Merge pull request #3638
faf9ec3
AddressBook: add Grab QR code inline button (rating89us)
This commit is contained in:
commit
56a17e0a85
1 changed files with 24 additions and 1 deletions
|
@ -345,6 +345,29 @@ Rectangle {
|
|||
onEnterPressed: addButton.enabled ? addButton.clicked() : ""
|
||||
onReturnPressed: addButton.enabled ? addButton.clicked() : ""
|
||||
|
||||
MoneroComponents.InlineButton {
|
||||
fontFamily: FontAwesome.fontFamilySolid
|
||||
fontStyleName: "Solid"
|
||||
fontPixelSize: 18
|
||||
text: FontAwesome.desktop
|
||||
tooltip: qsTr("Grab QR code from screen") + translationManager.emptyString
|
||||
onClicked: {
|
||||
clearFields();
|
||||
const codes = oshelper.grabQrCodesFromScreen();
|
||||
for (var index = 0; index < codes.length; ++index) {
|
||||
const parsed = walletManager.parse_uri_to_object(codes[index]);
|
||||
if (!parsed.error) {
|
||||
addressLine.text = parsed.address
|
||||
descriptionLine.text = parsed.recipient_name
|
||||
break;
|
||||
} else if (walletManager.addressValid(codes[index], appWindow.persistentSettings.nettype)) {
|
||||
addressLine.text = codes[index];
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
MoneroComponents.InlineButton {
|
||||
buttonColor: MoneroComponents.Style.orange
|
||||
fontFamily: FontAwesome.fontFamily
|
||||
|
@ -509,7 +532,7 @@ Rectangle {
|
|||
function updateFromQrCode(address, payment_id, amount, tx_description, recipient_name) {
|
||||
console.log("updateFromQrCode")
|
||||
addressLine.text = address
|
||||
descriptionLine.text = recipient_name + " " + tx_description
|
||||
descriptionLine.text = recipient_name
|
||||
cameraUi.qrcode_decoded.disconnect(updateFromQrCode)
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue