diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-11-13 09:03:02 -0600 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-11-13 09:03:02 -0600 |
| commit | 8bd820b9099679f91fb0c542eb9edfd71a720332 (patch) | |
| tree | 9a0faed7cc20e81dc197bba305327dc90dd5e90e /pages | |
| parent | f948d0e21443e0ffc913b7c2b65a87400c4d8fe3 (diff) | |
| parent | 74e12ce71d00e7e9aea43a985e8a9dbfc4ad0844 (diff) | |
| download | monzero-gui-8bd820b9099679f91fb0c542eb9edfd71a720332.tar.gz monzero-gui-8bd820b9099679f91fb0c542eb9edfd71a720332.tar.xz monzero-gui-8bd820b9099679f91fb0c542eb9edfd71a720332.zip | |
Merge pull request #2429
74e12ce ContextMenu: implement 'paste' context menu for all text fields (xiphon)
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/AddressBook.qml | 4 | ||||
| -rw-r--r-- | pages/Transfer.qml | 8 | ||||
| -rw-r--r-- | pages/merchant/Merchant.qml | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/pages/AddressBook.qml b/pages/AddressBook.qml index ce8acfe5..5812dac5 100644 --- a/pages/AddressBook.qml +++ b/pages/AddressBook.qml @@ -325,8 +325,8 @@ Rectangle { wrapMode: Text.WrapAnywhere addressValidation: true pasteButton: true - onPaste: function(clipboardText) { - const parsed = walletManager.parse_uri_to_object(clipboardText); + onTextChanged: { + const parsed = walletManager.parse_uri_to_object(addressLine.text); if (!parsed.error) { addressLine.text = parsed.address; descriptionLine.text = parsed.tx_description; diff --git a/pages/Transfer.qml b/pages/Transfer.qml index 4216a3ce..69b35b38 100644 --- a/pages/Transfer.qml +++ b/pages/Transfer.qml @@ -257,18 +257,14 @@ Rectangle { appWindow.showPageRequest("AddressBook"); } pasteButton: true - onPaste: function(clipboardText) { - const parsed = walletManager.parse_uri_to_object(clipboardText); + onTextChanged: { + const parsed = walletManager.parse_uri_to_object(text); if (!parsed.error) { addressLine.text = parsed.address; setPaymentId(parsed.payment_id); amountLine.text = parsed.amount; setDescription(parsed.tx_description); - } else { - addressLine.text = clipboardText; } - } - onTextChanged: { warningLongPidTransfer = isLongPidService(text); } inlineButton.text: FontAwesome.qrcode diff --git a/pages/merchant/Merchant.qml b/pages/merchant/Merchant.qml index 93b78148..8096001e 100644 --- a/pages/merchant/Merchant.qml +++ b/pages/merchant/Merchant.qml @@ -455,7 +455,7 @@ Item { width: 220 source: "qrc:///images/merchant/input_box.png" - TextField { + MoneroComponents.Input { id: amountToReceive topPadding: 0 leftPadding: 10 |