Skip to content

Storage options text fixups #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions src/qml/components/ConnectionOptions.qml
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,5 @@ ColumnLayout {
ButtonGroup.group: group
text: qsTr("Only when on Wi-Fi")
description: qsTr("Loads quickly when on wi-fi and pauses when on cellular data.")
detail: ProgressIndicator {
implicitWidth: 50
SequentialAnimation on progress {
loops: Animation.Infinite
SmoothedAnimation { to: 1; velocity: 1; }
SmoothedAnimation { to: 0; velocity: 1; }
}
}
}
}
8 changes: 4 additions & 4 deletions src/qml/components/StorageLocations.qml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ ColumnLayout {
OptionButton {
Layout.fillWidth: true
ButtonGroup.group: group
text: qsTr("Default directory")
description: qsTr("The downloaded block data will be saved to the default data directory for your OS.")
text: qsTr("Default")
description: qsTr("Your application directory.")
recommended: true
checked: true
}
OptionButton {
Layout.fillWidth: true
ButtonGroup.group: group
text: qsTr("Custom directory")
description: qsTr("The downloaded block data will be saved to the chosen directory.")
text: qsTr("Custom")
description: qsTr("Choose the directory and storage device.")
}
}
14 changes: 3 additions & 11 deletions src/qml/components/StorageOptions.qml
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,14 @@ ColumnLayout {
Layout.fillWidth: true
ButtonGroup.group: group
text: qsTr("Reduce storage")
description: qsTr("Uses about 2GB.")
description: qsTr("Uses about 2GB. For simple wallet use.")
recommended: true
checked: true
detail: ProgressIndicator {
implicitWidth: 75
progress: 0.25
}
}
OptionButton {
Layout.fillWidth: true
ButtonGroup.group: group
text: qsTr("Default")
description: qsTr("Uses about 423GB.")
detail: ProgressIndicator {
implicitWidth: 75
progress: 0.8
}
text: qsTr("Store all data")
description: qsTr("Uses about 550GB. Support the network.")
}
}
11 changes: 9 additions & 2 deletions src/qml/controls/OptionButton.qml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ Button {
id: button
padding: 15
checkable: true
property alias detail: detail_loader.sourceComponent
implicitWidth: 450
background: Rectangle {
border.width: 1
Expand Down Expand Up @@ -67,7 +66,15 @@ Button {
}
Loader {
id: detail_loader
visible: item
visible: button.checked
active: true
sourceComponent: Button {
icon.source: "image://images/check"
icon.color: Theme.color.neutral9
icon.height: 24
icon.width: 24
background: null
}
}
}
}
2 changes: 1 addition & 1 deletion src/qml/pages/onboarding/OnboardingStorageLocation.qml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ InformationPage {
bold: true
headerText: qsTr("Storage location")
headerMargin: 0
description: qsTr("Where do you want to store the downloaded block data?")
description: qsTr("Where do you want to store the downloaded block data?\nYou need a minimum of 1GB of storage.")
descriptionMargin: 20
detailActive: true
detailItem: ColumnLayout {
Expand Down