From 6ca0713739e7dc08be838364b2ab493222793039 Mon Sep 17 00:00:00 2001 From: Sander Ferdinand Date: Thu, 5 Apr 2018 09:21:43 +0200 Subject: [PATCH] Fixes blockchain size warnings --- main.qml | 5 +++-- pages/Settings.qml | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/main.qml b/main.qml index b481985c..61a20d0e 100644 --- a/main.qml +++ b/main.qml @@ -76,6 +76,7 @@ ApplicationWindow { readonly property string localDaemonAddress : persistentSettings.nettype == NetworkType.MAINNET ? "localhost:18081" : persistentSettings.nettype == NetworkType.TESTNET ? "localhost:28081" : "localhost:38081" property string currentDaemonAddress; property bool startLocalNodeCancelled: false + property int estimatedBlockchainSize: 50 // GB // true if wallet ever synchronized property bool walletInitialized : false @@ -1150,9 +1151,9 @@ ApplicationWindow { if(validator.readOnly) confirmationDialog.text += qsTr("Error: Filesystem is read only") + "\n\n" if(validator.storageAvailable < 20) - confirmationDialog.text += qsTr("Warning: There's only %1 GB available on the device. Blockchain requires ~%2 GB of data.").arg(validator.storageAvailable).arg(30) + "\n\n" + confirmationDialog.text += qsTr("Warning: There's only %1 GB available on the device. Blockchain requires ~%2 GB of data.").arg(validator.storageAvailable).arg(estimatedBlockchainSize) + "\n\n" else - confirmationDialog.text += qsTr("Note: There's %1 GB available on the device. Blockchain requires ~%2 GB of data.").arg(validator.storageAvailable).arg(30) + "\n\n" + confirmationDialog.text += qsTr("Note: There's %1 GB available on the device. Blockchain requires ~%2 GB of data.").arg(validator.storageAvailable).arg(estimatedBlockchainSize) + "\n\n" if(!validator.lmdbExists) confirmationDialog.text += qsTr("Note: lmdb folder not found. A new folder will be created.") + "\n\n" diff --git a/pages/Settings.qml b/pages/Settings.qml index abfc0e05..668dabfd 100644 --- a/pages/Settings.qml +++ b/pages/Settings.qml @@ -747,10 +747,10 @@ Rectangle { confirmationDialog.text += qsTr("Error: Filesystem is read only") + "\n\n" } - if(validator.storageAvailable < 20) { - confirmationDialog.text += qsTr("Warning: There's only %1 GB available on the device. Blockchain requires ~%2 GB of data.").arg(validator.storageAvailable).arg(15) + "\n\n" + if(validator.storageAvailable < estimatedBlockchainSize) { + confirmationDialog.text += qsTr("Warning: There's only %1 GB available on the device. Blockchain requires ~%2 GB of data.").arg(validator.storageAvailable).arg(estimatedBlockchainSize) + "\n\n" } else { - confirmationDialog.text += qsTr("Note: There's %1 GB available on the device. Blockchain requires ~%2 GB of data.").arg(validator.storageAvailable).arg(15) + "\n\n" + confirmationDialog.text += qsTr("Note: There's %1 GB available on the device. Blockchain requires ~%2 GB of data.").arg(validator.storageAvailable).arg(estimatedBlockchainSize) + "\n\n" } if(!validator.lmdbExists) {