Do not dynamically load OnboardingViews from url, which now have descriptive names

src/Makefile.qt.include

@@ -341,15 +341,14 @@ QML_RES_QML = \
   qml/controls/TextButton.qml \
   qml/controls/Theme.qml \
   qml/controls/ValueInput.qml \
-  qml/controls/Wizard.qml \
   qml/pages/initerrormessage.qml \
   qml/pages/main.qml \
-  qml/pages/onboarding/onboarding01.qml \
-  qml/pages/onboarding/onboarding02.qml \
-  qml/pages/onboarding/onboarding03.qml \
-  qml/pages/onboarding/onboarding04.qml \
-  qml/pages/onboarding/onboarding05.qml \
-  qml/pages/onboarding/onboarding06.qml \
+  qml/pages/onboarding/OnboardingBlockclock.qml \
+  qml/pages/onboarding/OnboardingConnection.qml \
+  qml/pages/onboarding/OnboardingCover.qml \
+  qml/pages/onboarding/OnboardingStorageAmount.qml \
+  qml/pages/onboarding/OnboardingStorageLocation.qml \
+  qml/pages/onboarding/OnboardingStrengthen.qml \
   qml/pages/settings/SettingsAbout.qml \
   qml/pages/settings/SettingsConnection.qml \
   qml/pages/settings/SettingsDeveloper.qml \

src/qml/bitcoin_qml.qrc

@@ -24,15 +24,14 @@
         <file>controls/TextButton.qml</file>
         <file>controls/Theme.qml</file>
         <file>controls/ValueInput.qml</file>
-        <file>controls/Wizard.qml</file>
         <file>pages/initerrormessage.qml</file>
         <file>pages/main.qml</file>
-        <file>pages/onboarding/onboarding01.qml</file>
-        <file>pages/onboarding/onboarding02.qml</file>
-        <file>pages/onboarding/onboarding03.qml</file>
-        <file>pages/onboarding/onboarding04.qml</file>
-        <file>pages/onboarding/onboarding05.qml</file>
-        <file>pages/onboarding/onboarding06.qml</file>
+        <file>pages/onboarding/OnboardingBlockclock.qml</file>
+        <file>pages/onboarding/OnboardingConnection.qml</file>
+        <file>pages/onboarding/OnboardingCover.qml</file>
+        <file>pages/onboarding/OnboardingStorageAmount.qml</file>
+        <file>pages/onboarding/OnboardingStorageLocation.qml</file>
+        <file>pages/onboarding/OnboardingStrengthen.qml</file>
         <file>pages/settings/SettingsAbout.qml</file>
         <file>pages/settings/SettingsConnection.qml</file>
         <file>pages/settings/SettingsDeveloper.qml</file>

src/qml/components/AboutOptions.qml

@@ -57,7 +57,6 @@ ColumnLayout {
             background: null
             onClicked: {
                 introductions.incrementCurrentIndex()
-                swipeView.inSubPage = true
             }
         }
     }

src/qml/pages/main.qml

@@ -7,6 +7,7 @@ import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import "../components"
 import "../controls"
+import "./onboarding"
 
 ApplicationWindow {
     id: appWindow
@@ -22,19 +23,25 @@ ApplicationWindow {
         anchors.fill: parent
     }
 
-    Wizard {
+    Component {
         id: onboardingWizard
-        anchors.fill: parent
-        views: [
-            "onboarding/onboarding01.qml",
-            "onboarding/onboarding02.qml",
-            "onboarding/onboarding03.qml",
-            "onboarding/onboarding04.qml",
-            "onboarding/onboarding05.qml",
-            "onboarding/onboarding06.qml",
-        ]
-        onFinishedChanged: main.push(node)
+        SwipeView {
+            id: swipeView
+            property bool finished: false
+            anchors.fill: parent
+            interactive: false
+
+            OnboardingCover {}
+            OnboardingStrengthen {}
+            OnboardingBlockclock {}
+            OnboardingStorageLocation {}
+            OnboardingStorageAmount {}
+            OnboardingConnection {}
+
+            onFinishedChanged: main.push(node)
+        }
     }
+
     Component {
         id: node
         Page {

src/qml/pages/onboarding/onboarding06.qml → src/qml/pages/onboarding/OnboardingConnection.qml

@@ -42,7 +42,6 @@ Page {
                 textColor: Theme.color.orange
                 onClicked: {
                     connections.incrementCurrentIndex()
-                    swipeView.inSubPage = true
                 }
             }
             lastPage: true
@@ -53,7 +52,6 @@ Page {
                 text: qsTr("Done")
                 onClicked: {
                     connections.decrementCurrentIndex()
-                    swipeView.inSubPage = false
                 }
             }
         }

src/qml/pages/onboarding/onboarding01.qml → src/qml/pages/onboarding/OnboardingCover.qml

@@ -23,7 +23,6 @@ Page {
                 iconHeight: 24
                 onClicked: {
                     introductions.incrementCurrentIndex()
-                    swipeView.inSubPage = true
                 }
             }
             bannerItem: Image {
@@ -50,7 +49,6 @@ Page {
                 text: qsTr("Back")
                 onClicked: {
                     introductions.decrementCurrentIndex()
-                    swipeView.inSubPage = false
                 }
             }
         }
@@ -60,7 +58,6 @@ Page {
                 text: qsTr("Back")
                 onClicked: {
                     introductions.decrementCurrentIndex()
-                    swipeView.inSubPage = true
                 }
             }
         }

src/qml/pages/onboarding/onboarding05.qml → src/qml/pages/onboarding/OnboardingStorageAmount.qml

@@ -44,7 +44,6 @@ Page {
                     textColor: "#F7931A"
                     onClicked: {
                         storages.incrementCurrentIndex()
-                        swipeView.inSubPage = true
                     }
                 }
             }
@@ -55,7 +54,6 @@ Page {
                 text: qsTr("Done")
                 onClicked: {
                     storages.decrementCurrentIndex()
-                    swipeView.inSubPage = false
                 }
             }
         }