The wrong usage of qsTr was fixed

mavlink · Apr 19, 2024 · ba4af81 · ba4af81
1 parent bda40c9
commit ba4af81
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 303 deletions.
diff --git a/src/Viewer3D/Viewer3DQml/Models3D/Viewer3DModel.qml b/src/Viewer3D/Viewer3DQml/Models3D/Viewer3DModel.qml
@@ -114,7 +114,7 @@ View3D {
             margins: ScreenTools.defaultFontPixelWidth
         }
         width:          ScreenTools.screenWidth * 0.2
-        progressText: "Loading Map: "
+        progressText: qsTr("Downloading Imageries: ")
     }
 
     Binding{

diff --git a/src/Viewer3D/Viewer3DQml/Viewer3DProgressBar.qml b/src/Viewer3D/Viewer3DQml/Viewer3DProgressBar.qml
@@ -16,7 +16,7 @@ Rectangle{
     id: progressBody
 
     property real progressValue: 100.0
-    property string progressText: "Progress"
+    property string progressText: qsTr("Progress")
 
     QGCPalette { id: qgcPal; colorGroupEnabled: true }
 
@@ -54,7 +54,7 @@ Rectangle{
 
         QGCLabel {
             anchors.horizontalCenter: parent.horizontalCenter
-            text:                progressText + Number(Math.floor(progressBody.progressValue)) + qsTr(" %")
+            text:                progressText + Number(Math.floor(progressBody.progressValue)) + " %"
             color:              qgcPal.text
             font.family:        ScreenTools.demiboldFontFamily
             font.pointSize:     ScreenTools.mediumFontPointSize

diff --git a/src/Viewer3D/maptileimageryloader.cpp b/src/Viewer3D/maptileimageryloader.cpp
diff --git a/src/Viewer3D/maptileimageryloader.h b/src/Viewer3D/maptileimageryloader.h
diff --git a/src/ui/preferences/FlyViewSettings.qml b/src/ui/preferences/FlyViewSettings.qml
@@ -253,7 +253,7 @@ SettingsPage {
                     text:       qsTr("Select File")
 
                     onClicked: {
-                        var filename = qsTr(_viewer3DOsmFilePath.rawValue);
+                        var filename = _viewer3DOsmFilePath.rawValue;
                         const found = filename.match(/(.*)[\/\\]/);
                         if(found){
                             filename = found[1]||''; // extracting the directory from the file path