Skip to content

Commit 1a9fd5c

Browse files
committed
Merge #9724: Qt/Intro: Add explanation of IBD process
f6d18f5 Qt/Intro: Explain a bit more what will happen first time (Luke Dashjr) 50c5657 Qt/Intro: Storage shouldn't grow significantly with pruning enabled (Luke Dashjr) 9adb694 Qt/Intro: Move sizeWarningLabel text into C++ code (Luke Dashjr)
2 parents 390a39b + f6d18f5 commit 1a9fd5c

File tree

2 files changed

+50
-5
lines changed

2 files changed

+50
-5
lines changed

src/qt/forms/intro.ui

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<x>0</x>
88
<y>0</y>
99
<width>674</width>
10-
<height>363</height>
10+
<height>415</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -55,9 +55,6 @@
5555
</item>
5656
<item>
5757
<widget class="QLabel" name="sizeWarningLabel">
58-
<property name="text">
59-
<string>%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.</string>
60-
</property>
6158
<property name="wordWrap">
6259
<bool>true</bool>
6360
</property>
@@ -203,6 +200,36 @@
203200
</item>
204201
</layout>
205202
</item>
203+
<item>
204+
<widget class="QLabel" name="lblExplanation1">
205+
<property name="text">
206+
<string>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.</string>
207+
</property>
208+
<property name="wordWrap">
209+
<bool>true</bool>
210+
</property>
211+
</widget>
212+
</item>
213+
<item>
214+
<widget class="QLabel" name="lblExplanation2">
215+
<property name="text">
216+
<string>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.</string>
217+
</property>
218+
<property name="wordWrap">
219+
<bool>true</bool>
220+
</property>
221+
</widget>
222+
</item>
223+
<item>
224+
<widget class="QLabel" name="lblExplanation3">
225+
<property name="text">
226+
<string>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.</string>
227+
</property>
228+
<property name="wordWrap">
229+
<bool>true</bool>
230+
</property>
231+
</widget>
232+
</item>
206233
<item>
207234
<spacer name="verticalSpacer">
208235
<property name="orientation">

src/qt/intro.cpp

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,16 +124,34 @@ Intro::Intro(QWidget *parent) :
124124
ui->setupUi(this);
125125
ui->welcomeLabel->setText(ui->welcomeLabel->text().arg(tr(PACKAGE_NAME)));
126126
ui->storageLabel->setText(ui->storageLabel->text().arg(tr(PACKAGE_NAME)));
127+
128+
ui->lblExplanation1->setText(ui->lblExplanation1->text()
129+
.arg(tr(PACKAGE_NAME))
130+
.arg(BLOCK_CHAIN_SIZE)
131+
.arg(2009)
132+
.arg(tr("Bitcoin"))
133+
);
134+
ui->lblExplanation2->setText(ui->lblExplanation2->text().arg(tr(PACKAGE_NAME)));
135+
127136
uint64_t pruneTarget = std::max<int64_t>(0, GetArg("-prune", 0));
128137
requiredSpace = BLOCK_CHAIN_SIZE;
138+
QString storageRequiresMsg = tr("At least %1 GB of data will be stored in this directory, and it will grow over time.");
129139
if (pruneTarget) {
130140
uint64_t prunedGBs = std::ceil(pruneTarget * 1024 * 1024.0 / GB_BYTES);
131141
if (prunedGBs <= requiredSpace) {
132142
requiredSpace = prunedGBs;
143+
storageRequiresMsg = tr("Approximately %1 GB of data will be stored in this directory.");
133144
}
145+
ui->lblExplanation3->setVisible(true);
146+
} else {
147+
ui->lblExplanation3->setVisible(false);
134148
}
135149
requiredSpace += CHAIN_STATE_SIZE;
136-
ui->sizeWarningLabel->setText(ui->sizeWarningLabel->text().arg(tr(PACKAGE_NAME)).arg(requiredSpace));
150+
ui->sizeWarningLabel->setText(
151+
tr("%1 will download and store a copy of the Bitcoin block chain.").arg(tr(PACKAGE_NAME)) + " " +
152+
storageRequiresMsg.arg(requiredSpace) + " " +
153+
tr("The wallet will also be stored in this directory.")
154+
);
137155
startThread();
138156
}
139157

0 commit comments

Comments
 (0)