From 9adb694b171efd6c0f87f96436de92526f920383 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Wed, 8 Feb 2017 03:56:52 +0000 Subject: [PATCH 1/3] Qt/Intro: Move sizeWarningLabel text into C++ code --- src/qt/forms/intro.ui | 3 --- src/qt/intro.cpp | 6 +++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/qt/forms/intro.ui b/src/qt/forms/intro.ui index e4ff3da1a..1ec0333a9 100644 --- a/src/qt/forms/intro.ui +++ b/src/qt/forms/intro.ui @@ -55,9 +55,6 @@ - - %1 will download and store a copy of the Bitcoin block chain. At least %2GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory. - true diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index 96bddb81e..aec9a97cf 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -133,7 +133,11 @@ Intro::Intro(QWidget *parent) : } } requiredSpace += CHAIN_STATE_SIZE; - ui->sizeWarningLabel->setText(ui->sizeWarningLabel->text().arg(tr(PACKAGE_NAME)).arg(requiredSpace)); + ui->sizeWarningLabel->setText( + tr("%1 will download and store a copy of the Bitcoin block chain.").arg(tr(PACKAGE_NAME)) + " " + + tr("At least %1 GB of data will be stored in this directory, and it will grow over time.").arg(requiredSpace) + " " + + tr("The wallet will also be stored in this directory.") + ); startThread(); } From 50c56570b23c4ecbbf2a22f3b8b18d0a24050b93 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Wed, 8 Feb 2017 04:05:55 +0000 Subject: [PATCH 2/3] Qt/Intro: Storage shouldn't grow significantly with pruning enabled --- src/qt/intro.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index aec9a97cf..e39c39bb0 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -126,16 +126,18 @@ Intro::Intro(QWidget *parent) : ui->storageLabel->setText(ui->storageLabel->text().arg(tr(PACKAGE_NAME))); uint64_t pruneTarget = std::max(0, GetArg("-prune", 0)); requiredSpace = BLOCK_CHAIN_SIZE; + QString storageRequiresMsg = tr("At least %1 GB of data will be stored in this directory, and it will grow over time."); if (pruneTarget) { uint64_t prunedGBs = std::ceil(pruneTarget * 1024 * 1024.0 / GB_BYTES); if (prunedGBs <= requiredSpace) { requiredSpace = prunedGBs; + storageRequiresMsg = tr("Approximately %1 GB of data will be stored in this directory."); } } requiredSpace += CHAIN_STATE_SIZE; ui->sizeWarningLabel->setText( tr("%1 will download and store a copy of the Bitcoin block chain.").arg(tr(PACKAGE_NAME)) + " " + - tr("At least %1 GB of data will be stored in this directory, and it will grow over time.").arg(requiredSpace) + " " + + storageRequiresMsg.arg(requiredSpace) + " " + tr("The wallet will also be stored in this directory.") ); startThread(); From f6d18f5b3397df0152243ed81dcc9d0c18a55e04 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Wed, 8 Feb 2017 04:21:04 +0000 Subject: [PATCH 3/3] Qt/Intro: Explain a bit more what will happen first time --- src/qt/forms/intro.ui | 32 +++++++++++++++++++++++++++++++- src/qt/intro.cpp | 12 ++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/src/qt/forms/intro.ui b/src/qt/forms/intro.ui index 1ec0333a9..cfdd8482e 100644 --- a/src/qt/forms/intro.ui +++ b/src/qt/forms/intro.ui @@ -7,7 +7,7 @@ 0 0 674 - 363 + 415 @@ -200,6 +200,36 @@ + + + + When you click OK, %1 will begin to download and process the full %4 block chain (%2GB) starting with the earliest transactions in %3 when %4 initially launched. + + + true + + + + + + + This initial synchronisation is very demanding, and may expose hardware problems with your computer that had previously gone unnoticed. Each time you run %1, it will continue downloading where it left off. + + + true + + + + + + + If you have chosen to limit block chain storage (pruning), the historical data must still be downloaded and processed, but will be deleted afterward to keep your disk usage low. + + + true + + + diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index e39c39bb0..0ecdf76df 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -124,6 +124,15 @@ Intro::Intro(QWidget *parent) : ui->setupUi(this); ui->welcomeLabel->setText(ui->welcomeLabel->text().arg(tr(PACKAGE_NAME))); ui->storageLabel->setText(ui->storageLabel->text().arg(tr(PACKAGE_NAME))); + + ui->lblExplanation1->setText(ui->lblExplanation1->text() + .arg(tr(PACKAGE_NAME)) + .arg(BLOCK_CHAIN_SIZE) + .arg(2009) + .arg(tr("Bitcoin")) + ); + ui->lblExplanation2->setText(ui->lblExplanation2->text().arg(tr(PACKAGE_NAME))); + uint64_t pruneTarget = std::max(0, GetArg("-prune", 0)); requiredSpace = BLOCK_CHAIN_SIZE; QString storageRequiresMsg = tr("At least %1 GB of data will be stored in this directory, and it will grow over time."); @@ -133,6 +142,9 @@ Intro::Intro(QWidget *parent) : requiredSpace = prunedGBs; storageRequiresMsg = tr("Approximately %1 GB of data will be stored in this directory."); } + ui->lblExplanation3->setVisible(true); + } else { + ui->lblExplanation3->setVisible(false); } requiredSpace += CHAIN_STATE_SIZE; ui->sizeWarningLabel->setText(