Differential D8914

[backport#17453] gui: Fix intro dialog labels when the prune button is toggled
ClosedPublic
Actions

Authored by majcosta on Jan 14 2021, 13:03.

Details

Reviewers

PiRK

Group Reviewers

Restricted Project

Commits

rABCfbd564ae6a78: [backport#17453] gui: Fix intro dialog labels when the prune button is toggled

Summary

4f7127d1e3a51f0f55d42a08439c516dcc8d1a26 gui: Make Intro consistent with prune checkbox (Hennadii Stepanov)
4824a7d36cf47e766865e0fefe952ec860eb82dd gui: Add Intro::UpdateFreeSpaceLabel() (Hennadii Stepanov)
daa3f3fa9071a229275dd6a1b8445237ddc3fa97 refactor: Add Intro::UpdatePruneLabels() (Hennadii Stepanov)
e4caa82a03df5c6a6d5d29f34ab006d732c6dac1 refactor: Replace static variable with data member (Hennadii Stepanov)
2bede28cd9ec638d8bb32c187ccf12d89345218e util: Add PruneGBtoMiB() function (Hennadii Stepanov)
e35e4b2ba052c9a533626286026dbe0a2d546c5b util: Add PruneMiBtoGB() function (Hennadii Stepanov)

Pull request description:

On master (a6f6333ba253cda83221ee529810cacf930e413f) and on 0.19.0.1 the intro dialog with prune enabled (checkbox "Discard blocks..." is checked) provides a user with wrong info about the required disk space:

![DeepinScreenshot_bitcoin-qt_20191208112228](https://user-images.githubusercontent.com/32963518/70387510-8daab400-19ae-11ea-9338-29add9c31118.png)

Also the paragraph "If you have chosen to limit..." is missed.

---

With this PR when prune checkbox is toggled, the related text labels and the amount of required space shown are updated (previously they were only updated when the data directory was updated):
![Screenshot from 2019-12-08 11-34-53](https://user-images.githubusercontent.com/32963518/70387542-eed28780-19ae-11ea-9565-49d8a64b2f33.png)

---

This PR is an alternative to #17035.

**ryanofsky**'s [suggestion](https://github.com/bitcoin/bitcoin/pull/17035#discussion_r337594268) also has been implemented.

Backport of Core PR17453

Depends on D8913

Test Plan

ninja all check check-functional
./src/qt/bitcoin-qt -choosedatadir

check that correct information is provided, whether prune checkbox is ticked or not

Diff Detail

Repository

rABC Bitcoin ABC

Branch

pr17696

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 14775
Build 29505: Build Diff	lint-circular-dependencies · build-without-wallet · build-diff · build-debug · build-clang-tidy · build-clang
Build 29504: arc lint + arc unit

Event Timeline

majcosta created this revision.Jan 14 2021, 13:03

Herald added a reviewer: Restricted Project. · View Herald TranscriptJan 14 2021, 13:03

majcosta requested review of this revision.Jan 14 2021, 13:03

majcosta edited the summary of this revision. (Show Details)Jan 14 2021, 13:03

majcosta added a parent revision: D8913: [backport#17696] qt: Force set nPruneSize in QSettings after the intro dialog.

teamcity edited the summary of this revision. (Show Details)Jan 14 2021, 13:04

Harbormaster completed remote builds in B14768: Diff 26956.Jan 14 2021, 13:25

Build Bitcoin ABC Diffs / Diff Testing (lint-circular-dependencies) failed.

Tail of the build log:

/work /work/abc-ci-builds/lint-circular-dependencies
A new circular dependency in the form of "qt/intro -> qt/optionsmodel -> qt/intro" appears to have been introduced.

/work/abc-ci-builds/lint-circular-dependencies
Build lint-circular-dependencies failed with exit code 1