Bump actions/upload-artifact from 3 to 5

.github/workflows/build_android_signed.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
         with:
           submodules: recursive
 

.github/workflows/build_android_signed_qt6.yml

@@ -40,7 +40,7 @@ jobs:
 
     steps:
       - name: Checkout repository and submodules
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
         with:
           submodules: recursive
 
@@ -110,7 +110,7 @@ jobs:
         run: ccache -s
 
       - name: Upload AAB artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v5
         with:
           name: ${{ matrix.ARTIFACT }}
           path: ${{ runner.temp }}/shadow_build_dir/android-build/build/outputs/bundle/release/*.aab

.github/workflows/build_android_unsigned.yml

@@ -28,7 +28,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
         with:
           submodules: recursive
 

.github/workflows/build_package_Rock5.yml

@@ -30,7 +30,7 @@ jobs:
           echo "BRANCH=${GITHUB_REF##*/}" >> $GITHUB_ENV    
 
       - name: Checkout repository and submodules
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
         with:
           submodules: recursive
       - name: Building QOpenHD in CHROOT
@@ -58,7 +58,7 @@ jobs:
         run: echo "artifact_name=QOpenHD-${{ env.DT }}" >> $GITHUB_ENV
 
       - name: Upload to Github
-        uses: 'actions/upload-artifact@v4'
+        uses: 'actions/upload-artifact@v5'
         with:
           name: "QOpenHD-${{ env.DT }}"
           path: |

.github/workflows/build_package_rpi.yml

@@ -27,7 +27,7 @@ jobs:
         remove-haskell: 'true'
         overprovision-lvm: 'true'
 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v5
       with:
         submodules: recursive
 
@@ -55,7 +55,7 @@ jobs:
             ls -a
 
     - name: Upload to Github
-      uses: 'actions/upload-artifact@v4'
+      uses: 'actions/upload-artifact@v5'
       with:
         name: "QOpenHd"
         path: |

.github/workflows/build_package_x86_jammy.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
     - name: Checkout repository and submodules
-      uses: actions/checkout@v3
+      uses: actions/checkout@v5
       with:
         submodules: recursive
 

.github/workflows/build_package_x86_noble.yml

@@ -43,7 +43,7 @@ jobs:
           ls -a
 
       - name: Upload to Github
-        uses: 'actions/upload-artifact@v4'
+        uses: 'actions/upload-artifact@v5'
         with:
           name: "QOpenHD"
           path: |

.github/workflows/ubuntu22_build_test.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout repository and submodules
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
         with:
           submodules: recursive
 

.github/workflows/ubuntu22_build_test_qt6.yml

@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: Checkout repository and submodules
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
         with:
           submodules: recursive
 

CMakeLists.txt

@@ -14,6 +14,7 @@ find_package(Qt6 ${X_QT_VERSION} REQUIRED COMPONENTS Core)
 find_package(Qt6 ${X_QT_VERSION} REQUIRED COMPONENTS Quick)
 find_package(Qt6 ${X_QT_VERSION} REQUIRED COMPONENTS Gui)
 find_package(Qt6 ${X_QT_VERSION} REQUIRED COMPONENTS Widgets)
+find_package(Qt6 ${X_QT_VERSION} REQUIRED COMPONENTS LinguistTools)
 
 qt_standard_project_setup(REQUIRES ${X_QT_VERSION})
 
@@ -89,6 +90,27 @@ qt_add_executable(QOpenHDApp
     androidqt6/AndroidManifest.xml
 )
 
+# Translation files
+set(QOPENHD_TS_FILES
+    translations/QOpenHD_en.ts
+    translations/QOpenHD_de.ts
+    translations/QOpenHD_uk.ts
+    translations/QOpenHD_ru.ts
+    translations/QOpenHD_nl.ts
+    translations/QOpenHD_es.ts
+    translations/QOpenHD_fr.ts
+    translations/QOpenHD_zh.ts
+    translations/QOpenHD_it.ts
+    translations/QOpenHD_ro.ts
+)
+
+qt_add_translations(QOpenHDApp
+    TS_FILES ${QOPENHD_TS_FILES}
+    QM_FILES_OUTPUT_VARIABLE QOPENHD_QM_FILES
+    LUPDATE_OPTIONS -no-obsolete
+    LRELEASE_OPTIONS -compress
+)
+
 target_include_directories(QOpenHDApp PUBLIC app)
 target_include_directories(QOpenHDApp PUBLIC app/common)
 target_include_directories(QOpenHDApp PUBLIC app/adsb)
@@ -131,6 +153,25 @@ include(lib/h264/h264.cmake)
 #include(app/videostreaming/gstreamer/gst_video.cmake)
 
 qt_finalize_executable(QOpenHDApp)
