github/monero-gui
1
Fork 0
mirror of https://github.com/monero-project/monero-gui synced 2024-11-30 08:40:03 +01:00
Code Releases Activity

wizard: allow restore height when creating wallet from device

Browse Source
This commit is contained in:
mmbyday 2019-02-28 11:08:54 -08:00 committed by Monero-Pootle
parent 2af79ca8b5
commit 1eadb1dbf8
No known key found for this signature in database
GPG Key ID: 762AF8C608E56CDF
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
wizard/WizardCreateDevice1.qml
View File

@ -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;

2
wizard/WizardSummary.qml
View File

@ -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 {