Skip to content

Commit fffabbf

Browse files
committed
qml: define the settings pages nav elements at page instantiation
This extracts out the navbar element defintions from the settings page itself, and moves it to where the page is instantiated. This allows the settings views to be reused anywhere else we want to use them, and are now no longer limited to being used within the onboarding wizard.
1 parent 58e52ba commit fffabbf

File tree

7 files changed

+38
-34
lines changed

7 files changed

+38
-34
lines changed

src/qml/pages/onboarding/onboarding01.qml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,25 @@ Page {
4646
subtext: qsTr("100% open-source & open-design")
4747
buttonText: qsTr("Start")
4848
}
49-
SettingsAbout {}
50-
SettingsDeveloper {}
49+
SettingsAbout {
50+
navLeftDetail: NavButton {
51+
iconSource: "image://images/caret-left"
52+
text: qsTr("Back")
53+
onClicked: {
54+
introductions.decrementCurrentIndex()
55+
swipeView.inSubPage = false
56+
}
57+
}
58+
}
59+
SettingsDeveloper {
60+
navLeftDetail: NavButton {
61+
iconSource: "image://images/caret-left"
62+
text: qsTr("Back")
63+
onClicked: {
64+
introductions.decrementCurrentIndex()
65+
swipeView.inSubPage = true
66+
}
67+
}
68+
}
5169
}
5270
}

src/qml/pages/onboarding/onboarding05.qml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,14 @@ Page {
5252
}
5353
buttonText: qsTr("Next")
5454
}
55-
SettingsStorage {}
55+
SettingsStorage {
56+
navRightDetail: NavButton {
57+
text: qsTr("Done")
58+
onClicked: {
59+
storages.decrementCurrentIndex()
60+
swipeView.inSubPage = false
61+
}
62+
}
63+
}
5664
}
5765
}

src/qml/pages/onboarding/onboarding06.qml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,14 @@ Page {
5050
lastPage: true
5151
buttonText: qsTr("Next")
5252
}
53-
SettingsConnection {}
53+
SettingsConnection {
54+
navRightDetail: NavButton {
55+
text: qsTr("Done")
56+
onClicked: {
57+
connections.decrementCurrentIndex()
58+
swipeView.inSubPage = false
59+
}
60+
}
61+
}
5462
}
5563
}

src/qml/pages/settings/SettingsAbout.qml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,6 @@ import "../../components"
1010

1111
InformationPage {
1212
Layout.fillWidth: true
13-
navLeftDetail: NavButton {
14-
iconSource: "image://images/caret-left"
15-
text: qsTr("Back")
16-
onClicked: {
17-
introductions.decrementCurrentIndex()
18-
swipeView.inSubPage = false
19-
}
20-
}
2113
bannerActive: false
2214
bold: true
2315
headerText: qsTr("About")

src/qml/pages/settings/SettingsConnection.qml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,6 @@ InformationPage {
1212
background: null
1313
Layout.fillWidth: true
1414
clip: true
15-
navRightDetail: NavButton {
16-
text: qsTr("Done")
17-
onClicked: {
18-
connections.decrementCurrentIndex()
19-
swipeView.inSubPage = false
20-
}
21-
}
2215
bannerActive: false
2316
bold: true
2417
headerText: qsTr("Connection settings")

src/qml/pages/settings/SettingsDeveloper.qml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,6 @@ import "../../components"
1010

1111
InformationPage {
1212
Layout.fillWidth: true
13-
navLeftDetail: NavButton {
14-
iconSource: "image://images/caret-left"
15-
text: qsTr("Back")
16-
onClicked: {
17-
introductions.decrementCurrentIndex()
18-
swipeView.inSubPage = true
19-
}
20-
}
2113
bannerActive: false
2214
bold: true
2315
headerText: qsTr("Developer options")

src/qml/pages/settings/SettingsStorage.qml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,6 @@ import "../../components"
1010

1111
InformationPage {
1212
Layout.fillWidth: true
13-
navRightDetail: NavButton {
14-
text: qsTr("Done")
15-
onClicked: {
16-
storages.decrementCurrentIndex()
17-
swipeView.inSubPage = false
18-
}
19-
}
2013
bannerActive: false
2114
bold: true
2215
headerText: qsTr("Storage settings")

0 commit comments

Comments
 (0)