small UI improvements and rename

OpenHD · Oct 27, 2023 · 2bfce26 · 2bfce26
1 parent ac653fb
commit 2bfce26
Show file tree

Hide file tree

Showing 11 changed files with 443 additions and 1,179 deletions.
diff --git a/app/util/qopenhd.h b/app/util/qopenhd.h
@@ -68,7 +68,7 @@ class QOpenHD : public QObject
     // Tries to mimic android toast as much as possible
     //
     Q_INVOKABLE void show_toast(QString message,bool long_toast=false);
-    L_RO_PROP(QString,version_string,set_version_string,"2.5.2-alpha");
+    L_RO_PROP(QString,version_string,set_version_string,"2.5.2-evo-alpha");
 public:
     L_RO_PROP(QString,toast_text,set_toast_text,"NONE");
     L_RO_PROP(bool,toast_visible,set_toast_visible,false);

diff --git a/qml/qml.qrc b/qml/qml.qrc
@@ -209,7 +209,6 @@
         <file>ui/configpopup/qopenhd_settings/AppDevSettingsView.qml</file>
         <file>ui/configpopup/openhd_settings/MavlinkParamPanel.qml</file>
         <file>ui/configpopup/openhd_settings/MavlinkParamEditor.qml</file>
-        <file>ui/configpopup/openhd_settings/MavlinkOpenHDWBParamPanel.qml</file>
         <file>ui/configpopup/openhd_settings/MavlinkAllSettingsPanel.qml</file>
         <file>ui/configpopup/openhd_settings/DialoqueFreqChangeGndOnly.qml</file>
         <file>ui/configpopup/ConfigPopupSidebarButton.qml</file>
@@ -228,7 +227,6 @@
         <file>ui/elements/RestartQOpenHDMessageBox.qml</file>
         <file>ui/widgets/map/MapWidgetForm.ui.qml</file>
         <file>ui/widgets/map/MapWidget.qml</file>
-        <file>ui/configpopup/status/StatusCardsColumn.qml</file>
         <file>ui/configpopup/status/PingUtilColumn.qml</file>
         <file>ui/elements/ButtonRed.qml</file>
         <file>ui/elements/ButtonOrange.qml</file>
@@ -251,14 +249,14 @@
         <file>ui/configpopup/status/DialoqueNotAlive.qml</file>
         <file>ui/configpopup/openhd_settings/PopupAnalyzeChannels.qml</file>
         <file>ui/configpopup/log/LogMessagesView.qml</file>
-        <file>ui/configpopup/openhd_settings/MavlinkOpenHDWBParamPanel2.qml</file>
+        <file>ui/configpopup/openhd_settings/MavlinkOpenHDWBParamPanel.qml</file>
         <file>ui/configpopup/openhd_settings/PopupScanChannels.qml</file>
         <file>ui/configpopup/openhd_settings/PopupTxPowerEditor.qml</file>
         <file>ui/elements/TextOrWarningButton.qml</file>
         <file>ui/configpopup/status/StatusCardRow.qml</file>
         <file>ui/configpopup/connect/PaneConnectionMode.qml</file>
         <file>ui/configpopup/openhd_settings/PopupEnableSTBCLDPC.qml</file>
         <file>ui/widgets/PerformanceHorizonWidget2.qml</file>
-        <file>ui/configpopup/status/StatusCardsColumn2.qml</file>
+        <file>ui/configpopup/status/StatusCardsColumn.qml</file>
     </qresource>
 </RCC>
