diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-03-01 02:40:18 -0600 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-03-01 02:40:18 -0600 |
| commit | 287e379a24fcca39f70dd0104155a8fe069cb7ac (patch) | |
| tree | 13aedbd978fced610ca239fd5b215bcb62ec42ff | |
| parent | cd9e1bf0ea64cf09d766559f391dc2cdc644323d (diff) | |
| parent | 0d24f642c3e81af8fc61a898c4e69df2bc91fc8b (diff) | |
| download | monzero-gui-287e379a24fcca39f70dd0104155a8fe069cb7ac.tar.gz monzero-gui-287e379a24fcca39f70dd0104155a8fe069cb7ac.tar.xz monzero-gui-287e379a24fcca39f70dd0104155a8fe069cb7ac.zip | |
Merge pull request #1990
0d24f64 invalidate wallet name after creation (xmrdsc)
| -rw-r--r-- | wizard/WizardCreateDevice1.qml | 6 | ||||
| -rw-r--r-- | wizard/WizardCreateWallet1.qml | 6 | ||||
| -rw-r--r-- | wizard/WizardRestoreWallet1.qml | 1 | ||||
| -rw-r--r-- | wizard/WizardWalletInput.qml | 5 |
4 files changed, 18 insertions, 0 deletions
diff --git a/wizard/WizardCreateDevice1.qml b/wizard/WizardCreateDevice1.qml index f80b767d..5913d4f8 100644 --- a/wizard/WizardCreateDevice1.qml +++ b/wizard/WizardCreateDevice1.qml @@ -225,4 +225,10 @@ Rectangle { wizardCreateDevice1.update(); console.log() } + + function onPageCompleted(previousView){ + if(previousView.viewName == "wizardHome"){ + walletInput.reset(); + } + } } diff --git a/wizard/WizardCreateWallet1.qml b/wizard/WizardCreateWallet1.qml index 5d484408..69866abd 100644 --- a/wizard/WizardCreateWallet1.qml +++ b/wizard/WizardCreateWallet1.qml @@ -144,4 +144,10 @@ Rectangle { } } } + + function onPageCompleted(previousView){ + if(previousView.viewName == "wizardHome"){ + walletInput.reset(); + } + } } diff --git a/wizard/WizardRestoreWallet1.qml b/wizard/WizardRestoreWallet1.qml index cff87b4d..95e125fe 100644 --- a/wizard/WizardRestoreWallet1.qml +++ b/wizard/WizardRestoreWallet1.qml @@ -305,6 +305,7 @@ Rectangle { function onPageCompleted(previousView){ if(previousView.viewName == "wizardHome"){ // cleanup + walletInput.reset(); seedInput.text = ""; addressLine.text = ""; spendKeyLine.text = ""; diff --git a/wizard/WizardWalletInput.qml b/wizard/WizardWalletInput.qml index aba521f7..e8946647 100644 --- a/wizard/WizardWalletInput.qml +++ b/wizard/WizardWalletInput.qml @@ -52,6 +52,11 @@ GridLayout { return false; } + function reset() { + walletName.error = !walletName.verify(); + walletLocation.error = walletLocation.text === ""; + } + MoneroComponents.LineEdit { id: walletName Layout.fillWidth: true |