Update CMakeLists.txt

WiX v7 requires conditions to be set via the Condition attribute,
not as inner text of the Custom element.

.github/workflows/windows-msi.yml

@@ -18,16 +18,19 @@ jobs:
   build-msi:
     name: Build MSI with WiX v7
     runs-on: windows-latest
+
     # Only runs if Windows Build succeeded (or triggered manually)
     if: >
       github.event_name == 'workflow_dispatch' ||
       github.event.workflow_run.conclusion == 'success'
+
     permissions:
       contents: write
       pages: write
       id-token: write
 
     steps:
+
       # ----------------------------------------------------------------
       # 1. Checkout (to retrieve QElectroTech.wxs and sources)
       # ----------------------------------------------------------------
@@ -38,16 +41,12 @@ jobs:
 
       # ----------------------------------------------------------------
       # 2. Download the portable artifact from the main build
-      #    Requires windows-build.yml to upload an artifact named
-      #    "qelectrotech-windows-portable" (fixed name)
       # ----------------------------------------------------------------
       - name: Download portable artifact
         uses: actions/download-artifact@v4
         with:
           name: qelectrotech-windows-portable
           path: artifact\files
-          # workflow_run => use the triggering run's ID
-          # workflow_dispatch => use input run_id if provided, otherwise current run
           run-id: ${{ github.event.workflow_run.id || github.event.inputs.run_id || github.run_id }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
           repository: ${{ github.repository }}
@@ -59,12 +58,10 @@ jobs:
         id: version
         shell: pwsh
         run: |
-          # Version from qetversion.cpp (same logic as windows-build.yml)
           $src = Get-Content "sources\qetversion.cpp" -Raw -ErrorAction SilentlyContinue
           if ($src -match 'return QVersionNumber\{([^}]+)\}') {
             $ver = $Matches[1] -replace '\s','' -replace ',','.'
           } else {
-            # Fallback: CMakeLists.txt
             $cmake = Get-Content "CMakeLists.txt" -Raw
             if ($cmake -match 'project\s*\([^)]*VERSION\s+([\d]+\.[\d]+\.[\d]+)') {
               $ver = $Matches[1]
@@ -72,43 +69,30 @@ jobs:
               $ver = "0.0.0"
             }
           }
-
-          # Numeric MSI version: 4 digits required (e.g. 0.100.1.0)
           $verMsi = "$ver.0"
-
-          # Short SHA for the display version
           $sha = git rev-parse --short HEAD 2>$null
           if (-not $sha) { $sha = "unknown" }
-
-          # Cumulative revision number (same calculation as windows-build.yml)
           $count = git rev-list HEAD --count 2>$null
           $rev = [int]$count + 473
-
           $verDisplay = "${ver}-r${rev}-${sha}_x86_64-win64"
-
-          echo "VERSION_MSI=$verMsi"          >> $env:GITHUB_OUTPUT
-          echo "VERSION_DISPLAY=$verDisplay"  >> $env:GITHUB_OUTPUT
+          echo "VERSION_MSI=$verMsi"         >> $env:GITHUB_OUTPUT
+          echo "VERSION_DISPLAY=$verDisplay" >> $env:GITHUB_OUTPUT
           Write-Host "Version MSI     : $verMsi"
           Write-Host "Version display : $verDisplay"
 
       # ----------------------------------------------------------------
       # 4. Install WiX v7, accept EULA and install WixUI extension
-      #    All done in one step: PATH is updated within the same step
-      #    so wix is immediately available for eula and extension commands
       # ----------------------------------------------------------------
       - name: Install WiX v7
         shell: pwsh
         run: |
           dotnet tool install --global wix --version 7.0.0
-          # Update PATH immediately for the rest of this step
           $toolsPath = [System.IO.Path]::Combine($env:USERPROFILE, '.dotnet', 'tools')
           $env:PATH = "$toolsPath;$env:PATH"
-          # Also export for subsequent steps
           echo $toolsPath >> $env:GITHUB_PATH
-          # Accept OSMF EULA (official CI/CD method: writes a sentinel file)
           wix eula accept wix7
-          # Install WixUI extension
           wix extension add WixToolset.UI.wixext/7.0.0
+          wix extension add WixToolset.Util.wixext/7.0.0
           Write-Host "WiX v7 installed, EULA accepted, UI extension added."
 
       # ----------------------------------------------------------------
@@ -120,8 +104,6 @@ jobs:
           $wxs = "build-aux\windows\QElectroTech.wxs"
           if (-not (Test-Path $wxs)) {
             Write-Error "WXS file not found: $wxs"
-            Write-Host "Contents of build-aux\windows\ :"
-            Get-ChildItem "build-aux\windows\" -ErrorAction SilentlyContinue
             exit 1
           }
           Write-Host "WXS found: $wxs"
@@ -136,10 +118,8 @@ jobs:
           Get-ChildItem -Path "artifact\files" -Depth 2 |
             Select-Object FullName | Format-Table -AutoSize
 
-          # Search for qelectrotech.exe in the artifact
           $exe = Get-ChildItem -Path "artifact\files" -Filter "qelectrotech.exe" -Recurse | Select-Object -First 1
           if (-not $exe) {
-            # Also try QElectroTech.exe (capital Q)
             $exe = Get-ChildItem -Path "artifact\files" -Filter "QElectroTech.exe" -Recurse | Select-Object -First 1
           }
           if (-not $exe) {
@@ -147,69 +127,58 @@ jobs:
             exit 1
           }
           Write-Host "Executable: $($exe.FullName) ($([math]::Round($exe.Length/1MB,1)) MB)"
-
-          # FilesDir = folder containing bin\
           $binDir   = $exe.Directory.FullName
           $filesDir = Split-Path $binDir -Parent
-
           echo "FILES_DIR=$filesDir" >> $env:GITHUB_ENV
           Write-Host "FILES_DIR: $filesDir"
 
       # ----------------------------------------------------------------
       # 7. Convert LICENSE (GPL-2) to RTF for the WixUI licence screen
-      #    RTF is the only format accepted by Windows Installer.
-      #    The conversion wraps plain text lines in basic RTF markup.
       # ----------------------------------------------------------------
       - name: Convert LICENSE to RTF
         shell: pwsh
         run: |
-          $licSrc  = "LICENSE"
-          $licRtf  = "$env:TEMP\License.rtf"
-
+          $licSrc = "LICENSE"
+          $licRtf = "$env:TEMP\License.rtf"
           if (-not (Test-Path $licSrc)) {
             Write-Error "LICENSE file not found in repository root"
             exit 1
           }
-
           $lines = Get-Content $licSrc -Encoding UTF8
-
-          # RTF header — Courier New, 9pt, black
           $rtf = New-Object System.Text.StringBuilder
           [void]$rtf.AppendLine('{\rtf1\ansi\ansicpg1252\deff0')
           [void]$rtf.AppendLine('{\fonttbl{\f0\fmodern\fprq1\fcharset0 Courier New;}}')
           [void]$rtf.AppendLine('{\colortbl;\red0\green0\blue0;}')
           [void]$rtf.AppendLine('\f0\fs18\cf1')
-
           foreach ($line in $lines) {
-            # Escape RTF special characters
             $escaped = $line `
               -replace '\\', '\\\\' `
               -replace '\{', '\{' `
               -replace '\}', '\}'
             [void]$rtf.AppendLine("$escaped\par")
           }
-
           [void]$rtf.AppendLine('}')
-
           [System.IO.File]::WriteAllText($licRtf, $rtf.ToString(), [System.Text.Encoding]::ASCII)
           echo "LICENSE_RTF=$licRtf" >> $env:GITHUB_ENV
           Write-Host "License.rtf generated: $licRtf ($([math]::Round((Get-Item $licRtf).Length/1KB,1)) KB)"
 
       # ----------------------------------------------------------------
-      # 8. Replace Lancer QET.bat with the MSI-specific version
-      #    The portable version uses relative paths suited for the zip.
-      #    The MSI version uses %~dp0 to resolve paths relative to
-      #    the installation directory in Program Files.
+      # 8. Remove Lancer QET.bat from the artifact
+      #    The MSI does not use the .bat: shortcuts point directly to
+      #    qelectrotech.exe, and elements\ is set read-only via a
+      #    CustomAction in QElectroTech.wxs.
+      #    The .bat is kept as-is in the ZIP portable build.
       # ----------------------------------------------------------------
-      - name: Replace Lancer QET.bat for MSI
+      - name: Remove Lancer QET.bat from artifact
         shell: pwsh
         run: |
           $bat = "$env:FILES_DIR\Lancer QET.bat"
-          $content = "@echo off`r`nstart `"`" `"%~dp0bin\qelectrotech.exe`" --common-elements-dir=`"%~dp0elements/`" --common-tbt-dir=`"%~dp0titleblocks/`" --lang-dir=`"%~dp0lang/`" -style windowsvista`r`n"
-          [System.IO.File]::WriteAllText($bat, $content, [System.Text.Encoding]::ASCII)
-          Write-Host "Lancer QET.bat replaced for MSI installation."
-          Write-Host "=== Content of new Lancer QET.bat ==="
-          Get-Content $bat
+          if (Test-Path $bat) {
+            Remove-Item $bat -Force
+            Write-Host "Lancer QET.bat removed from artifact (MSI uses direct exe shortcut)."
+          } else {
+            Write-Host "Lancer QET.bat not found in artifact (already absent)."
+          }
 
       # ----------------------------------------------------------------
       # 9. Build the MSI
@@ -227,11 +196,11 @@ jobs:
           New-Item -ItemType Directory -Force -Path "dist" | Out-Null
 
           Write-Host "=== wix build ==="
-          Write-Host "  WXS         : $wxs"
-          Write-Host "  Version     : $version"
-          Write-Host "  FilesDir    : $filesDir"
-          Write-Host "  LicenseRtf  : $licRtf"
-          Write-Host "  Output      : dist\$outputName"
+          Write-Host " WXS        : $wxs"
+          Write-Host " Version    : $version"
+          Write-Host " FilesDir   : $filesDir"
+          Write-Host " LicenseRtf : $licRtf"
+          Write-Host " Output     : dist\$outputName"
 
           wix build $wxs `
             -arch x64 `
@@ -240,13 +209,13 @@ jobs:
             -d "FilesDir=$filesDir" `
             -d "LicenseRtf=$licRtf" `
             -ext WixToolset.UI.wixext `
+            -ext WixToolset.Util.wixext `
             -o "dist\$outputName"
 
           if (-not (Test-Path "dist\$outputName")) {
             Write-Error "MSI not generated: dist\$outputName"
             exit 1
           }
-
           $size = [math]::Round((Get-Item "dist\$outputName").Length / 1MB, 1)
           Write-Host "MSI generated: dist\$outputName ($size MB) ✓"
           echo "MSI_NAME=$outputName" >> $env:GITHUB_ENV
@@ -272,7 +241,7 @@ jobs:
         run: |
           gh release view nightly --repo "$REPO" --json assets \
             --jq '.assets[] | select(.name | test("\\.msi$")) | .name' \
-          | while read -r name; do
+            | while read -r name; do
               echo "Deleting old asset: $name"
               gh release delete-asset nightly "$name" --repo "$REPO" --yes
             done
@@ -308,7 +277,6 @@ jobs:
 
       # ----------------------------------------------------------------
       # 13. Generate and deploy the GitHub Pages download page
-      #     Toutes les URLs sont connues ici (exe, zip, msi).
       # ----------------------------------------------------------------
       - name: Checkout (for generate-page.py)
         uses: actions/checkout@v4
@@ -325,29 +293,22 @@ jobs:
         run: |
           set -euo pipefail
           REPO="${{ github.repository }}"
-
-          # Fetch asset names from the nightly release (source of truth)
           ASSETS=$(gh release view nightly --repo "$REPO" --json assets --jq '.assets[].name')
-
-          EXE_NAME=$(echo "$ASSETS" | grep '\.exe$' | head -1)
-          ZIP_NAME=$(echo "$ASSETS" | grep '\.zip$' | head -1)
-          MSI_NAME=$(echo "$ASSETS" | grep '\.msi$' | head -1 || echo "")
-
+          EXE_NAME=$(echo "$ASSETS" | grep '\.exe$'  | head -1)
+          ZIP_NAME=$(echo "$ASSETS" | grep '\.zip$'  | head -1)
+          MSI_NAME=$(echo "$ASSETS" | grep '\.msi$'  | head -1 || echo "")
           BASE="https://github.com/$REPO/releases/download/nightly"
           INSTALLER_URL="$BASE/$EXE_NAME"
           PORTABLE_URL="$BASE/$ZIP_NAME"
           MSI_URL=""
           [ -n "$MSI_NAME" ] && MSI_URL="$BASE/$MSI_NAME"
-
           SHA="${{ github.event.workflow_run.head_sha || github.sha }}"
           SHORT="${SHA:0:7}"
           DATE=$(date -u '+%Y-%m-%d %H:%M UTC')
           RUN_URL="https://github.com/$REPO/actions/runs/${{ github.run_id }}"
           RUN_NUMBER="${{ github.run_number }}"
-
           export DATE SHORT REPO SHA RUN_URL RUN_NUMBER
           export INSTALLER_URL PORTABLE_URL MSI_URL
-
           python3 source/build-aux/generate-page.py
 
       - name: Add .nojekyll

CMakeLists.txt

@@ -19,10 +19,10 @@ include(cmake/hoto_update_cmake_message.cmake)
 cmake_minimum_required(VERSION 3.14...3.19 FATAL_ERROR)
 
 project(qelectrotech
-  VERSION 0.9.0
-  DESCRIPTION "QET is a CAD/CAE editor focusing on schematics drawing features."
-  HOMEPAGE_URL "https://qelectrotech.org/"
-  LANGUAGES CXX)
+        VERSION 0.100.1
+        DESCRIPTION "QET is a CAD/CAE editor focusing on schematics drawing features."
+        HOMEPAGE_URL "https://qelectrotech.org/"
+        LANGUAGES CXX)
 
 include(cmake/copyright_message.cmake)
 
@@ -31,8 +31,8 @@ set(QET_DIR ${PROJECT_SOURCE_DIR})
 # Add sub directories
 option(PACKAGE_TESTS "Build the tests" ON)
 if(PACKAGE_TESTS)
-  message("Add sub directory tests")
-  add_subdirectory(tests)
+    message("Add sub directory tests")
+    add_subdirectory(tests)
 endif()
 
 include(cmake/paths_compilation_installation.cmake)
@@ -46,31 +46,31 @@ include(cmake/fetch_pugixml.cmake)
 include(cmake/qet_compilation_vars.cmake)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
-
 SET(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 find_package(
-  QT
- NAMES
-  Qt5
- COMPONENTS
-  ${QET_COMPONENTS}
- REQUIRED
- )
+    QT
+    NAMES
+    Qt5
+    COMPONENTS
+    ${QET_COMPONENTS}
+    REQUIRED
+)
 
 find_package(
-  Qt${QT_VERSION_MAJOR}
- COMPONENTS
- ${QET_COMPONENTS}
- REQUIRED)
+    Qt${QT_VERSION_MAJOR}
+    COMPONENTS
+    ${QET_COMPONENTS}
+    REQUIRED)
+
 find_package(SQLite3 REQUIRED)
 
 set(CMAKE_AUTOUIC_SEARCH_PATHS ${QET_DIR}/sources/ui)
