Skip to content

Commit 01f3d56

Browse files
committed
Merge #206: Storage options text fixups
a9812ff qml: storage options description fixups (Jarol Rodriguez) Pull request description: Based on #205 so as to not conflict. Only PR commit is ac13dc1 Performs small text fixups to the storage options to fall in line with the designs. Only differs from the [figma designs](https://www.figma.com/file/GaCoOSNHB2yMB9ThiDtred/Bitcoin-Core-App?node-id=3288%3A72160&t=ttpjexCKgAerUbB2-0) by changing `For regular wallet use.` to `For simple wallet use.` in the StorageAmount OptionsButton control. ### Master | a | b | | - | - | | <img width="752" alt="Screen Shot 2022-12-14 at 2 12 47 AM" src="https://user-images.githubusercontent.com/23396902/207529947-346fcd7b-4a7c-42bd-aee6-4784b1fbb43a.png"> | <img width="752" alt="Screen Shot 2022-12-14 at 2 12 52 AM" src="https://user-images.githubusercontent.com/23396902/207529982-e4e3faa1-7e24-4460-b5da-1d87ee69dc17.png"> | ### PR | a | b | | - | - | | <img width="752" alt="Screen Shot 2022-12-14 at 2 08 00 AM" src="https://user-images.githubusercontent.com/23396902/207530072-3da9a872-7a76-4ba7-86b0-ba7b3fc48287.png"> | <img width="752" alt="Screen Shot 2022-12-14 at 2 08 18 AM" src="https://user-images.githubusercontent.com/23396902/207530101-5503aa6b-ac23-4d95-976d-7f37f4fb50f0.png"> | [![Windows](https://img.shields.io/badge/OS-Windows-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/win64/insecure_win_gui.zip?branch=pull/206) [![Intel macOS](https://img.shields.io/badge/OS-Intel%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos/insecure_mac_gui.zip?branch=pull/206) [![Apple Silicon macOS](https://img.shields.io/badge/OS-Apple%20Silicon%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos_arm64/insecure_mac_arm64_gui.zip?branch=pull/206) [![ARM64 Android](https://img.shields.io/badge/OS-Android-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/android/insecure_android_apk.zip?branch=pull/206) ACKs for top commit: johnny9: ACK a9812ff Tree-SHA512: 3abaf8f6a020823974a60dca1146069a2cdc41c80a9d41621242538251327642678b60907604745a36f86666f7f4af87d09f327305239cdf4090af3be8ced9b3
2 parents e431255 + a9812ff commit 01f3d56

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

src/qml/components/StorageLocations.qml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ ColumnLayout {
1515
OptionButton {
1616
Layout.fillWidth: true
1717
ButtonGroup.group: group
18-
text: qsTr("Default directory")
19-
description: qsTr("The downloaded block data will be saved to the default data directory for your OS.")
18+
text: qsTr("Default")
19+
description: qsTr("Your application directory.")
2020
recommended: true
2121
checked: true
2222
}
2323
OptionButton {
2424
Layout.fillWidth: true
2525
ButtonGroup.group: group
26-
text: qsTr("Custom directory")
27-
description: qsTr("The downloaded block data will be saved to the chosen directory.")
26+
text: qsTr("Custom")
27+
description: qsTr("Choose the directory and storage device.")
2828
}
2929
}

src/qml/components/StorageOptions.qml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ ColumnLayout {
1616
Layout.fillWidth: true
1717
ButtonGroup.group: group
1818
text: qsTr("Reduce storage")
19-
description: qsTr("Uses about 2GB.")
19+
description: qsTr("Uses about 2GB. For simple wallet use.")
2020
recommended: true
2121
checked: true
2222
}
2323
OptionButton {
2424
Layout.fillWidth: true
2525
ButtonGroup.group: group
26-
text: qsTr("Default")
27-
description: qsTr("Uses about 423GB.")
26+
text: qsTr("Store all data")
27+
description: qsTr("Uses about 550GB. Support the network.")
2828
}
2929
}

src/qml/pages/onboarding/OnboardingStorageLocation.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ InformationPage {
1919
bold: true
2020
headerText: qsTr("Storage location")
2121
headerMargin: 0
22-
description: qsTr("Where do you want to store the downloaded block data?")
22+
description: qsTr("Where do you want to store the downloaded block data?\nYou need a minimum of 1GB of storage.")
2323
descriptionMargin: 20
2424
detailActive: true
2525
detailItem: StorageLocations {}

0 commit comments

Comments
 (0)