diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-01-21 14:45:48 -0600 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-01-21 14:45:48 -0600 |
| commit | 442320bc3635a387b60ddebac226a3b6cd3d975e (patch) | |
| tree | 5a0e47ef1d4baf087ab3e4a356cf1f7b14716d26 | |
| parent | 2207fd5b29aaeaab0884cf4e131e00f26e8002da (diff) | |
| parent | bb3723414269270c0802326a79f966fb77f43bc0 (diff) | |
| download | monzero-gui-442320bc3635a387b60ddebac226a3b6cd3d975e.tar.gz monzero-gui-442320bc3635a387b60ddebac226a3b6cd3d975e.tar.xz monzero-gui-442320bc3635a387b60ddebac226a3b6cd3d975e.zip | |
Merge pull request #1866
bb37234 Transfer: disable long payment ids by default (selsta)
| -rw-r--r-- | main.qml | 1 | ||||
| -rw-r--r-- | pages/AddressBook.qml | 1 | ||||
| -rw-r--r-- | pages/Transfer.qml | 2 | ||||
| -rw-r--r-- | pages/settings/SettingsLayout.qml | 10 |
4 files changed, 14 insertions, 0 deletions
@@ -1056,6 +1056,7 @@ ApplicationWindow { property bool hideBalance: false property bool lockOnUserInActivity: true property int lockOnUserInActivityInterval: 10 // minutes + property bool showPid: false } // Information dialog diff --git a/pages/AddressBook.qml b/pages/AddressBook.qml index 36de37d5..7399c786 100644 --- a/pages/AddressBook.qml +++ b/pages/AddressBook.qml @@ -71,6 +71,7 @@ Rectangle { LineEditMulti { id: paymentIdLine + visible: appWindow.persistentSettings.showPid Layout.fillWidth: true; labelText: qsTr("Payment ID <font size='2'>(Optional)</font>") + translationManager.emptyString placeholderText: qsTr("Paste 64 hexadecimal characters") + translationManager.emptyString diff --git a/pages/Transfer.qml b/pages/Transfer.qml index a36e22e6..c57ff2a8 100644 --- a/pages/Transfer.qml +++ b/pages/Transfer.qml @@ -287,6 +287,8 @@ Rectangle { } ColumnLayout { + visible: appWindow.persistentSettings.showPid || paymentIdCheckbox.checked + CheckBox { id: paymentIdCheckbox border: false diff --git a/pages/settings/SettingsLayout.qml b/pages/settings/SettingsLayout.qml index 1ae870e3..83f63845 100644 --- a/pages/settings/SettingsLayout.qml +++ b/pages/settings/SettingsLayout.qml @@ -80,6 +80,16 @@ Rectangle { MoneroComponents.CheckBox { visible: !isMobile + id: showPidCheckBox + checked: persistentSettings.showPid + onClicked: { + persistentSettings.showPid = !persistentSettings.showPid + } + text: qsTr("Enable transfer with payment ID (OBSOLETE)") + translationManager.emptyString + } + + MoneroComponents.CheckBox { + visible: !isMobile id: userInActivityCheckbox checked: persistentSettings.lockOnUserInActivity onClicked: persistentSettings.lockOnUserInActivity = !persistentSettings.lockOnUserInActivity |