+
 qt5_create_translation(QM_FILES ${CMAKE_SOURCE_DIR} ${TS_FILES})
 set_source_files_properties(${TS_FILES} PROPERTIES OUTPUT_LOCATION "${QET_DIR}/lang")
 qt5_add_translation(QM_FILES ${TS_FILES})
@@ -78,78 +78,91 @@ qt5_add_translation(QM_FILES ${TS_FILES})
 # als laatse
 include(cmake/define_definitions.cmake)
 
-add_executable(
-  ${PROJECT_NAME}
-  ${QET_RES_FILES}
-  ${QET_SRC_FILES}
-  ${QM_FILES}
-  ${QET_DIR}/qelectrotech.qrc
-  )
+# On Windows, WIN32 sets /SUBSYSTEM:WINDOWS to suppress the console window.
+# Qt automatically links qtmain.lib which provides the WinMain entry point,
+# so no source code change is needed.
+if(WIN32)
+    add_executable(
+        ${PROJECT_NAME}
+        WIN32
+        ${QET_RES_FILES}
+        ${QET_SRC_FILES}
+        ${QM_FILES}
+        ${QET_DIR}/qelectrotech.qrc
+    )
+else()
+    add_executable(
+        ${PROJECT_NAME}
+        ${QET_RES_FILES}
+        ${QET_SRC_FILES}
+        ${QM_FILES}
+        ${QET_DIR}/qelectrotech.qrc
+    )
+endif()
 
 target_link_libraries(
-  ${PROJECT_NAME}
-  PUBLIC
-  PRIVATE
-  pugixml::pugixml
-  SingleApplication::SingleApplication
-  SQLite::SQLite3
-  ${KF5_PRIVATE_LIBRARIES}
-  ${QET_PRIVATE_LIBRARIES}
-  )
+    ${PROJECT_NAME}
+    PUBLIC
+    PRIVATE
+    pugixml::pugixml
+    SingleApplication::SingleApplication
+    SQLite::SQLite3
+    ${KF5_PRIVATE_LIBRARIES}
+    ${QET_PRIVATE_LIBRARIES}
+)
 
 target_include_directories(
-  ${PROJECT_NAME}
-  PRIVATE
-  ${QET_DIR}/sources/titleblock
-  ${QET_DIR}/sources/ui
-  ${QET_DIR}/sources/qetgraphicsitem
-  ${QET_DIR}/sources/qetgraphicsitem/ViewItem
-  ${QET_DIR}/sources/qetgraphicsitem/ViewItem/ui
-  ${QET_DIR}/sources/richtext
-  ${QET_DIR}/sources/factory
-  ${QET_DIR}/sources/properties
-  ${QET_DIR}/sources/dvevent
-  ${QET_DIR}/sources/editor
-  ${QET_DIR}/sources/editor/esevent
-  ${QET_DIR}/sources/editor/graphicspart
-  ${QET_DIR}/sources/editor/ui
-  ${QET_DIR}/sources/editor/UndoCommand
-  ${QET_DIR}/sources/undocommand
-  ${QET_DIR}/sources/diagramevent
-  ${QET_DIR}/sources/ElementsCollection
-  ${QET_DIR}/sources/ElementsCollection/ui
-  ${QET_DIR}/sources/autoNum
-  ${QET_DIR}/sources/autoNum/ui
-  ${QET_DIR}/sources/ui/configpage
-  ${QET_DIR}/sources/SearchAndReplace
-  ${QET_DIR}/sources/SearchAndReplace/ui
-  ${QET_DIR}/sources/NameList
-  ${QET_DIR}/sources/NameList/ui
-  ${QET_DIR}/sources/utils
-  ${QET_DIR}/pugixml/src
-  ${QET_DIR}/sources/dataBase
-  ${QET_DIR}/sources/dataBase/ui
-  ${QET_DIR}/sources/factory/ui
-  ${QET_DIR}/sources/print
-  )
+    ${PROJECT_NAME}
+    PRIVATE
+    ${QET_DIR}/sources/titleblock
+    ${QET_DIR}/sources/ui
+    ${QET_DIR}/sources/qetgraphicsitem
+    ${QET_DIR}/sources/qetgraphicsitem/ViewItem
+    ${QET_DIR}/sources/qetgraphicsitem/ViewItem/ui
+    ${QET_DIR}/sources/richtext
+    ${QET_DIR}/sources/factory
+    ${QET_DIR}/sources/properties
+    ${QET_DIR}/sources/dvevent
+    ${QET_DIR}/sources/editor
+    ${QET_DIR}/sources/editor/esevent
+    ${QET_DIR}/sources/editor/graphicspart
+    ${QET_DIR}/sources/editor/ui
+    ${QET_DIR}/sources/editor/UndoCommand
+    ${QET_DIR}/sources/undocommand
+    ${QET_DIR}/sources/diagramevent
+    ${QET_DIR}/sources/ElementsCollection
+    ${QET_DIR}/sources/ElementsCollection/ui
+    ${QET_DIR}/sources/autoNum
+    ${QET_DIR}/sources/autoNum/ui
+    ${QET_DIR}/sources/ui/configpage
+    ${QET_DIR}/sources/SearchAndReplace
+    ${QET_DIR}/sources/SearchAndReplace/ui
+    ${QET_DIR}/sources/NameList
+    ${QET_DIR}/sources/NameList/ui
+    ${QET_DIR}/sources/utils
+    ${QET_DIR}/pugixml/src
+    ${QET_DIR}/sources/dataBase
+    ${QET_DIR}/sources/dataBase/ui
+    ${QET_DIR}/sources/factory/ui
+    ${QET_DIR}/sources/print
+)
 
 install(TARGETS ${PROJECT_NAME})
