Revert "Merge Lunkes UI improvements nr.1 (#644)"

This reverts commit 8ff20c3.
OpenHD · Dec 18, 2023 · c911fe3 · c911fe3
1 parent 6a3b373
commit c911fe3
Show file tree

Hide file tree

Showing 74 changed files with 274 additions and 893 deletions.
diff --git a/qml/qml.qrc b/qml/qml.qrc
@@ -1,33 +1,33 @@
 <RCC>
-    <qresource lang="en" prefix="/translations">
+    <qresource prefix="/translations" lang="en">
         <file alias="QOpenHD.qm">../translations/QOpenHD_en.qm</file>
         <file>resources/cursors/arrow_512_green.png</file>
         <file>resources/cursors/arrow_512_transparent.png</file>
         <file>resources/cursors/arrow_512_white.png</file>
         <file>resources/cursors/hand_white.png</file>
     </qresource>
-    <qresource lang="de" prefix="/translations">
+    <qresource prefix="/translations" lang="de">
         <file alias="QOpenHD.qm">../translations/QOpenHD_de.qm</file>
     </qresource>
-    <qresource lang="ru" prefix="/translations">
+    <qresource prefix="/translations" lang="ru">
         <file alias="QOpenHD.qm">../translations/QOpenHD_ru.qm</file>
     </qresource>
-    <qresource lang="es" prefix="/translations">
+    <qresource prefix="/translations" lang="es">
         <file alias="QOpenHD.qm">../translations/QOpenHD_es.qm</file>
     </qresource>
-    <qresource lang="fr" prefix="/translations">
+    <qresource prefix="/translations" lang="fr">
         <file alias="QOpenHD.qm">../translations/QOpenHD_fr.qm</file>
     </qresource>
-    <qresource lang="nl" prefix="/translations">
+    <qresource prefix="/translations" lang="nl">
         <file alias="QOpenHD.qm">../translations/QOpenHD_nl.qm</file>
     </qresource>
-    <qresource lang="ro" prefix="/translations">
+    <qresource prefix="/translations" lang="ro">
         <file alias="QOpenHD.qm">../translations/QOpenHD_ro.qm</file>
     </qresource>
-    <qresource lang="it" prefix="/translations">
+    <qresource prefix="/translations" lang="it">
         <file alias="QOpenHD.qm">../translations/QOpenHD_it.qm</file>
     </qresource>
-    <qresource lang="zh" prefix="/translations">
+    <qresource prefix="/translations" lang="zh">
         <file alias="QOpenHD.qm">../translations/QOpenHD_zh.qm</file>
     </qresource>
     <qresource prefix="/">
@@ -187,10 +187,6 @@
         <file>ui/elements/SettingBaseElement.qml</file>
         <file>ui/widgets/WBLinkRateControlWidget.qml</file>
         <file>ui/widgets/BaseWidgetDefaultUiControlElements.qml</file>
-        <file>ui/elements/NewSlider.qml</file>
-        <file>ui/elements/NewComboBox.qml</file>
-        <file>ui/elements/NewSwitch.qml</file>
-        <file>ui/elements/NewSpinBox.qml</file>
         <file>resources/cursors/arrow_512_transparent.png</file>
         <file>resources/cursors/arrow_512_green.png</file>
         <file>resources/cursors/arrow_512_white.png</file>

diff --git a/qml/ui/configpopup/connect/PaneConnectionMode.qml b/qml/ui/configpopup/connect/PaneConnectionMode.qml
@@ -64,7 +64,7 @@ Rectangle{
                 horizontalAlignment: Qt.AlignHCenter
                 font.pixelSize: settings.qopenhd_general_font_pixel_size
             }
