diff options
| author | mmbyday <mmbyday@protonmail.com> | 2019-02-28 11:08:54 -0800 |
|---|---|---|
| committer | mmbyday <mmbyday@protonmail.com> | 2019-02-28 11:23:19 -0800 |
| commit | 61af76fcb852f8f2be10267355edc3f1c7626fca (patch) | |
| tree | d4c71b20249cd92c870a11a139f1e37506472f9b | |
| parent | 07df0f41bf8d5f735480289854f08f9e19356d39 (diff) | |
| download | monzero-gui-61af76fcb852f8f2be10267355edc3f1c7626fca.tar.gz monzero-gui-61af76fcb852f8f2be10267355edc3f1c7626fca.tar.xz monzero-gui-61af76fcb852f8f2be10267355edc3f1c7626fca.zip | |
wizard: allow restore height when creating wallet from device
| -rw-r--r-- | wizard/WizardCreateDevice1.qml | 24 | ||||
| -rw-r--r-- | wizard/WizardSummary.qml | 2 |
2 files changed, 17 insertions, 9 deletions
diff --git a/wizard/WizardCreateDevice1.qml b/wizard/WizardCreateDevice1.qml index a9b15303..060c4f12 100644 --- a/wizard/WizardCreateDevice1.qml +++ b/wizard/WizardCreateDevice1.qml @@ -89,12 +89,14 @@ Rectangle { MoneroComponents.LineEdit { id: restoreHeight Layout.fillWidth: true - - labelText: qsTr("Restore height (optional)") + translationManager.emptyString + labelText: qsTr("Wallet creation date as `YYYY-MM-DD` or restore height") + translationManager.emptyString labelFontSize: 14 * scaleRatio placeholderFontSize: 16 * scaleRatio - placeholderText: "0" - validator: RegExpValidator { regExp: /(\d+)?$/ } + placeholderText: qsTr("Restore height") + translationManager.emptyString + validator: RegExpValidator { + regExp: /^(\d+|\d{4}-\d{2}-\d{2})$/ + } + text: "0" } MoneroComponents.LineEdit { @@ -161,12 +163,18 @@ Rectangle { wizardController.walletOptionsName = walletInput.walletName.text; wizardController.walletOptionsLocation = walletInput.walletLocation.text; wizardController.walletOptionsDeviceName = wizardCreateDevice1.deviceName; - - if(restoreHeight.text) - wizardController.walletOptionsRestoreHeight = parseInt(restoreHeight.text); if(lookahead.text) wizardController.walletOptionsSubaddressLookahead = lookahead.text; - + var _restoreHeight = 0; + if(restoreHeight.text){ + // Parse date string or restore height as integer + if(restoreHeight.text.indexOf('-') === 4 && restoreHeight.text.length === 10){ + _restoreHeight = Wizard.getApproximateBlockchainHeight(restoreHeight.text); + } else { + _restoreHeight = parseInt(restoreHeight.text) + } + wizardController.walletOptionsRestoreHeight = _restoreHeight; + } var written = wizardController.createWalletFromDevice(); if(written){ wizardController.walletOptionsIsRecoveringFromDevice = true; diff --git a/wizard/WizardSummary.qml b/wizard/WizardSummary.qml index fb10cf60..5b62a345 100644 --- a/wizard/WizardSummary.qml +++ b/wizard/WizardSummary.qml @@ -67,7 +67,7 @@ ColumnLayout { Layout.fillWidth: true header: qsTr("Restore height") + translationManager.emptyString value: wizardController.walletOptionsRestoreHeight - visible: wizardStateView.state != "wizardCreateWallet4" + visible: wizardController.walletOptionsRestoreHeight > 0 } WizardSummaryItem { |