+
 if (NOT MINGW)
-
-install(DIRECTORY ico/breeze-icons/16x16 DESTINATION ${QET_ICONS_PATH})
-install(DIRECTORY ico/breeze-icons/22x22 DESTINATION ${QET_ICONS_PATH})
-install(DIRECTORY ico/breeze-icons/32x32 DESTINATION ${QET_ICONS_PATH})
-install(DIRECTORY ico/breeze-icons/48x48 DESTINATION ${QET_ICONS_PATH})
-install(DIRECTORY ico/breeze-icons/64x64 DESTINATION ${QET_ICONS_PATH})
-install(DIRECTORY ico/breeze-icons/128x128 DESTINATION ${QET_ICONS_PATH})
-install(DIRECTORY ico/breeze-icons/256x256 DESTINATION ${QET_ICONS_PATH})
-install(DIRECTORY elements DESTINATION share/qelectrotech)
-install(DIRECTORY examples DESTINATION share/qelectrotech)
-install(DIRECTORY titleblocks DESTINATION share/qelectrotech)
-install(FILES LICENSE ELEMENTS.LICENSE CREDIT README ChangeLog DESTINATION share/doc/qelectrotech)
-install(FILES misc/org.qelectrotech.qelectrotech.desktop DESTINATION share/applications)
-install(FILES misc/qelectrotech.xml DESTINATION share/mime/packages)
-install(FILES misc/qelectrotech.appdata.xml DESTINATION ${QET_APPDATA_PATH})
-install(FILES ${QM_FILES} DESTINATION ${QET_LANG_PATH})
-
+    install(DIRECTORY ico/breeze-icons/16x16   DESTINATION ${QET_ICONS_PATH})
+    install(DIRECTORY ico/breeze-icons/22x22   DESTINATION ${QET_ICONS_PATH})
+    install(DIRECTORY ico/breeze-icons/32x32   DESTINATION ${QET_ICONS_PATH})
+    install(DIRECTORY ico/breeze-icons/48x48   DESTINATION ${QET_ICONS_PATH})
+    install(DIRECTORY ico/breeze-icons/64x64   DESTINATION ${QET_ICONS_PATH})
+    install(DIRECTORY ico/breeze-icons/128x128 DESTINATION ${QET_ICONS_PATH})
+    install(DIRECTORY ico/breeze-icons/256x256 DESTINATION ${QET_ICONS_PATH})
+    install(DIRECTORY elements    DESTINATION share/qelectrotech)
+    install(DIRECTORY examples    DESTINATION share/qelectrotech)
+    install(DIRECTORY titleblocks DESTINATION share/qelectrotech)
+    install(FILES LICENSE ELEMENTS.LICENSE CREDIT README ChangeLog DESTINATION share/doc/qelectrotech)
+    install(FILES misc/org.qelectrotech.qelectrotech.desktop DESTINATION share/applications)
+    install(FILES misc/qelectrotech.xml    DESTINATION share/mime/packages)
+    install(FILES misc/qelectrotech.appdata.xml DESTINATION ${QET_APPDATA_PATH})
+    install(FILES ${QM_FILES} DESTINATION ${QET_LANG_PATH})
 endif()

