pretty fonts

OpenHD · Oct 19, 2023 · 68fd8ec · 68fd8ec
1 parent 32eb5ff
commit 68fd8ec
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 32 deletions.
diff --git a/qml/ui/configpopup/openhd_settings/FreqComboBoxRow.qml b/qml/ui/configpopup/openhd_settings/FreqComboBoxRow.qml
@@ -24,9 +24,7 @@ Rectangle{
     property int m_selection_tpye: 0
 
     property bool m_is_2G: false
-    property bool m_2G_5G_show: false
     property bool m_show_radar: false
-    property bool m_show_good_channel: false
 
     property int m_openhd_race_band: -1
 
@@ -57,17 +55,19 @@ Rectangle{
         }
         Text{
             Layout.alignment: Qt.AlignLeft
-            text: m_is_2G ? "5.8G" : "2.4G"
+            text: "2.4G"
             //color: value > 3000 ? "green" : "#ff8c00" //"orange"
             color: "#706F1D" // dark green
-            visible: m_2G_5G_show && m_openhd_race_band<0
+            visible: m_is_2G
+            font.pixelSize: comboBoxFreq.font.pixelSize
         }
         Text { // Radar icon
             Layout.alignment: Qt.AlignLeft
             text: qsTr("\uf7c0");
             font.family: "Font Awesome 5 Free"
             color: "red"
             visible: m_show_radar
+            font.pixelSize: comboBoxFreq.font.pixelSize
         }
         Item{
             Layout.fillWidth: true
@@ -88,6 +88,7 @@ Rectangle{
             font.family: "Font Awesome 5 Free"
             color: "green"
             visible: m_openhd_race_band==2
+            font.pixelSize: comboBoxFreq.font.pixelSize
         }
 
         Text{ // recommended / openhd race band channel
@@ -99,6 +100,7 @@ Rectangle{
             visible: m_openhd_race_band>=0
             font.family: "Font Awesome 5 Free"
             color: "green"
+            font.pixelSize: comboBoxFreq.font.pixelSize
         }
     }
 }
diff --git a/qml/ui/configpopup/openhd_settings/MavlinkAllSettingsPanel.qml b/qml/ui/configpopup/openhd_settings/MavlinkAllSettingsPanel.qml
@@ -34,24 +34,24 @@ Rectangle {
 
     // Tab bar for selecting items in stack layout
     TabBar {
-          id: selectItemInStackLayoutBar
-          width: parent.width
-          TabButton {
-              text: qsTr("WB Link")
-          }
-          TabButton {
-              text: qsTr("Air Camera 1")
-          }
-          TabButton {
-              text: qsTr("Air Camera 2")
-              enabled: settings.dev_qopenhd_n_cameras>1
-          }
-          TabButton {
-              text: qsTr("Air")
-          }
-          TabButton {
-              text: qsTr("Ground")
-          }
+        id: selectItemInStackLayoutBar
+        width: parent.width
+        TabButton {
+            text: qsTr("LINK/QUICK")
+        }
+        TabButton {
+            text: qsTr("AIR CAM 1")
+        }
+        TabButton {
+            text: qsTr("AIR CAM 2")
+            enabled: settings.dev_qopenhd_n_cameras>1
+        }
+        TabButton {
+            text: qsTr("AIR")
+        }
+        TabButton {
+            text: qsTr("GROUND")
+        }
     }
 
     // placed right below the top bar

diff --git a/qml/ui/configpopup/openhd_settings/MavlinkOpenHDWBParamPanel2.qml b/qml/ui/configpopup/openhd_settings/MavlinkOpenHDWBParamPanel2.qml
@@ -220,10 +220,8 @@ Rectangle{
                             contentItem: FreqComboBoxRow{
                                 m_main_text: title
                                 m_selection_tpye: (value===_wbLinkSettingsHelper.curr_channel_mhz) ? 1 : 0
-                                m_is_2G: value > 3000
-                                m_2G_5G_show: value > 100
+                                m_is_2G: value < 3000 && value > 100
                                 m_show_radar: radar
-                                m_show_good_channel: recommended
                                 m_openhd_race_band: openhd_raceband_nr
                             }
                             highlighted: comboBoxFreq.highlightedIndex === index

diff --git a/qml/ui/configpopup/status/StatusCardRow.qml b/qml/ui/configpopup/status/StatusCardRow.qml
@@ -19,13 +19,13 @@ import "../../elements"
 // The general idea behind this element is to be green / pretty when everything is okay
 // and red if something is wrong (in which case the user should click on it for more info)
 Item {
-    /*Layout.fillWidth: true
-    Layout.minimumWidth: 50
-    Layout.minimumHeight: 30
+    //Layout.fillWidth: true
+    //Layout.minimumWidth: 50
+    //Layout.minimumHeight: 30
     //
-    Layout.preferredWidth: 250
-    Layout.preferredHeight: 30*/
-    Layout.minimumWidth: 250
+    //Layout.preferredWidth: 250
+    //Layout.preferredHeight: 30
+    //Layout.minimumWidth: 250
     width: parent.width
     height: 50
 
@@ -63,7 +63,7 @@ Item {
     }*/
     // Actual item,centered
     Item{
-        width: 250
+        width: 260
         height: main_item.height
         anchors.centerIn: parent