-
Notifications
You must be signed in to change notification settings - Fork 43
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
c52566d qml: Swap existing SwipeViews for PageStack (jarolrod) f0e5951 qml: Swap existing StackViews for PageStack (jarolrod) 7ba2f62 qml: declare OnboardingWizard file, reintroduce as PageStack (jarolrod) d49b888 qml: Introduce PageStack control (jarolrod) Pull request description: After fixing our sins in #427, migrating to A StackView based GUI is quite simple. Here we use a custom StackView control, PageStack, that has a property `vertical` used to declare if we want vertical or horizontal animations, and additionally implements the [custom animation](#422) we want. Closes #422 Closes #219 []() ACKs for top commit: pablomartin4btc: re-ACK c52566d MarnixCroes: tACK c52566d D33r-Gee: tACK [c52566d](c52566d) Works as expected on WSL Ubuntu 22.04 johnny9: ACK c52566d Tree-SHA512: f9a025944db24a46e1f78f4ad8a9b9aca4e1f3ff4dd5927eebfa2a7fb28ed390a17da79e23c6248c3c0e82b361ff1b2dedbf4df9df2a1d0677b05bacb7763bcb
Showing
15 changed files
with
397 additions
and
269 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| // Copyright (c) 2024 The Bitcoin Core developers | ||
| // Distributed under the MIT software license, see the accompanying | ||
| // file COPYING or http://www.opensource.org/licenses/mit-license.php. | ||
|
|
||
| import QtQuick 2.15 | ||
| import QtQuick.Controls 2.15 | ||
|
|
||
| StackView { | ||
| property bool vertical: false | ||
|
|
||
| pushEnter: Transition { | ||
| NumberAnimation { | ||
| property: vertical ? "y" : "x" | ||
| from: vertical ? parent.height : parent.width | ||
| to: 0 | ||
| duration: 400 | ||
| easing.type: Easing.Bezier | ||
| easing.bezierCurve: [0.5, 0.0, 0.2, 1.0] | ||
| } | ||
| } | ||
| pushExit: Transition { | ||
| NumberAnimation { | ||
| property: vertical ? "y" : "x" | ||
| from: 0 | ||
| to: vertical ? -parent.height : -parent.width | ||
| duration: 400 | ||
| easing.type: Easing.Bezier | ||
| easing.bezierCurve: [0.5, 0.0, 0.2, 1.0] | ||
| } | ||
| } | ||
| popEnter: Transition { | ||
| NumberAnimation { | ||
| property: vertical ? "y" : "x" | ||
| from: vertical ? -parent.height : -parent.width | ||
| to: 0 | ||
| duration: 400 | ||
| easing.type: Easing.Bezier | ||
| easing.bezierCurve: [0.5, 0.0, 0.2, 1.0] | ||
| } | ||
| } | ||
| popExit: Transition { | ||
| NumberAnimation { | ||
| property: vertical ? "y" : "x" | ||
| from: 0 | ||
| to: vertical ? parent.height : parent.width | ||
| duration: 400 | ||
| easing.type: Easing.Bezier | ||
| easing.bezierCurve: [0.5, 0.0, 0.2, 1.0] | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,7 +16,7 @@ Item { | |
|
|
||
| id: root | ||
|
|
||
| StackView { | ||
| PageStack { | ||
| id: nodeSettingsView | ||
| anchors.fill: parent | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| // Copyright (c) 2024 The Bitcoin Core developers | ||
| // Distributed under the MIT software license, see the accompanying | ||
| // file COPYING or http://www.opensource.org/licenses/mit-license.php. | ||
|
|
||
| import QtQuick 2.15 | ||
| import QtQuick.Controls 2.15 | ||
| import QtQuick.Layouts 1.15 | ||
| import "../../controls" | ||
|
|
||
| PageStack { | ||
| id: root | ||
|
|
||
| signal finished() | ||
| initialItem: cover | ||
|
|
||
| Component { | ||
| id: cover | ||
| OnboardingCover { | ||
| onNext: root.push(strengthen) | ||
| } | ||
| } | ||
| Component { | ||
| id: strengthen | ||
| OnboardingStrengthen { | ||
| onBack: root.pop() | ||
| onNext: root.push(blockclock) | ||
| } | ||
| } | ||
| Component { | ||
| id: blockclock | ||
| OnboardingBlockclock { | ||
| onBack: root.pop() | ||
| onNext: root.push(storageLocation) | ||
| } | ||
| } | ||
| Component { | ||
| id: storageLocation | ||
| OnboardingStorageLocation { | ||
| onBack: root.pop() | ||
| onNext: root.push(storageAmount) | ||
| } | ||
| } | ||
| Component { | ||
| id: storageAmount | ||
| OnboardingStorageAmount { | ||
| onBack: root.pop() | ||
| onNext: root.push(connection) | ||
| } | ||
| } | ||
| Component { | ||
| id: connection | ||
| OnboardingConnection { | ||
| onBack: root.pop() | ||
| onNext: root.finished() | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,7 +13,7 @@ Item { | |
|
|
||
| id: root | ||
|
|
||
| StackView { | ||
| PageStack { | ||
| id: displaySettingsView | ||
| anchors.fill: parent | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters