rename a bit, font select - update on change

OpenHD · Nov 18, 2023 · 7ef5d54 · 7ef5d54
1 parent c633fd5
commit 7ef5d54
Show file tree

Hide file tree

Showing 8 changed files with 97 additions and 459 deletions.
diff --git a/qml/qml.qrc b/qml/qml.qrc
@@ -127,7 +127,6 @@
         <file>osdfonts/Visitor.ttf</file>
         <file>osdfonts/ZolanMonoOblique.ttf</file>
         <file>ui/elements/FontSelect.qml</file>
-        <file>ui/elements/FontSelectForm.ui.qml</file>
         <file>ui/elements/OSDCustomizer.qml</file>
         <file>ui/elements/colorwheel/CheckerBoard.qml</file>
         <file>ui/elements/colorwheel/ColorWheel.qml</file>
@@ -208,7 +207,7 @@
         <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/MavlinkAllSettingsPanel.qml</file>
+        <file>ui/configpopup/openhd_settings/OHDSettingsPanel.qml</file>
         <file>ui/configpopup/openhd_settings/DialoqueFreqChangeGndOnly.qml</file>
         <file>ui/configpopup/ConfigPopupSidebarButton.qml</file>
         <file>ui/configpopup/rc/RcInfoScreen.qml</file>
@@ -248,7 +247,7 @@
         <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/MavlinkOpenHDWBParamPanel.qml</file>
+        <file>ui/configpopup/openhd_settings/LinkQuickPanel.qml</file>
         <file>ui/configpopup/openhd_settings/PopupScanChannels.qml</file>
         <file>ui/configpopup/openhd_settings/PopupTxPowerEditor.qml</file>
         <file>ui/elements/TextOrWarningButton.qml</file>
@@ -261,7 +260,6 @@
         <file>video/SecondaryVideoGstreamerPane.qml</file>
         <file>ui/elements/SettingsHeaderElement.qml</file>
         <file>ui/configpopup/qopenhd_settings/AppWidgetStyleSettingsView.qml</file>
-        <file>ui/configpopup/openhd_settings/OpenHDQuickPanel.qml</file>
         <file>ui/elements/BaseHeaderItem.qml</file>
         <file>ui/elements/ButtonIconInfo2.qml</file>
         <file>ui/elements/CardBasic.qml</file>

diff --git a/qml/ui/configpopup/ConfigPopup.qml b/qml/ui/configpopup/ConfigPopup.qml
@@ -54,7 +54,7 @@ Rectangle {
     function user_guidance_open_openhd_settings_find_air_unit_location(){
         openSettings();
         mainStackLayout.currentIndex=1;
-        mavlinkAllSettingsPanel.user_quidance_animate_channel_scan();
+        ohdSettingsPanel.user_quidance_animate_channel_scan();
     }
 
     /*Keys.onPressed: (event)=> {
@@ -170,7 +170,7 @@ Rectangle {
                     m_selection_index: 0
                 }
 
-                // OpenHD Settings - MavlinkAllSettingsPanel
+                // OpenHD OHD Settings
                 ConfigPopupSidebarButton{
                     id:  openhd_button
                     m_icon_text: "\uf085"
@@ -253,8 +253,8 @@ Rectangle {
         }
 
          //this is "openhd" menu
-        MavlinkAllSettingsPanel {
-            id:  mavlinkAllSettingsPanel
+        OHDSettingsPanel {
+            id:  ohdSettingsPanel
         }
 
         AppSettingsPanel {

diff --git a/...hd_settings/MavlinkOpenHDWBParamPanel.qml → ...gpopup/openhd_settings/LinkQuickPanel.qml b/...hd_settings/MavlinkOpenHDWBParamPanel.qml → ...gpopup/openhd_settings/LinkQuickPanel.qml
@@ -206,17 +206,6 @@ Rectangle{
                     }
                     enabled: _ohdSystemGround.is_alive && _ohdSystemGround.wb_gnd_operating_mode==0;
                 }
-                /*Switch{
-                    Layout.alignment: Qt.AlignCenter
-                    text: "SIMPLIFY"
-                    checked: true
-                    onCheckedChanged: {
-                        if(m_simplify_enable!=checked){
-                            m_simplify_enable=checked;
-                            function_rebuild_ui();
-                        }
-                    }
-                }*/
                 TabBar{
                     id: filter_tab_bar
                     Layout.preferredWidth: 200
@@ -249,8 +238,8 @@ Rectangle{
                     Layout.alignment: Qt.AlignRight
                     onClicked: {
                         var text="Please select a channel / frequency free of noise and interference. The current loss / pollution / throttle stats below can help,"+
-                                "as well as the analyze channels feature or a frequency analyzer on your phone. SIMPLIFY: Show OpenHD standard channels [1-5] only - they "+
-                                " often are free of wifi pollution and should be used. Only disable SIMPLIFY if you know exactly why."
+                                "as well as the analyze channels feature or a frequency analyzer on your phone. DEF: Show OpenHD standard channels [1-5] only - they "+
+                                " often are free of wifi pollution and should be used."
                         _messageBoxInstance.set_text_and_show(text)
                     }
                 }

diff --git a/...enhd_settings/MavlinkAllSettingsPanel.qml → ...opup/openhd_settings/OHDSettingsPanel.qml b/...enhd_settings/MavlinkAllSettingsPanel.qml → ...opup/openhd_settings/OHDSettingsPanel.qml
@@ -63,8 +63,7 @@ Rectangle {
         anchors.bottom: parent.bottom
         currentIndex: selectItemInStackLayoutBar.currentIndex
 
-        MavlinkOpenHDWBParamPanel{
-        //OpenHDQuickPanel{
+        LinkQuickPanel{
             id: mavlink_openhd_wb_param_panel
         }
         MavlinkParamPanel{