Merge pull request #622 from OpenHD/consti-dev

Improve log, link charts, remove unneccessary include
OpenHD · Nov 24, 2023 · ea129ed · ea129ed
2 parents 4cca522 + 8439ce7
commit ea129ed
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 14 deletions.
diff --git a/QOpenHD.pro b/QOpenHD.pro
@@ -71,6 +71,7 @@ LinuxBuild {
 QT +=core quick qml gui \
     widgets
 QT += opengl
+QT += charts
 
 INCLUDEPATH += $$PWD/lib
 INCLUDEPATH += $$PWD/app

diff --git a/app/main.cpp b/app/main.cpp
@@ -390,7 +390,7 @@ int main(int argc, char *argv[]) {
     QtAndroid::hideSplashScreen();
 #endif
 
-    qDebug() << "Running QML";
+    qDebug() << "QML loaded";
     // Now we start mavlink for the first time
     MavlinkTelemetry::instance().start();
 

diff --git a/install_build_dep.sh b/install_build_dep.sh
@@ -42,7 +42,7 @@ PLATFORM_PACKAGES="qml-module-qt-labs-platform"
  if [[ "${QTTYPE}" == "custom" ]]; then
     apt install -y openhd-qt 
  else
-    apt -y install qml-module-qtquick-controls2 libqt5texttospeech5-dev libqt5concurrent5 libqt5core5a libqt5dbus5 libqt5designer5 libqt5gui5 libqt5help5 libqt5location5 libqt5location5-plugins libqt5multimedia5 libqt5multimedia5-plugins libqt5multimediagsttools5 libqt5multimediawidgets5 libqt5network5 libqt5opengl5 libqt5opengl5-dev libqt5positioning5 libqt5positioning5-plugins libqt5positioningquick5 libqt5printsupport5 libqt5qml5 libqt5quick5 libqt5quickparticles5 libqt5quickshapes5 libqt5quicktest5 libqt5quickwidgets5 libqt5sensors5 libqt5sql5 libqt5sql5-sqlite libqt5svg5 libqt5test5 libqt5webchannel5 libqt5webkit5 libqt5widgets5 libqt5x11extras5 libqt5xml5 openshot-qt python3-pyqt5 python3-pyqt5.qtopengl python3-pyqt5.qtsvg python3-pyqt5.qtwebkit python3-pyqtgraph qml-module-qt-labs-settings qml-module-qtgraphicaleffects qml-module-qtlocation qml-module-qtpositioning qml-module-qtquick-controls qml-module-qtquick-dialogs qml-module-qtquick-extras qml-module-qtquick-layouts qml-module-qtquick-privatewidgets qml-module-qtquick-shapes qml-module-qtquick-window2 qml-module-qtquick2 qt5-gtk-platformtheme qt5-qmake qt5-qmake-bin qt5-qmltooling-plugins qtbase5-dev qtbase5-dev-tools qtchooser qtdeclarative5-dev qtdeclarative5-dev-tools qtpositioning5-dev qttranslations5-l10n
+    apt -y install qml-module-qtquick-controls2 libqt5texttospeech5-dev libqt5concurrent5 libqt5core5a libqt5dbus5 libqt5designer5 libqt5gui5 libqt5help5 libqt5location5 libqt5location5-plugins libqt5multimedia5 libqt5multimedia5-plugins libqt5multimediagsttools5 libqt5multimediawidgets5 libqt5network5 libqt5opengl5 libqt5opengl5-dev libqt5positioning5 libqt5positioning5-plugins libqt5positioningquick5 libqt5printsupport5 libqt5qml5 libqt5quick5 libqt5quickparticles5 libqt5quickshapes5 libqt5quicktest5 libqt5quickwidgets5 libqt5sensors5 libqt5sql5 libqt5sql5-sqlite libqt5svg5 libqt5test5 libqt5webchannel5 libqt5webkit5 libqt5widgets5 libqt5x11extras5 libqt5xml5 openshot-qt python3-pyqt5 python3-pyqt5.qtopengl python3-pyqt5.qtsvg python3-pyqt5.qtwebkit python3-pyqtgraph qml-module-qt-labs-settings qml-module-qtgraphicaleffects qml-module-qtlocation qml-module-qtpositioning qml-module-qtquick-controls qml-module-qtquick-dialogs qml-module-qtquick-extras qml-module-qtquick-layouts qml-module-qtquick-privatewidgets qml-module-qtquick-shapes qml-module-qtquick-window2 qml-module-qtquick2 qt5-gtk-platformtheme qt5-qmake qt5-qmake-bin qt5-qmltooling-plugins qtbase5-dev qtbase5-dev-tools qtchooser qtdeclarative5-dev qtdeclarative5-dev-tools qtpositioning5-dev qttranslations5-l10n libqt5charts5-dev
  fi
 
  # Install platform-specific packages

diff --git a/qml/ui/configpopup/openhd_settings/LinkQuickPanel.qml b/qml/ui/configpopup/openhd_settings/LinkQuickPanel.qml
@@ -14,8 +14,6 @@ import OpenHD 1.0
 import "../../../ui" as Ui
 import "../../elements"
 
-import QtCharts 2.0
-
 // This is an extra screen for changing the frequency / channel width -
 // They both need to match !
 Rectangle{

diff --git a/qml/ui/configpopup/openhd_settings/PopupAnalyzeChannels.qml b/qml/ui/configpopup/openhd_settings/PopupAnalyzeChannels.qml
@@ -14,7 +14,7 @@ import OpenHD 1.0
 import "../../../ui" as Ui
 import "../../elements"
 
-import QtCharts 2.0
+import QtCharts 2.15
 
 Rectangle{
     id: main_background
@@ -216,14 +216,6 @@ Rectangle{
                     }
                 }
             }
-            /*Button{
-                anchors.top: pollution_chart.top
-                anchors.left: pollution_chart.left
-                text: "ENLARGE"
-                onClicked: {
-                    m_chart_enlarged = !m_chart_enlarged;
-                }
-            }*/
         }
         // Filler
         //Item{

diff --git a/qml/ui/configpopup/qopenhd_settings/AppDevSettingsView.qml b/qml/ui/configpopup/qopenhd_settings/AppDevSettingsView.qml
@@ -5,7 +5,6 @@ import QtQuick.Dialogs 1.0
 import QtQuick.Controls.Material 2.12
 import Qt.labs.settings 1.0
 import Qt.labs.folderlistmodel 2.0
-import Qt.labs.platform 1.0
 
 import OpenHD 1.0
 

diff --git a/qml/ui/elements/RestartQOpenHDMessageBox.qml b/qml/ui/elements/RestartQOpenHDMessageBox.qml
@@ -28,6 +28,7 @@ Card {
             height:parent.height
             leftPadding: 12
             rightPadding: 12
+            font.pixelSize: 14
             wrapMode: Text.WordWrap
         }
     }

diff --git a/qml/ui/elements/WorkaroundMessageBox.qml b/qml/ui/elements/WorkaroundMessageBox.qml
@@ -35,6 +35,7 @@ Card {
             text: _messageBoxInstance.text
             leftPadding: 12
             rightPadding: 12
+            font.pixelSize: 14
             wrapMode: Text.WordWrap
         }
     }