Merge pull request #1916

02493be Bring back paymentID to tranfer page and force hide paymentId on a settings toggle (and reset fields on transfer page) (xmrdsc)
This commit is contained in:
luigi1111 2019-02-01 01:07:47 -06:00
commit 666dee9bd8
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
3 changed files with 3 additions and 2 deletions

View file

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

View file

@ -306,7 +306,7 @@ Rectangle {
fontSize: paymentIdLine.labelFontSize
iconOnTheLeft: false
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: {
if (!paymentIdCheckbox.checked) {
paymentIdLine.text = "";

View file

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