Skip to content

Commit 9d7ca09

Browse files
committed
qml: updated pages so they use optionsModel instead of nodeModel
1 parent f5e0bfa commit 9d7ca09

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

src/qml/components/AboutOptions.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ ColumnLayout {
5151
header: qsTr("Version")
5252
actionItem: ExternalLink {
5353
parentState: versionLink.state
54-
description: nodeModel.fullClientVersion
54+
description: optionsModel.fullClientVersion
5555
link: "https://bitcoin.org/en/download"
5656
iconSource: "image://images/caret-right"
5757
iconWidth: 18

src/qml/components/StorageOptions.qml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ColumnLayout {
2222
Layout.fillWidth: true
2323
ButtonGroup.group: group
2424
text: qsTr("Reduce storage")
25-
description: qsTr("Uses about %1GB. For simple wallet use.").arg(chainModel.assumedChainstateSize + 2)
25+
description: qsTr("Uses about %1GB. For simple wallet use.").arg(optionsModel.assumedChainstateSize + 2)
2626
recommended: true
2727
checked: !root.customStorage && optionsModel.prune
2828
onClicked: {
@@ -40,7 +40,7 @@ ColumnLayout {
4040
text: qsTr("Store all data")
4141
checked: !optionsModel.prune
4242
description: qsTr("Uses about %1GB. Support the network.").arg(
43-
chainModel.assumedBlockchainSize + chainModel.assumedChainstateSize)
43+
optionsModel.assumedBlockchainSize + optionsModel.assumedChainstateSize)
4444
onClicked: {
4545
optionsModel.prune = false
4646
}

src/qml/pages/main.qml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ ApplicationWindow {
4949
focus: true
5050
Keys.onReleased: {
5151
if (event.key == Qt.Key_Back) {
52-
nodeModel.requestShutdown()
52+
optionsModel.requestShutdown()
5353
event.accepted = true
5454
}
5555
}
5656
}
5757

5858
Connections {
59-
target: nodeModel
59+
target: optionsModel
6060
function onRequestedShutdown() {
6161
main.clear()
6262
main.push(shutdown)
@@ -78,6 +78,7 @@ ApplicationWindow {
7878
OnboardingConnection {}
7979

8080
onFinishedChanged: {
81+
optionsModel.onboardingFinished()
8182
optionsModel.onboard()
8283
if (AppMode.walletEnabled && AppMode.isDesktop) {
8384
main.push(desktopWallets)

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?\nYou need a minimum of %1GB of storage.").arg(chainModel.assumedChainstateSize + 1)
22+
description: qsTr("Where do you want to store the downloaded block data?\nYou need a minimum of %1GB of storage.").arg(optionsModel.assumedChainstateSize + 1)
2323
descriptionMargin: 20
2424
detailActive: true
2525
detailItem: StorageLocations {}

0 commit comments

Comments
 (0)