koggertech · Antony007 · Dec 6, 2024 · Dec 6, 2024
diff --git a/KoggerApp.pro b/KoggerApp.pro
@@ -2,6 +2,7 @@ QT += quick
 QT += widgets
 QT += network
 QT += qml
+QT += opengl openglwidgets
 
 #CONFIG += FLASHER
 #CONFIG += MOTOR # motor_control definition

diff --git a/LinkManager.cpp b/LinkManager.cpp
@@ -254,10 +254,10 @@ void LinkManager::importPinnedLinksFromXML()
         const QXmlStreamReader::TokenType token = xmlReader.readNext();
 
         if (token == QXmlStreamReader::StartElement) {
-            if (xmlReader.name() == "link") {
+            if (xmlReader.name().toString() == "link") {
                 Link* link = createNewLink();
 
-                while (!(xmlReader.tokenType() == QXmlStreamReader::EndElement && xmlReader.name() == "link")) {
+                while (!(xmlReader.tokenType() == QXmlStreamReader::EndElement && xmlReader.name().toString() == "link")) {
                     if (xmlReader.tokenType() == QXmlStreamReader::StartElement) {
                         if (xmlReader.name().toString() == "uuid") {
                             link->setUuid(QUuid(xmlReader.readElementText()));

diff --git a/QML/BottomTrackControlMenu.qml b/QML/BottomTrackControlMenu.qml
@@ -1,8 +1,8 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.3
 import QtQuick.Controls 2.12
-import QtQuick.Dialogs 1.2
-import Qt.labs.settings 1.1
+import QtQuick.Dialogs
+import Qt.labs.settings
 
 import KoggerCommon 1.0
 Item {

diff --git a/QML/CalcMethodTINSettings.qml b/QML/CalcMethodTINSettings.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 ColumnLayout {

diff --git a/QML/ChartBox.qml b/QML/ChartBox.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 

diff --git a/QML/CheckButton.qml b/QML/CheckButton.qml
@@ -1,7 +1,6 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
-import QtQuick.Controls.Styles 1.4
 
 Button {
     id: control

diff --git a/QML/ConnectionViewer.qml b/QML/ConnectionViewer.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 ColumnLayout {
@@ -508,7 +508,7 @@ ColumnLayout {
             FileDialog {
                 id: newFileDialog
                 title: qsTr("Please choose a file")
-                folder: shortcuts.home
+                currentFolder: shortcuts.home
 
                 nameFilters: ["Logs (*.klf *.ubx *.xtf)", "Kogger log files (*.klf)", "U-blox (*.ubx)"]
 
@@ -524,7 +524,7 @@ ColumnLayout {
             }
 
             Settings {
-                property alias logFolder: newFileDialog.folder
+                property alias logFolder: newFileDialog.currentFolder
             }
         }
 
@@ -542,7 +542,7 @@ ColumnLayout {
             FileDialog {
                 id: appendFileDialog
                 title: qsTr("Please choose a file")
-                folder: shortcuts.home
+                currentFolder: shortcuts.home
 
                 nameFilters: ["Logs (*.klf *.ubx *.xtf)", "Kogger log files (*.klf)", "U-blox (*.ubx)"]
 
@@ -559,7 +559,7 @@ ColumnLayout {
             }
 
             Settings {
-                property alias logFolder: appendFileDialog.folder
+                property alias logFolder: appendFileDialog.currentFolder
             }
         }
 

diff --git a/QML/DatasetBox.qml b/QML/DatasetBox.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 

diff --git a/QML/DeviceItem.qml b/QML/DeviceItem.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 
@@ -202,8 +202,8 @@ ColumnLayout {
 
                 property var items: ["Off", "On"]
 
-                validator: RegExpValidator {
-                    regExp: new RegExp("(Off|On)", "i")
+                validator: RegularExpressionValidator {
+                    regularExpression: new RegExp("(Off|On)", "i")
                 }
 
                 textFromValue: function(value) {

diff --git a/QML/DeviceSettingsViewer.qml b/QML/DeviceSettingsViewer.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 MenuScroll {

diff --git a/QML/DiplaySettingsViewer.qml b/QML/DiplaySettingsViewer.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 MenuScroll {

diff --git a/QML/DisplaySettings.qml b/QML/DisplaySettings.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 GridLayout {
@@ -991,21 +991,19 @@ GridLayout {
                         onClicked: exportFileDialog.open()
                     }
 
-                    FileDialog {
+                    FolderDialog {
                         id: exportFileDialog
-                        folder: shortcuts.home
-                        selectExisting: true
-                        selectFolder: true
+                        currentFolder: shortcuts.home
 
                         onAccepted: {
-                            exportPathText.text = exportFileDialog.folder.toString()
+                            exportPathText.text = exportFileDialog.selectedFolder.toString()
                         }
 
                         onRejected: { }
                     }
 
                     Settings {
-                        property alias exportFolder: exportFileDialog.folder
+                        property alias exportFolder: exportFileDialog.currentFolder
                     }
 
                     Settings {

diff --git a/QML/DopplerBox.qml b/QML/DopplerBox.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 DevSettingsBox {

diff --git a/QML/ExportDist.qml b/QML/ExportDist.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 Item {

diff --git a/QML/ExportSettings.qml b/QML/ExportSettings.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 MenuScroll {

diff --git a/QML/FactoryBox.qml b/QML/FactoryBox.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 DevSettingsBox {
@@ -11,7 +11,7 @@ DevSettingsBox {
         FileDialog {
             id: fileDialog
             title: qsTr("Please choose a file")
-            folder: shortcuts.home
+            currentFolder: shortcuts.home
             nameFilters: ["Upgrade files (*.bin)"]
             onAccepted: {
                 pathText.text = fileDialog.fileUrl.toString()
@@ -21,7 +21,7 @@ DevSettingsBox {
         }
 
         Settings {
-            property alias upgradeFolder: fileDialog.folder
+            property alias upgradeFolder: fileDialog.currentFolder
         }
 
     MenuBlock {

diff --git a/QML/FlashBox.qml b/QML/FlashBox.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 

diff --git a/QML/KoggerCommon/MenuBlockEx.qml b/QML/KoggerCommon/MenuBlockEx.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.3
 import QtQuick.Controls 2.12
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 Rectangle {

diff --git a/QML/MenuBlock.qml b/QML/MenuBlock.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 Rectangle {

diff --git a/QML/MenuButton.qml b/QML/MenuButton.qml
@@ -1,7 +1,6 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
-import QtQuick.Controls.Styles 1.4
 
 Button {
     property bool active: false

diff --git a/QML/MotorViewer.qml b/QML/MotorViewer.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 ColumnLayout {
@@ -276,7 +276,7 @@ ColumnLayout {
             FileDialog {
                 id: newFileDialog
                 title: "Please choose a CSV file"
-                folder: shortcuts.home
+                currentFolder: shortcuts.home
 
                 nameFilters: ["CSV (*.csv)"]
 
@@ -291,7 +291,7 @@ ColumnLayout {
             }
 
             Settings {
-                property alias logFolder: newFileDialog.folder
+                property alias logFolder: newFileDialog.currentFolder
             }
         }
 

diff --git a/QML/MpcFilterControlMenu.qml b/QML/MpcFilterControlMenu.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.3
 import QtQuick.Controls 2.12
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 import KoggerCommon 1.0

diff --git a/QML/NpdFilterControlMenu.qml b/QML/NpdFilterControlMenu.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.3
 import QtQuick.Controls 2.12
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 import KoggerCommon 1.0

diff --git a/QML/Plot2D.qml b/QML/Plot2D.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 import WaterFall 1.0

diff --git a/QML/PointGroupControlMenu.qml b/QML/PointGroupControlMenu.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.3
 import QtQuick.Controls 2.12
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 import KoggerCommon 1.0

diff --git a/QML/PolygonGroupControlMenu.qml b/QML/PolygonGroupControlMenu.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.12
 import QtQuick.Layouts 1.3
 import QtQuick.Controls 2.12
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 import QtQuick.Controls 1.4
 

diff --git a/QML/RecorderBox.qml b/QML/RecorderBox.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 import QtQml.Models 2.15
 

diff --git a/QML/Scene3DToolbar.qml b/QML/Scene3DToolbar.qml
@@ -2,7 +2,7 @@ import QtQuick 2.12
 import QtQuick.Controls 2.12
 import QtQuick.Layouts 1.12
 import Qt.labs.settings 1.1
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 
 
 ColumnLayout {

diff --git a/QML/SmoothMethodTriDivideSettings.qml b/QML/SmoothMethodTriDivideSettings.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 ColumnLayout {

diff --git a/QML/SmoothMethodUGINSettings.qml b/QML/SmoothMethodUGINSettings.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.15
 import QtQuick.Controls 2.15
-import QtQuick.Dialogs 1.2
+import QtQuick.Dialogs
 import Qt.labs.settings 1.1
 
 ColumnLayout {