status should be first

OpenHD · Sep 27, 2023 · 24c5833 · 24c5833
1 parent 79cbced
commit 24c5833
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 23 deletions.
diff --git a/qml/ui/configpopup/ConfigPopup.qml b/qml/ui/configpopup/ConfigPopup.qml
@@ -157,54 +157,44 @@ Rectangle {
 
             anchors.top: parent.top
 
-            // We only need the connect panel on android (external device)
-            // On localhost, QOpenHD "automatically" connects due to udp localhost method
-            ConfigPopupSidebarButton{
-                visible: m_show_connect_option
-                id:  connect_button
-                m_icon_text: "\uf6ff"
-                m_description_text: "Connect"
-                m_selection_index: 0
-            }
-
             // Status
             ConfigPopupSidebarButton{
                 id:  power
                 m_icon_text: "\uf21e" //"\uf011"
                 m_description_text: "Status"
-                m_selection_index: 1
+                m_selection_index: 0
             }
 
             // QOpenHD Settings - AppSettingsPanel
             ConfigPopupSidebarButton{
                 id:  qopenhd_button
                 m_icon_text: "\uf013"
                 m_description_text: "QOpenHD"
-                m_selection_index: 2
+                m_selection_index: 1
             }
 
             // OpenHD Settings - MavlinkAllSettingsPanel
             ConfigPopupSidebarButton{
                 id:  openhd_button
                 m_icon_text: "\uf085"
                 m_description_text: "OpenHD"
-                m_selection_index: 3
+                m_selection_index: 2
             }
 
             // Log
             ConfigPopupSidebarButton{
                 id:  log_button
                 m_icon_text: "\uf0c9"
                 m_description_text: "Log"
-                m_selection_index: 4
+                m_selection_index: 3
             }
 
             // RC
             ConfigPopupSidebarButton{
                 id:  rc
                 m_icon_text: "\uf11b"
                 m_description_text: "RC"
-                m_selection_index: 5
+                m_selection_index: 4
             }
 
 
@@ -213,16 +203,27 @@ Rectangle {
                 id:  credits
                 m_icon_text: "\uf005"
                 m_description_text: "Credits"
-                m_selection_index: 6
+                m_selection_index: 5
             }
 
             // Developer stats
             ConfigPopupSidebarButton{
                 id:  developerstats
                 m_icon_text: "\uf0ad"
                 m_description_text: "DEV"
+                m_selection_index: 6
+            }
+
+            // We only need the connect panel on android (external device)
+            // On localhost, QOpenHD "automatically" connects due to udp localhost method
+            ConfigPopupSidebarButton{
+                visible: m_show_connect_option
+                id:  connect_button
+                m_icon_text: "\uf6ff"
+                m_description_text: "Connect"
                 m_selection_index: 7
             }
+
         }
     }
 
@@ -239,11 +240,7 @@ Rectangle {
         anchors.topMargin: 0
 
         // default index
-        currentIndex: m_show_connect_option ? 0 : 1
-
-        ConnectPanel{
-            id: connectPanel
-        }
+        currentIndex: 0
 
         PanelStatus {
             id: statusPanel
@@ -272,6 +269,9 @@ Rectangle {
         AppDeveloperStatsPanel {
             id: appDeveloperStatsPanel
         }
+        ConnectPanel{
+            id: connectPanel
+        }
     }
 }
 
diff --git a/qml/ui/configpopup/status/StatusCardBodyOpenHD.qml b/qml/ui/configpopup/status/StatusCardBodyOpenHD.qml
@@ -23,7 +23,7 @@ ColumnLayout {
     property string m_version: m_model.openhd_version
     property string m_last_ping: m_model.last_ping_result_openhd
     property bool m_is_alive: m_model.is_alive
-    property string m_qopenhd_version: "TODO"
+    property string m_qopenhd_version: "2.5.0-beta4X"
 
     function get_alive_text(){
         return m_is_alive ? "Yes" : "NOT ALIVE !"
@@ -74,7 +74,7 @@ ColumnLayout {
         return ret;
     }
     function get_text_openhd_air_ground_version_mismatch(){
-        var ret="Your version of OpenHD AIR ["+m_qopenhd_version+"] is incompatible with OpenHD GROUND: ["+_ohdSystemGround.openhd_version+"]"+
+        var ret="Your version of OpenHD AIR ["+_ohdSystemAir.openhd_version+"] is incompatible with OpenHD GROUND: ["+_ohdSystemGround.openhd_version+"]"+
                 "\nPlease update your AIR / GROUND unit.";
         return ret;
     }