aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorselsta <selsta@sent.at>2019-02-27 00:26:16 +0100
committerselsta <selsta@sent.at>2019-02-27 00:26:16 +0100
commitdc5028f019330c22f005bf57d3574d450067de41 (patch)
treee07ba55836a114d0b5a1160fae46ba82e096a781
parent42103432b79bb52b254531a77d93f26007e1cc42 (diff)
downloadmonzero-gui-dc5028f019330c22f005bf57d3574d450067de41.tar.gz
monzero-gui-dc5028f019330c22f005bf57d3574d450067de41.tar.xz
monzero-gui-dc5028f019330c22f005bf57d3574d450067de41.zip
SettingsInfo: allow a date for restore height
-rw-r--r--pages/settings/SettingsInfo.qml16
1 files changed, 13 insertions, 3 deletions
diff --git a/pages/settings/SettingsInfo.qml b/pages/settings/SettingsInfo.qml
index e8f1b08a..4e98463a 100644
--- a/pages/settings/SettingsInfo.qml
+++ b/pages/settings/SettingsInfo.qml
@@ -31,6 +31,7 @@ import QtQuick.Layouts 1.1
import QtQuick.Controls 2.0
import QtQuick.Dialogs 1.2
+import "../../js/Wizard.js" as Wizard
import "../../version.js" as Version
import "../../components" as MoneroComponents
@@ -172,10 +173,19 @@ Rectangle {
property var style: "<style type='text/css'>a {cursor:pointer;text-decoration: none; color: #FF6C3C}</style>"
text: (currentWallet ? currentWallet.walletCreationHeight : "") + style + qsTr(" <a href='#'> (Click to change)</a>") + translationManager.emptyString
onLinkActivated: {
- inputDialog.labelText = qsTr("Set a new restore height:") + translationManager.emptyString;
+ inputDialog.labelText = qsTr("Set a new restore height.\nYou can enter a block height or a date (YYYY-MM-DD):") + translationManager.emptyString;
inputDialog.inputText = currentWallet ? currentWallet.walletCreationHeight : "0";
inputDialog.onAcceptedCallback = function() {
- var _restoreHeight = parseInt(inputDialog.inputText);
+ var _restoreHeight;
+ if (inputDialog.inputText) {
+ var restoreHeightText = inputDialog.inputText;
+ // Parse date string or restore height as integer
+ if(restoreHeightText.indexOf('-') === 4 && restoreHeightText.length === 10) {
+ _restoreHeight = Wizard.getApproximateBlockchainHeight(restoreHeightText);
+ } else {
+ _restoreHeight = parseInt(restoreHeightText)
+ }
+ }
if (!isNaN(_restoreHeight)) {
if(_restoreHeight >= 0) {
currentWallet.walletCreationHeight = _restoreHeight
@@ -206,7 +216,7 @@ Rectangle {
}
}
- appWindow.showStatusMessage(qsTr("Invalid restore height specified. Must be a number."),3);
+ appWindow.showStatusMessage(qsTr("Invalid restore height specified. Must be a number or a date formatted YYYY-MM-DD"),3);
}
inputDialog.onRejectedCallback = null;
inputDialog.open()