build-aux/windows/QElectroTech.wxs

@@ -37,20 +37,26 @@
 
     <!-- ============================================================
          All application files harvested in one pass from files\**
-    ============================================================ -->
+         (Lancer QET.bat has been removed from the artifact before
+          this build — see windows-msi.yml step "Remove Lancer QET.bat")
+         ============================================================ -->
     <ComponentGroup Id="CG_AllFiles" Directory="INSTALLDIR">
       <Files Include="$(var.FilesDir)\**" />
     </ComponentGroup>
 
     <!-- ============================================================
          Desktop + Start Menu shortcuts
-    ============================================================ -->
+         Point directly to qelectrotech.exe with all required arguments.
+         No .bat wrapper needed.
+         ============================================================ -->
     <ComponentGroup Id="CG_Shortcuts" Directory="INSTALLDIR">
+
       <Component Id="C_ShortcutDesktop" Guid="F1A2B3C4-D5E6-7890-5678-012345678901">
         <Shortcut Id="DesktopShortcut"
                   Directory="DesktopFolder"
                   Name="QElectroTech"
-                  Target="[INSTALLDIR]Lancer QET.bat"
+                  Target="[INSTALLDIR]bin\qelectrotech.exe"
+                  Arguments="--common-elements-dir=&quot;[INSTALLDIR]elements/&quot; --common-tbt-dir=&quot;[INSTALLDIR]titleblocks/&quot; --lang-dir=&quot;[INSTALLDIR]lang/&quot; -style windowsvista"
                   Icon="qet.ico"
                   WorkingDirectory="INSTALLDIR" />
         <RegistryValue Root="HKCU"