+
+# Copy generated .qm files to qml directory for qml.qrc
+foreach(QM_FILE ${QOPENHD_QM_FILES})
+    get_filename_component(QM_FILENAME ${QM_FILE} NAME)
+    add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/qml/${QM_FILENAME}
+        COMMAND ${CMAKE_COMMAND} -E copy ${QM_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/qml/${QM_FILENAME}
+        DEPENDS ${QM_FILE}
+        COMMENT "Copying ${QM_FILENAME} to qml directory for qrc inclusion"
+    )
+    list(APPEND QM_COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/qml/${QM_FILENAME})
+endforeach()
+
+add_custom_target(copy_qm_files ALL DEPENDS ${QM_COPY_FILES})
+
+# Ensure generated translation files exist before processing the qml.qrc resource
+if(TARGET QOpenHDApp_autogen)
+    add_dependencies(QOpenHDApp_autogen copy_qm_files)
+endif()
+
 #include(GNUInstallDirs)
 #install(TARGETS QOpenHD
 #    BUNDLE DESTINATION .

QOpenHD.pro

@@ -7,6 +7,7 @@ CONFIG += resources_big
 
 TRANSLATIONS = translations/QOpenHD_en.ts \
                translations/QOpenHD_de.ts \
+               translations/QOpenHD_uk.ts \
                translations/QOpenHD_ru.ts \
                translations/QOpenHD_nl.ts \
                translations/QOpenHD_es.ts \
@@ -15,6 +16,26 @@ TRANSLATIONS = translations/QOpenHD_en.ts \
                translations/QOpenHD_it.ts \
                translations/QOpenHD_ro.ts
 
+# Generate .qm files into qml/ so rcc finds the compiled translations
+translation_outputs =
+for(tsfile, TRANSLATIONS) {
+    qm_base = $$basename(tsfile)
+    qm_base = $$replace(qm_base, \\.ts$, )
+    qm_file = $$PWD/qml/$${qm_base}.qm
+    ts_abs = $$PWD/$$tsfile
+
+    qmtarget = qm_$${qm_base}
+    $${qmtarget}.target = $$qm_file
+    $${qmtarget}.commands = mkdir -p $$PWD/qml && lrelease $$ts_abs -qm $$qm_file
+    $${qmtarget}.depends = $$ts_abs
+
+    QMAKE_EXTRA_TARGETS += $$qmtarget
+    PRE_TARGETDEPS += $$qm_file
+    QMAKE_CLEAN += $$qm_file
+    translation_outputs += $$qm_file
+}
+
+qml/qml.qrc.depends += $$translation_outputs
 
 include(platforms.pri)
 
@@ -246,7 +267,12 @@ AndroidBuild {
     message("AndroidBuild")
     # Text to speech crashes on android for some weird reason
     #CONFIG += EnableSpeech
-    QT += androidextras
+    androidextras_hdr = $$[QT_INSTALL_HEADERS]/QtAndroidExtras
+    exists($$androidextras_hdr) {
+        QT += androidextras
+    } else {
+        message("androidextras module not available, skipping")
+    }
 
     include(app/videostreaming/gstreamer/gst_video.pri)
     include(app/videostreaming/android/videostreamingandroid.pri)
@@ -264,4 +290,4 @@ EnableSpeech {
 android{
     ANDROID_PACKAGE_SOURCE_DIR = \
         $$PWD/android
-}
+}

android/build.gradle

@@ -63,4 +63,13 @@ android {
     aaptOptions {
         noCompress 'rcc'
     }
+
+    // Customize the generated APK name to include version and build timestamp
+    applicationVariants.all { variant ->
+        variant.outputs.all { output ->
+            def versionLabel = variant.versionName ?: output.versionName
+            def timestamp = new Date().format('yyyyMMdd_HHmmss')
+            outputFileName = "QOpenHD_${versionLabel}_${timestamp}.apk"
+        }
+    }
 }

app/main.cpp

@@ -324,20 +324,15 @@ int main(int argc, char *argv[]) {
     //QLoggingCategory::setFilterRules("qt.scenegraph.general=true");
     //QLoggingCategory::setFilterRules("qt.scenegraph.time.texture=true");
     //QLoggingCategory::setFilterRules("qt.scenegraph.time.renderloop=true");
+    //QLoggingCategory::setFilterRules("qt.scenegraph.time.*=true");
     //QLoggingCategory::setFilterRules("qt.qpa.eglfs.*=true");
     //QLoggingCategory::setFilterRules("qt.qpa.egl*=true");
 
-    // From https://stackoverflow.com/questions/63473541/how-to-dynamically-toggle-vsync-in-a-qt-application-at-runtime
-    // Get rid of VSYNC if possible. Might / might not work. On my ubuntu nvidia & intel laptop, this at least seems to
-    // result in tripple buffering with unlimited fps, a bit "better" regarding latency than default.
-    if(settings.value("dev_set_swap_interval_zero",false).toBool()){
-        qDebug()<<"Request swap interval of 0";
-        QSurfaceFormat format=QSurfaceFormat::defaultFormat();
-        format.setSwapInterval(0);
-        QSurfaceFormat::setDefaultFormat(format);
-    }
-
     QApplication app(argc, argv);
+
+    // Load translation based on saved locale (requires an active Q(Core)Application on Qt5)
+    QString localeStr = settings.value("locale", "en").toString();
+    QOpenHD::instance().installTranslatorForLanguage(localeStr, &settings);
     {  // This includes dpi adjustment
         QScreen* screen=app.primaryScreen();
         if(screen){