Skip to content

Commit

Permalink
qml: Swap StackView usage for PageView
Browse files Browse the repository at this point in the history
  • Loading branch information
jarolrod committed Oct 16, 2024
1 parent aaadb64 commit 138ceb7
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion src/qml/pages/main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ ApplicationWindow {
ColorAnimation { duration: 150 }
}

StackView {
PageView {
id: main
initialItem: {
if (needOnboarding) {
Expand Down
2 changes: 1 addition & 1 deletion src/qml/pages/node/NodeSettings.qml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Item {

id: root

StackView {
PageView {
id: nodeSettingsView
anchors.fill: parent

Expand Down
2 changes: 1 addition & 1 deletion src/qml/pages/settings/SettingsDisplay.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Item {

id: root

StackView {
PageView {
id: displaySettingsView
anchors.fill: parent

Expand Down
2 changes: 1 addition & 1 deletion src/qml/pages/wallet/AddWallet.qml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import "../../components"
import "../settings"
import "../wallet"

StackView {
PageView {
id: addWalletStack

signal finished()
Expand Down
4 changes: 2 additions & 2 deletions src/qml/pages/wallet/CreateBackup.qml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Page {
iconSource: "image://images/caret-left"
text: qsTr("Back")
onClicked: {
root.StackView.view.pop()
root.PageView.view.pop()
}
}
}
Expand Down Expand Up @@ -83,7 +83,7 @@ Page {
Layout.alignment: Qt.AlignCenter
text: qsTr("Done")
onClicked: {
root.StackView.view.finished()
root.PageView.view.finished()
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/qml/pages/wallet/CreateConfirm.qml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Page {
iconSource: "image://images/caret-left"
text: qsTr("Back")
onClicked: {
root.StackView.view.pop()
root.PageView.view.pop()
}
}
}
Expand Down Expand Up @@ -67,7 +67,7 @@ Page {
Layout.alignment: Qt.AlignCenter
text: qsTr("Next")
onClicked: {
root.StackView.view.push("qrc:/qml/pages/wallet/CreateBackup.qml")
root.PageView.view.push("qrc:/qml/pages/wallet/CreateBackup.qml")
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/qml/pages/wallet/CreateIntro.qml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Page {
iconSource: "image://images/caret-left"
text: qsTr("Back")
onClicked: {
root.StackView.view.pop()
root.PageView.view.pop()
}
}
}
Expand Down Expand Up @@ -107,7 +107,7 @@ Page {
Layout.alignment: Qt.AlignCenter
text: qsTr("Start")
onClicked: {
root.StackView.view.push("qrc:/qml/pages/wallet/CreateName.qml")
root.PageView.view.push("qrc:/qml/pages/wallet/CreateName.qml")
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/qml/pages/wallet/CreateName.qml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Page {
iconSource: "image://images/caret-left"
text: qsTr("Back")
onClicked: {
root.StackView.view.pop()
root.PageView.view.pop()
}
}
}
Expand Down Expand Up @@ -62,7 +62,7 @@ Page {
text: qsTr("Continue")
onClicked: {
console.log("Creating wallet with name: " + walletNameInput.text)
root.StackView.view.push(createPassword)
root.PageView.view.push(createPassword)
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/qml/pages/wallet/CreatePassword.qml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ Page {
iconSource: "image://images/caret-left"
text: qsTr("Back")
onClicked: {
root.StackView.view.pop()
root.PageView.view.pop()
}
}
rightItem: NavButton {
text: qsTr("Skip")
onClicked: {
walletController.createSingleSigWallet(walletName, "")
root.StackView.view.push("qrc:/qml/pages/wallet/CreateConfirm.qml")
root.PageView.view.push("qrc:/qml/pages/wallet/CreateConfirm.qml")
}
}
}
Expand Down Expand Up @@ -108,7 +108,7 @@ Page {
enabled: password.text != "" && passwordRepeat.text != "" && password.text == passwordRepeat.text && confirmToggle.loadedItem.checked
onClicked: {
walletController.createSingleSigWallet(walletName, password.text)
root.StackView.view.push("qrc:/qml/pages/wallet/CreateConfirm.qml")
root.PageView.view.push("qrc:/qml/pages/wallet/CreateConfirm.qml")
}
}
}
Expand Down

0 comments on commit 138ceb7

Please sign in to comment.