upgrade qml 5.15 to 6.4

janbar · Oct 12, 2024 · 0d21811 · 0d21811
1 parent e2c8973
commit 0d21811
Show file tree

Hide file tree

Showing 46 changed files with 82 additions and 85 deletions.
diff --git a/gui/controls2_640/Banner.qml b/gui/controls2_640/Banner.qml
@@ -17,7 +17,6 @@
 
 import QtQuick 2.9
 import QtQuick.Controls 2.2
-import QtQml 2.2
 import Osmin 1.0
 
 Page {

diff --git a/gui/controls2_640/ConfigureMap.qml b/gui/controls2_640/ConfigureMap.qml
@@ -17,7 +17,6 @@
 
 import QtQuick 2.9
 import QtQuick.Controls 2.2
-import QtQml 2.2
 import Osmin 1.0
 import "./components"
 import "../toolbox.js" as ToolBox

diff --git a/gui/controls2_640/ConfigureVoice.qml b/gui/controls2_640/ConfigureVoice.qml
@@ -17,7 +17,6 @@
 
 import QtQuick 2.9
 import QtQuick.Controls 2.2
-import QtQml 2.2
 import QtQml.Models 2.3
 import Osmin 1.0
 import "./components"

diff --git a/gui/controls2_640/DialogAbout.qml b/gui/controls2_640/DialogAbout.qml
@@ -17,7 +17,6 @@
 
 import QtQuick 2.9
 import QtQuick.Controls 2.2
-import QtQml 2.2
 import Osmin 1.0
 import "./components"
 

diff --git a/gui/controls2_640/Favorites.qml b/gui/controls2_640/Favorites.qml
@@ -17,7 +17,6 @@
 
 import QtQuick 2.9
 import QtQuick.Controls 2.2
-import QtQml 2.2
 import QtQml.Models 2.3
 import Osmin 1.0
 import "./components"

diff --git a/gui/controls2_640/LocationInfo.qml b/gui/controls2_640/LocationInfo.qml
@@ -17,7 +17,6 @@
 
 import QtQuick 2.9
 import QtQuick.Controls 2.2
-import QtQml 2.2
 import Osmin 1.0
 import "./components"
 

diff --git a/gui/controls2_640/MainMenu.qml b/gui/controls2_640/MainMenu.qml
@@ -17,7 +17,6 @@
 
 import QtQuick 2.9
 import QtQuick.Controls 2.2
-import QtQml 2.2
 import QtQml.Models 2.3
 import "./components"
 import "../toolbox.js" as ToolBox

diff --git a/gui/controls2_640/MapDownloads.qml b/gui/controls2_640/MapDownloads.qml
@@ -17,7 +17,6 @@
 
 import QtQuick 2.9
 import QtQuick.Controls 2.2
-import QtQml 2.2
 import QtQml.Models 2.3
 import Osmin 1.0
 import "./components"

diff --git a/gui/controls2_640/MapView.qml b/gui/controls2_640/MapView.qml
@@ -18,7 +18,6 @@
 import QtQuick 2.9
 import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
-import QtQml 2.2
 import Osmin 1.0
 import "./components"
 import "../toolbox.js" as ToolBox
@@ -94,7 +93,7 @@ MapPage {
         // configure style from setting
         var flags = JSON.parse(settings.styleFlags);
         if (Array.isArray(flags)) {
-            flags.push({ "name": "daylight", "value": !nightView });
+            flags.push({ "name": "daylight", "value": MapExtras.dayLight });
             setStyleFlags(flags);
         }
 
@@ -111,7 +110,6 @@ MapPage {
         property double lon: 0.0
     }
 
-    property bool nightView: false
     property bool rotateEnabled: false
     property real rotation: 0.0 // rotation of the map (radians)
     property bool lockRotation: true // lock or unlock rotation of the map
@@ -334,7 +332,7 @@ MapPage {
     ScaleIndicator{
         id: scaleIndicator
         pixelSize: map.pixelSize
-        color: "black"
+        color: MapExtras.dayLight ? "black" : "lightGray"
         visible: !showToolbar
         anchors{
           bottom: parent.bottom
@@ -351,7 +349,7 @@ MapPage {
         text: "© OpenStreetMap contributors"
         font.pixelSize: units.fs("x-small")
         font.weight: Font.Thin
-        color: nightView ? "white" : "black"
+        color: MapExtras.dayLight ? "black" : "white"
         visible: !showToolbar && !navigation
     }
 
@@ -483,27 +481,27 @@ MapPage {
                 id: currentSpeed
                 text: Converter.readableSpeed(Tracker.currentSpeed)
                 font.pixelSize: 1.5 * units.fs("x-large")
-                color: nightView ? "white" : "black"
+                color: MapExtras.dayLight ? "black" : "white"
             }
             Row {
                 spacing: units.gu(2)
                 Label {
                     id: duration
                     text: Converter.panelDurationHMS(Tracker.duration)
                     font.pixelSize: units.fs("medium")
-                    color: nightView ? "white" : "black"
+                    color: MapExtras.dayLight ? "black" : "white"
                 }
                 Label {
                     id: distance
                     text: Converter.panelDistance(Tracker.distance)
                     font.pixelSize: units.fs("medium")
-                    color: nightView ? "white" : "black"
+                    color: MapExtras.dayLight ? "black" : "white"
                 }
             }
             MapIcon {
                 id: elevation
                 source: "qrc:/images/trip/elevation.svg"
-                color: nightView ? "white" : "black"
+                color: MapExtras.dayLight ? "black" : "white"
                 enabled: false
                 height: units.gu(2)
                 borderPadding: 0
@@ -786,8 +784,7 @@ MapPage {
                         opacity: 0.7
                         height: units.gu(6)
                         onClicked: {
-                            nightView = !nightView;
-                            MapExtras.setDaylight(!nightView);
+                            MapExtras.setDaylight(!MapExtras.dayLight);
                         }
                     }
                 }
@@ -929,8 +926,7 @@ MapPage {
                         opacity: 0.7
                         height: units.gu(6)
                         onClicked: {
-                            nightView = !nightView;
-                            map.toggleDaylight();
+                            MapExtras.setDaylight(!MapExtras.dayLight);
                         }
                     }
                 }
@@ -1129,7 +1125,7 @@ MapPage {
             popNavigatorInfo.visible = Qt.binding(function() { return mapView.state === "view"; });
         }
 
-        onTargetReached: {
+        onTargetReached: function(targetDistance, targetBearing) {
             popInfo.open(qsTr("Target reached at %1 %2.").arg(Converter.readableDistance(targetDistance)).arg(Converter.readableBearing(targetBearing)));
         }
     }
@@ -1165,12 +1161,29 @@ MapPage {
         }
     }
 
+    property QtObject suspendedState: QtObject {
+        property bool navigation: false
+    }
+
     Connections {
         target: mainView
         function onApplicationSuspendedChanged() {
-            // On android disable navigation when the app is suspended
-            if (DeviceMobile && applicationSuspended && navigation)
-                navigation = false;
+            // On device mobile (e.g Android) disable all when the app is suspended
+            if (DeviceMobile) {
+                if (applicationSuspended) {
+                    rotateEnabled = false;
+                    map.lockToPosition = false;
+                    // save current state
+                    suspendedState.navigation = navigation;
+                    // disable navigation state
+                    if (navigation)
+                        navigation = false;
+                } else {
+                    // restore navigation state
+                    if (suspendedState.navigation)
+                        navigation = true;
+                }
+            }
         }
         function onShowFavoritesChanged() {
             if (showFavorites)
@@ -1264,7 +1277,7 @@ MapPage {
             if (Service.status === Service.ServiceConnected) {
                 popInfo.open(qsTr("Tracker service is connected"), "limegreen", "black");
                 // clear all data before ping ALL
-                Tracker.magneticDip = settings.magneticDip;
+                mainView.flipAzimuth(settings.magneticDip);
                 overlayManager.removeRecording();
                 overlayManager.removeMark(1);
                 overlayRecording.clear();

diff --git a/gui/controls2_640/Routing.qml b/gui/controls2_640/Routing.qml
@@ -17,7 +17,6 @@
 
 import QtQuick 2.9
 import QtQuick.Controls 2.2
-import QtQml 2.2
 import QtQml.Models 2.3
 import Osmin 1.0
 import "./components"

diff --git a/gui/controls2_640/SearchPlace.qml b/gui/controls2_640/SearchPlace.qml
@@ -1,6 +1,5 @@
 import QtQuick 2.9
 import QtQuick.Controls 2.2
-import QtQml 2.2
 import Osmin 1.0
 import "./components"
 import "../toolbox.js" as ToolBox

diff --git a/gui/controls2_640/Settings.qml b/gui/controls2_640/Settings.qml
@@ -17,7 +17,6 @@
 
 import QtQuick 2.9
 import QtQuick.Controls 2.2
-import QtQml 2.2
 import QtQml.Models 2.3
 import QtQuick.Layouts 1.3
 import Osmin 1.0
@@ -204,9 +203,9 @@ MapPage {
                 }
                 SpinBox {
                     id: magdipBox
-                    from: -300
+                    from: -1800
                     value: settings.magneticDip * 10
-                    to: 300
+                    to: 1800
                     stepSize: 10
                     font.pixelSize: units.fs("medium");
                     Layout.fillWidth: true
@@ -230,8 +229,8 @@ MapPage {
                     onValueModified: {
                         // save settings
                         settings.magneticDip = realValue;
-                        // setup tracker
-                        Tracker.magneticDip = realValue;
+                        // reconfigure azimuth
+                        mainView.flipAzimuth(realValue);
                     }
                 }
             }

diff --git a/gui/controls2_640/TrackCollection.qml b/gui/controls2_640/TrackCollection.qml
@@ -17,7 +17,6 @@
 
 import QtQuick 2.9
 import QtQuick.Controls 2.2
-import QtQml 2.2
 import QtQml.Models 2.3
 import Osmin 1.0
 import "./components"

diff --git a/gui/controls2_640/Tracking.qml b/gui/controls2_640/Tracking.qml
@@ -17,7 +17,6 @@
 
 import QtQuick 2.9
 import QtQuick.Controls 2.2
-import QtQml 2.2
 import Osmin 1.0
 import "./components"
 
@@ -223,10 +222,18 @@ PopOver {
                 color: styleMap.popover.highlightedColor
                 font.pixelSize: units.fs("medium")
             }
-            Label {
-                text: Converter.readableDegreeGeocaching(180.0 * Tracker.bearing / Math.PI)
-                font.pixelSize: units.fs("large")
-                color: foregroundColor
+            Row {
+                spacing: units.gu(1)
+                Label {
+                    text: Converter.readableDegree(180.0 * Tracker.bearing / Math.PI)
+                    font.pixelSize: units.fs("large")
+                    color: foregroundColor
+                }
+                Label {
+                    text: "(" + Converter.readableCardinal(180.0 * Tracker.bearing / Math.PI) + ")"
+                    font.pixelSize: units.fs("large")
+                    color: foregroundColor
+                }
             }
         }
     }

diff --git a/gui/controls2_640/Welcome.qml b/gui/controls2_640/Welcome.qml
@@ -17,7 +17,6 @@
 
 import QtQuick 2.9
 import QtQuick.Controls 2.2
-import QtQml 2.2
 import "./components"
 
 MapPage {

diff --git a/gui/controls2_640/components/ActivitySpinner.qml b/gui/controls2_640/components/ActivitySpinner.qml
@@ -17,7 +17,6 @@
 
 import QtQuick 2.9
 import QtQuick.Controls 2.2
-import QtQml 2.2
 
 Item {
     id: loading

diff --git a/gui/controls2_640/components/CompassSensor.qml b/gui/controls2_640/components/CompassSensor.qml
@@ -16,7 +16,6 @@
  */
 
 import QtQuick 2.0
-import QtQml 2.2
 //import QtSensors 5.2 as Legacy
 import Osmin 1.0 as Osmin
 

diff --git a/gui/controls2_640/components/DialogAction.qml b/gui/controls2_640/components/DialogAction.qml
@@ -17,7 +17,6 @@
 
 import QtQuick 2.9
 import QtQuick.Controls 2.2
-import QtQml 2.2
 
 DialogBase {
     id: dialog

diff --git a/gui/controls2_640/components/DialogAlert.qml b/gui/controls2_640/components/DialogAlert.qml
@@ -17,7 +17,6 @@
 
 import QtQuick 2.9
 import QtQuick.Controls 2.2
-import QtQml 2.2
 
 DialogBase {
     id: dialog

diff --git a/gui/controls2_640/components/DialogBase.qml b/gui/controls2_640/components/DialogBase.qml
@@ -17,7 +17,6 @@
 
 import QtQuick 2.9
 import QtQuick.Controls 2.2
-import QtQml 2.2
 
 Dialog {
     id: dialog

diff --git a/gui/controls2_640/components/DialogEnter.qml b/gui/controls2_640/components/DialogEnter.qml
@@ -17,7 +17,6 @@
 
 import QtQuick 2.9
 import QtQuick.Controls 2.2
-import QtQml 2.2
 
 DialogBase {
     id: dialog

diff --git a/gui/controls2_640/components/DialogMarkPosition.qml b/gui/controls2_640/components/DialogMarkPosition.qml
@@ -17,7 +17,6 @@
 
 import QtQuick 2.9
 import QtQuick.Controls 2.2
-import QtQml 2.2
 
 DialogBase {
     id: dialog

diff --git a/gui/controls2_640/components/MapCheckBox.qml b/gui/controls2_640/components/MapCheckBox.qml
@@ -17,7 +17,6 @@
 
 import QtQuick 2.2
 import QtQuick.Controls 2.2
-import QtQml 2.2
 
 Item {
     id: control

diff --git a/gui/controls2_640/components/MapIcon.qml b/gui/controls2_640/components/MapIcon.qml
@@ -17,7 +17,6 @@
 
 import QtQuick 2.9
 import QtQuick.Controls 2.2
-import QtQml 2.2
 import Qt5Compat.GraphicalEffects 6.0
 
 MouseArea {

diff --git a/gui/controls2_640/components/MapListView.qml b/gui/controls2_640/components/MapListView.qml
@@ -17,7 +17,6 @@
 
 import QtQuick 2.9
 import QtQuick.Controls 2.2
-import QtQml 2.2
 
 ListView {
     Component.onCompleted: {

diff --git a/gui/controls2_640/components/MapPage.qml b/gui/controls2_640/components/MapPage.qml
@@ -18,7 +18,6 @@
 import QtQuick 2.9
 import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
-import QtQml 2.2
 
 // generic page for map
 Page {

diff --git a/gui/controls2_640/components/MapRotator.qml b/gui/controls2_640/components/MapRotator.qml
@@ -16,7 +16,6 @@
  */
 
 import QtQuick 2.2
-import QtQml 2.2
 import Osmin 1.0
 
 Item {