diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-04-30 15:20:51 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-04-30 15:20:51 -0500 |
| commit | 6b54017f08cdd1939447cc60000dc004fb391fe0 (patch) | |
| tree | a68f90d9252e1bde9f59f3a16ad6398e520db0e7 | |
| parent | 776d0ab33df54de75d2a99851b22c719aad5f310 (diff) | |
| parent | 9b7adfc0a8662b13340992dbe3caba3ad4c019d2 (diff) | |
| download | monzero-gui-6b54017f08cdd1939447cc60000dc004fb391fe0.tar.gz monzero-gui-6b54017f08cdd1939447cc60000dc004fb391fe0.tar.xz monzero-gui-6b54017f08cdd1939447cc60000dc004fb391fe0.zip | |
Merge pull request #2092
9b7adfc transfer: change description/pid checkbox (mmbyday)
| -rw-r--r-- | pages/Transfer.qml | 95 |
1 files changed, 46 insertions, 49 deletions
diff --git a/pages/Transfer.qml b/pages/Transfer.qml index 09b3df58..9d83f98e 100644 --- a/pages/Transfer.qml +++ b/pages/Transfer.qml @@ -304,64 +304,61 @@ Rectangle { } ColumnLayout { - visible: appWindow.persistentSettings.showPid || paymentIdCheckbox.checked + spacing: 15 - CheckBox { - id: paymentIdCheckbox - border: false - checkedIcon: "qrc:///images/minus-white.png" - uncheckedIcon: "qrc:///images/plus-white.png" - imgWidth: 12 - imgHeight: 12 - fontSize: paymentIdLine.labelFontSize - iconOnTheLeft: false - Layout.fillWidth: true - text: qsTr("Payment ID <font size='2'>( Optional )</font>") + translationManager.emptyString - onClicked: { - if (!paymentIdCheckbox.checked) { - paymentIdLine.text = ""; + ColumnLayout { + CheckBox { + id: descriptionCheckbox + border: false + checkedIcon: "qrc:///images/plus-in-circle-medium-white.png" + uncheckedIcon: "qrc:///images/plus-in-circle-medium-white.png" + fontSize: descriptionLine.labelFontSize + iconOnTheLeft: true + Layout.fillWidth: true + text: qsTr("Add description") + translationManager.emptyString + onClicked: { + if (!descriptionCheckbox.checked) { + descriptionLine.text = ""; + } } } - } - // payment id input - LineEditMulti { - id: paymentIdLine - fontBold: true - placeholderText: qsTr("64 hexadecimal characters") + translationManager.emptyString - Layout.fillWidth: true - wrapMode: Text.WrapAnywhere - addressValidation: false - visible: paymentIdCheckbox.checked + LineEditMulti { + id: descriptionLine + placeholderText: qsTr("Saved to local wallet history") + translationManager.emptyString + Layout.fillWidth: true + visible: descriptionCheckbox.checked + } } - } - ColumnLayout { - CheckBox { - id: descriptionCheckbox - border: false - checkedIcon: "qrc:///images/minus-white.png" - uncheckedIcon: "qrc:///images/plus-white.png" - imgWidth: 12 - imgHeight: 12 - fontSize: descriptionLine.labelFontSize - iconOnTheLeft: false - Layout.fillWidth: true - text: qsTr("Description <font size='2'>( Optional )</font>") + translationManager.emptyString - onClicked: { - if (!descriptionCheckbox.checked) { - descriptionLine.text = ""; + ColumnLayout { + visible: appWindow.persistentSettings.showPid || paymentIdCheckbox.checked + // @TODO: remove after pid removal hardfork + CheckBox { + id: paymentIdCheckbox + border: false + checkedIcon: "qrc:///images/plus-in-circle-medium-white.png" + uncheckedIcon: "qrc:///images/plus-in-circle-medium-white.png" + fontSize: paymentIdLine.labelFontSize + iconOnTheLeft: true + Layout.fillWidth: true + text: qsTr("Add payment ID") + translationManager.emptyString + onClicked: { + if (!paymentIdCheckbox.checked) { + paymentIdLine.text = ""; + } } } - } - LineEditMulti { - id: descriptionLine - placeholderText: qsTr("Saved to local wallet history") + translationManager.emptyString - Layout.fillWidth: true - visible: descriptionCheckbox.checked - onTextChanged: { - paymentIdWarningBox.visible = walletManager.paymentIdValid(text) && !persistentSettings.showPid + // payment id input + LineEditMulti { + id: paymentIdLine + fontBold: true + placeholderText: qsTr("64 hexadecimal characters") + translationManager.emptyString + Layout.fillWidth: true + wrapMode: Text.WrapAnywhere + addressValidation: false + visible: paymentIdCheckbox.checked } } } |