Skip to content

Commit 58e52ba

Browse files
jarolrodjarolrod
committed
qml: do not load settings pages from url inside of onboarding pages
1 parent 2738f48 commit 58e52ba

File tree

8 files changed

+98
-152
lines changed

8 files changed

+98
-152
lines changed

‎src/Makefile.qt.include

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -345,14 +345,11 @@ QML_RES_QML = \
345345
qml/pages/initerrormessage.qml \
346346
qml/pages/main.qml \
347347
qml/pages/onboarding/onboarding01.qml \
348-
qml/pages/onboarding/onboarding01a.qml \
349348
qml/pages/onboarding/onboarding02.qml \
350349
qml/pages/onboarding/onboarding03.qml \
351350
qml/pages/onboarding/onboarding04.qml \
352351
qml/pages/onboarding/onboarding05.qml \
353-
qml/pages/onboarding/onboarding05a.qml \
354352
qml/pages/onboarding/onboarding06.qml \
355-
qml/pages/onboarding/onboarding06a.qml \
356353
qml/pages/settings/SettingsAbout.qml \
357354
qml/pages/settings/SettingsConnection.qml \
358355
qml/pages/settings/SettingsDeveloper.qml \

‎src/qml/bitcoin_qml.qrc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,11 @@
2828
<file>pages/initerrormessage.qml</file>
2929
<file>pages/main.qml</file>
3030
<file>pages/onboarding/onboarding01.qml</file>
31-
<file>pages/onboarding/onboarding01a.qml</file>
3231
<file>pages/onboarding/onboarding02.qml</file>
3332
<file>pages/onboarding/onboarding03.qml</file>
3433
<file>pages/onboarding/onboarding04.qml</file>
3534
<file>pages/onboarding/onboarding05.qml</file>
36-
<file>pages/onboarding/onboarding05a.qml</file>
3735
<file>pages/onboarding/onboarding06.qml</file>
38-
<file>pages/onboarding/onboarding06a.qml</file>
3936
<file>pages/settings/SettingsAbout.qml</file>
4037
<file>pages/settings/SettingsConnection.qml</file>
4138
<file>pages/settings/SettingsDeveloper.qml</file>

‎src/qml/pages/onboarding/onboarding01.qml

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import QtQuick.Controls 2.15
77
import QtQuick.Layouts 1.15
88
import "../../controls"
99
import "../../components"
10+
import "../settings"
1011

1112
Page {
1213
background: null
@@ -17,14 +18,35 @@ Page {
1718
anchors.fill: parent
1819
interactive: false
1920
orientation: Qt.Horizontal
20-
Loader {
21-
source:"onboarding01a.qml"
22-
}
23-
Loader {
24-
source:"../settings/SettingsAbout.qml"
25-
}
26-
Loader {
27-
source:"../settings/SettingsDeveloper.qml"
21+
InformationPage {
22+
Layout.fillWidth: true
23+
navRightDetail: NavButton {
24+
iconSource: "image://images/info"
25+
iconHeight: 24
26+
onClicked: {
27+
introductions.incrementCurrentIndex()
28+
swipeView.inSubPage = true
29+
}
30+
}
31+
bannerItem: Image {
32+
Layout.fillWidth: true
33+
Layout.alignment: Qt.AlignCenter
34+
source: "image://images/app"
35+
// Bitcoin icon has ~11% padding
36+
sourceSize.width: 112
37+
sourceSize.height: 112
38+
}
39+
bannerMargin: 0
40+
bold: true
41+
headerText: qsTr("Bitcoin Core App")
42+
headerSize: 36
43+
description: qsTr("Be part of the Bitcoin network.")
44+
descriptionMargin: 10
45+
descriptionSize: 24
46+
subtext: qsTr("100% open-source & open-design")
47+
buttonText: qsTr("Start")
2848
}
49+
SettingsAbout {}
50+
SettingsDeveloper {}
2951
}
3052
}

‎src/qml/pages/onboarding/onboarding01a.qml

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎src/qml/pages/onboarding/onboarding05.qml

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import QtQuick.Controls 2.15
77
import QtQuick.Layouts 1.15
88
import "../../controls"
99
import "../../components"
10+
import "../settings"
1011

1112
Page {
1213
background: null
@@ -17,11 +18,40 @@ Page {
1718
anchors.fill: parent
1819
interactive: false
1920
orientation: Qt.Vertical
20-
Loader {
21-
source:"onboarding05a.qml"
22-
}
23-
Loader {
24-
source:"../settings/SettingsStorage.qml"
21+
InformationPage {
22+
Layout.fillWidth: true
23+
navLeftDetail: NavButton {
24+
iconSource: "image://images/caret-left"
25+
text: qsTr("Back")
26+
onClicked: swipeView.decrementCurrentIndex()
27+
}
28+
bannerActive: false
29+
bold: true
30+
headerText: qsTr("Storage")
31+
headerMargin: 0
32+
description: qsTr("Data retrieved from the Bitcoin network is stored on your device.\nYou have 500GB of storage available.")
33+
descriptionMargin: 10
34+
detailActive: true
35+
detailItem: ColumnLayout {
36+
spacing: 0
37+
StorageOptions {
38+
Layout.maximumWidth: 450
39+
Layout.alignment: Qt.AlignCenter
40+
}
41+
TextButton {
42+
Layout.topMargin: 30
43+
Layout.fillWidth: true
44+
text: qsTr("Detailed settings")
45+
textSize: 18
46+
textColor: "#F7931A"
47+
onClicked: {
48+
storages.incrementCurrentIndex()
49+
swipeView.inSubPage = true
50+
}
51+
}
52+
}
53+
buttonText: qsTr("Next")
2554
}
55+
SettingsStorage {}
2656
}
2757
}

‎src/qml/pages/onboarding/onboarding05a.qml

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎src/qml/pages/onboarding/onboarding06.qml

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import QtQuick.Controls 2.15
77
import QtQuick.Layouts 1.15
88
import "../../controls"
99
import "../../components"
10+
import "../settings"
1011

1112
Page {
1213
background: null
@@ -17,11 +18,38 @@ Page {
1718
anchors.fill: parent
1819
interactive: false
1920
orientation: Qt.Vertical
20-
Loader {
21-
source:"onboarding06a.qml"
22-
}
23-
Loader {
24-
source:"../settings/SettingsConnection.qml"
21+
InformationPage {
22+
Layout.fillWidth: true
23+
navLeftDetail: NavButton {
24+
iconSource: "image://images/caret-left"
25+
text: qsTr("Back")
26+
onClicked: swipeView.decrementCurrentIndex()
27+
}
28+
bannerItem: Image {
29+
Layout.topMargin: 20
30+
Layout.alignment: Qt.AlignCenter
31+
source: Theme.image.storage
32+
sourceSize.width: 200
33+
sourceSize.height: 200
34+
}
35+
bold: true
36+
headerText: qsTr("Starting initial download")
37+
headerMargin: 30
38+
description: qsTr("The application will connect to the Bitcoin network and start downloading and verifying transactions.\n\nThis may take several hours, or even days, based on your connection.")
39+
descriptionMargin: 20
40+
detailActive: true
41+
detailItem: TextButton {
42+
text: qsTr("Connection settings")
43+
textSize: 18
44+
textColor: Theme.color.orange
45+
onClicked: {
46+
connections.incrementCurrentIndex()
47+
swipeView.inSubPage = true
48+
}
49+
}
50+
lastPage: true
51+
buttonText: qsTr("Next")
2552
}
53+
SettingsConnection {}
2654
}
2755
}

‎src/qml/pages/onboarding/onboarding06a.qml

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)