diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index 8284708451..9d4868c89b 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -307,7 +307,7 @@ QML_RES_ICONS = \
qml/res/icons/gear.png \
qml/res/icons/info.png \
qml/res/icons/network-dark.png \
- qml/res/icons/network-light.png
+ qml/res/icons/network-light.png
QML_QRC_CPP = qml/qrc_bitcoin.cpp
QML_QRC = qml/bitcoin_qml.qrc
@@ -340,18 +340,11 @@ QML_RES_QML = \
qml/pages/initerrormessage.qml \
qml/pages/main.qml \
qml/pages/onboarding/onboarding01.qml \
- qml/pages/onboarding/onboarding01a.qml \
- qml/pages/onboarding/onboarding01b.qml \
- qml/pages/onboarding/onboarding01c.qml \
qml/pages/onboarding/onboarding02.qml \
qml/pages/onboarding/onboarding03.qml \
qml/pages/onboarding/onboarding04.qml \
qml/pages/onboarding/onboarding05.qml \
- qml/pages/onboarding/onboarding05a.qml \
- qml/pages/onboarding/onboarding05b.qml \
- qml/pages/onboarding/onboarding06.qml \
- qml/pages/onboarding/onboarding06a.qml \
- qml/pages/onboarding/onboarding06b.qml
+ qml/pages/onboarding/onboarding06.qml
BITCOIN_QT_CPP = $(BITCOIN_QT_BASE_CPP)
if TARGET_WINDOWS
diff --git a/src/qml/bitcoin_qml.qrc b/src/qml/bitcoin_qml.qrc
index a5e01656f7..f3cf751429 100644
--- a/src/qml/bitcoin_qml.qrc
+++ b/src/qml/bitcoin_qml.qrc
@@ -28,18 +28,11 @@
pages/initerrormessage.qml
pages/main.qml
pages/onboarding/onboarding01.qml
- pages/onboarding/onboarding01a.qml
- pages/onboarding/onboarding01b.qml
- pages/onboarding/onboarding01c.qml
pages/onboarding/onboarding02.qml
pages/onboarding/onboarding03.qml
pages/onboarding/onboarding04.qml
pages/onboarding/onboarding05.qml
- pages/onboarding/onboarding05a.qml
- pages/onboarding/onboarding05b.qml
pages/onboarding/onboarding06.qml
- pages/onboarding/onboarding06a.qml
- pages/onboarding/onboarding06b.qml
res/icons/arrow-down.png
diff --git a/src/qml/pages/onboarding/onboarding01.qml b/src/qml/pages/onboarding/onboarding01.qml
index d44a41bfdb..a7b1b6d356 100644
--- a/src/qml/pages/onboarding/onboarding01.qml
+++ b/src/qml/pages/onboarding/onboarding01.qml
@@ -17,14 +17,101 @@ Page {
anchors.fill: parent
interactive: false
orientation: Qt.Horizontal
- Loader {
- source:"onboarding01a.qml"
+ Page {
+ background: null
+ clip: true
+ Layout.fillWidth: true
+ header: OnboardingNav {
+ alignLeft: false
+ navButton: NavButton {
+ iconSource: "image://images/info"
+ iconHeight: 24
+ onClicked: {
+ introductions.incrementCurrentIndex()
+ swipeView.inSubPage = true
+ }
+ }
+ }
+ OnboardingInfo {
+ width: 600
+ anchors.top: parent.top
+ anchors.horizontalCenter: parent.horizontalCenter
+ banner: Image {
+ Layout.fillWidth: true
+ Layout.alignment: Qt.AlignCenter
+ source: "image://images/app"
+ // Bitcoin icon has ~11% padding
+ sourceSize.width: 112
+ sourceSize.height: 112
+ }
+ bold: true
+ header: qsTr("Bitcoin Core App")
+ headerSize: 36
+ description: qsTr("Be part of the Bitcoin network.")
+ descriptionSize: 24
+ subtext: qsTr("100% open-source & open-design")
+ buttonText: "Start"
+ }
}
- Loader {
- source:"onboarding01b.qml"
+ Page {
+ background: null
+ clip: true
+ Layout.fillWidth: true
+ header: OnboardingNav {
+ navButton: NavButton {
+ iconSource: "image://images/caret-left"
+ text: "Back"
+ onClicked: {
+ introductions.decrementCurrentIndex()
+ swipeView.inSubPage = false
+ }
+ }
+ }
+ ColumnLayout {
+ width: 600
+ spacing: 0
+ anchors.top: parent.top
+ anchors.horizontalCenter: parent.horizontalCenter
+ Header {
+ Layout.fillWidth: true
+ bold: true
+ header: "About"
+ description: qsTr("Bitcoin Core is an open source project.\nIf you find it useful, please contribute.\n\n This is experimental software.")
+ descriptionMargin: 20
+ }
+ AboutOptions {
+ Layout.topMargin: 30
+ }
+ }
}
- Loader {
- source:"onboarding01c.qml"
+ Page {
+ background: null
+ clip: true
+ Layout.fillWidth: true
+ header: OnboardingNav {
+ navButton: NavButton {
+ iconSource: "image://images/caret-left"
+ text: "Back"
+ onClicked: {
+ introductions.decrementCurrentIndex()
+ swipeView.inSubPage = true
+ }
+ }
+ }
+ ColumnLayout {
+ width: 600
+ spacing: 0
+ anchors.top: parent.top
+ anchors.horizontalCenter: parent.horizontalCenter
+ Header {
+ Layout.fillWidth: true
+ bold: true
+ header: "Developer options"
+ }
+ DeveloperOptions {
+ Layout.topMargin: 30
+ }
+ }
}
}
}
diff --git a/src/qml/pages/onboarding/onboarding01a.qml b/src/qml/pages/onboarding/onboarding01a.qml
deleted file mode 100644
index 71de5a8b9e..0000000000
--- a/src/qml/pages/onboarding/onboarding01a.qml
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) 2022 The Bitcoin Core developers
-// Distributed under the MIT software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-// Copyright (c) 2022 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"
-
-Page {
- background: null
- clip: true
- Layout.fillWidth: true
- header: OnboardingNav {
- alignLeft: false
- navButton: NavButton {
- iconSource: "image://images/info"
- iconHeight: 24
- onClicked: {
- introductions.incrementCurrentIndex()
- swipeView.inSubPage = true
- }
- }
- }
- OnboardingInfo {
- anchors.top: parent.top
- anchors.horizontalCenter: parent.horizontalCenter
- banner: Image {
- Layout.fillWidth: true
- Layout.alignment: Qt.AlignCenter
- source: "image://images/app"
- // Bitcoin icon has ~11% padding
- sourceSize.width: 112
- sourceSize.height: 112
- }
- bannerMargin: 0
- bold: true
- header: qsTr("Bitcoin Core App")
- headerSize: 36
- description: qsTr("Be part of the Bitcoin network.")
- descriptionMargin: 10
- descriptionSize: 24
- subtext: qsTr("100% open-source & open-design")
- buttonText: "Start"
- }
-}
diff --git a/src/qml/pages/onboarding/onboarding01b.qml b/src/qml/pages/onboarding/onboarding01b.qml
deleted file mode 100644
index 65ac830ce2..0000000000
--- a/src/qml/pages/onboarding/onboarding01b.qml
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) 2022 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"
-import "../../components"
-
-Page {
- background: null
- clip: true
- Layout.fillWidth: true
- header: OnboardingNav {
- navButton: NavButton {
- iconSource: "image://images/caret-left"
- text: "Back"
- onClicked: {
- introductions.decrementCurrentIndex()
- swipeView.inSubPage = false
- }
- }
- }
- ColumnLayout {
- width: 600
- spacing: 0
- anchors.top: parent.top
- anchors.horizontalCenter: parent.horizontalCenter
- Header {
- Layout.fillWidth: true
- bold: true
- header: "About"
- description: qsTr("Bitcoin Core is an open source project.\nIf you find it useful, please contribute.\n\n This is experimental software.")
- descriptionMargin: 20
- }
- AboutOptions {
- Layout.topMargin: 30
- }
- }
-}
diff --git a/src/qml/pages/onboarding/onboarding01c.qml b/src/qml/pages/onboarding/onboarding01c.qml
deleted file mode 100644
index 0420c4e919..0000000000
--- a/src/qml/pages/onboarding/onboarding01c.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2022 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"
-import "../../components"
-
-Page {
- background: null
- clip: true
- Layout.fillWidth: true
- header: OnboardingNav {
- navButton: NavButton {
- iconSource: "image://images/caret-left"
- text: "Back"
- onClicked: {
- introductions.decrementCurrentIndex()
- swipeView.inSubPage = true
- }
- }
- }
- ColumnLayout {
- width: 600
- spacing: 0
- anchors.top: parent.top
- anchors.horizontalCenter: parent.horizontalCenter
- Header {
- Layout.fillWidth: true
- bold: true
- header: "Developer options"
- }
- DeveloperOptions {
- Layout.topMargin: 30
- }
- }
-}
diff --git a/src/qml/pages/onboarding/onboarding02.qml b/src/qml/pages/onboarding/onboarding02.qml
index 47a154d0b2..90328585bb 100644
--- a/src/qml/pages/onboarding/onboarding02.qml
+++ b/src/qml/pages/onboarding/onboarding02.qml
@@ -19,16 +19,16 @@ Page {
}
}
OnboardingInfo {
- anchors.top: parent.top
- anchors.horizontalCenter: parent.horizontalCenter
- banner: Image {
- source: Theme.image.network
- sourceSize.width: 200
- sourceSize.height: 200
- }
- bold: true
- header: qsTr("Strengthen bitcoin")
- description: qsTr("Bitcoin Core runs a full Bitcoin node which verifies the rules of the network are being followed.\n\nUsers running nodes is what makes bitcoin\nso resilient and trustworthy.")
- buttonText: "Next"
+ anchors.top: parent.top
+ anchors.horizontalCenter: parent.horizontalCenter
+ banner: Image {
+ source: Theme.image.network
+ sourceSize.width: 200
+ sourceSize.height: 200
+ }
+ bold: true
+ header: qsTr("Strengthen bitcoin")
+ description: qsTr("Bitcoin Core runs a full Bitcoin node which verifies the rules of the network are being followed.\n\nUsers running nodes is what makes bitcoin\nso resilient and trustworthy.")
+ buttonText: "Next"
}
}
diff --git a/src/qml/pages/onboarding/onboarding05.qml b/src/qml/pages/onboarding/onboarding05.qml
index 85b918edc2..02619b3b56 100644
--- a/src/qml/pages/onboarding/onboarding05.qml
+++ b/src/qml/pages/onboarding/onboarding05.qml
@@ -17,11 +17,79 @@ Page {
anchors.fill: parent
interactive: false
orientation: Qt.Vertical
- Loader {
- source:"onboarding05a.qml"
+ Page {
+ background: null
+ Layout.fillWidth: true
+ clip: true
+ header: OnboardingNav {
+ navButton: NavButton {
+ iconSource: "image://images/caret-left"
+ text: "Back"
+ onClicked: swipeView.currentIndex -= 1
+ }
+ }
+ ColumnLayout {
+ width: 600
+ spacing: 0
+ anchors.top: parent.top
+ anchors.horizontalCenter: parent.horizontalCenter
+ Header {
+ Layout.fillWidth: true
+ bold: true
+ header: qsTr("Storage")
+ description: qsTr("Data retrieved from the Bitcoin network is stored\non your device.\n\nYou have 500GB of storage available.")
+ }
+ StorageOptions {
+ Layout.topMargin: 30
+ Layout.alignment: Qt.AlignCenter
+ }
+ TextButton {
+ Layout.alignment: Qt.AlignCenter
+ Layout.topMargin: 30
+ text: "Detailed settings"
+ textSize: 18
+ textColor: "#F7931A"
+ onClicked: {
+ storages.incrementCurrentIndex()
+ swipeView.inSubPage = true
+ }
+ }
+ ContinueButton {
+ Layout.alignment: Qt.AlignCenter
+ Layout.topMargin: 40
+ text: "Next"
+ onClicked: swipeView.incrementCurrentIndex()
+ }
+ }
}
- Loader {
- source:"onboarding05b.qml"
+ Page {
+ background: null
+ Layout.fillWidth: true
+ clip: true
+ header: OnboardingNav {
+ alignLeft: false
+ navButton: NavButton {
+ text: "Done"
+ onClicked: {
+ storages.decrementCurrentIndex()
+ swipeView.inSubPage = false
+ }
+ }
+ }
+ ColumnLayout {
+ width: 450
+ spacing: 0
+ anchors.top: parent.top
+ anchors.horizontalCenter: parent.horizontalCenter
+ Header {
+ Layout.fillWidth: true
+ bold: true
+ header: "Storage settings"
+ }
+ StorageSettings {
+ Layout.topMargin: 30
+ }
+ }
}
}
}
diff --git a/src/qml/pages/onboarding/onboarding05a.qml b/src/qml/pages/onboarding/onboarding05a.qml
deleted file mode 100644
index 7dfc79c222..0000000000
--- a/src/qml/pages/onboarding/onboarding05a.qml
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) 2022 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.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.11
-import "../../controls"
-import "../../components"
-
-Page {
- background: null
- Layout.fillWidth: true
- clip: true
- header: OnboardingNav {
- navButton: NavButton {
- iconSource: "image://images/caret-left"
- text: "Back"
- onClicked: swipeView.currentIndex -= 1
- }
- }
- ColumnLayout {
- width: 600
- spacing: 0
- anchors.top: parent.top
- anchors.horizontalCenter: parent.horizontalCenter
- Header {
- Layout.fillWidth: true
- bold: true
- header: qsTr("Storage")
- description: qsTr("Data retrieved from the Bitcoin network is stored\non your device.\n\nYou have 500GB of storage available.")
- }
- StorageOptions {
- Layout.topMargin: 30
- Layout.alignment: Qt.AlignCenter
- }
- TextButton {
- Layout.alignment: Qt.AlignCenter
- Layout.topMargin: 30
- text: "Detailed settings"
- textSize: 18
- textColor: "#F7931A"
- onClicked: {
- storages.incrementCurrentIndex()
- swipeView.inSubPage = true
- }
- }
- ContinueButton {
- Layout.alignment: Qt.AlignCenter
- Layout.topMargin: 40
- text: "Next"
- onClicked: swipeView.incrementCurrentIndex()
- }
- }
-}
diff --git a/src/qml/pages/onboarding/onboarding05b.qml b/src/qml/pages/onboarding/onboarding05b.qml
deleted file mode 100644
index b4840edec3..0000000000
--- a/src/qml/pages/onboarding/onboarding05b.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2022 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"
-import "../../components"
-
-Page {
- background: null
- Layout.fillWidth: true
- clip: true
- header: OnboardingNav {
- alignLeft: false
- navButton: NavButton {
- text: "Done"
- onClicked: {
- storages.decrementCurrentIndex()
- swipeView.inSubPage = false
- }
- }
- }
- ColumnLayout {
- width: 450
- spacing: 0
- anchors.top: parent.top
- anchors.horizontalCenter: parent.horizontalCenter
- Header {
- Layout.fillWidth: true
- bold: true
- header: "Storage settings"
- }
- StorageSettings {
- Layout.topMargin: 30
- }
- }
-}
diff --git a/src/qml/pages/onboarding/onboarding06.qml b/src/qml/pages/onboarding/onboarding06.qml
index e0fae57bdf..a77adce10d 100644
--- a/src/qml/pages/onboarding/onboarding06.qml
+++ b/src/qml/pages/onboarding/onboarding06.qml
@@ -17,11 +17,79 @@ Page {
anchors.fill: parent
interactive: false
orientation: Qt.Vertical
- Loader {
- source:"onboarding06a.qml"
+ Page {
+ background: null
+ Layout.fillWidth: true
+ clip: true
+ header: OnboardingNav {
+ navButton: NavButton {
+ iconSource: "image://images/caret-left"
+ text: "Back"
+ onClicked: swipeView.currentIndex -= 1
+ }
+ }
+ ColumnLayout {
+ width: 600
+ spacing: 0
+ anchors.top: parent.top
+ anchors.horizontalCenter: parent.horizontalCenter
+ Header {
+ Layout.fillWidth: true
+ bold: true
+ header: qsTr("Connection")
+ description: qsTr("Communicating with the Bitcoin network can use a lot of data.")
+ }
+ ConnectionOptions {
+ Layout.topMargin: 30
+ Layout.alignment: Qt.AlignCenter
+ }
+ TextButton {
+ Layout.alignment: Qt.AlignCenter
+ Layout.topMargin: 30
+ text: "Detailed Settings"
+ textSize: 18
+ textColor: "#F7931A"
+ onClicked: {
+ connections.incrementCurrentIndex()
+ swipeView.inSubPage = true
+ }
+ }
+ ContinueButton {
+ Layout.alignment: Qt.AlignCenter
+ Layout.topMargin: 40
+ text: "Next"
+ onClicked: swipeView.finished = true
+ }
+ }
}
- Loader {
- source:"onboarding06b.qml"
+ Page {
+ background: null
+ Layout.fillWidth: true
+ clip: true
+ header: OnboardingNav {
+ alignLeft: false
+ navButton: NavButton {
+ text: "Done"
+ onClicked: {
+ connections.decrementCurrentIndex()
+ swipeView.inSubPage = false
+ }
+ }
+ }
+ ColumnLayout {
+ width: 450
+ spacing: 0
+ anchors.top: parent.top
+ anchors.horizontalCenter: parent.horizontalCenter
+ Header {
+ Layout.fillWidth: true
+ bold: true
+ header: "Connection settings"
+ }
+ ConnectionSettings {
+ Layout.topMargin: 30
+ }
+ }
}
}
}
diff --git a/src/qml/pages/onboarding/onboarding06a.qml b/src/qml/pages/onboarding/onboarding06a.qml
deleted file mode 100644
index 00059d4b5d..0000000000
--- a/src/qml/pages/onboarding/onboarding06a.qml
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) 2022 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"
-import "../../components"
-
-Page {
- background: null
- Layout.fillWidth: true
- clip: true
- header: OnboardingNav {
- navButton: NavButton {
- iconSource: "image://images/caret-left"
- text: "Back"
- onClicked: swipeView.currentIndex -= 1
- }
- }
- ColumnLayout {
- width: 600
- spacing: 0
- anchors.top: parent.top
- anchors.horizontalCenter: parent.horizontalCenter
- Header {
- Layout.fillWidth: true
- bold: true
- header: qsTr("Connection")
- description: qsTr("Communicating with the Bitcoin network can use a lot of data.")
- }
- ConnectionOptions {
- Layout.topMargin: 30
- Layout.alignment: Qt.AlignCenter
- }
- TextButton {
- Layout.alignment: Qt.AlignCenter
- Layout.topMargin: 30
- text: "Detailed Settings"
- textSize: 18
- textColor: "#F7931A"
- onClicked: {
- connections.incrementCurrentIndex()
- swipeView.inSubPage = true
- }
- }
- ContinueButton {
- Layout.alignment: Qt.AlignCenter
- Layout.topMargin: 40
- text: "Next"
- onClicked: swipeView.finished = true
- }
- }
-}
diff --git a/src/qml/pages/onboarding/onboarding06b.qml b/src/qml/pages/onboarding/onboarding06b.qml
deleted file mode 100644
index 8d82008a13..0000000000
--- a/src/qml/pages/onboarding/onboarding06b.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2022 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"
-import "../../components"
-
-Page {
- background: null
- Layout.fillWidth: true
- clip: true
- header: OnboardingNav {
- alignLeft: false
- navButton: NavButton {
- text: "Done"
- onClicked: {
- connections.decrementCurrentIndex()
- swipeView.inSubPage = false
- }
- }
- }
- ColumnLayout {
- width: 450
- spacing: 0
- anchors.top: parent.top
- anchors.horizontalCenter: parent.horizontalCenter
- Header {
- Layout.fillWidth: true
- bold: true
- header: "Connection settings"
- }
- ConnectionSettings {
- Layout.topMargin: 30
- }
- }
-}