@@ -59,11 +65,13 @@
                        Type="integer" Value="1"
                        KeyPath="yes" />
       </Component>
+
       <Component Id="C_ShortcutStartMenu" Guid="A2B3C4D5-E6F7-8901-6789-123456789012">
         <Shortcut Id="StartMenuShortcut"
                   Directory="ProgramMenuFolder"
                   Name="QElectroTech"
-                  Target="[INSTALLDIR]Lancer QET.bat"
+                  Target="[INSTALLDIR]bin\qelectrotech.exe"
+                  Arguments="--common-elements-dir=&quot;[INSTALLDIR]elements/&quot; --common-tbt-dir=&quot;[INSTALLDIR]titleblocks/&quot; --lang-dir=&quot;[INSTALLDIR]lang/&quot; -style windowsvista"
                   Icon="qet.ico"
                   WorkingDirectory="INSTALLDIR" />
         <RegistryValue Root="HKCU"
@@ -72,11 +80,12 @@
                        Type="integer" Value="1"
                        KeyPath="yes" />
       </Component>
+
     </ComponentGroup>
 
     <!-- ============================================================
          .qet file association
-    ============================================================ -->
+         ============================================================ -->
     <ComponentGroup Id="CG_FileAssoc" Directory="INSTALLDIR">
       <Component Id="C_FileAssoc" Guid="B3C4D5E6-F7A8-9012-7890-234567890123">
         <RegistryValue Root="HKCR" Key=".qet" Type="string" Value="QElectroTech.Document" KeyPath="yes" />
