Bring back paymentID to tranfer page and force hide paymentId on a settings toggle (and reset fields on transfer page)

This commit is contained in:
dsc 2019-01-24 12:47:03 +01:00
parent 9689fff957
commit 02493be6eb
No known key found for this signature in database
GPG key ID: 7BBC83D7A8810AAB
3 changed files with 3 additions and 2 deletions

View file

@ -1047,7 +1047,7 @@ ApplicationWindow {
property bool hideBalance: false property bool hideBalance: false
property bool lockOnUserInActivity: true property bool lockOnUserInActivity: true
property int lockOnUserInActivityInterval: 10 // minutes property int lockOnUserInActivityInterval: 10 // minutes
property bool showPid: false property bool showPid: true
} }
// Information dialog // Information dialog

View file

@ -300,7 +300,7 @@ Rectangle {
fontSize: paymentIdLine.labelFontSize fontSize: paymentIdLine.labelFontSize
iconOnTheLeft: false iconOnTheLeft: false
Layout.fillWidth: true Layout.fillWidth: true
text: qsTr("Payment ID <font size='2'>( Optional )</font>") + translationManager.emptyString text: qsTr("Payment ID <font size='2'>( Optional, deprecated )</font>") + translationManager.emptyString
onClicked: { onClicked: {
if (!paymentIdCheckbox.checked) { if (!paymentIdCheckbox.checked) {
paymentIdLine.text = ""; paymentIdLine.text = "";

View file

@ -84,6 +84,7 @@ Rectangle {
checked: persistentSettings.showPid checked: persistentSettings.showPid
onClicked: { onClicked: {
persistentSettings.showPid = !persistentSettings.showPid persistentSettings.showPid = !persistentSettings.showPid
middlePanel.transferView.clearFields();
} }
text: qsTr("Enable transfer with payment ID (OBSOLETE)") + translationManager.emptyString text: qsTr("Enable transfer with payment ID (OBSOLETE)") + translationManager.emptyString
} }