Merge bitcoin-core/gui-qml#495: fix settings navigation

tx-signer450 · tx-signer450 · commit 15f1084c1819 · 2025-08-07T21:10:39.000+01:00
9da6768443fe0762fb1c9d23bd26d307e776ddbd fix settings navigation (Marnix Croes) Pull request description: fixes bitcoin-core/gui-qml#494 ACKs for top commit: pinheadmz: ACK 9da6768443fe0762fb1c9d23bd26d307e776ddbd Tree-SHA512: 6943379621a718582c6f8d6bbf3e8bd5fef2bb24ddf699886f12719a270fedfd20cea2b345aed983eb900b9296875caa8a7c48e715d3984b47d31feb60c4ed70
diff --git a/qml/pages/settings/SettingsDisplay.qml b/qml/pages/settings/SettingsDisplay.qml
@@ -49,7 +49,7 @@ Item {
                         color: gotoTheme.stateColor
                     }
                     onClicked: {
-                        nodeSettingsView.push(theme_page)
+                        displaySettingsView.push(theme_page)
                     }
                 }
                 Separator { Layout.fillWidth: true }
@@ -61,7 +61,7 @@ Item {
                         color: gotoBlockClockSize.stateColor
                     }
                     onClicked: {
-                        nodeSettingsView.push(blockclocksize_page)
+                        displaySettingsView.push(blockclocksize_page)
                     }
                 }
             }
@@ -71,15 +71,15 @@ Item {
         id: theme_page
         SettingsTheme {
             onBack: {
-                nodeSettingsView.pop()
+                displaySettingsView.pop()
             }
         }
     }
     Component {
         id: blockclocksize_page
         SettingsBlockClockDisplayMode {
             onBack: {
-                nodeSettingsView.pop()
+                displaySettingsView.pop()
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ Item {`
`49`	`49`	`color: gotoTheme.stateColor`
`50`	`50`	`}`
`51`	`51`	`onClicked: {`
`52`		`- nodeSettingsView.push(theme_page)`
	`52`	`+ displaySettingsView.push(theme_page)`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`	`Separator { Layout.fillWidth: true }`
`@@ -61,7 +61,7 @@ Item {`
`61`	`61`	`color: gotoBlockClockSize.stateColor`
`62`	`62`	`}`
`63`	`63`	`onClicked: {`
`64`		`- nodeSettingsView.push(blockclocksize_page)`
	`64`	`+ displaySettingsView.push(blockclocksize_page)`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`	`}`
`@@ -71,15 +71,15 @@ Item {`
`71`	`71`	`id: theme_page`
`72`	`72`	`SettingsTheme {`
`73`	`73`	`onBack: {`
`74`		`- nodeSettingsView.pop()`
	`74`	`+ displaySettingsView.pop()`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`	`Component {`
`79`	`79`	`id: blockclocksize_page`
`80`	`80`	`SettingsBlockClockDisplayMode {`
`81`	`81`	`onBack: {`
`82`		`- nodeSettingsView.pop()`
	`82`	`+ displaySettingsView.pop()`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`	`}`