@@ -90,12 +99,44 @@
 
     <!-- ============================================================
          Icon for shortcuts
-    ============================================================ -->
+         ============================================================ -->
     <Icon Id="qet.ico" SourceFile="$(var.FilesDir)\ico\qelectrotech.ico" />
 
+    <!-- ============================================================
+         CustomAction: set elements\ subtree read-only after install
+
+         Pattern used: two-step SetProperty + Exec
+         1. CA_ResolveElementsPath (immediate, SetProperty):
+              copies the runtime value of INSTALLDIR into the property
+              ELEMENTS_READONLY_CMD, building the full powershell command.
+         2. CA_SetElementsReadOnly (deferred, Execute="deferred"):
+              runs the command stored in ELEMENTS_READONLY_CMD.
+
+         This is the correct WiX v4/v7 pattern for passing a
+         directory path (resolved at runtime) to a deferred CA.
+         ============================================================ -->
+
+    <!-- Step 1: build the powershell command with the resolved INSTALLDIR -->
+    <CustomAction Id="CA_ResolveElementsPath"
+                  Property="CA_SetElementsReadOnly"
+                  Value="powershell.exe -NonInteractive -NoProfile -WindowStyle Hidden -Command &quot;Get-ChildItem -LiteralPath '[INSTALLDIR]elements' -Recurse -File | ForEach-Object { `$_.IsReadOnly = `$true }&quot;" />
+
+    <!-- Step 2: deferred execution of the powershell command -->
+    <CustomAction Id="CA_SetElementsReadOnly"
+                  BinaryRef="Wix4UtilCA_X86"
+                  DllEntry="WixQuietExec"
+                  Execute="deferred"
+                  Impersonate="no"
+                  Return="ignore" />
+
+    <InstallExecuteSequence>
+      <Custom Action="CA_ResolveElementsPath" After="InstallFiles" Condition="NOT Installed AND NOT REMOVE" />
+      <Custom Action="CA_SetElementsReadOnly" After="CA_ResolveElementsPath" Condition="NOT Installed AND NOT REMOVE" />
+    </InstallExecuteSequence>
+
     <!-- ============================================================
          Main feature (everything included)
-    ============================================================ -->
+         ============================================================ -->
     <Feature Id="ProductFeature" Title="QElectroTech" Level="1">
       <ComponentGroupRef Id="CG_AllFiles" />
       <ComponentGroupRef Id="CG_Shortcuts" />
@@ -110,9 +151,9 @@
 
     <!-- Properties shown in Programs and Features -->
     <Property Id="ARPPRODUCTICON" Value="qet.ico" />
-    <Property Id="ARPHELPLINK" Value="https://qelectrotech.org" />
+    <Property Id="ARPHELPLINK"    Value="https://qelectrotech.org" />
     <Property Id="ARPURLINFOABOUT" Value="https://qelectrotech.org" />
-    <Property Id="ARPCOMMENTS" Value="Free electrical schematic editor" />
+    <Property Id="ARPCOMMENTS"   Value="Free electrical schematic editor" />
 
   </Package>
 </Wix>