From 06ac24eaab6c1f381467347e31c8a84d72eac26f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Barbosa?= <joao.paulo.barbosa@gmail.com>
Date: Tue, 12 Sep 2023 22:07:57 +0100
Subject: [PATCH] qml: use NavigationBar2 in NodeSettings

---
 src/qml/pages/main.qml              | 10 ++--------
 src/qml/pages/node/NodeSettings.qml | 22 +++++++++++++---------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/qml/pages/main.qml b/src/qml/pages/main.qml
index 70a4697d53..581e9b42b4 100644
--- a/src/qml/pages/main.qml
+++ b/src/qml/pages/main.qml
@@ -87,14 +87,8 @@ ApplicationWindow {
                 }
             }
             NodeSettings {
-                navMiddleDetail: Header {
-                    headerBold: true
-                    headerSize: 18
-                    header: "Settings"
-                }
-                navRightDetail: NavButton {
-                    text: qsTr("Done")
-                    onClicked: node_swipe.decrementCurrentIndex()
+                onDoneClicked: {
+                    node_swipe.decrementCurrentIndex()
                 }
             }
         }
diff --git a/src/qml/pages/node/NodeSettings.qml b/src/qml/pages/node/NodeSettings.qml
index 8ef205a35c..47d4cc551e 100644
--- a/src/qml/pages/node/NodeSettings.qml
+++ b/src/qml/pages/node/NodeSettings.qml
@@ -10,28 +10,32 @@ import "../../components"
 import "../settings"
 
 Item {
-    id: nodeSettings
-    property alias navMiddleDetail: nodeSettingsView.navMiddleDetail
-    property alias navRightDetail: nodeSettingsView.navRightDetail
+    signal doneClicked
+
+    id: root
 
     StackView {
         id: nodeSettingsView
-        property alias navMiddleDetail: node_settings.navMiddleDetail
-        property alias navRightDetail: node_settings.navRightDetail
         anchors.fill: parent
 
         initialItem: Page {
             id: node_settings
-            property alias navMiddleDetail: navbar.middleDetail
-            property alias navRightDetail: navbar.rightDetail
             background: null
             implicitWidth: 450
             leftPadding: 20
             rightPadding: 20
             topPadding: 30
 
-            header: NavigationBar {
-                id: navbar
+            header: NavigationBar2 {
+                centerItem: Header {
+                    headerBold: true
+                    headerSize: 18
+                    header: "Settings"
+                }
+                rightItem: NavButton {
+                    text: qsTr("Done")
+                    onClicked: root.doneClicked()
+                }
             }
             ColumnLayout {
                 spacing: 4