wb link rate widget - use combobox instead of buttons

OpenHD · Nov 14, 2023 · 07fa49d · 07fa49d
1 parent 683bf9e
commit 07fa49d
Show file tree

Hide file tree

Showing 6 changed files with 146 additions and 226 deletions.
diff --git a/app/main.cpp b/app/main.cpp
@@ -192,7 +192,7 @@ int main(int argc, char *argv[]) {
     QCoreApplication::setOrganizationDomain("openhd");
     QCoreApplication::setApplicationName("QOpenHD");
     {// Original screen resoluton before setting anything
-        QApplication a(argc, argv);
+        //QApplication a(argc, argv);
         const auto screen=QGuiApplication::primaryScreen();
         if(screen){
             const auto actual_size=screen->size();

diff --git a/qml/qml.qrc b/qml/qml.qrc
@@ -266,5 +266,6 @@
         <file>ui/elements/ButtonIconInfo2.qml</file>
         <file>ui/elements/CardBasic.qml</file>
         <file>ui/elements/ButtonIconConnect.qml</file>
+        <file>ui/elements/SmallHeaderInfoRow.qml</file>
     </qresource>
 </RCC>
diff --git a/qml/ui/configpopup/qopenhd_settings/AppScreenSettingsView.qml b/qml/ui/configpopup/qopenhd_settings/AppScreenSettingsView.qml
@@ -51,18 +51,18 @@ ScrollView {
                     anchors.right: parent.right
                     anchors.verticalCenter: parent.verticalCenter
                     from : 0.3
-                    to : 2.0
+                    to : 2.5
                     // Important: Looks as without .1 steps, we can get rendering artfacts
                     stepSize: .1
 
                     anchors.rightMargin: Qt.inputMethod.visible ? 78 : 18
                     value: settings.global_scale
 
-                    // @disable-check M223
                     onValueChanged: {
-                        // @disable-check M222
+                        if(settings.global_scale != value){
+                            _restartqopenhdmessagebox.show();
+                        }
                         settings.global_scale = value
-                        //_messageBoxInstance.set_text_and_show("Please restart QOpenHD !")
                     }
                 }
             }

diff --git a/qml/ui/elements/SmallHeaderInfoRow.qml b/qml/ui/elements/SmallHeaderInfoRow.qml
@@ -0,0 +1,27 @@
+import QtQuick 2.12
+
+Item {
+    width: parent.width
+    height: 40
+
+    property string m_text: "FILL ME"
+    property string m_info_text: "FILL ME"
+
+    Text{
+        anchors.fill: parent
+        verticalAlignment: Qt.AlignVCenter
+        horizontalAlignment: Qt.AlignLeft
+        text: m_text
+        font.pixelSize: 18
+        font.bold: true
+        color: "white"
+    }
+    ButtonIconInfo{
+        anchors.right: parent.right
+        width: parent.height
+        height: parent.height
+        onClicked: {
+            _messageBoxInstance.set_text_and_show(m_info_text)
+        }
+    }
+}
diff --git a/qml/ui/widgets/VideoBitrateWidgetGeneric.qml b/qml/ui/widgets/VideoBitrateWidgetGeneric.qml
@@ -196,7 +196,7 @@ BaseWidget {
                 Layout.preferredWidth: 200
                 Layout.minimumWidth: 200
                 height: 50
-                currentIndex: 0
+                currentIndex: -1
                 displayText: {
                     if(!_ohdSystemAir.is_alive)return "Res@fps N/A";
                     return m_curr_video_format;