diff options
| author | Jaquee <jaquee.monero@gmail.com> | 2017-11-02 07:51:15 +0100 |
|---|---|---|
| committer | Jaquee <jaquee.monero@gmail.com> | 2017-11-03 16:57:12 +0100 |
| commit | 2170f6a46d42704f5fe1b0ff04bf7a9a5992804f (patch) | |
| tree | 4e44336b8ee08d93c58f3d08eddbf9fe0411ca34 | |
| parent | e6ada22611dcdb34dbba3298dc1597fd04e29590 (diff) | |
| download | monzero-gui-2170f6a46d42704f5fe1b0ff04bf7a9a5992804f.tar.gz monzero-gui-2170f6a46d42704f5fe1b0ff04bf7a9a5992804f.tar.xz monzero-gui-2170f6a46d42704f5fe1b0ff04bf7a9a5992804f.zip | |
Improve copy text handling
| -rw-r--r-- | components/AddressBookTable.qml | 4 | ||||
| -rw-r--r-- | components/StandardDialog.qml | 15 | ||||
| -rw-r--r-- | main.qml | 3 | ||||
| -rw-r--r-- | pages/Keys.qml | 8 | ||||
| -rw-r--r-- | pages/Receive.qml | 3 | ||||
| -rw-r--r-- | wizard/WizardMemoTextInput.qml | 6 |
6 files changed, 36 insertions, 3 deletions
diff --git a/components/AddressBookTable.qml b/components/AddressBookTable.qml index abf72371..4d281440 100644 --- a/components/AddressBookTable.qml +++ b/components/AddressBookTable.qml @@ -144,8 +144,10 @@ ListView { onOptionClicked: { // Ensure tooltip is closed appWindow.toolTip.visible = false; - if(option === 0) + if(option === 0) { clipboard.setText(address) + appWindow.showStatusMessage(qsTr("Address copied to clipboard"),3) + } else if(option === 1){ console.log("Sending to: ", address +" "+ paymentId); middlePanel.sendTo(address, paymentId, description); diff --git a/components/StandardDialog.qml b/components/StandardDialog.qml index d3e14b29..044c0a5c 100644 --- a/components/StandardDialog.qml +++ b/components/StandardDialog.qml @@ -113,6 +113,21 @@ Rectangle { textFormat: TextEdit.AutoText readOnly: true font.pixelSize: 12 * scaleRatio + selectByMouse: false + + MouseArea { + anchors.fill: parent + onClicked: { + appWindow.showStatusMessage(qsTr("Double tap to copy"),3) + } + onDoubleClicked: { + parent.selectAll() + parent.copy() + parent.deselect() + console.log("copied to clipboard"); + appWindow.showStatusMessage(qsTr("Content copied to clipboard"),3) + } + } } } @@ -1481,10 +1481,11 @@ ApplicationWindow { Rectangle { id: statusMessage + z: 99 visible: false property alias text: statusMessageText.text anchors.bottom: parent.bottom - width: 200 * scaleRatio + width: statusMessageText.contentWidth + 20 * scaleRatio anchors.horizontalCenter: parent.horizontalCenter color: "black" height: 40 * scaleRatio diff --git a/pages/Keys.qml b/pages/Keys.qml index 6c78b7a3..3fad708d 100644 --- a/pages/Keys.qml +++ b/pages/Keys.qml @@ -75,10 +75,14 @@ Rectangle { MouseArea { anchors.fill: parent onClicked: { + appWindow.showStatusMessage(qsTr("Double tap to copy"),3) + } + onDoubleClicked: { parent.selectAll() parent.copy() parent.deselect() console.log("copied to clipboard"); + appWindow.showStatusMessage(qsTr("Seed copied to clipboard"),3) } } } @@ -105,10 +109,14 @@ Rectangle { MouseArea { anchors.fill: parent onClicked: { + appWindow.showStatusMessage(qsTr("Double tap to copy"),3) + } + onDoubleClicked: { parent.selectAll() parent.copy() parent.deselect() console.log("copied to clipboard"); + appWindow.showStatusMessage(qsTr("Keys copied to clipboard"),3) } } } diff --git a/pages/Receive.qml b/pages/Receive.qml index bd3d0bd3..b22ddfcd 100644 --- a/pages/Receive.qml +++ b/pages/Receive.qml @@ -205,6 +205,7 @@ Rectangle { if (addressLine.text.length > 0) { console.log(addressLine.text + " copied to clipboard") clipboard.setText(addressLine.text) + appWindow.showStatusMessage(qsTr("Address copied to clipboard"),3) } } } @@ -237,6 +238,7 @@ Rectangle { onClicked: { if (paymentIdLine.text.length > 0) { clipboard.setText(paymentIdLine.text) + appWindow.showStatusMessage(qsTr("Payment ID copied to clipboard"),3) } } } @@ -289,6 +291,7 @@ Rectangle { onClicked: { if (integratedAddressLine.text.length > 0) { clipboard.setText(integratedAddressLine.text) + appWindow.showStatusMessage(qsTr("Integrated address copied to clipboard"),3) } } } diff --git a/wizard/WizardMemoTextInput.qml b/wizard/WizardMemoTextInput.qml index c999f49c..d278508e 100644 --- a/wizard/WizardMemoTextInput.qml +++ b/wizard/WizardMemoTextInput.qml @@ -59,7 +59,11 @@ Column { MouseArea { anchors.fill: parent cursorShape: Qt.PointingHandCursor - onClicked: clipboard.setText(memoTextInput.text) + onClicked: { + clipboard.setText(memoTextInput.text) + appWindow.showStatusMessage(qsTr("Seed copied to clipboard"),3) + } + } } Rectangle { |