From 4906a66bca4b411f54a2efffc4699672fd6202aa Mon Sep 17 00:00:00 2001
From: consti10 <geierconstantinabc@gmail.com>
Date: Mon, 6 Nov 2023 12:17:23 +0100
Subject: [PATCH] Flow settings OSD -> Widgets first

---
 qml/ui/configpopup/ConfigPopup.qml            |  4 ----
 .../qopenhd_settings/AppDevSettingsView.qml   |  1 -
 .../AppGeneralSettingsView.qml                |  1 -
 .../AppScreenSettingsView.qml                 |  1 -
 .../qopenhd_settings/AppSettingsPanel.qml     | 20 +++++++------------
 .../AppVehicleSettingsView.qml                |  1 -
 .../qopenhd_settings/AppVideoSettingsView.qml |  1 -
 .../AppWidgetSettingsView.qml                 |  1 -
 8 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/qml/ui/configpopup/ConfigPopup.qml b/qml/ui/configpopup/ConfigPopup.qml
index 2af0d6f00..c57603de9 100644
--- a/qml/ui/configpopup/ConfigPopup.qml
+++ b/qml/ui/configpopup/ConfigPopup.qml
@@ -38,10 +38,6 @@ Rectangle {
         hudOverlayGrid.regain_focus();
     }
 
-    function showAppSettings(i) {
-        console.log("TEST show app settings:"+i);
-    }
-
     function side_bar_regain_focus(){
         sidebar.focus = true;
     }
diff --git a/qml/ui/configpopup/qopenhd_settings/AppDevSettingsView.qml b/qml/ui/configpopup/qopenhd_settings/AppDevSettingsView.qml
index 535f60caa..6034c8132 100755
--- a/qml/ui/configpopup/qopenhd_settings/AppDevSettingsView.qml
+++ b/qml/ui/configpopup/qopenhd_settings/AppDevSettingsView.qml
@@ -18,7 +18,6 @@ ScrollView {
     width: parent.width
     height: parent.height
     contentHeight: manageColumn.height
-    visible: appSettingsBar.currentIndex == 5
 
     clip: true
 
diff --git a/qml/ui/configpopup/qopenhd_settings/AppGeneralSettingsView.qml b/qml/ui/configpopup/qopenhd_settings/AppGeneralSettingsView.qml
index 89a963cba..5c4b53972 100755
--- a/qml/ui/configpopup/qopenhd_settings/AppGeneralSettingsView.qml
+++ b/qml/ui/configpopup/qopenhd_settings/AppGeneralSettingsView.qml
@@ -16,7 +16,6 @@ ScrollView {
     width: parent.width
     height: parent.height
     contentHeight: generalColumn.height
-    visible: appSettingsBar.currentIndex == 0
 
     clip: true
 
diff --git a/qml/ui/configpopup/qopenhd_settings/AppScreenSettingsView.qml b/qml/ui/configpopup/qopenhd_settings/AppScreenSettingsView.qml
index a100bd914..60915821b 100755
--- a/qml/ui/configpopup/qopenhd_settings/AppScreenSettingsView.qml
+++ b/qml/ui/configpopup/qopenhd_settings/AppScreenSettingsView.qml
@@ -16,7 +16,6 @@ ScrollView {
     width: parent.width
     height: parent.height
     contentHeight: screenColumn.height
-    visible: appSettingsBar.currentIndex == 3
 
     clip: true
 
diff --git a/qml/ui/configpopup/qopenhd_settings/AppSettingsPanel.qml b/qml/ui/configpopup/qopenhd_settings/AppSettingsPanel.qml
index 69c827dcc..3929af780 100755
--- a/qml/ui/configpopup/qopenhd_settings/AppSettingsPanel.qml
+++ b/qml/ui/configpopup/qopenhd_settings/AppSettingsPanel.qml
@@ -49,8 +49,7 @@ Rectangle {
         }
 
         TabButton {
-            y: 0
-            text: qsTr("General")
+            text: qsTr("Widgets")
             width: implicitWidth
             height: 48
             font.pixelSize: 13
@@ -58,14 +57,15 @@ Rectangle {
 
         TabButton {
             y: 0
-            text: qsTr("Vehicle")
+            text: qsTr("General")
             width: implicitWidth
             height: 48
             font.pixelSize: 13
         }
 
         TabButton {
-            text: qsTr("Widgets")
+            y: 0
+            text: qsTr("Vehicle")
             width: implicitWidth
             height: 48
             font.pixelSize: 13
@@ -104,23 +104,17 @@ Rectangle {
         anchors.bottom: parent.bottom
         anchors.bottomMargin: 0
 
-        currentIndex:     {
-           // console.log("index:"+appSettingsBar.currentIndex);
-            // for future use to set focus for goggle support
-            showAppSettings(appSettingsBar.currentIndex);
+        currentIndex: appSettingsBar.currentIndex
 
-            return appSettingsBar.currentIndex;
+        AppWidgetSettingsView{
+            id: appWidgetSettingsView
         }
-
         AppGeneralSettingsView{
             id: appGeneralSettingsView
         }
         AppVehicleSettingsView{
             id: appVehicleSettingsView
         }
-        AppWidgetSettingsView{
-            id: appWidgetSettingsView
-        }
         AppScreenSettingsView{
             id: appScreenSettingsView
         }
diff --git a/qml/ui/configpopup/qopenhd_settings/AppVehicleSettingsView.qml b/qml/ui/configpopup/qopenhd_settings/AppVehicleSettingsView.qml
index a5c37e09f..ef6956e26 100755
--- a/qml/ui/configpopup/qopenhd_settings/AppVehicleSettingsView.qml
+++ b/qml/ui/configpopup/qopenhd_settings/AppVehicleSettingsView.qml
@@ -16,7 +16,6 @@ ScrollView {
     width: parent.width
     height: parent.height
     contentHeight: vehicleColumn.height
-    visible: appSettingsBar.currentIndex == 1
 
     clip: true
 
diff --git a/qml/ui/configpopup/qopenhd_settings/AppVideoSettingsView.qml b/qml/ui/configpopup/qopenhd_settings/AppVideoSettingsView.qml
index a38441b32..740d53d1b 100755
--- a/qml/ui/configpopup/qopenhd_settings/AppVideoSettingsView.qml
+++ b/qml/ui/configpopup/qopenhd_settings/AppVideoSettingsView.qml
@@ -18,7 +18,6 @@ ScrollView {
     contentHeight: videoColumn.height
 
     clip: true
-    visible: appSettingsBar.currentIndex == 4
 
     Item {
         anchors.fill: parent
diff --git a/qml/ui/configpopup/qopenhd_settings/AppWidgetSettingsView.qml b/qml/ui/configpopup/qopenhd_settings/AppWidgetSettingsView.qml
index 406c8b0af..a8a075b9b 100755
--- a/qml/ui/configpopup/qopenhd_settings/AppWidgetSettingsView.qml
+++ b/qml/ui/configpopup/qopenhd_settings/AppWidgetSettingsView.qml
@@ -16,7 +16,6 @@ ScrollView {
     width: parent.width
     height: parent.height
     contentHeight: widgetColumn.height
-    visible: appSettingsBar.currentIndex == 2
 
     clip: true