diff --git a/qml/ui/configpopup/connect/PaneConnectionMode.qml b/qml/ui/configpopup/connect/PaneConnectionMode.qml
@@ -41,6 +41,8 @@ Rectangle{
         ColumnLayout{
             id: main_layout
             width: main_item.width
+            anchors.left: parent.left
+            anchors.leftMargin: 4
             //Layout.fillWidth: true
             Layout.fillHeight: true
             Text{

diff --git a/qml/ui/configpopup/openhd_settings/MavlinkAllSettingsPanel.qml b/qml/ui/configpopup/openhd_settings/MavlinkAllSettingsPanel.qml
@@ -29,7 +29,7 @@ Rectangle {
 
     function user_quidance_animate_channel_scan(){
         selectItemInStackLayoutBar.currentIndex=0;
-        xX_WBLinkSettings.user_quidance_animate_channel_scan();
+        mavlink_openhd_wb_param_panel.user_quidance_animate_channel_scan();
     }
 
     // Tab bar for selecting items in stack layout
@@ -56,45 +56,40 @@ Rectangle {
 
     // placed right below the top bar
     StackLayout {
-          width: parent.width
-          height: parent.height-selectItemInStackLayoutBar.height
-          anchors.top: selectItemInStackLayoutBar.bottom
-          anchors.left: selectItemInStackLayoutBar.left
-          anchors.bottom: parent.bottom
-          currentIndex: selectItemInStackLayoutBar.currentIndex
+        width: parent.width
+        height: parent.height-selectItemInStackLayoutBar.height
+        anchors.top: selectItemInStackLayoutBar.bottom
+        anchors.left: selectItemInStackLayoutBar.left
+        anchors.bottom: parent.bottom
+        currentIndex: selectItemInStackLayoutBar.currentIndex
 
-          MavlinkOpenHDWBParamPanel2{
-          //WBFrequencyPanel{
-              id: xX_WBLinkSettings
-          }
-        //   MavlinkSetupPiCameraPanel{
-        //       id: x1_WBPiCameraSettings
-        //   }
-          MavlinkParamPanel{
-              id: x1_AirCameraSettingsPanel
-              m_name: "CAMERA1"
-              m_instanceMavlinkSettingsModel: _airCameraSettingsModel
-              m_instanceCheckIsAvlie: _ohdSystemAir
-          }
-          // exp
-          MavlinkParamPanel{
-              id: x1_AirCameraSettingsPanel2
-              m_name: "CAMERA2"
-              m_instanceMavlinkSettingsModel: _airCameraSettingsModel2
-              m_instanceCheckIsAvlie: _ohdSystemAir
-          }
-          MavlinkParamPanel{
-              id: x2_AirSettingsPanel
-              m_name: "AIR"
-              m_instanceMavlinkSettingsModel: _ohdSystemAirSettingsModel
-              m_instanceCheckIsAvlie: _ohdSystemAir
-          }
-          MavlinkParamPanel{
-              id: x3_GroundSettingsPanel
-              m_name: "GROUND"
-              m_instanceMavlinkSettingsModel: _ohdSystemGroundSettings
-              m_instanceCheckIsAvlie: _ohdSystemGround
-          }
-      }
+        MavlinkOpenHDWBParamPanel{
+            id: mavlink_openhd_wb_param_panel
+        }
+        MavlinkParamPanel{
+            id: x1_AirCameraSettingsPanel
+            m_name: "CAMERA1"
+            m_instanceMavlinkSettingsModel: _airCameraSettingsModel
+            m_instanceCheckIsAvlie: _ohdSystemAir
+        }
+        MavlinkParamPanel{
+            id: x1_AirCameraSettingsPanel2
+            m_name: "CAMERA2"
+            m_instanceMavlinkSettingsModel: _airCameraSettingsModel2
+            m_instanceCheckIsAvlie: _ohdSystemAir
+        }
+        MavlinkParamPanel{
+            id: x2_AirSettingsPanel
+            m_name: "AIR"
+            m_instanceMavlinkSettingsModel: _ohdSystemAirSettingsModel
+            m_instanceCheckIsAvlie: _ohdSystemAir
+        }
+        MavlinkParamPanel{
+            id: x3_GroundSettingsPanel
+            m_name: "GROUND"
+            m_instanceMavlinkSettingsModel: _ohdSystemGroundSettings
+            m_instanceCheckIsAvlie: _ohdSystemGround
+        }
+    }
 
 }