-            NewComboBox {
+            ComboBox {
                 Layout.fillWidth: false
                 Layout.fillHeight: true;
                 Layout.preferredWidth: 200

diff --git a/qml/ui/configpopup/openhd_settings/LinkQuickPanel.qml b/qml/ui/configpopup/openhd_settings/LinkQuickPanel.qml
@@ -150,7 +150,7 @@ Rectangle{
                     Row{
                         anchors.horizontalCenter: parent.horizontalCenter
                         spacing: 8
-                        NewComboBox {
+                        ComboBox {
                             width: elementComboBoxWidth
                             id: comboBoxFreq
                             model: frequencies_model

diff --git a/qml/ui/configpopup/openhd_settings/MavlinkParamEditor.qml b/qml/ui/configpopup/openhd_settings/MavlinkParamEditor.qml
@@ -324,10 +324,10 @@ Rectangle{
         // Value edit part begin
 
         // Type int only begin --------------------------
-        // For int values that do not have an enum mapping, we use a NewSpinBox such that the user can either
+        // For int values that do not have an enum mapping, we use a SpinBox such that the user can either
         // use the +/- to edit the value (for touch screen users) but also allows the user to
         // type in an int value directly with the keyboard.
-        NewSpinBox {
+        SpinBox {
             id: spinBoxInputParamtypeInt
             height: customHeight
             font.pixelSize: 14
@@ -352,7 +352,7 @@ Rectangle{
             id: intEnumDynamicListModel
             ListElement {title: "I SHOULD NEVER APPEAR"; value: 0}
         }
-        NewComboBox {
+        ComboBox {
             id: intEnumDynamicComboBox
             height: customHeight
             font.pixelSize: 14
@@ -373,7 +373,7 @@ Rectangle{
             ListElement {title: "I SHOULD NEVER APPEAR"; value:"ERROR"}
         }
 
-        NewComboBox {
+        ComboBox {
             id: stringEnumDynamicComboBox
             height: customHeight
             font.pixelSize: 14

diff --git a/qml/ui/configpopup/openhd_settings/MavlinkParamPanel.qml b/qml/ui/configpopup/openhd_settings/MavlinkParamPanel.qml
@@ -73,7 +73,7 @@ Rectangle {
                 _messageBoxInstance.set_text_and_show(text)
             }
         }
-        NewSwitch{
+        Switch{
             checked: settings.screen_settings_openhd_parameters_transparent
             onCheckedChanged: settings.screen_settings_openhd_parameters_transparent = checked
         }

diff --git a/qml/ui/configpopup/openhd_settings/PopupAnalyzeChannels.qml b/qml/ui/configpopup/openhd_settings/PopupAnalyzeChannels.qml
@@ -114,7 +114,7 @@ Rectangle{
                 }
                 enabled: _ohdSystemGround.is_alive && _ohdSystemGround.wb_gnd_operating_mode==0
             }
-            NewComboBox {
+            ComboBox {
                 Layout.preferredWidth: 150
                 Layout.minimumWidth: 50
                 id: comboBoxWhichFrequencyToAnalyze
@@ -124,7 +124,7 @@ Rectangle{
                     pollution_chart.update_pollution_graph();
                 }
             }
-            NewSwitch{
+            Switch{
                 id:normalize_sw
                 checked: m_normalize_data
                 onCheckedChanged: {

diff --git a/qml/ui/configpopup/openhd_settings/PopupEnableSTBCLDPC.qml b/qml/ui/configpopup/openhd_settings/PopupEnableSTBCLDPC.qml
@@ -78,7 +78,7 @@ Rectangle{
             }
         }
 
-        NewComboBox {
+        ComboBox {
             id: comboBoxNAntennasAir
             Layout.minimumWidth: 100
             Layout.preferredWidth: 450
@@ -91,7 +91,7 @@ Rectangle{
                 }
             }
         }
-        NewComboBox {
+        ComboBox {
             id: comboBoxNAntennasGnd
             Layout.minimumWidth: 100
             Layout.preferredWidth: 450

diff --git a/qml/ui/configpopup/openhd_settings/PopupScanChannels.qml b/qml/ui/configpopup/openhd_settings/PopupScanChannels.qml
@@ -95,7 +95,7 @@ Rectangle{
                 }
             }
 
-            NewComboBox {
+            ComboBox {
                 Layout.preferredWidth: 400
                 Layout.minimumWidth: 100
                 id: comboBoxWhichFrequencyToScan

diff --git a/qml/ui/configpopup/qopenhd_settings/AppDevSettingsView.qml b/qml/ui/configpopup/qopenhd_settings/AppDevSettingsView.qml
@@ -32,7 +32,7 @@ ScrollView {
             SettingBaseElement{
                 m_short_description: "DEV_SHOW_WHITELISTED_PARAMS"
                 m_long_description: "Enabling this gives you full controll over the mavlink parameters set openhd exposes (both air and ground) BUT BE WARNED yu can easily break things!"
-                NewSwitch {
+                Switch {
                     width: 32
                     height: elementHeight
                     anchors.rightMargin: Qt.inputMethod.visible ? 96 : 36
@@ -46,7 +46,7 @@ ScrollView {
             SettingBaseElement{
                 m_short_description:"DEV_SHOW_ADVANCED_BUTTON"
                 m_long_description: "Allows more customization of the mavlink parameters set than what openhd exposes, BE WARNED you can easily break things this way !"
-                NewSwitch {
+                Switch {
                     width: 32
                     height: elementHeight
                     anchors.rightMargin: Qt.inputMethod.visible ? 96 : 36
@@ -60,7 +60,7 @@ ScrollView {
             SettingBaseElement{
                 m_short_description:"dev_allow_freq_change_when_armed"
                 m_long_description: "Allows changing the frequency and channel width while armed, THIS CAN BREAK YOUR LINK DURING FLIGHT !"
-                NewSwitch {
+                Switch {
                     width: 32
                     height: elementHeight
                     anchors.rightMargin: Qt.inputMethod.visible ? 96 : 36
@@ -142,7 +142,7 @@ ScrollView {
                 m_short_description: "Enable audio playback"
                 m_long_description: "Enable live audio playback in QOpenHD, NOTE: audio streaming is not supported in OpenHD yet. Requires restart of QOpenHD."
 
-                NewSwitch {
+                Switch {
                     width: 32
                     height: elementHeight
                     anchors.rightMargin: Qt.inputMethod.visible ? 96 : 36
@@ -157,7 +157,7 @@ ScrollView {
                 m_short_description: "dirty_enable_inav_hacks"
                 m_long_description: "NEVER ENABLE UNLESS YOU HAVE TO. INAV mavlink support is quirky in some ways to say the least."
 
-                NewSwitch {
+                Switch {
                     width: 32
                     height: elementHeight
                     anchors.rightMargin: Qt.inputMethod.visible ? 96 : 36
@@ -172,7 +172,7 @@ ScrollView {
                 m_short_description: "dirty_enable_mavlink_fc_sys_id_check"
                  m_long_description: "Only accept FCs that explicitly expose themselves as autopilot - can fix issues with FC discovery in QOpenHD."
 
-                NewSwitch {
+                Switch {
                     width: 32
                     height: elementHeight
                     anchors.rightMargin: Qt.inputMethod.visible ? 96 : 36
@@ -187,7 +187,7 @@ ScrollView {
             SettingBaseElement{
                 m_short_description: "dev_mavlink_via_tcp"
                 m_long_description: "Requires full restart. Connect via TCP instead of UDP. Requires matching server IP."
-                NewSwitch {
+                Switch {
                     width: 32
                     height: elementHeight
                     anchors.rightMargin: Qt.inputMethod.visible ? 96 : 36
@@ -216,7 +216,7 @@ ScrollView {
             SettingBaseElement{
                 m_short_description: "dev_wb_show_no_stbc_enabled_warning"
                 m_long_description: "Do not show the STBC recommended enabled message"
-                NewSwitch {
+                Switch {
                     width: 32
                     height: elementHeight
                     anchors.rightMargin: Qt.inputMethod.visible ? 96 : 36

diff --git a/qml/ui/configpopup/qopenhd_settings/AppGeneralSettingsView.qml b/qml/ui/configpopup/qopenhd_settings/AppGeneralSettingsView.qml
@@ -32,7 +32,7 @@ ScrollView {
                 m_short_description: "Enable speech"
                 m_long_description: "Enable text to speech - events like flight mode change are given as audio messages"
 
-                NewSwitch {
+                Switch {
                     width: 32
                     height: elementHeight
                     anchors.rightMargin: Qt.inputMethod.visible ? 96 : 36
@@ -60,7 +60,7 @@ ScrollView {
                     anchors.left: parent.left
                 }
 
-                NewSwitch {
+                Switch {
                     width: 32
                     height: elementHeight
                     anchors.rightMargin: Qt.inputMethod.visible ? 96 : 36
@@ -101,7 +101,7 @@ ScrollView {
 
                 }
 
-                NewSlider {
+                Slider {
                     id: smoothing_Slider
                     height: elementHeight
                     width: 210
@@ -141,7 +141,7 @@ ScrollView {
                     anchors.left: parent.left
                 }
 
-                NewSpinBox {
+                SpinBox {
                     id: gndBatteryCellspinBox
                     height: elementHeight
                     width: 210
@@ -204,7 +204,7 @@ ScrollView {
                     anchors.left: parent.left
                 }
 
-                NewSpinBox {
+                SpinBox {
                     id: dev_qopenhd_n_cameras_spinbox
                     height: elementHeight
                     width: 210
@@ -230,7 +230,7 @@ ScrollView {
                 m_short_description: "Mavlink sys id"
                 m_long_description: "Mavlink sys id of QOpenHD (this Ground control station application). Leave default (255) ! . Change requires restart."
 
-                NewSpinBox {
+                SpinBox {
                     id: mavlinkSysIDSpinBox
                     height: elementHeight
                     width: 210
@@ -256,7 +256,7 @@ ScrollView {
                 m_short_description: "Hide identity offset lattitude"
                 m_long_description: "Set this to a random value only you know to hide lat identity"
 
-                /*NewSpinBox {
+                /*SpinBox {
                     height: elementHeight
                     width: 210
                     font.pixelSize: 14

diff --git a/qml/ui/configpopup/qopenhd_settings/AppScreenSettingsView.qml b/qml/ui/configpopup/qopenhd_settings/AppScreenSettingsView.qml
@@ -43,7 +43,7 @@ ScrollView {
 
                 }
 
-                NewSlider {
+                Slider {
                     id: screenScaleSpinBox
                     height: elementHeight
                     width: 210
@@ -70,7 +70,7 @@ ScrollView {
                 m_short_description: "Cursor AutoHide"
                 m_long_description: "Automatically hide cursor on inactivity"
 
-                NewSwitch {
+                Switch {
                     width: 32
                     height: elementHeight
                     anchors.rightMargin: Qt.inputMethod.visible ? 96 : 36
@@ -89,7 +89,7 @@ ScrollView {
             SettingBaseElement{
                 m_short_description: "Custom cursor"
                 m_long_description: "Customize cursor for high visibility in the field"
-                NewSpinBox {
+                SpinBox {
                     width: 210
                     font.pixelSize: 14
                     height: elementHeight
@@ -111,7 +111,7 @@ ScrollView {
                 m_short_description: "Custom cursor scale"
                 m_long_description: "Scale of your custom cursor. NOTE: Only works if custom cursor is not 0 !"
 
-                NewSpinBox {
+                SpinBox {
                     width: 210
                     font.pixelSize: 14
                     height: elementHeight
@@ -137,7 +137,7 @@ ScrollView {
                     m_short_description: "Screen rotation"
                     m_long_description: "Rotate QOpenHD, can be usefull if your screen is installed the wrong way around. Might or might not work."
                     // anything other than 0 and 180 can breaks things
-                    NewComboBox {
+                    ComboBox {
                         height: elementHeight
                         anchors.right: parent.right
                         anchors.rightMargin: Qt.inputMethod.visible ? 78 : 18
@@ -169,7 +169,7 @@ ScrollView {
                     m_short_description: "Background transparent"
                     m_long_description: "Use a transparent surface, such that another application can play (hw composer accelerated) video behind the QOpenHD surface."
 
-                    NewSwitch {
+                    Switch {
                         width: 32
                         height: elementHeight
                         anchors.rightMargin: Qt.inputMethod.visible ? 96 : 36
@@ -184,7 +184,7 @@ ScrollView {
                     m_short_description: "Force full screen"
                     m_long_description: "Force Full screen if QOpenHD is not already full screen"
 
-                    NewSwitch {
+                    Switch {
                         width: 32
                         height: elementHeight
                         anchors.rightMargin: Qt.inputMethod.visible ? 96 : 36
@@ -199,7 +199,7 @@ ScrollView {
                     m_short_description: "Swap interval 0"
                     m_long_description: "Can decrease latency on x86 / laptop. Requires restart. Experimental."
 
-                    NewSwitch {
+                    Switch {
                         width: 32
                         height: elementHeight
                         anchors.rightMargin: Qt.inputMethod.visible ? 96 : 36
@@ -215,7 +215,7 @@ ScrollView {
                     m_short_description: "Settings window size"
                     m_long_description: "Change the size of the settings window, such that you can view the live video while changing settings"
 
-                    NewSpinBox {
+                    SpinBox {
                         width: 210
                         font.pixelSize: 14
                         height: elementHeight
@@ -236,7 +236,7 @@ ScrollView {
                     m_short_description: "Settings window transparency"
                     m_long_description: "make the openhd parameters window semi-transparent"
 
-                    NewSwitch {
+                    Switch {
                         width: 32
                         height: elementHeight
                         anchors.rightMargin: Qt.inputMethod.visible ? 96 : 36
@@ -250,7 +250,7 @@ ScrollView {
                 SettingBaseElement{
                     m_short_description: "Font DPI"
                     m_long_description: "Scale the text / line size of the artifical horizon / ladders, requires restart of QOpenHD."
-                    NewComboBox {
+                    ComboBox {
                         height: elementHeight
                         anchors.right: parent.right
                         anchors.rightMargin: Qt.inputMethod.visible ? 78 : 18