Numerous Qt fixes, qml refactoring, translation escape fixes

.gitignore

@@ -2,6 +2,8 @@
 src/build/*
 src/build/**
 .vscode
+compile_commands.json
+src/.cache/clangd
 obj-**
 debian/rpi-imager/**
 debian/.debhelper**

.qmllint.ini

@@ -0,0 +1,48 @@
+[General]
+AdditionalQmlImportPaths=
+DisableDefaultImports=false
+MaxWarnings=0
+OverwriteImportTypes=
+ResourcePath=
+
+[Warnings]
+AccessSingletonViaObject=warning
+Anchors=warning
+AttachedPropertyReuse=warning
+AttachedPropertyType=warning
+BadSignalHandler=warning
+BadSignalHandlerParameters=warning
+CompilerWarnings=disable
+ControlsAttachedPropertyReuse=warning
+ControlsNativeCustomize=warning
+Deprecated=warning
+DuplicatePropertyBinding=warning
+DuplicatedName=warning
+ImportFailure=warning
+IncompatibleType=warning
+InheritanceCycle=warning
+InvalidLintDirective=warning
+LayoutsPositioning=warning
+LintPluginWarnings=warning
+MissingProperty=warning
+MissingType=warning
+MultilineStrings=warning
+NonListProperty=warning
+PrefixedImportType=warning
+PropertyAlias=warning
+PropertyAliasCycles=warning
+PropertyChangesParsed=warning
+ReadOnlyProperty=warning
+RequiredProperty=warning
+RestrictedType=warning
+TopLevelComponent=warning
+TypeError=warning
+UncreatableType=warning
+UnexpectedVarType=warning
+UnknownProperty=warning
+UnqualifiedAccess=warning
+UnresolvedType=warning
+UnusedImports=warning
+UseProperFunction=warning
+VarUsedBeforeDeclaration=warning
+WithStatement=warning

src/.gitignore

@@ -1,3 +1,5 @@
-
 dependencies/libarchive-3.4.2/build/pkgconfig/libarchive.pc
 CMakeLists.txt.user
+/build-*
+.qmlls.ini
+

src/.zed/settings.json

@@ -0,0 +1,7 @@
+// Folder-specific settings
+//
+// For a full list of overridable settings, and general information on folder-specific settings,
+// see the documentation: https://zed.dev/docs/configuring-zed#settings-files
+{
+  "format_on_save": "off"
+}

src/CMakeLists.txt

@@ -32,9 +32,16 @@ if (APPLE)
     set(IMAGER_SIGNING_IDENTITY "" CACHE STRING "The Developer Identity to use for signing.")
     set(IMAGER_NOTARIZE_APP OFF CACHE BOOL "Perform notarization of the Imager .dmg as part of the build")
     set(IMAGER_NOTARIZE_KEYCHAIN_PROFILE "" CACHE STRING "The name of the Keychain item containing your notarization credentials")
-endif(APPLE)
 
-## Preferentially build the bundled code. Full vendoring is to follow in a later version.
+    # Per CMake Bug 21918, if you do not use the following block, CMake will automatically include homebrew libraries.
+    # This is undesirable, as on macOS/Apple Silicon, you may find newer versions of Qt will pull in new dependencies
+    # - breaking your x86_64 build prematurely. Regardless, this is desirable behaviour to make the build more predictable.
+    set(CMAKE_IGNORE_PATH)
+    foreach(_prefix /sw /opt/local /usr/local /opt/homebrew)
+      list(APPEND CMAKE_IGNORE_PATH ${_prefix}/bin ${_prefix}/include ${_prefix}/lib)
+      list(APPEND CMAKE_SYSTEM_IGNORE_PATH ${_prefix}/bin ${_prefix}/include ${_prefix}/lib)
+    endforeach()
+endif(APPLE)
 
 # Bundled code will occasionally use identical options - eg, BUILD_TESTING.
 set(BUILD_TESTING OFF)
@@ -81,6 +88,20 @@ set(Zstd_LIBRARIES libzstd_static)
 set(ZSTD_LIBRARIES libzstd_static)
 set(ZSTD_LIBRARY libzstd_static)
 
+# Remote nghttp2
+include(FetchContent)
+FetchContent_Declare(nghttp2
+ GIT_REPOSITORY https://github.com/nghttp2/nghttp2.git
+ GIT_TAG        v1.64.0
+)
+set(BUILD_EXAMPLES OFF)
+set(ENABLE_LIB_ONLY ON)
+set(ENABLE_FAILMALLOC OFF)
+FetchContent_MakeAvailable(nghttp2)
+unset(ENABLE_LIB_ONLY)
+unset(ENABLE_FAILMALLOC)
+unset(BUILD_EXAMPLES)
+
 # Bundled zlib
 set(ZLIB_BUILD_EXAMPLES OFF)
 set(SKIP_INSTALL_ALL ON)
@@ -171,7 +192,10 @@ set(CURL_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/dependencies/curl-8.11.0/include
 # Adding headers explicity so they are displayed in Qt Creator
 set(HEADERS config.h imagewriter.h networkaccessmanagerfactory.h nan.h drivelistitem.h drivelistmodel.h drivelistmodelpollthread.h driveformatthread.h powersaveblocker.h cli.h
     devicewrapper.h devicewrapperblockcacheentry.h devicewrapperpartition.h devicewrapperstructs.h devicewrapperfatpartition.h wlancredentials.h
-    downloadthread.h downloadextractthread.h localfileextractthread.h downloadstatstelemetry.h dependencies/mountutils/src/mountutils.hpp dependencies/sha256crypt/sha256crypt.h)
+    downloadthread.h downloadextractthread.h localfileextractthread.h downloadstatstelemetry.h dependencies/mountutils/src/mountutils.hpp dependencies/sha256crypt/sha256crypt.h
+    hwlistmodel.h
+    oslistmodel.h
+)
 
 # Add dependencies
 if (APPLE)
@@ -243,7 +267,7 @@ if( IS_BIG_ENDIAN )
     message( FATAL_ERROR "We currently only support 'little endian' CPU architectures" )
 endif( IS_BIG_ENDIAN )
 
-set(SOURCES ${PLATFORM_SOURCES} "main.cpp" "imagewriter.cpp" "networkaccessmanagerfactory.cpp"
+set(SOURCES ${PLATFORM_SOURCES} "main.cpp" "networkaccessmanagerfactory.cpp"
     "drivelistitem.cpp" "drivelistmodel.cpp" "drivelistmodelpollthread.cpp" "downloadthread.cpp" "downloadextractthread.cpp"
     "devicewrapper.cpp" "devicewrapperblockcacheentry.cpp" "devicewrapperpartition.cpp" "devicewrapperfatpartition.cpp"
     "driveformatthread.cpp" "localfileextractthread.cpp" "powersaveblocker.cpp" "downloadstatstelemetry.cpp" "qml.qrc" "dependencies/sha256crypt/sha256crypt.c" "cli.cpp")
@@ -284,6 +308,9 @@ qt_add_translation(QM_FILES  ${TRANSLATIONS})
 configure_file(i18n/translations.qrc "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)
 set(SOURCES ${SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc ${QM_FILES})
 
+# Create an rpi-imager_lupdate target
+qt_add_lupdate(TS_FILES ${TRANSLATIONS} SOURCE_TARGETS ${PROJECT_NAME})
+
 if (WIN32)
     # Adding WIN32 prevents a console window being opened on Windows
     add_executable(${PROJECT_NAME} WIN32 ${SOURCES} ${HEADERS} ${DEPENDENCIES})
@@ -307,6 +334,58 @@ else()
     add_definitions(-DCHECK_VERSION_DEFAULT=false)
 endif()
 
+qt_policy(SET QTP0001 NEW)
+
+if (QT_KNOWN_POLICY_QTP0004)
+    qt_policy(SET QTP0004 NEW)
+endif()
+
+set(QT_QML_GENERATE_QMLLS_INI ON)
+
+set(IMAGER_QML_FILES
+    main.qml
+    MsgPopup.qml
+    OptionsGeneralTab.qml
+    OptionsMiscTab.qml
+    OptionsPopup.qml
+    OptionsServicesTab.qml
+    OptionsTabBase.qml
+    Style.qml
+    UseSavedSettingsPopup.qml
+    qmlcomponents/ImButton.qml
+    qmlcomponents/ImButtonRed.qml
+    qmlcomponents/ImCheckBox.qml
+    qmlcomponents/ImCloseButton.qml
+    qmlcomponents/ImPopup.qml
+    qmlcomponents/ImRadioButton.qml
+    MainPopupBase.qml
+    HwPopup.qml
+    OSPopup.qml
+    DstPopup.qml
+    MainPopupListViewBase.qml
+)
+
+set_source_files_properties(Style.qml PROPERTIES QT_QML_SINGLETON_TYPE TRUE)
+
+# C++ types exposed to QML
+set(IMAGER_QML_CPP_TYPES
+    imagewriter.cpp
+    hwlistmodel.cpp
+    oslistmodel.cpp
+)
+
+qt_add_qml_module(${PROJECT_NAME}
+    URI RpiImager
+    VERSION 1.0
+    QML_FILES ${IMAGER_QML_FILES}
+    SOURCES ${IMAGER_QML_CPP_TYPES}
+    NO_CACHEGEN
+    OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/RpiImager
+    DEPENDENCIES QtQuick
+    NO_PLUGIN
+    RESOURCE_PREFIX "/" # Puts the stuff into qrc:/RpiImager/
+)
+
 # Because dependencies are typically not available by default on Windows, build bundled code
 if (WIN32)
     # Target Windows 10, in line with Qt requirements
@@ -469,6 +548,9 @@ elseif(APPLE)
         endif(IMAGER_SIGNING_IDENTITY)
     else()
         # Unsigned application
+        add_custom_command(TARGET ${PROJECT_NAME}
+            POST_BUILD
+            COMMAND mv "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.app" "${CMAKE_BINARY_DIR}/Raspberry\ Pi\ Imager.app")
         add_custom_command(TARGET ${PROJECT_NAME}
             POST_BUILD
             COMMAND "${MACDEPLOYQT_EXECUTABLE}" "${CMAKE_BINARY_DIR}/Raspberry\ Pi\ Imager.app" -qmldir="${CMAKE_CURRENT_SOURCE_DIR}" -always-overwrite -no-strip -dmg)