monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-11-17 00:07:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1936

Browse source 
f91b38f Revert 02493be (xiphon)
This commit is contained in:
luigi1111 2019-02-14 11:18:07 -06:00
commit 0064e595c3
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
main.qml
View file

@ -1054,7 +1054,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: true property bool showPid: false
} }
// Information dialog // Information dialog

2
pages/Transfer.qml
View file

@ -302,7 +302,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, deprecated )</font>") + translationManager.emptyString text: qsTr("Payment ID <font size='2'>( Optional )</font>") + translationManager.emptyString
onClicked: { onClicked: {
if (!paymentIdCheckbox.checked) { if (!paymentIdCheckbox.checked) {
paymentIdLine.text = ""; paymentIdLine.text = "";

1
pages/settings/SettingsLayout.qml
View file

@ -84,7 +84,6 @@ 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
} }