Flow settings OSD -> Widgets first

OpenHD · Nov 6, 2023 · 4906a66 · 4906a66
1 parent 76630ed
commit 4906a66
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 23 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -49,23 +49,23 @@ Rectangle {
         }
 
         TabButton {
-            y: 0
-            text: qsTr("General")
+            text: qsTr("Widgets")
             width: implicitWidth
             height: 48
             font.pixelSize: 13
         }
 
         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
@@ -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
@@ -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
@@ -16,7 +16,6 @@ ScrollView {
     width: parent.width
     height: parent.height
     contentHeight: widgetColumn.height
-    visible: appSettingsBar.currentIndex == 2
 
     clip: true