add MSI and MSIX packaging

(cherry picked from commit 87410aea50)

.github/workflows/appimage-build.yml

@@ -2,7 +2,7 @@ name: AppImage Build
 
 on:
   push:
-    branches: [master]
+    branches: [master, 'release/**']
   pull_request:
     branches: [master]
 

.github/workflows/flatpak-build.yml

@@ -2,7 +2,7 @@ name: Flatpak Build
 
 on:
   push:
-    branches: [master]
+    branches: [master, 'release/**']
   pull_request:
     branches: [master]
 

.github/workflows/windows-build.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - 'release/**'
   pull_request:
     branches:
       - master

.github/workflows/windows-msi-build.yml

@@ -0,0 +1,382 @@
+name: Windows MSI/MSIX Build
+
+on:
+  push:
+    branches:
+      - master
+      - 'release/**'
+  pull_request:
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+  windows_msi_build:
+    runs-on: windows-2022
+
+    permissions:
+      contents: read
+      id-token: write
+      attestations: write
+      artifact-metadata: write
+
+    strategy:
+      matrix:
+        platform: [x64]
+        arch: [x64]
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v5
+
+      - uses: actions/setup-python@v6
+        with:
+          python-version: '3.14.3'
+          architecture: ${{ matrix.arch }}
+
+      - name: Install Dependencies
+        shell: pwsh
+        run: |
+          New-Item -Name "deps" -ItemType "Directory" -Force | Out-Null
+
+          python -m pip install --upgrade pip
+          python -m pip install cffi
+          python -m pip install zstandard
+
+          $ProgressPreference = 'SilentlyContinue'
+          function Download-WithRetry {
+            param(
+              [string]$Url,
+              [string]$OutFile,
+              [int]$MaxAttempts = 5,
+              [int]$InitialDelaySeconds = 2
+            )
+            for ($attempt = 1; $attempt -le $MaxAttempts; $attempt++) {
+              try {
+                Invoke-WebRequest -Uri $Url -OutFile $OutFile -ErrorAction Stop
+                return
+              }
+              catch {
+                if ($attempt -eq $MaxAttempts) {
+                  throw
+                }
+                Start-Sleep -Seconds ($InitialDelaySeconds * [math]::Pow(2, $attempt - 1))
+              }
+            }
+          }
+
+          # The existing solution includes installer.vcxproj, so Inno Setup is
+          # still required to build the unmodified solution. This workflow does
+          # not publish that EXE; it packages the same staged rel tree as MSI/MSIX.
+          Download-WithRetry -Url https://github.com/jrsoftware/issrc/releases/download/is-6_7_1/innosetup-6.7.1.exe -OutFile deps\innosetup-unicode.exe
+          & deps\innosetup-unicode.exe /VERYSILENT | Out-Null
+
+          Download-WithRetry -Url https://github.com/ZoiteChat/gvsbuild/releases/download/zoitechat-2.18.1/GTK3_Gvsbuild_zoitechat-2.18.1_x64.zip -OutFile deps\gtk-${{ matrix.arch }}.zip
+          Expand-Archive -LiteralPath deps\gtk-${{ matrix.arch }}.zip -DestinationPath C:\gtk-build\gtk\x64\release -Force
+
+          Download-WithRetry -Url https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-hicolor-icon-theme-0.18-1-any.pkg.tar.zst -OutFile deps\hicolor-icon-theme.pkg.tar.zst
+          python -c "import tarfile,zstandard,pathlib;archive=pathlib.Path(r'deps\\hicolor-icon-theme.pkg.tar.zst');target=pathlib.Path(r'C:\\gtk-build\\gtk\\x64\\release');dctx=zstandard.ZstdDecompressor();f=archive.open('rb');reader=dctx.stream_reader(f);tf=tarfile.open(fileobj=reader,mode='r|');[tf.extract(m,path=target) for m in tf if m.name.startswith('mingw64/share/icons/hicolor/')];tf.close();reader.close();f.close()"
+
+          Download-WithRetry -Url https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libarchive-3.8.6-1-any.pkg.tar.zst -OutFile deps\libarchive.pkg.tar.zst
+          python -c "import tarfile,zstandard,pathlib;archive=pathlib.Path(r'deps\\libarchive.pkg.tar.zst');target=pathlib.Path(r'C:\\gtk-build\\gtk\\x64\\release');dctx=zstandard.ZstdDecompressor();f=archive.open('rb');reader=dctx.stream_reader(f);tf=tarfile.open(fileobj=reader,mode='r|');[tf.extract(m,path=target) for m in tf if m.name.startswith(('mingw64/include/archive','mingw64/lib/libarchive','mingw64/bin/libarchive'))];tf.close();reader.close();f.close()"
+
+          if (Test-Path C:\gtk-build\gtk\x64\release\mingw64\share\icons\hicolor) {
+            New-Item -Path C:\gtk-build\gtk\x64\release\share\icons -ItemType Directory -Force | Out-Null
+            Copy-Item -Path C:\gtk-build\gtk\x64\release\mingw64\share\icons\hicolor -Destination C:\gtk-build\gtk\x64\release\share\icons\hicolor -Recurse -Force
+          }
+          if (Test-Path C:\gtk-build\gtk\x64\release\mingw64\include) {
+            New-Item -Path C:\gtk-build\gtk\x64\release\include -ItemType Directory -Force | Out-Null
+            Copy-Item -Path C:\gtk-build\gtk\x64\release\mingw64\include\archive* -Destination C:\gtk-build\gtk\x64\release\include -Recurse -Force
+          }
+          if (Test-Path C:\gtk-build\gtk\x64\release\mingw64\lib) {
+            New-Item -Path C:\gtk-build\gtk\x64\release\lib -ItemType Directory -Force | Out-Null
+            Copy-Item -Path C:\gtk-build\gtk\x64\release\mingw64\lib\libarchive* -Destination C:\gtk-build\gtk\x64\release\lib -Force
+          }
+          if (Test-Path C:\gtk-build\gtk\x64\release\mingw64\bin) {
+            New-Item -Path C:\gtk-build\gtk\x64\release\bin -ItemType Directory -Force | Out-Null
+            Copy-Item -Path C:\gtk-build\gtk\x64\release\mingw64\bin\libarchive*.dll -Destination C:\gtk-build\gtk\x64\release\bin -Force
+          }
+          if (Test-Path C:\gtk-build\gtk\x64\release\mingw64) {
+            Remove-Item -Path C:\gtk-build\gtk\x64\release\mingw64 -Recurse -Force
+          }
+
+          Download-WithRetry -Url https://github.com/ZoiteChat/gvsbuild/releases/download/zoitechat-2.18.0-pre4/gendef20260315.7z -OutFile deps\gendef.7z
+          & 7z.exe x deps\gendef.7z -oC:\gtk-build
+
+          Download-WithRetry -Url https://github.com/ZoiteChat/gvsbuild/releases/download/zoitechat-2.18.0-pre4/WinSparkle-20260315.7z -OutFile deps\WinSparkle.7z
+          & 7z.exe x deps\WinSparkle.7z -oC:\gtk-build\WinSparkle
+
+          Download-WithRetry -Url https://github.com/ZoiteChat/gvsbuild/releases/download/zoitechat-2.18.0-pre4/perl-5.42.0.1-${{ matrix.arch }}.7z -OutFile deps\perl-${{ matrix.arch }}.7z
+          & 7z.exe x deps\perl-${{ matrix.arch }}.7z -oC:\gtk-build\perl-5.42.0.1\${{ matrix.platform }}
+
+          $pyRoot = $env:pythonLocation
+          if (-not $pyRoot) { $pyRoot = & python -c "import sys; print(sys.prefix)" }
+
+          foreach ($pyDir in @("C:\gtk-build\python-3.14.3", "C:\gtk-build\python-3.14")) {
+            New-Item -Path $pyDir -ItemType Directory -Force | Out-Null
+            $target = Join-Path $pyDir "${{ matrix.platform }}"
+            if (Test-Path $target) { Remove-Item $target -Recurse -Force }
+            New-Item -Path $pyDir -Name "${{ matrix.platform }}" -ItemType Junction -Value $pyRoot | Out-Null
+          }
+
+      - uses: actions/setup-python@v6
+        with:
+          python-version: '3.8.10'
+          architecture: ${{ matrix.arch }}
+
+      - name: Prepare Python 3.8
+        shell: pwsh
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install cffi
+
+          $pyRoot = $env:pythonLocation
+          if (-not $pyRoot) { $pyRoot = & python -c "import sys; print(sys.prefix)" }
+
+          foreach ($pyDir in @("C:\gtk-build\python-3.8.10", "C:\gtk-build\python-3.8")) {
+            New-Item -Path $pyDir -ItemType Directory -Force | Out-Null
+            $target = Join-Path $pyDir "${{ matrix.platform }}"
+            if (Test-Path $target) { Remove-Item $target -Recurse -Force }
+            New-Item -Path $pyDir -Name "${{ matrix.platform }}" -ItemType Junction -Value $pyRoot | Out-Null
+          }
+
+      - name: Build
+        shell: cmd
+        run: |
+          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
+
+          set "PYTHON_DIR=C:\gtk-build\python-3.14.3\${{ matrix.platform }}"
+          if not exist "%PYTHON_DIR%\libs\python314.lib" (
+            echo Missing %PYTHON_DIR%\libs\python314.lib
+            dir "%PYTHON_DIR%\libs"
+            exit /b 1
+          )
+
+          set "PYTHON38_DIR=C:\gtk-build\python-3.8\${{ matrix.platform }}"
+          if not exist "%PYTHON38_DIR%\libs\python38.lib" (
+            echo Missing %PYTHON38_DIR%\libs\python38.lib
+            dir "%PYTHON38_DIR%\libs"
+            exit /b 1
+          )
+          if not exist "%PYTHON38_DIR%\Lib\site-packages\_cffi_backend.cp38*.pyd" (
+            echo Missing %PYTHON38_DIR%\Lib\site-packages\_cffi_backend.cp38*.pyd
+            exit /b 1
+          )
+
+          set "LIB=%PYTHON_DIR%\libs;%LIB%"
+          set "INCLUDE=%PYTHON_DIR%\include;%INCLUDE%"
+
+          powershell -NoProfile -ExecutionPolicy Bypass -Command "$archiveLib='C:\gtk-build\gtk\x64\release\lib\libarchive.lib'; if (-not (Test-Path $archiveLib)) { $archiveDll = Get-ChildItem 'C:\gtk-build\gtk\x64\release\bin\libarchive*.dll' | Select-Object -First 1; if ($archiveDll) { Push-Location 'C:\gtk-build\gtk\x64\release\lib'; & 'C:\gtk-build\gendef\gendef.exe' $archiveDll.FullName | Out-Null; $archiveDef = Get-ChildItem 'libarchive*.def' | Select-Object -First 1; if ($archiveDef) { & lib /def:$archiveDef.Name /machine:${{ matrix.platform }} /out:libarchive.lib | Out-Null }; Pop-Location } }"
+
+          msbuild win32\zoitechat.sln /m /verbosity:minimal /p:Configuration=Release /p:Platform=${{ matrix.platform }}
+          if errorlevel 1 exit /b 1
+
+          if not exist "..\zoitechat-build\${{ matrix.platform }}\rel\plugins\hcpython38.dll" (
+            echo hcpython38.dll was not built
+            exit /b 1
+          )
+          if not exist "..\zoitechat-build\${{ matrix.platform }}\rel\_cffi_backend.cp38*.pyd" (
+            echo _cffi_backend for Python 3.8 was not staged for the installer
+            exit /b 1
+          )
+
+      - name: Install WiX Toolset
+        shell: pwsh
+        run: |
+          $ErrorActionPreference = 'Stop'
+          # Keep this pinned. WiX v6 introduced OSMF terms and WiX v7 adds
+          # explicit EULA acceptance; do not silently accept new terms in CI.
+          dotnet tool install --tool-path .wix wix --version 5.0.2
+          if ($LASTEXITCODE -ne 0) { throw 'Failed to install WiX Toolset 5.0.2' }
+          & .\.wix\wix.exe --version
+          if ($LASTEXITCODE -ne 0) { throw 'WiX Toolset could not be executed' }
+
+      - name: Build MSI
+        id: build_msi
+        shell: pwsh
+        run: |
+          $ErrorActionPreference = 'Stop'
+
+          $rawVersion = (Get-Content VERSION -Raw).Trim()
+          if ($rawVersion -notmatch '^(\d+)\.(\d+)\.(\d+)') {
+            throw "VERSION '$rawVersion' does not begin with an MSI-compatible major.minor.patch version"
+          }
+
+          # Windows Installer ProductVersion is numeric. Keep the full project
+          # version in the artifact filename while using major.minor.patch in MSI.
+          $msiVersion = "$($Matches[1]).$($Matches[2]).$($Matches[3])"
+          $safeVersion = $rawVersion -replace '[^0-9A-Za-z._-]', '-'
+          $sourceDir = (Resolve-Path "..\zoitechat-build\${{ matrix.platform }}\rel").Path
+          $outputPath = Join-Path $PWD "ZoiteChat-$safeVersion_${{ matrix.arch }}.msi"
+
+          if (-not (Test-Path (Join-Path $sourceDir 'zoitechat.exe'))) {
+            throw "Staged ZoiteChat executable is missing from $sourceDir"
+          }
+
+          & .\.wix\wix.exe build win32\wix\zoitechat.wxs `
+            -arch x64 `
+            -d "SourceDir=$sourceDir" `
+            -d "ProductVersion=$msiVersion" `
+            -out $outputPath
+          if ($LASTEXITCODE -ne 0) { throw 'WiX MSI build failed' }
+
+          if (-not (Test-Path $outputPath)) {
+            throw "Expected MSI was not created: $outputPath"
+          }
+
+          "path=$outputPath" >> $env:GITHUB_OUTPUT
+          "filename=$(Split-Path $outputPath -Leaf)" >> $env:GITHUB_OUTPUT
+
+      - name: Test MSI administrative extraction
+        shell: pwsh
+        run: |
+          $ErrorActionPreference = 'Stop'
+          $msi = '${{ steps.build_msi.outputs.path }}'
+          $adminImage = Join-Path $PWD 'msi-admin-image'
+          New-Item -ItemType Directory -Path $adminImage -Force | Out-Null
+
+          $arguments = "/a `"$msi`" /qn TARGETDIR=`"$adminImage`""
+          $process = Start-Process -FilePath msiexec.exe -ArgumentList $arguments -Wait -PassThru
+          if ($process.ExitCode -ne 0) {
+            throw "MSI administrative extraction failed with exit code $($process.ExitCode)"
+          }
+
+          foreach ($requiredFile in @(
+            'zoitechat.exe',
+            'hclua.dll',
+            'hcupd.dll',
+            'WinSparkle.dll',
+            'hcchecksum.dll',
+            'hcexec.dll',
+            'hcfishlim.dll',
+            'hcsysinfo.dll',
+            'system.png',
+            'hcperl.dll',
+            'hcpython3.dll',
+            'hcpython38.dll'
+          )) {
+            $match = Get-ChildItem -Path $adminImage -Filter $requiredFile -File -Recurse | Select-Object -First 1
+            if ($null -eq $match) {
+              throw "Administrative image does not contain required normal-install file: $requiredFile"
+            }
+          }
+
+          foreach ($requiredPattern in @('_cffi_backend.cp314*.pyd', '_cffi_backend.cp38*.pyd')) {
+            $match = Get-ChildItem -Path $adminImage -Filter $requiredPattern -File -Recurse | Select-Object -First 1
+            if ($null -eq $match) {
+              throw "Administrative image does not contain required Python support file: $requiredPattern"
+            }
+          }
+
+          foreach ($requiredPythonFile in @('zoitechat.py', '_zoitechat.py', 'hexchat.py', 'xchat.py')) {
+            $match = Get-ChildItem -Path $adminImage -Filter $requiredPythonFile -File -Recurse |
+              Where-Object { $_.Directory.Name -eq 'python' } |
+              Select-Object -First 1
+            if ($null -eq $match) {
+              throw "Administrative image does not contain required Python bridge file: $requiredPythonFile"
+            }
+          }
+
+          foreach ($excludedFile in @(
+            'portable-mode',
+            'zoitechat-text.exe'
+          )) {
+            $match = Get-ChildItem -Path $adminImage -Filter $excludedFile -File -Recurse | Select-Object -First 1
+            if ($null -ne $match) {
+              throw "MSI incorrectly contains Inno custom/portable-only file: $excludedFile"
+            }
+          }
+
+      - name: Build MSIX
+        id: build_msix
+        shell: pwsh
+        run: |
+          $ErrorActionPreference = 'Stop'
+
+          $rawVersion = (Get-Content VERSION -Raw).Trim()
+          if ($rawVersion -notmatch '^(\d+)\.(\d+)\.(\d+)') {
+            throw "VERSION '$rawVersion' does not begin with a Store-compatible major.minor.build version"
+          }
+
+          $versionParts = @(
+            [int]$Matches[1],
+            [int]$Matches[2],
+            [int]$Matches[3]
+          )
+          if ($versionParts[0] -eq 0) {
+            throw 'The Microsoft Store requires a non-zero major package version.'
+          }
+          foreach ($part in $versionParts) {
+            if ($part -lt 0 -or $part -gt 65535) {
+              throw "MSIX version component '$part' is outside the Store-supported 0-65535 range."
+            }
+          }
+
+          # Partner Center reserves the fourth version field and requires it to
+          # be zero in submitted Windows 10/11 app packages.
+          $packageVersion = "$($versionParts[0]).$($versionParts[1]).$($versionParts[2]).0"
+          $safeVersion = $rawVersion -replace '[^0-9A-Za-z._-]', '-'
+          $sourceDir = (Resolve-Path "..\zoitechat-build\${{ matrix.platform }}\rel").Path
+          $outputPath = Join-Path $PWD "ZoiteChat-$safeVersion_${{ matrix.arch }}.msix"
+
+          # Microsoft Store identity reserved for ZoiteChat in Partner Center.
+          # These three values are case-sensitive and must exactly match the
+          # Product identity page for the Store submission.
+          $identityName = 'deependtilde.ZoiteChat'
+          $publisher = 'CN=6C7766BB-6AC6-488B-A09E-E3F8E68E63E4'
+          $publisherDisplayName = 'deepend_tilde'
+          $artifactName = 'MSIX Store Package ${{ matrix.arch }}'
+
+          Write-Host "Building Store MSIX for identity: $identityName"
+
+          & .\win32\msix\build-msix.ps1 `
+            -SourceDir $sourceDir `
+            -OutputPath $outputPath `
+            -PackageVersion $packageVersion `
+            -IdentityName $identityName `
+            -Publisher $publisher `
+            -PublisherDisplayName $publisherDisplayName `
+            -SelfSign
+          if ($LASTEXITCODE -ne 0) {
+            throw 'MSIX build script failed'
+          }
+
+          if (-not (Test-Path $outputPath)) {
+            throw "Expected MSIX was not created: $outputPath"
+          }
+
+          "path=$outputPath" >> $env:GITHUB_OUTPUT
+          "filename=$(Split-Path $outputPath -Leaf)" >> $env:GITHUB_OUTPUT
+          "package_version=$packageVersion" >> $env:GITHUB_OUTPUT
+          "store_ready=true" >> $env:GITHUB_OUTPUT
+          "artifact_name=$artifactName" >> $env:GITHUB_OUTPUT
+
+      - name: Upload MSI Installer
+        id: upload_msi
+        uses: actions/upload-artifact@v6
+        with:
+          name: MSI Installer ${{ matrix.arch }}
+          path: ${{ steps.build_msi.outputs.path }}
+          if-no-files-found: error
+
+      - name: Attest MSI Installer (Artifact Attestation)
+        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository }}
+        uses: actions/attest-build-provenance@v3
+        with:
+          subject-name: MSI Installer ${{ matrix.arch }}
+          subject-digest: sha256:${{ steps.upload_msi.outputs.artifact-digest }}
+
+      - name: Upload MSIX Package
+        id: upload_msix
+        uses: actions/upload-artifact@v6
+        with:
+          name: ${{ steps.build_msix.outputs.artifact_name }}
+          path: ${{ steps.build_msix.outputs.path }}
+          if-no-files-found: error
+
+      - name: Attest MSIX Package (Artifact Attestation)
+        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository }}
+        uses: actions/attest-build-provenance@v3
+        with:
+          subject-name: ${{ steps.build_msix.outputs.artifact_name }}
+          subject-digest: sha256:${{ steps.upload_msix.outputs.artifact-digest }}

VERSION

@@ -0,0 +1 @@
+2.19.1

changelog.rst

@@ -1,6 +1,20 @@
 ZoiteChat ChangeLog
 =================
 
+2.19.0 (2026-07-28)
+-------------------
+
+- Added Python 3.8 compatibility for older Windows releases.
+- Added on-demand SASL password prompts, including renewed prompts after reconnecting.
+- Corrected NickServ authentication to use the decrypted password for the active network.
+- Made system theme matching the default and polished GTK3 theme integration.
+- Applied more settings changes immediately, reducing the need to restart ZoiteChat.
+- Added descriptive tooltips to the color picker choices and refined default text-event colors.
+- Stabilized channel tree font handling across palette and theme updates.
+- Corrected the chat scrollbar increment used by its arrow buttons.
+- Improved Windows URL launching through the native shell.
+- Restored expected minimize behavior when clicking ZoiteChat on the Windows taskbar.
+
 2.18.3 (2026-06-29)
 -------------------
 

data/misc/meson.build

@@ -2,6 +2,7 @@ appdir = join_paths(get_option('datadir'), 'applications')
 metainfodir = join_paths(get_option('datadir'), 'metainfo')
 mimedir = join_paths(get_option('datadir'), 'mime', 'packages')
 desktop_utils = find_program('desktop-file-validate', required: false)
+appstreamcli = find_program('appstreamcli', required: false)
 
 if get_option('gtk-frontend')
   if get_option('install-appdata')
@@ -13,7 +14,6 @@ if get_option('gtk-frontend')
       install_dir: metainfodir
     )
 
-    appstreamcli = find_program('appstreamcli', required: false)
     if appstreamcli.found()
       test('Validate net.zoite.Zoitechat.appdata.xml', appstreamcli,
         args: ['validate', zoitechat_appdata]

data/misc/net.zoite.Zoitechat.appdata.xml.in

@@ -29,6 +29,22 @@
     <id>zoitechat.desktop</id>
   </provides>
 <releases>
+<release date="2026-07-28" version="2.19.0">
+  <description>
+    <ul>
+      <li>Added Python 3.8 compatibility for older Windows releases.</li>
+      <li>Added on-demand SASL password prompts, including renewed prompts after reconnecting.</li>
+      <li>Corrected NickServ authentication to use the decrypted password for the active network.</li>
+      <li>Made system theme matching the default and polished GTK3 theme integration.</li>
+      <li>Applied more settings changes immediately, reducing the need to restart ZoiteChat.</li>
+      <li>Added descriptive tooltips to the color picker choices and refined default text-event colors.</li>
+      <li>Stabilized channel tree font handling across palette and theme updates.</li>
+      <li>Corrected the chat scrollbar increment used by its arrow buttons.</li>
+      <li>Improved Windows URL launching through the native shell.</li>
+      <li>Restored expected minimize behavior when clicking ZoiteChat on the Windows taskbar.</li>
+    </ul>
+  </description>
+</release>
 <release date="2026-06-29" version="2.18.3">
   <description>
     <ul>

meson.build

@@ -1,6 +1,6 @@
 project('zoitechat', 'c',
-  version: '2.18.3',
-  meson_version: '>= 0.55.0',
+  version: run_command('cat', 'VERSION', check: true).stdout().strip(),
+  meson_version: '>= 0.59.0',
   default_options: [
     'c_std=c17',
     'buildtype=debugoptimized',

packaging/fedora/zoitechat.spec

@@ -1,5 +1,5 @@
 Name:           zoitechat
-Version:        2.18.3
+Version:        %(cat VERSION)
 Release:        %autorelease
 Summary:        HexChat-based IRC client
 License:        GPL-2.0-or-later WITH cryptsetup-OpenSSL-exception

plugins/python/meson.build

@@ -13,8 +13,16 @@ else
   python_dep = dependency(python_opt, version: '>= 2.7')
 endif
 
+python_py_conf = configuration_data()
+python_py_conf.set('VERSION', meson.project_version())
+python_py = configure_file(
+  input: 'python.py',
+  output: 'python.py',
+  configuration: python_py_conf
+)
+
 python3_source = custom_target('python-bindings',
-  input: ['../../src/common/zoitechat-plugin.h', 'python.py'],
+  input: ['../../src/common/zoitechat-plugin.h', python_py],
   output: 'python.c',
   command: [find_program('generate_plugin.py'), '@INPUT@', '@OUTPUT@']
 )

plugins/python/python.py

@@ -19,7 +19,7 @@ else:
 if not hasattr(sys, 'argv'):
     sys.argv = ['<zoitechat>']
 
-VERSION = b'2.18.3'
+VERSION = b'@VERSION@'
 PLUGIN_NAME = ffi.new('char[]', b'Python')
 PLUGIN_DESC = ffi.new('char[]', b'Python %d.%d scripting interface' % (sys.version_info[0], sys.version_info[1]))
 PLUGIN_VERSION = ffi.new('char[]', VERSION)

src/common/ctcp.c

@@ -126,7 +126,21 @@ ctcp_handle (session *sess, char *to, char *nick, char *ip,
 		if (ctcp_check (sess, nick, word, word_eol, word[4] + ctcp_offset))
 			goto generic;
 
-		inbound_action (sess, to, nick, ip, msg + 7, FALSE, tags_data->identified, tags_data);
+		{
+			gboolean private_fromme = !serv->p_cmp (nick, serv->nick) && !is_channel (serv, to);
+
+			if (private_fromme)
+			{
+				session *target = find_dialog (serv, to);
+
+				if (target)
+					sess = target;
+				else if (serv->front_session)
+					sess = serv->front_session;
+			}
+
+			inbound_action (sess, to, nick, ip, msg + 7, private_fromme, tags_data->identified, tags_data);
+		}
 		return;
 	}
 

src/common/dbus/meson.build

@@ -13,9 +13,9 @@ dbus_includes = [
 dbus_service_dir = join_paths(get_option('datadir'), 'dbus-1/services')
 
 if get_option('dbus-service-use-appid')
-  dbus_service_name = 'io.github.Hexchat'
-  dbus_output_file = 'io.github.Hexchat.service'
-  dbus_cargs = '-DDBUS_SERVICE="io.github.Hexchat"'
+  dbus_service_name = 'net.zoite.Zoitechat'
+  dbus_output_file = 'net.zoite.Zoitechat.service'
+  dbus_cargs = '-DDBUS_SERVICE="net.zoite.Zoitechat"'
 else
   dbus_service_name = 'org.zoitechat.service'
   dbus_output_file = 'org.zoitechat.service.service'

src/common/gtk3-theme-service.c

@@ -858,8 +858,10 @@ path_depth_from_root (const char *base, const char *path)
 static gint
 theme_root_candidate_compare (gconstpointer a, gconstpointer b)
 {
-	const ThemeRootCandidate *ca = a;
-	const ThemeRootCandidate *cb = b;
+	/* g_ptr_array_sort() passes pointers to the array slots, not the values
+	 * stored in those slots. Dereference once before comparing candidates. */
+	const ThemeRootCandidate *ca = *(ThemeRootCandidate * const *) a;
+	const ThemeRootCandidate *cb = *(ThemeRootCandidate * const *) b;
 	if (ca->has_index_theme != cb->has_index_theme)
 		return ca->has_index_theme ? -1 : 1;
 	if (ca->depth != cb->depth)

src/common/inbound.c

@@ -675,7 +675,8 @@ inbound_chanmsg (server *serv, session *sess, char *chan, char *from,
 
 	if (fromme)
 	{
-		if (prefs.hex_away_auto_unmark && serv->is_away && !tags_data->timestamp)
+		if (prefs.hex_away_auto_unmark && serv->is_away &&
+			 (!tags_data->timestamp || serv->have_echo_message))
 			sess->server->p_set_back (sess->server);
 		reply_context_print (sess, tags_data);
 		EMIT_SIGNAL_TIMESTAMP (XP_TE_UCHANMSG, sess, from, text, nickchar, NULL,

src/common/outbound.c

@@ -3025,7 +3025,7 @@ cmd_msg (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 									  newsess->server->nick, msg + offset, TRUE, FALSE,
 									  &no_tags);
 			}
-			else
+			else if (!sess->server->have_echo_message)
 			{
 				/* mask out passwords */
 				if (g_ascii_strcasecmp (nick, "nickserv") == 0)
@@ -5058,6 +5058,11 @@ handle_user_input (session *sess, char *text, int history, int nocommand)
 		handle_say (sess, text, TRUE);
 		return 1;
 	}
+	if (text[0] == cmd_char && text[1] == cmd_char)
+	{
+		handle_say (sess, text + 1, TRUE);
+		return 1;
+	}
 
 	for (i = 1; text[i]; i++)
 	{

src/common/plugin.c

@@ -86,6 +86,88 @@ plugin_windows_needs_python38 (void)
 
 	return version.dwMajorVersion < 10;
 }
+
+/*
+ * The Windows scripting plugins are linked against exact runtime DLL names.
+ * Keep the bridge DLLs installed and resolve the matching system runtimes at
+ * startup so installing Python/Perl later only requires restarting ZoiteChat.
+ */
+static gboolean
+plugin_windows_dll_available (const wchar_t *dll_name)
+{
+	return SearchPathW (NULL, dll_name, NULL, 0, NULL, NULL) != 0;
+}
+
+/*
+ * MSIX packaged processes do not search the normal user PATH for dependent
+ * DLLs. Official CPython installs register an InstallPath using PEP 514, so
+ * explicitly load pythonXY.dll from that absolute path before loading the
+ * ZoiteChat Python bridge. The loaded-module list will then satisfy the
+ * hcpython*.dll import of the same Python runtime DLL.
+ */
+static HMODULE
+plugin_windows_load_python_runtime_from_registry (const wchar_t *version,
+                                                   const wchar_t *dll_name)
+{
+	static const HKEY roots[] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE };
+	wchar_t key_name[128];
+	wchar_t install_path[32768];
+	wchar_t dll_path[32768];
+	DWORD install_size;
+	LONG status;
+	HMODULE module;
+	int install_len;
+	const wchar_t *separator;
+	guint i;
+
+	if (_snwprintf_s (key_name, G_N_ELEMENTS (key_name), _TRUNCATE,
+	                  L"Software\\Python\\PythonCore\\%ls\\InstallPath",
+	                  version) < 0)
+		return NULL;
+
+	for (i = 0; i < G_N_ELEMENTS (roots); i++)
+	{
+		install_size = sizeof (install_path);
+		status = RegGetValueW (roots[i], key_name, NULL,
+		                       RRF_RT_REG_SZ | RRF_RT_REG_EXPAND_SZ,
+		                       NULL, install_path, &install_size);
+		if (status != ERROR_SUCCESS)
+			continue;
+
+		install_path[G_N_ELEMENTS (install_path) - 1] = L'\0';
+		install_len = lstrlenW (install_path);
+		if (install_len == 0)
+			continue;
+
+		separator = (install_path[install_len - 1] == L'\\' ||
+		             install_path[install_len - 1] == L'/') ? L"" : L"\\";
+
+		if (_snwprintf_s (dll_path, G_N_ELEMENTS (dll_path), _TRUNCATE,
+		                  L"%ls%ls%ls", install_path, separator, dll_name) < 0)
+			continue;
+
+		module = LoadLibraryW (dll_path);
+		if (module != NULL)
+			return module;
+	}
+
+	return NULL;
+}
+
+static gboolean
+plugin_windows_prepare_python_runtime (const wchar_t *version,
+                                       const wchar_t *dll_name)
+{
+	HMODULE module;
+
+	module = GetModuleHandleW (dll_name);
+	if (module == NULL)
+		module = LoadLibraryW (dll_name);
+	if (module == NULL)
+		module = plugin_windows_load_python_runtime_from_registry (version, dll_name);
+
+	return module != NULL;
+}
 #endif
 
 /* crafted to be an even 32 bytes */
@@ -521,11 +603,18 @@ plugin_auto_load (session *sess)
 	for_files (lib_dir, "hcexec.dll", plugin_auto_load_cb);
 	for_files (lib_dir, "hcfishlim.dll", plugin_auto_load_cb);
 	for_files(lib_dir, "hclua.dll", plugin_auto_load_cb);
-	for_files (lib_dir, "hcperl.dll", plugin_auto_load_cb);
+	if (plugin_windows_dll_available (L"perl542.dll"))
+		for_files (lib_dir, "hcperl.dll", plugin_auto_load_cb);
 	if (plugin_windows_needs_python38 ())
-		for_files (lib_dir, "hcpython38.dll", plugin_auto_load_cb);
+	{
+		if (plugin_windows_prepare_python_runtime (L"3.8", L"python38.dll"))
+			for_files (lib_dir, "hcpython38.dll", plugin_auto_load_cb);
+	}
 	else
-		for_files (lib_dir, "hcpython3.dll", plugin_auto_load_cb);
+	{
+		if (plugin_windows_prepare_python_runtime (L"3.14", L"python314.dll"))
+			for_files (lib_dir, "hcpython3.dll", plugin_auto_load_cb);
+	}
 	for_files (lib_dir, "hcupd.dll", plugin_auto_load_cb);
 	for_files (lib_dir, "hcsysinfo.dll", plugin_auto_load_cb);
 #else

src/common/proto-irc.c

@@ -1368,7 +1368,7 @@ process_named_msg (session *sess, char *type, char *word[], char *word_eol[],
 						{
 							if (ignore_check (word[1], IG_PRIV))
 								return;
-							if (serv->have_echo_message && !serv->p_cmp (nick, serv->nick))
+							if (!serv->p_cmp (nick, serv->nick))
 							{
 								session *target_sess = find_dialog (serv, to);
 

src/common/zoitechat.c

@@ -463,8 +463,7 @@ doover:
 		while (list)
 		{
 			sess = list->data;
-			if (!sess->server->have_awaynotify)
-				sess->done_away_check = FALSE;
+			sess->done_away_check = FALSE;
 			list = list->next;
 		}
 		loop++;

src/fe-gtk/chanview-tree.c

@@ -301,26 +301,35 @@ cv_tree_focus (chan *ch)
 	path = gtk_tree_model_get_path (model, &ch->iter);
 	if (path)
 	{
-		/* This full section does what
-		 * gtk_tree_view_scroll_to_cell (tree, path, NULL, TRUE, 0.5, 0.5);
-		 * does, except it only scrolls the window if the provided cell is
-		 * not visible. Basic algorithm taken from gtktreeview.c */
-
-		/* obtain information to see if the cell is visible */
-		gtk_tree_view_get_background_area (tree, path, NULL, &cell_rect);
-		gtk_tree_view_get_visible_rect (tree, &vis_rect);
-
-		/* The cordinates aren't offset correctly */
-		gtk_tree_view_convert_widget_to_bin_window_coords ( tree, cell_rect.x, cell_rect.y, NULL, &cell_rect.y );
-
-		/* only need to scroll if out of bounds */
-		if (cell_rect.y < vis_rect.y ||
-				cell_rect.y + cell_rect.height > vis_rect.y + vis_rect.height)
+		if (!gtk_widget_get_realized (GTK_WIDGET (tree)))
 		{
-			dest_y = cell_rect.y - ((vis_rect.height - cell_rect.height) * 0.5);
-			if (dest_y < 0)
-				dest_y = 0;
-			gtk_tree_view_scroll_to_point (tree, -1, dest_y);
+			/* Layout changes can restore focus before the new tree is realized.
+			 * Let GTK track the row and scroll once its geometry is available. */
+			gtk_tree_view_scroll_to_cell (tree, path, NULL, TRUE, 0.5, 0.5);
+		}
+		else
+		{
+			/* This full section does what
+			 * gtk_tree_view_scroll_to_cell (tree, path, NULL, TRUE, 0.5, 0.5);
+			 * does, except it only scrolls the window if the provided cell is
+			 * not visible. Basic algorithm taken from gtktreeview.c */
+
+			/* obtain information to see if the cell is visible */
+			gtk_tree_view_get_background_area (tree, path, NULL, &cell_rect);
+			gtk_tree_view_get_visible_rect (tree, &vis_rect);
+
+			/* The cordinates aren't offset correctly */
+			gtk_tree_view_convert_widget_to_bin_window_coords ( tree, cell_rect.x, cell_rect.y, NULL, &cell_rect.y );
+
+			/* only need to scroll if out of bounds */
+			if (cell_rect.y < vis_rect.y ||
+					cell_rect.y + cell_rect.height > vis_rect.y + vis_rect.height)
+			{
+				dest_y = cell_rect.y - ((vis_rect.height - cell_rect.height) * 0.5);
+				if (dest_y < 0)
+					dest_y = 0;
+				gtk_tree_view_scroll_to_point (tree, -1, dest_y);
+			}
 		}
 		/* theft done, now make it focused like */
 		gtk_tree_view_set_cursor (tree, path, NULL, FALSE);

src/fe-gtk/chanview.c

@@ -307,6 +307,109 @@ chanview_set_impl (chanview *cv, int type)
 		cv->func_focus (cv->focused);
 }
 
+void
+chanview_set_sorted (chanview *cv, gboolean sorted)
+{
+	cv->sorted = sorted ? 1 : 0;
+}
+
+void
+chanview_set_use_icons (chanview *cv, gboolean use_icons)
+{
+	cv->use_icons = use_icons ? 1 : 0;
+}
+
+void
+chanview_set_trunc_len (chanview *cv, int trunc_len)
+{
+	cv->trunc_len = trunc_len;
+}
+
+typedef struct
+{
+	chan *ch;
+	int old_pos;
+} chanview_sort_entry;
+
+/* re-sort the session rows below one parent with cb_compare, leaving
+ * utility rows (tag != 0) in place; mirrors chanview_insert_sorted() */
+static void
+chanview_resort_children (chanview *cv, GtkTreeIter *parent)
+{
+	GtkTreeModel *model = GTK_TREE_MODEL (cv->store);
+	GtkTreeIter iter;
+	chanview_sort_entry *entries;
+	int *positions;
+	gint *new_order;
+	chan *ch;
+	int n, i, j, count;
+
+	n = gtk_tree_model_iter_n_children (model, parent);
+	if (n < 2)
+		return;
+
+	entries = g_new0 (chanview_sort_entry, n);
+	positions = g_new0 (int, n);
+	new_order = g_new0 (gint, n);
+
+	count = 0;
+	for (i = 0; i < n; i++)
+	{
+		new_order[i] = i;
+		if (!gtk_tree_model_iter_nth_child (model, &iter, parent, i))
+			continue;
+		gtk_tree_model_get (model, &iter, COL_CHAN, &ch, -1);
+		if (ch && ch->tag == 0 && ch->userdata)
+		{
+			entries[count].ch = ch;
+			entries[count].old_pos = i;
+			positions[count] = i;
+			count++;
+		}
+	}
+
+	/* stable insertion sort; tab groups stay small so this is cheap */
+	for (i = 1; i < count; i++)
+	{
+		chanview_sort_entry key = entries[i];
+
+		j = i - 1;
+		while (j >= 0 && cv->cb_compare (entries[j].ch->userdata, key.ch->userdata) > 0)
+		{
+			entries[j + 1] = entries[j];
+			j--;
+		}
+		entries[j + 1] = key;
+	}
+
+	for (i = 0; i < count; i++)
+		new_order[positions[i]] = entries[i].old_pos;
+
+	gtk_tree_store_reorder (cv->store, parent, new_order);
+
+	g_free (entries);
+	g_free (positions);
+	g_free (new_order);
+}
+
+/* top-level rows keep their order (insertion never sorts them either);
+ * only the children within each family are sorted */
+void
+chanview_resort (chanview *cv)
+{
+	GtkTreeIter iter;
+
+	if (!cv->cb_compare)
+		return;
+
+	if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (cv->store), &iter))
+	{
+		do
+			chanview_resort_children (cv, &iter);
+		while (gtk_tree_model_iter_next (GTK_TREE_MODEL (cv->store), &iter));
+	}
+}
+
 static void
 chanview_free_ch (chanview *cv, GtkTreeIter *iter)
 {

src/fe-gtk/chanview.h

@@ -34,6 +34,10 @@ void chanview_set_callbacks (chanview *cv,
 	gboolean (*cb_contextmenu) (chanview *, chan *, int tag, void *userdata, GdkEventButton *),
 	int (*cb_compare) (void *a, void *b));
 void chanview_set_impl (chanview *cv, int type);
+void chanview_set_sorted (chanview *cv, gboolean sorted);
+void chanview_set_use_icons (chanview *cv, gboolean use_icons);
+void chanview_set_trunc_len (chanview *cv, int trunc_len);
+void chanview_resort (chanview *cv);
 chan *chanview_add (chanview *cv, char *name, void *family, void *userdata, gboolean allow_closure, int tag, GdkPixbuf *icon);
 int chanview_get_size (chanview *cv);
 GtkWidget *chanview_get_box (chanview *cv);

src/fe-gtk/fe-gtk.c

@@ -124,12 +124,38 @@ create_msg_dialog (gchar *title, gchar *message)
 
 static char *win32_argv0_dir;
 
+static gboolean
+win32_has_package_identity (void)
+{
+	HMODULE kernel32;
+	LONG (WINAPI *get_current_aumid) (UINT32 *, PWSTR);
+	UINT32 length = 0;
+
+	kernel32 = GetModuleHandleW (L"kernel32.dll");
+	if (!kernel32)
+		return FALSE;
+
+	get_current_aumid = (LONG (WINAPI *) (UINT32 *, PWSTR))
+		GetProcAddress (kernel32, "GetCurrentApplicationUserModelId");
+	if (!get_current_aumid)
+		return FALSE;
+
+	return get_current_aumid (&length, NULL) == ERROR_INSUFFICIENT_BUFFER;
+}
+
 static void
 win32_set_appusermodelid (void)
 {
 	HMODULE shell32;
 	HRESULT (WINAPI *set_appid) (PCWSTR);
 
+	/*
+	 * Packaged desktop apps must use the AUMID assigned by the Windows app
+	 * package. Keep the existing explicit AUMID only for Inno/MSI installs.
+	 */
+	if (win32_has_package_identity ())
+		return;
+
 	shell32 = GetModuleHandleW (L"shell32.dll");
 	if (!shell32)
 		shell32 = LoadLibraryW (L"shell32.dll");

src/fe-gtk/maingui.c

@@ -569,6 +569,18 @@ mg_create_tab_colors (void)
         away_list = mg_attr_list_create (&gui_palette[THEME_TOKEN_TAB_AWAY], FALSE);
 }
 
+static PangoAttrList *
+mg_attr_list_for_tab_state (int state)
+{
+        if (state & TAB_STATE_NEW_HILIGHT)
+                return nickseen_list;
+        if (state & TAB_STATE_NEW_MSG)
+                return newmsg_list;
+        if (state & TAB_STATE_NEW_DATA)
+                return newdata_list;
+        return plain_list;
+}
+
 static void
 set_window_urgency (GtkWidget *win, gboolean set)
 {
@@ -714,7 +726,10 @@ mg_set_access_icon (session_gui *gui, GdkPixbuf *pix, gboolean away)
 {
         if (gui->op_xpm)
         {
-                if (pix == gtk_image_get_pixbuf (GTK_IMAGE (gui->op_xpm))) /* no change? */
+                /* no change? (the pref check makes sure a live settings
+                   change can still remove the icon) */
+                if (pix == gtk_image_get_pixbuf (GTK_IMAGE (gui->op_xpm)) &&
+                         prefs.hex_gui_input_icon)
                 {
                         mg_set_myself_away (gui, away);
                         return;
@@ -3596,6 +3611,48 @@ mg_create_topicbar (session *sess, GtkWidget *box)
 	mg_create_chanmodebuttons (gui, bbox);
 }
 
+/* re-apply the multi-line topic and inline mode button preferences to an
+ * already built topic bar (see mg_create_topicbar () for the layout) */
+
+static void
+mg_update_topicbar_layout (session_gui *gui)
+{
+	GtkWidget *topic = gui->topic_entry;
+	GtkWidget *vbox = gui->topic_bar;
+	GtkWidget *topic_scroll;
+	GtkWidget *hbox;
+	GtkWidget *mode_hbox;
+	GtkWidget *desired_parent;
+	GtkWidget *current_parent;
+	gboolean wrap;
+
+	if (!topic || !GTK_IS_TEXT_VIEW (topic) || !vbox || !gui->topicbutton_box)
+		return;
+
+	wrap = prefs.hex_gui_topicbar_multiline && !prefs.hex_gui_mode_buttons_inline;
+	gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (topic),
+		wrap ? GTK_WRAP_WORD_CHAR : GTK_WRAP_NONE);
+
+	topic_scroll = gtk_widget_get_parent (topic);
+	hbox = topic_scroll ? gtk_widget_get_parent (topic_scroll) : NULL;
+	mode_hbox = gtk_widget_get_parent (gui->topicbutton_box);
+
+	if (mode_hbox && hbox)
+	{
+		desired_parent = prefs.hex_gui_mode_buttons_inline ? hbox : vbox;
+		current_parent = gtk_widget_get_parent (mode_hbox);
+		if (current_parent && current_parent != desired_parent)
+		{
+			g_object_ref (mode_hbox);
+			gtk_container_remove (GTK_CONTAINER (current_parent), mode_hbox);
+			gtk_box_pack_start (GTK_BOX (desired_parent), mode_hbox, 0, 0, 0);
+			g_object_unref (mode_hbox);
+		}
+	}
+
+	mg_topicbar_update_height (topic);
+}
+
 /* check if a word is clickable */
 
 static int
@@ -4004,8 +4061,12 @@ mg_create_userlist (session_gui *gui, GtkWidget *box)
         gtk_widget_set_margin_end (gui->namelistinfo, 0);
         gtk_widget_set_hexpand (gui->namelistinfo, TRUE);
         gtk_widget_set_halign (gui->namelistinfo, GTK_ALIGN_FILL);
+        /* always pack it so the preference can be toggled without a
+           restart; visibility is controlled explicitly */
+        gtk_widget_set_no_show_all (gui->namelistinfo, TRUE);
+        gtk_box_pack_start (GTK_BOX (vbox), gui->namelistinfo, 0, 0, 0);
         if (prefs.hex_gui_ulist_count)
-                gtk_box_pack_start (GTK_BOX (vbox), gui->namelistinfo, 0, 0, 0);
+                gtk_widget_show (gui->namelistinfo);
 
         gui->user_tree = ulist = userlist_create (vbox);
 
@@ -5233,6 +5294,10 @@ mg_apply_setup (void)
                 sess = list->data;
                 gtk_xtext_set_time_stamp (sess->res->buffer, prefs.hex_stamp_text);
                 ((xtext_buffer *)sess->res->buffer)->needs_recalc = TRUE;
+                /* the attribute lists were just recreated, so re-apply the
+                   color matching each tab's activity state */
+                if (sess->res->tab)
+                        chan_set_color (sess->res->tab, mg_attr_list_for_tab_state (sess->tab_state));
                 if (!sess->gui->is_tab || !done_main)
                         mg_place_userlist_and_chanview (sess->gui);
                 if (sess->gui->is_tab)
@@ -5275,6 +5340,49 @@ fe_buttons_update (session *sess)
                 gtk_widget_hide (sess->gui->button_box);
 }
 
+/* tab label for a session that has no joined channel: the channel we are
+ * waiting to join in parentheses, or "<none>". tbuf must hold CHANLEN+6. */
+
+static void
+mg_tab_pending_name (session *sess, char *tbuf)
+{
+        if (sess->waitchannel[0])
+        {
+                if (prefs.hex_gui_tab_trunc > 2 && g_utf8_strlen (sess->waitchannel, -1) > prefs.hex_gui_tab_trunc)
+                {
+                        /* truncate long channel names */
+                        tbuf[0] = '(';
+                        strcpy (tbuf + 1, sess->waitchannel);
+                        g_utf8_offset_to_pointer(tbuf, prefs.hex_gui_tab_trunc)[0] = 0;
+                        strcat (tbuf, "..)");
+                } else
+                {
+                        sprintf (tbuf, "(%s)", sess->waitchannel);
+                }
+        }
+        else
+                strcpy (tbuf, _("<none>"));
+}
+
+/* re-apply the tab label truncation preference to a session's tab */
+
+static void
+mg_retrunc_tab (session *sess)
+{
+        char tbuf[CHANLEN+6];
+
+        if (!sess->res->tab)
+                return;
+
+        if (sess->channel[0])
+                chan_rename (sess->res->tab, sess->channel, prefs.hex_gui_tab_trunc);
+        else
+        {
+                mg_tab_pending_name (sess, tbuf);
+                chan_rename (sess->res->tab, tbuf, prefs.hex_gui_tab_trunc);
+        }
+}
+
 void
 fe_clear_channel (session *sess)
 {
@@ -5283,22 +5391,7 @@ fe_clear_channel (session *sess)
 
         if (sess->gui->is_tab)
         {
-                if (sess->waitchannel[0])
-                {
-                        if (prefs.hex_gui_tab_trunc > 2 && g_utf8_strlen (sess->waitchannel, -1) > prefs.hex_gui_tab_trunc)
-                        {
-                                /* truncate long channel names */
-                                tbuf[0] = '(';
-                                strcpy (tbuf + 1, sess->waitchannel);
-                                g_utf8_offset_to_pointer(tbuf, prefs.hex_gui_tab_trunc)[0] = 0;
-                                strcat (tbuf, "..)");
-                        } else
-                        {
-                                sprintf (tbuf, "(%s)", sess->waitchannel);
-                        }
-                }
-                else
-                        strcpy (tbuf, _("<none>"));
+                mg_tab_pending_name (sess, tbuf);
                 chan_rename (sess->res->tab, tbuf, prefs.hex_gui_tab_trunc);
         }
 
@@ -5422,6 +5515,110 @@ fe_set_channel (session *sess)
                 chan_rename (sess->res->tab, sess->channel, prefs.hex_gui_tab_trunc);
 }
 
+static void
+mg_apply_live_prefs_to_gui (session_gui *gui, session *sess, const mg_live_prefs *changes)
+{
+        if (changes->meters)
+                mg_update_meters (gui);
+
+        if (changes->ulist_columns && gui->user_tree)
+                userlist_rebuild_columns (gui->user_tree);
+
+        if (changes->ulist_count && gui->namelistinfo)
+        {
+                if (prefs.hex_gui_ulist_count)
+                        gtk_widget_show (gui->namelistinfo);
+                else
+                        gtk_widget_hide (gui->namelistinfo);
+        }
+
+        if (changes->input_box && gui->nick_box)
+        {
+                if (prefs.hex_gui_input_nick)
+                        gtk_widget_show (gui->nick_box);
+                else
+                        gtk_widget_hide (gui->nick_box);
+        }
+
+        /* refresh the access icon; re-filling the user list rows can
+           clear it as a side effect, so restore it here too */
+        if ((changes->input_box || changes->ulist_rows) && sess && is_session (sess))
+        {
+                if (sess->type == SESS_DIALOG)
+                        mg_set_access_icon (gui, NULL, sess->server->is_away);
+                else
+                        mg_set_access_icon (gui, get_user_icon (sess->server, sess->me), sess->server->is_away);
+        }
+
+        if (changes->topic_bar)
+                mg_update_topicbar_layout (gui);
+
+        if (changes->transparency && gui->window)
+                gtk_widget_set_opacity (gui->window, (prefs.hex_gui_transparency / 255.));
+}
+
+/* apply preference changes that used to require a restart. called by
+ * setup.c after the new prefs have been committed. */
+
+void
+mg_apply_live_prefs (const mg_live_prefs *changes)
+{
+        GSList *list;
+        session *sess;
+        int done_main = FALSE;
+
+        if (!changes)
+                return;
+
+        /* the tab bar / channel tree lives in the shared tab window */
+        if (mg_gui && mg_gui->chanview)
+        {
+                if (changes->tab_resort)
+                {
+                        chanview_set_sorted (mg_gui->chanview, prefs.hex_gui_tab_sort);
+                        chanview_resort (mg_gui->chanview);
+                }
+                if (changes->tab_trunc)
+                        chanview_set_trunc_len (mg_gui->chanview, prefs.hex_gui_tab_trunc);
+                if (changes->chanview || changes->tab_resort)
+                {
+                        chanview_set_use_icons (mg_gui->chanview,
+                                                                                        prefs.hex_gui_tab_icons && (pix_tree_channel || pix_tree_dialog ||
+                                                                                                                                                                 pix_tree_server || pix_tree_util));
+                        /* rebuild the tab bar / tree widgets from the model */
+                        chanview_set_impl (mg_gui->chanview, prefs.hex_gui_tab_layout);
+                }
+        }
+
+        list = sess_list;
+        while (list)
+        {
+                sess = list->data;
+
+                if (changes->tab_trunc)
+                        mg_retrunc_tab (sess);
+                if (changes->ulist_sort)
+                        userlist_apply_sort (sess);
+                if (changes->ulist_rows)
+                        userlist_refill (sess);
+
+                if (sess->gui->is_tab)
+                {
+                        /* only apply to the shared tab window once, using the
+                           front-most session for session-dependent bits */
+                        if (!done_main)
+                        {
+                                done_main = TRUE;
+                                mg_apply_live_prefs_to_gui (sess->gui, current_tab, changes);
+                        }
+                }
+                else
+                        mg_apply_live_prefs_to_gui (sess->gui, sess, changes);
+
+                list = list->next;
+        }
+}
+
 void
 fe_set_typing (session *sess, const char *nick, const char *state)
 {

src/fe-gtk/maingui.h

@@ -37,6 +37,24 @@ GtkWidget *mg_create_generic_tab (char *name, char *title, int force_toplevel, i
 void mg_set_title (GtkWidget *button, char *title);
 void mg_set_access_icon (session_gui *gui, GdkPixbuf *pix, gboolean away);
 void mg_apply_setup (void);
+
+/* which parts of the GUI need a live rebuild after a preferences change */
+typedef struct
+{
+	unsigned int chanview:1;			/* rebuild the tab bar / channel tree */
+	unsigned int tab_resort:1;		/* re-sort channel tabs */
+	unsigned int tab_trunc:1;			/* re-truncate tab labels */
+	unsigned int ulist_columns:1;	/* rebuild user list columns */
+	unsigned int ulist_rows:1;		/* re-fill user list rows */
+	unsigned int ulist_sort:1;		/* re-apply user list sort order */
+	unsigned int ulist_count:1;		/* user count label visibility */
+	unsigned int meters:1;				/* rebuild lag/throttle meters */
+	unsigned int input_box:1;			/* nick box visibility and access icon */
+	unsigned int topic_bar:1;			/* topic wrap mode and mode button placement */
+	unsigned int transparency:1;	/* main window opacity */
+} mg_live_prefs;
+
+void mg_apply_live_prefs (const mg_live_prefs *changes);
 void mg_apply_session_font_prefs (session_gui *gui);
 void mg_close_sess (session *);
 void mg_tab_close (session *sess);

src/fe-gtk/notifications/notification-winrt.cpp

@@ -22,6 +22,8 @@
 
 #include <string>
 #include <codecvt>
+#include <vector>
+#include <windows.h>
 #include <strsafe.h>
 
 #include <roapi.h>
@@ -32,6 +34,30 @@ using namespace Windows::Data::Xml::Dom;
 
 static ToastNotifier ^ notifier = nullptr;
 
+static Platform::String ^
+current_package_aumid (void)
+{
+	HMODULE kernel32;
+	LONG (WINAPI *get_current_aumid) (UINT32 *, PWSTR);
+	UINT32 length = 0;
+
+	kernel32 = GetModuleHandleW (L"kernel32.dll");
+	if (!kernel32)
+		return nullptr;
+
+	get_current_aumid = (LONG (WINAPI *) (UINT32 *, PWSTR))
+		GetProcAddress (kernel32, "GetCurrentApplicationUserModelId");
+	if (!get_current_aumid ||
+		get_current_aumid (&length, nullptr) != ERROR_INSUFFICIENT_BUFFER)
+		return nullptr;
+
+	std::vector<wchar_t> app_id (length);
+	if (get_current_aumid (&length, app_id.data ()) != ERROR_SUCCESS)
+		return nullptr;
+
+	return ref new Platform::String (app_id.data ());
+}
+
 static std::wstring
 widen(const std::string & to_widen)
 {
@@ -87,7 +113,14 @@ extern "C"
 		try
 		{
 			if (!notifier)
-				notifier = ToastNotificationManager::CreateToastNotifier (L"ZoiteChat.Desktop.Notify");
+			{
+				auto package_aumid = current_package_aumid ();
+
+				if (package_aumid != nullptr)
+					notifier = ToastNotificationManager::CreateToastNotifier (package_aumid);
+				else
+					notifier = ToastNotificationManager::CreateToastNotifier (L"ZoiteChat.Desktop.Notify");
+			}
 		}
 		catch (Platform::Exception ^ ex)
 		{

src/fe-gtk/setup.c

@@ -1045,28 +1045,30 @@ setup_create_spin (GtkWidget *table, int row, const setting *set)
         return wid;
 }
 
+static guint setup_trans_apply_tag = 0;
+/* the window opacity the dialog opened with, so cancelling can undo the
+ * live preview done by the slider */
+static int setup_transparency_snapshot;
+
 static gint
-setup_apply_trans (int *tag)
+setup_apply_trans (gpointer userdata)
 {
         prefs.hex_gui_transparency = setup_prefs.hex_gui_transparency;
-        gtk_widget_set_opacity (current_sess->gui->window,
-                                                        (prefs.hex_gui_transparency / 255.));
+        if (current_sess)
+                gtk_widget_set_opacity (current_sess->gui->window,
+                                                                (prefs.hex_gui_transparency / 255.));
 
-        *tag = 0;
+        setup_trans_apply_tag = 0;
         return 0;
 }
 
 static void
 setup_hscale_cb (GtkRange *wid, const setting *set)
 {
-        static int tag = 0;
-
         setup_set_int (&setup_prefs, set, (int) gtk_range_get_value (wid));
 
-        if (tag == 0)
-        {
-                tag = g_idle_add ((GSourceFunc) setup_apply_trans, &tag);
-        }
+        if (setup_trans_apply_tag == 0)
+                setup_trans_apply_tag = g_idle_add ((GSourceFunc) setup_apply_trans, NULL);
 }
 
 static void
@@ -1091,7 +1093,8 @@ setup_create_hscale (GtkWidget *table, int row, const setting *set)
 
 #ifndef WIN32 /* Windows always supports this */
         /* Only used for transparency currently */
-        if (!gdk_screen_is_composited (gtk_widget_get_screen (current_sess->gui->window)))
+        if (current_sess &&
+                 !gdk_screen_is_composited (gtk_widget_get_screen (current_sess->gui->window)))
                 gtk_widget_set_sensitive (wid, FALSE);
 #endif
 }
@@ -2293,7 +2296,9 @@ setup_apply (struct zoitechatprefs *pr)
 	ThemeChangedEvent event;
 	struct zoitechatprefs old_prefs = prefs;
 	int old_dark_mode = prefs.hex_gui_dark_mode;
+	mg_live_prefs live_changes;
 
+	memset (&live_changes, 0, sizeof (live_changes));
 
 #define DIFF(a) (pr->a != prefs.a)
 
@@ -2301,40 +2306,49 @@ setup_apply (struct zoitechatprefs *pr)
         if (DIFF (hex_gui_lang))
                 noapply = TRUE;
 #endif
-        if (DIFF (hex_gui_compact))
-                noapply = TRUE;
-        if (DIFF (hex_gui_input_icon))
-                noapply = TRUE;
-        if (DIFF (hex_gui_input_nick))
-                noapply = TRUE;
-        if (DIFF (hex_gui_lagometer))
-                noapply = TRUE;
-        if (DIFF (hex_gui_mode_buttons_inline))
-                noapply = TRUE;
-        if (DIFF (hex_gui_tab_icons))
-                noapply = TRUE;
-        if (DIFF (hex_gui_tab_closebuttons))
-                noapply = TRUE;
+        /* server tabs are only created when a connection is opened, so
+           existing connections keep their current tabs until a restart;
+           the channel tree indentation is still re-applied below */
         if (DIFF (hex_gui_tab_server))
+        {
                 noapply = TRUE;
-        if (DIFF (hex_gui_tab_small))
-                noapply = TRUE;
+                live_changes.chanview = TRUE;
+        }
+
+        if (DIFF (hex_gui_compact))
+        {
+                live_changes.chanview = TRUE;
+                live_changes.ulist_columns = TRUE;
+        }
+        if (DIFF (hex_gui_input_icon) || DIFF (hex_gui_input_nick))
+                live_changes.input_box = TRUE;
+        if (DIFF (hex_gui_lagometer) || DIFF (hex_gui_throttlemeter))
+                live_changes.meters = TRUE;
+        if (DIFF (hex_gui_mode_buttons_inline) || DIFF (hex_gui_topicbar_multiline))
+                live_changes.topic_bar = TRUE;
+        if (DIFF (hex_gui_tab_icons) || DIFF (hex_gui_tab_closebuttons) ||
+                 DIFF (hex_gui_tab_small))
+                live_changes.chanview = TRUE;
         if (DIFF (hex_gui_tab_sort))
-                noapply = TRUE;
+                live_changes.tab_resort = TRUE;
         if (DIFF (hex_gui_tab_trunc))
-                noapply = TRUE;
-        if (DIFF (hex_gui_throttlemeter))
-                noapply = TRUE;
-        if (DIFF (hex_gui_topicbar_multiline))
-                noapply = TRUE;
+                live_changes.tab_trunc = TRUE;
         if (DIFF (hex_gui_ulist_count))
-                noapply = TRUE;
+                live_changes.ulist_count = TRUE;
         if (DIFF (hex_gui_ulist_icons))
-                noapply = TRUE;
+                live_changes.ulist_rows = TRUE;
         if (DIFF (hex_gui_ulist_show_hosts))
-                noapply = TRUE;
+        {
+                live_changes.ulist_columns = TRUE;
+                live_changes.ulist_rows = TRUE; /* hostnames may be stale */
+        }
         if (DIFF (hex_gui_ulist_sort))
-                noapply = TRUE;
+                live_changes.ulist_sort = TRUE;
+        /* compare against the pre-dialog value: the slider previews the
+           opacity live on the current window only, so OK still needs to
+           apply it to the other windows */
+        if (pr->hex_gui_transparency != setup_transparency_snapshot)
+                live_changes.transparency = TRUE;
 
         if ((pr->hex_gui_tab_pos == 5 || pr->hex_gui_tab_pos == 6) &&
                  pr->hex_gui_tab_layout == 2 && pr->hex_gui_tab_pos != prefs.hex_gui_tab_pos)
@@ -2378,6 +2392,8 @@ setup_apply (struct zoitechatprefs *pr)
 
 	theme_manager_dispatch_setup_apply (&event);
 
+	mg_apply_live_prefs (&live_changes);
+
         if (noapply)
                 fe_message (_("Some settings were changed that require a"
                                                 " restart to take full effect."), FE_MSG_WARN);
@@ -2410,6 +2426,9 @@ setup_ok_cb (GtkWidget *but, GtkWidget *win)
         if (save_result.success)
         {
                 theme_preferences_stage_commit ();
+                /* the previewed values were accepted, so the close handler
+                   must not revert them */
+                setup_transparency_snapshot = prefs.hex_gui_transparency;
                 gtk_widget_destroy (win);
                 return;
         }
@@ -2472,6 +2491,24 @@ setup_close_cb (GtkWidget *win, GtkWidget **swin)
 {
         *swin = NULL;
 
+        /* drop any pending transparency preview and undo the previewed
+           opacity when the dialog is cancelled; after OK the snapshot
+           was updated so this is a no-op */
+        if (setup_trans_apply_tag)
+        {
+                g_source_remove (setup_trans_apply_tag);
+                setup_trans_apply_tag = 0;
+        }
+        if (prefs.hex_gui_transparency != setup_transparency_snapshot)
+        {
+                mg_live_prefs revert_changes;
+
+                prefs.hex_gui_transparency = setup_transparency_snapshot;
+                memset (&revert_changes, 0, sizeof (revert_changes));
+                revert_changes.transparency = TRUE;
+                mg_apply_live_prefs (&revert_changes);
+        }
+
         theme_preferences_stage_discard ();
 
         if (font_dialog)
@@ -2493,6 +2530,7 @@ setup_open (void)
         memcpy (&setup_prefs, &prefs, sizeof (prefs));
 
         color_change = FALSE;
+        setup_transparency_snapshot = prefs.hex_gui_transparency;
         theme_preferences_stage_begin ();
         setup_window = setup_window_open ();
 

src/fe-gtk/theme/theme-preferences.c

@@ -106,6 +106,11 @@ typedef struct
         gboolean staged_dirty[THEME_TOKEN_COUNT];
         GdkRGBA snapshot[THEME_TOKEN_COUNT];
         GdkRGBA staged[THEME_TOKEN_COUNT];
+        /* the GTK3 theme selection is previewed live from the combo, so
+         * remember what was active when the dialog opened in order to
+         * restore it when the dialog is cancelled */
+        char gtk3_theme_snapshot[sizeof ((struct zoitechatprefs *) 0)->hex_gui_gtk3_theme];
+        int gtk3_variant_snapshot;
 } theme_preferences_stage_state;
 
 static theme_preferences_stage_state theme_preferences_stage;
@@ -204,6 +209,11 @@ theme_preferences_stage_begin (void)
         memset (&theme_preferences_stage, 0, sizeof (theme_preferences_stage));
         theme_preferences_stage.active = TRUE;
 
+        g_strlcpy (theme_preferences_stage.gtk3_theme_snapshot,
+                   prefs.hex_gui_gtk3_theme,
+                   sizeof (theme_preferences_stage.gtk3_theme_snapshot));
+        theme_preferences_stage.gtk3_variant_snapshot = prefs.hex_gui_gtk3_variant;
+
         for (token = THEME_TOKEN_MIRC_0; token < THEME_TOKEN_COUNT; token++)
         {
                 GdkRGBA rgba;
@@ -237,12 +247,36 @@ theme_preferences_stage_commit (void)
         memset (&theme_preferences_stage, 0, sizeof (theme_preferences_stage));
 }
 
+/* undo a live GTK3 theme preview: put the selection that was active when
+ * the dialog opened back and re-apply it */
+static void
+theme_preferences_stage_restore_gtk3 (void)
+{
+        if (g_strcmp0 (prefs.hex_gui_gtk3_theme, theme_preferences_stage.gtk3_theme_snapshot) == 0 &&
+            prefs.hex_gui_gtk3_variant == theme_preferences_stage.gtk3_variant_snapshot)
+                return;
+
+        g_strlcpy (prefs.hex_gui_gtk3_theme,
+                   theme_preferences_stage.gtk3_theme_snapshot,
+                   sizeof (prefs.hex_gui_gtk3_theme));
+        prefs.hex_gui_gtk3_variant = theme_preferences_stage.gtk3_variant_snapshot;
+
+        theme_gtk3_apply_current (NULL);
+        theme_manager_dispatch_changed (THEME_CHANGED_REASON_THEME_PACK |
+                                        THEME_CHANGED_REASON_PALETTE |
+                                        THEME_CHANGED_REASON_WIDGET_STYLE |
+                                        THEME_CHANGED_REASON_USERLIST |
+                                        THEME_CHANGED_REASON_MODE);
+}
+
 void
 theme_preferences_stage_discard (void)
 {
         if (!theme_preferences_stage.active)
                 return;
 
+        /* restore the GTK3 theme first so the color snapshot below wins */
+        theme_preferences_stage_restore_gtk3 ();
         theme_preferences_stage_sync_runtime_to_snapshot ();
         memset (&theme_preferences_stage, 0, sizeof (theme_preferences_stage));
 }

src/fe-gtk/userlistgui.c

@@ -796,16 +796,12 @@ userlist_store_color (GtkListStore *store, GtkTreeIter *iter, ThemeSemanticToken
 	}
 }
 
-GtkListStore *
-userlist_create_model (session *sess)
+static void
+userlist_model_set_sort (GtkListStore *store, session *sess)
 {
-	GtkListStore *store;
 	GtkTreeIterCompareFunc cmp_func;
 	GtkSortType sort_type;
 
-	store = gtk_list_store_new (6, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING,
-										G_TYPE_STRING, G_TYPE_POINTER, THEME_GTK_COLOR_TYPE);
-
 	switch (prefs.hex_gui_ulist_sort)
 	{
 	case 0:
@@ -825,18 +821,77 @@ userlist_create_model (session *sess)
 		sort_type = GTK_SORT_DESCENDING;
 		break;
 	default:
-		/* No sorting */
+		/* No sorting; rows keep their current order and new rows
+		   go wherever they are inserted */
+		gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(store),
+							GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID, GTK_SORT_ASCENDING);
 		gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE(store), NULL, NULL, NULL);
-		return store;
+		return;
 	}
 
 	gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE(store), cmp_func, sess, NULL);
 	gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(store),
 						GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, sort_type);
+}
+
+GtkListStore *
+userlist_create_model (session *sess)
+{
+	GtkListStore *store;
+
+	store = gtk_list_store_new (6, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING,
+										G_TYPE_STRING, G_TYPE_POINTER, THEME_GTK_COLOR_TYPE);
+	userlist_model_set_sort (store, sess);
 
 	return store;
 }
 
+void
+userlist_apply_sort (session *sess)
+{
+	if (!sess->res || !sess->res->user_model)
+		return;
+
+	userlist_model_set_sort (sess->res->user_model, sess);
+}
+
+/* remove and re-insert every row, so per-row content that depends on
+ * preferences (mode icons vs. text prefixes, hostnames) is rebuilt */
+void
+userlist_refill (session *sess)
+{
+	GtkTreeModel *model;
+	GtkTreeIter iter;
+	GSList *users = NULL;
+	GSList *it;
+	struct User *user;
+
+	if (!sess->res || !sess->res->user_model)
+		return;
+
+	model = GTK_TREE_MODEL (sess->res->user_model);
+	if (gtk_tree_model_get_iter_first (model, &iter))
+	{
+		do
+		{
+			gtk_tree_model_get (model, &iter, COL_USER, &user, -1);
+			if (user)
+				users = g_slist_prepend (users, user);
+		}
+		while (gtk_tree_model_iter_next (model, &iter));
+	}
+
+	fe_userlist_clear (sess);
+
+	/* fe_userlist_insert() prepends, so inserting in reverse display
+	   order restores the on-screen order for unsorted lists; sorted
+	   models position the rows themselves */
+	for (it = users; it; it = it->next)
+		fe_userlist_insert (sess, it->data, FALSE);
+
+	g_slist_free (users);
+}
+
 static void
 userlist_add_columns (GtkTreeView * treeview)
 {
@@ -906,6 +961,23 @@ userlist_add_columns (GtkTreeView * treeview)
 	}
 }
 
+void
+userlist_rebuild_columns (GtkWidget *treeview)
+{
+	GList *columns;
+	GList *it;
+
+	if (!treeview)
+		return;
+
+	columns = gtk_tree_view_get_columns (GTK_TREE_VIEW (treeview));
+	for (it = columns; it; it = it->next)
+		gtk_tree_view_remove_column (GTK_TREE_VIEW (treeview), it->data);
+	g_list_free (columns);
+
+	userlist_add_columns (GTK_TREE_VIEW (treeview));
+}
+
 static gint
 userlist_click_cb (GtkWidget *widget, GdkEventButton *event, gpointer userdata)
 {

src/fe-gtk/userlistgui.h

@@ -24,6 +24,9 @@ void userlist_set_value (GtkWidget *treeview, gfloat val);
 gfloat userlist_get_value (GtkWidget *treeview);
 GtkWidget *userlist_create (GtkWidget *box);
 GtkListStore *userlist_create_model (session *sess);
+void userlist_apply_sort (session *sess);
+void userlist_refill (session *sess);
+void userlist_rebuild_columns (GtkWidget *treeview);
 void userlist_show (session *sess);
 void userlist_select (session *sess, char *name);
 void fe_userlist_set_typing (session *sess, const char *nick, const char *state);

win32/installer/zoitechat.iss.tt

@@ -373,10 +373,10 @@ begin
     idpClearFiles;
 
 	if WizardIsComponentSelected('themes\windows10') then
-		idpAddFile('https://dl.zoitechat.zoite.net/themes/GTK3Themes/Windows-10-3.2.1.zip', ExpandConstant('{tmp}\Windows-10-3.2.1.zip'));
+		idpAddFile('https://dl.zoitechat.org/themes/GTK3Themes/Windows-10-3.2.1.zip', ExpandConstant('{tmp}\Windows-10-3.2.1.zip'));
 
 	if WizardIsComponentSelected('themes\windows10dark') then
-		idpAddFile('https://dl.zoitechat.zoite.net/themes/GTK3Themes/Windows-10-Dark-3.2.1-dark.zip', ExpandConstant('{tmp}\Windows-10-Dark-3.2.1-dark.zip'));
+		idpAddFile('https://dl.zoitechat.org/themes/GTK3Themes/Windows-10-Dark-3.2.1-dark.zip', ExpandConstant('{tmp}\Windows-10-Dark-3.2.1-dark.zip'));
 
 	if not WizardIsTaskSelected('portable') then
 	begin

win32/msix/AppxManifest.xml.in

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3"
+  xmlns:uap10="http://schemas.microsoft.com/appx/manifest/uap/windows10/10"
+  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
+  IgnorableNamespaces="uap uap3 uap10 rescap">
+
+  <!--
+    Identity values are filled by build-msix.ps1. For Microsoft Store
+    submissions they must exactly match Product management > Product identity
+    in Partner Center.
+  -->
+  <Identity
+    Name="@IDENTITY_NAME@"
+    Publisher="@PUBLISHER@"
+    Version="@PACKAGE_VERSION@"
+    ProcessorArchitecture="x64" />
+
+  <Properties>
+    <DisplayName>ZoiteChat</DisplayName>
+    <PublisherDisplayName>@PUBLISHER_DISPLAY_NAME@</PublisherDisplayName>
+    <Description>ZoiteChat IRC client</Description>
+    <Logo>Assets\StoreLogo.png</Logo>
+  </Properties>
+
+  <Resources>
+    <Resource Language="en-us" />
+  </Resources>
+
+  <Dependencies>
+    <TargetDeviceFamily
+      Name="Windows.Desktop"
+      MinVersion="10.0.19041.0"
+      MaxVersionTested="10.0.26100.0" />
+    <PackageDependency
+      Name="Microsoft.VCLibs.140.00.UWPDesktop"
+      Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
+      MinVersion="14.0.30704.0" />
+  </Dependencies>
+
+  <Capabilities>
+    <rescap:Capability Name="runFullTrust" />
+  </Capabilities>
+
+  <Applications>
+    <Application
+      Id="ZoiteChat"
+      Executable="ZoiteChat\zoitechat.exe"
+      uap10:RuntimeBehavior="packagedClassicApp"
+      uap10:TrustLevel="mediumIL">
+
+      <uap:VisualElements
+        DisplayName="ZoiteChat"
+        Description="ZoiteChat IRC client"
+        BackgroundColor="transparent"
+        Square150x150Logo="Assets\Square150x150Logo.png"
+        Square44x44Logo="Assets\Square44x44Logo.png" />
+
+      <Extensions>
+        <uap3:Extension Category="windows.protocol">
+          <uap3:Protocol
+            Name="irc"
+            Parameters="--url=&quot;%1&quot;" />
+        </uap3:Extension>
+
+        <uap3:Extension Category="windows.fileTypeAssociation">
+          <uap3:FileTypeAssociation
+            Name="zoitechattheme"
+            Parameters="&quot;%1&quot;">
+            <uap:DisplayName>ZoiteChat Theme</uap:DisplayName>
+            <uap:SupportedFileTypes>
+              <uap:FileType>.zct</uap:FileType>
+              <uap:FileType>.hct</uap:FileType>
+            </uap:SupportedFileTypes>
+          </uap3:FileTypeAssociation>
+        </uap3:Extension>
+      </Extensions>
+    </Application>
+  </Applications>
+</Package>

win32/msix/build-msix.ps1

@@ -0,0 +1,388 @@
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory = $true)]
+    [string] $SourceDir,
+
+    [Parameter(Mandatory = $true)]
+    [string] $OutputPath,
+
+    [Parameter(Mandatory = $true)]
+    [ValidatePattern('^\d+\.\d+\.\d+\.0$')]
+    [string] $PackageVersion,
+
+    [Parameter(Mandatory = $true)]
+    [string] $IdentityName,
+
+    [Parameter(Mandatory = $true)]
+    [string] $Publisher,
+
+    [Parameter(Mandatory = $true)]
+    [string] $PublisherDisplayName,
+
+    [switch] $SelfSign
+)
+
+Set-StrictMode -Version Latest
+$ErrorActionPreference = 'Stop'
+
+Add-Type -AssemblyName System.Drawing
+
+function Find-WindowsSdkTool {
+    param(
+        [Parameter(Mandatory = $true)]
+        [string] $ToolName
+    )
+
+    $command = Get-Command $ToolName -ErrorAction SilentlyContinue
+    if ($command) {
+        return $command.Source
+    }
+
+    $kitsRoot = Join-Path ${env:ProgramFiles(x86)} 'Windows Kits\10\bin'
+    if (-not (Test-Path $kitsRoot)) {
+        throw "Windows SDK bin directory was not found: $kitsRoot"
+    }
+
+    $tool = Get-ChildItem -Path $kitsRoot -Filter $ToolName -File -Recurse |
+        Where-Object { $_.FullName -match '\\x64\\' } |
+        Sort-Object {
+            $versionDirectory = Split-Path (Split-Path $_.DirectoryName -Parent) -Leaf
+            try {
+                [version] $versionDirectory
+            }
+            catch {
+                [version] '0.0'
+            }
+        } -Descending |
+        Select-Object -First 1
+
+    if (-not $tool) {
+        throw "$ToolName was not found in the installed Windows SDK."
+    }
+
+    return $tool.FullName
+}
+
+function Escape-Xml {
+    param(
+        [Parameter(Mandatory = $true)]
+        [string] $Value
+    )
+
+    return [System.Security.SecurityElement]::Escape($Value)
+}
+
+function New-MsixAsset {
+    param(
+        [Parameter(Mandatory = $true)]
+        [System.Drawing.Image] $SourceImage,
+
+        [Parameter(Mandatory = $true)]
+        [int] $Width,
+
+        [Parameter(Mandatory = $true)]
+        [int] $Height,
+
+        [Parameter(Mandatory = $true)]
+        [string] $Path
+    )
+
+    $bitmap = [System.Drawing.Bitmap]::new($Width, $Height)
+    try {
+        $graphics = [System.Drawing.Graphics]::FromImage($bitmap)
+        try {
+            $graphics.Clear([System.Drawing.Color]::Transparent)
+            $graphics.InterpolationMode = [System.Drawing.Drawing2D.InterpolationMode]::HighQualityBicubic
+            $graphics.PixelOffsetMode = [System.Drawing.Drawing2D.PixelOffsetMode]::HighQuality
+            $graphics.SmoothingMode = [System.Drawing.Drawing2D.SmoothingMode]::HighQuality
+
+            $scale = [Math]::Min($Width / $SourceImage.Width, $Height / $SourceImage.Height)
+            $drawWidth = [Math]::Max(1, [int][Math]::Round($SourceImage.Width * $scale))
+            $drawHeight = [Math]::Max(1, [int][Math]::Round($SourceImage.Height * $scale))
+            $x = [int](($Width - $drawWidth) / 2)
+            $y = [int](($Height - $drawHeight) / 2)
+
+            $graphics.DrawImage($SourceImage, $x, $y, $drawWidth, $drawHeight)
+        }
+        finally {
+            $graphics.Dispose()
+        }
+
+        $bitmap.Save($Path, [System.Drawing.Imaging.ImageFormat]::Png)
+    }
+    finally {
+        $bitmap.Dispose()
+    }
+}
+
+$source = (Resolve-Path $SourceDir).Path
+if (-not (Test-Path (Join-Path $source 'zoitechat.exe'))) {
+    throw "Staged ZoiteChat executable is missing from $source"
+}
+
+$repoRoot = (Resolve-Path (Join-Path $PSScriptRoot '..\..')).Path
+$templatePath = Join-Path $PSScriptRoot 'AppxManifest.xml.in'
+$iconPath = Join-Path $repoRoot 'data\icons\zoitechat.png'
+
+if (-not (Test-Path $templatePath)) {
+    throw "MSIX manifest template is missing: $templatePath"
+}
+if (-not (Test-Path $iconPath)) {
+    throw "ZoiteChat PNG icon is missing: $iconPath"
+}
+
+if ([System.IO.Path]::IsPathRooted($OutputPath)) {
+    $output = [System.IO.Path]::GetFullPath($OutputPath)
+}
+else {
+    $output = [System.IO.Path]::GetFullPath((Join-Path $PWD $OutputPath))
+}
+$outputDirectory = Split-Path $output -Parent
+New-Item -ItemType Directory -Path $outputDirectory -Force | Out-Null
+
+$stagingRoot = Join-Path $env:RUNNER_TEMP 'zoitechat-msix'
+$verifyRoot = Join-Path $env:RUNNER_TEMP 'zoitechat-msix-verify'
+$pfxPath = Join-Path $env:RUNNER_TEMP 'zoitechat-msix-dev.pfx'
+
+foreach ($path in @($stagingRoot, $verifyRoot)) {
+    if (Test-Path $path) {
+        Remove-Item -Path $path -Recurse -Force
+    }
+}
+if (Test-Path $pfxPath) {
+    Remove-Item -Path $pfxPath -Force
+}
+
+New-Item -ItemType Directory -Path $stagingRoot -Force | Out-Null
+$appRoot = Join-Path $stagingRoot 'ZoiteChat'
+New-Item -ItemType Directory -Path $appRoot -Force | Out-Null
+Copy-Item -Path (Join-Path $source '*') -Destination $appRoot -Recurse -Force
+
+# copy.vcxproj stages everything needed by every Inno component. The Store
+# package keeps the useful bundled plugins and scripting bridges while letting
+# the Microsoft Store own application updates. The WinSparkle updater is the
+# only bundled plugin deliberately removed from the Store package.
+$excludeFiles = @(
+    'portable-mode',
+    'zoitechat-text.exe',
+    'plugins\hcupd.dll',
+    'WinSparkle.dll',
+    'share\download.png'
+)
+
+foreach ($relativePath in $excludeFiles) {
+    $path = Join-Path $appRoot $relativePath
+    if (Test-Path $path) {
+        Remove-Item -Path $path -Force
+    }
+}
+
+foreach ($relativePath in @('share\doc\WinSparkle')) {
+    $path = Join-Path $appRoot $relativePath
+    if (Test-Path $path) {
+        Remove-Item -Path $path -Recurse -Force
+    }
+}
+
+foreach ($requiredPath in @(
+    'zoitechat.exe',
+    'plugins\hcnotifications-winrt.dll',
+    'plugins\hcchecksum.dll',
+    'plugins\hcexec.dll',
+    'plugins\hcfishlim.dll',
+    'plugins\hcsysinfo.dll',
+    'share\system.png',
+    'plugins\hclua.dll',
+    'plugins\hcperl.dll',
+    'plugins\hcpython3.dll',
+    'plugins\hcpython38.dll'
+)) {
+    if (-not (Test-Path (Join-Path $appRoot $requiredPath))) {
+        throw "MSIX staging is missing required file: $requiredPath"
+    }
+}
+
+foreach ($requiredPattern in @('_cffi_backend.cp314*.pyd', '_cffi_backend.cp38*.pyd')) {
+    $match = Get-ChildItem -Path $appRoot -Filter $requiredPattern -File -ErrorAction SilentlyContinue |
+        Select-Object -First 1
+    if ($null -eq $match) {
+        throw "MSIX staging is missing required Python support file: $requiredPattern"
+    }
+}
+
+foreach ($requiredPythonFile in @('zoitechat.py', '_zoitechat.py', 'hexchat.py', 'xchat.py')) {
+    $path = Join-Path (Join-Path $appRoot 'python') $requiredPythonFile
+    if (-not (Test-Path $path)) {
+        throw "MSIX staging is missing required Python bridge file: $requiredPythonFile"
+    }
+}
+
+$assets = Join-Path $stagingRoot 'Assets'
+New-Item -ItemType Directory -Path $assets -Force | Out-Null
+
+$image = [System.Drawing.Image]::FromFile($iconPath)
+try {
+    New-MsixAsset -SourceImage $image -Width 50 -Height 50 `
+        -Path (Join-Path $assets 'StoreLogo.png')
+    New-MsixAsset -SourceImage $image -Width 44 -Height 44 `
+        -Path (Join-Path $assets 'Square44x44Logo.png')
+    New-MsixAsset -SourceImage $image -Width 150 -Height 150 `
+        -Path (Join-Path $assets 'Square150x150Logo.png')
+}
+finally {
+    $image.Dispose()
+}
+
+$manifest = Get-Content $templatePath -Raw -Encoding UTF8
+$manifest = $manifest.Replace('@IDENTITY_NAME@', (Escape-Xml $IdentityName))
+$manifest = $manifest.Replace('@PUBLISHER@', (Escape-Xml $Publisher))
+$manifest = $manifest.Replace('@PUBLISHER_DISPLAY_NAME@', (Escape-Xml $PublisherDisplayName))
+$manifest = $manifest.Replace('@PACKAGE_VERSION@', (Escape-Xml $PackageVersion))
+
+if ($manifest -match '@[A-Z0-9_]+@') {
+    throw "Unexpanded MSIX manifest placeholder: $($Matches[0])"
+}
+
+$manifestPath = Join-Path $stagingRoot 'AppxManifest.xml'
+[System.IO.File]::WriteAllText(
+    $manifestPath,
+    $manifest,
+    [System.Text.UTF8Encoding]::new($false)
+)
+
+# Catch malformed XML before MakeAppx so CI reports a useful error.
+[xml](Get-Content $manifestPath -Raw -Encoding UTF8) | Out-Null
+
+$makeAppx = Find-WindowsSdkTool -ToolName 'MakeAppx.exe'
+$signtool = Find-WindowsSdkTool -ToolName 'SignTool.exe'
+
+if (Test-Path $output) {
+    Remove-Item -Path $output -Force
+}
+
+& $makeAppx pack /d $stagingRoot /p $output /o
+if ($LASTEXITCODE -ne 0) {
+    throw "MakeAppx failed with exit code $LASTEXITCODE"
+}
+
+$certificate = $null
+try {
+    if ($SelfSign) {
+        # Partner Center replaces this development signature with Microsoft's
+        # trusted Store signature. The certificate subject must exactly match
+        # the manifest Publisher for SignTool to accept the package.
+        $certificate = New-SelfSignedCertificate `
+            -Type Custom `
+            -KeyUsage DigitalSignature `
+            -Subject $Publisher `
+            -CertStoreLocation 'Cert:\CurrentUser\My' `
+            -HashAlgorithm SHA256 `
+            -TextExtension @(
+                '2.5.29.37={text}1.3.6.1.5.5.7.3.3',
+                '2.5.29.19={text}'
+            ) `
+            -FriendlyName 'ZoiteChat MSIX CI signing certificate'
+
+        if ($certificate.Subject -cne $Publisher) {
+            throw "Generated certificate subject '$($certificate.Subject)' does not exactly match manifest Publisher '$Publisher'."
+        }
+
+        $passwordText = [Guid]::NewGuid().ToString('N')
+        $password = ConvertTo-SecureString -String $passwordText -AsPlainText -Force
+        Export-PfxCertificate -Cert $certificate -FilePath $pfxPath -Password $password | Out-Null
+
+        & $signtool sign /fd SHA256 /f $pfxPath /p $passwordText $output
+        if ($LASTEXITCODE -ne 0) {
+            throw "SignTool failed with exit code $LASTEXITCODE"
+        }
+
+        $signature = Get-AuthenticodeSignature -FilePath $output
+        if (-not $signature.SignerCertificate -or
+            $signature.SignerCertificate.Subject -cne $Publisher) {
+            throw 'MSIX signature does not match the manifest Publisher.'
+        }
+    }
+
+    New-Item -ItemType Directory -Path $verifyRoot -Force | Out-Null
+    & $makeAppx unpack /p $output /d $verifyRoot /o
+    if ($LASTEXITCODE -ne 0) {
+        throw "MakeAppx validation unpack failed with exit code $LASTEXITCODE"
+    }
+
+    [xml] $verifiedManifest = Get-Content (Join-Path $verifyRoot 'AppxManifest.xml') -Raw -Encoding UTF8
+    $ns = New-Object System.Xml.XmlNamespaceManager($verifiedManifest.NameTable)
+    $ns.AddNamespace('f', 'http://schemas.microsoft.com/appx/manifest/foundation/windows10')
+    $identity = $verifiedManifest.SelectSingleNode('/f:Package/f:Identity', $ns)
+    if (-not $identity) {
+        throw 'Validated MSIX does not contain a package Identity.'
+    }
+    if ($identity.Name -cne $IdentityName -or
+        $identity.Publisher -cne $Publisher -or
+        $identity.Version -cne $PackageVersion) {
+        throw 'Validated MSIX identity does not match the requested Store identity.'
+    }
+
+    foreach ($requiredPath in @(
+        'ZoiteChat\zoitechat.exe',
+        'ZoiteChat\plugins\hcnotifications-winrt.dll',
+        'ZoiteChat\plugins\hcchecksum.dll',
+        'ZoiteChat\plugins\hcexec.dll',
+        'ZoiteChat\plugins\hcfishlim.dll',
+        'ZoiteChat\plugins\hcsysinfo.dll',
+        'ZoiteChat\share\system.png',
+        'ZoiteChat\plugins\hclua.dll',
+        'ZoiteChat\plugins\hcperl.dll',
+        'ZoiteChat\plugins\hcpython3.dll',
+        'ZoiteChat\plugins\hcpython38.dll'
+    )) {
+        if (-not (Test-Path (Join-Path $verifyRoot $requiredPath))) {
+            throw "Validated MSIX is missing required file: $requiredPath"
+        }
+    }
+
+    foreach ($requiredPattern in @('_cffi_backend.cp314*.pyd', '_cffi_backend.cp38*.pyd')) {
+        $match = Get-ChildItem -Path (Join-Path $verifyRoot 'ZoiteChat') -Filter $requiredPattern -File -ErrorAction SilentlyContinue |
+            Select-Object -First 1
+        if ($null -eq $match) {
+            throw "Validated MSIX is missing required Python support file: $requiredPattern"
+        }
+    }
+
+    foreach ($requiredPythonFile in @('zoitechat.py', '_zoitechat.py', 'hexchat.py', 'xchat.py')) {
+        $path = Join-Path (Join-Path $verifyRoot 'ZoiteChat\python') $requiredPythonFile
+        if (-not (Test-Path $path)) {
+            throw "Validated MSIX is missing required Python bridge file: $requiredPythonFile"
+        }
+    }
+
+    foreach ($excludedPath in @(
+        'ZoiteChat\portable-mode',
+        'ZoiteChat\zoitechat-text.exe',
+        'ZoiteChat\plugins\hcupd.dll',
+        'ZoiteChat\WinSparkle.dll',
+        'ZoiteChat\share\download.png'
+    )) {
+        if (Test-Path (Join-Path $verifyRoot $excludedPath)) {
+            throw "MSIX incorrectly contains excluded file/directory: $excludedPath"
+        }
+    }
+}
+finally {
+    if ($certificate) {
+        Remove-Item -Path "Cert:\CurrentUser\My\$($certificate.Thumbprint)" -Force -ErrorAction SilentlyContinue
+    }
+    if (Test-Path $pfxPath) {
+        Remove-Item -Path $pfxPath -Force -ErrorAction SilentlyContinue
+    }
+    foreach ($path in @($stagingRoot, $verifyRoot)) {
+        if (Test-Path $path) {
+            Remove-Item -Path $path -Recurse -Force -ErrorAction SilentlyContinue
+        }
+    }
+}
+
+if (-not (Test-Path $output)) {
+    throw "Expected MSIX was not created: $output"
+}
+
+Write-Host "Created MSIX: $output"

win32/version-template.ps1

@@ -1,6 +1,6 @@
 param ([string] $templateFilename, [string] $outputFilename)
 
-$versionParts = Select-String -Path "${env:SOLUTIONDIR}meson.build" -Pattern "  version: '([^']+)',$" | Select-Object -First 1 | %{ $_.Matches[0].Groups[1].Value.Split('.') }
+$versionParts = (Get-Content "${env:SOLUTIONDIR}VERSION" -Raw).Trim().Split('.')
 
 [string[]] $contents = Get-Content $templateFilename -Encoding UTF8 | %{
 	while ($_ -match '^(.*?)<#=(.*?)#>(.*?)$') {

win32/version.txt

@@ -1 +0,0 @@
-2.18.3

win32/wix/zoitechat.wxs

@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <!--
+    This MSI intentionally mirrors the staged portion of the normal Inno Setup
+    payload. Optional/custom-only files are excluded below. In particular,
+    portable-mode must never be harvested because copy.vcxproj always stages
+    that marker. Inno-only download-at-install components remain outside the MSI.
+  -->
+  <Package
+    Name="ZoiteChat"
+    Manufacturer="ZoiteChat"
+    Version="$(ProductVersion)"
+    UpgradeCode="{E9F09DF3-12FA-4BDF-A8AA-A6D62A327ED5}"
+    Scope="perMachine"
+    InstallerVersion="500"
+    Compressed="yes">
+
+    <MajorUpgrade
+      AllowSameVersionUpgrades="yes"
+      DowngradeErrorMessage="A newer version of ZoiteChat is already installed." />
+
+    <MediaTemplate EmbedCab="yes" CompressionLevel="high" />
+
+    <Icon Id="ZoiteChat.ico" SourceFile="$(sys.SOURCEFILEDIR)..\..\data\icons\zoitechat.ico" />
+    <Property Id="ARPPRODUCTICON" Value="ZoiteChat.ico" />
+    <Property Id="ARPHELPLINK" Value="https://github.com/ZoiteChat/zoitechat/issues" />
+    <Property Id="ARPURLINFOABOUT" Value="https://zoitechat.org/" />
+    <Property Id="ARPURLUPDATEINFO" Value="https://zoitechat.org/downloads.html" />
+    <Property Id="ARPNOMODIFY" Value="1" />
+
+    <!--
+      The Inno installer can bootstrap the VC++ runtime. A plain MSI should not
+      run an EXE prerequisite as an MSI custom action, so require the runtime.
+      Administrative extraction is allowed regardless of prerequisite state.
+    -->
+    <Property Id="VCREDIST_X64_INSTALLED">
+      <RegistrySearch
+        Id="FindVCRedistX64"
+        Root="HKLM"
+        Key="SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64"
+        Name="Installed"
+        Type="raw"
+        Bitness="always64" />
+    </Property>
+    <Launch
+      Condition="Installed OR ACTION = &quot;ADMIN&quot; OR VCREDIST_X64_INSTALLED = &quot;#1&quot;"
+      Message="Microsoft Visual C++ 2015-2022 x64 Redistributable is required before installing ZoiteChat." />
+    <Launch
+      Condition="Installed OR ACTION = &quot;ADMIN&quot; OR VersionNT64 &gt; 601 OR (VersionNT64 = 601 AND ServicePackLevel &gt;= 1)"
+      Message="ZoiteChat requires 64-bit Windows 7 SP1 or later." />
+
+    <StandardDirectory Id="ProgramFiles6432Folder">
+      <Directory Id="INSTALLFOLDER" Name="ZoiteChat" />
+    </StandardDirectory>
+
+    <StandardDirectory Id="ProgramMenuFolder">
+      <Directory Id="ApplicationProgramsFolder" Name="ZoiteChat" />
+    </StandardDirectory>
+
+    <Feature Id="MainFeature" Title="ZoiteChat" Level="1">
+      <ComponentGroupRef Id="ApplicationFiles" />
+      <ComponentRef Id="StartMenuShortcuts" />
+      <ComponentRef Id="ProtocolAndThemeAssociations" />
+    </Feature>
+  </Package>
+
+  <Fragment>
+    <ComponentGroup Id="ApplicationFiles">
+      <Files Directory="INSTALLFOLDER" Include="$(SourceDir)\**">
+        <!-- Created by copy.vcxproj for Inno's optional portable task only. -->
+        <Exclude Files="$(SourceDir)\portable-mode" />
+
+        <!-- Inno custom-only application component. -->
+        <Exclude Files="$(SourceDir)\zoitechat-text.exe" />
+
+        <!--
+          The MSI has no Inno-style component selection UI, so keep the
+          bundled utility plugins (Checksum, Exec, FiSHLiM, SysInfo) available.
+        -->
+
+        <!--
+          Keep the Python and Perl bridge plugins in the MSI. They use the
+          matching system runtimes when present: Python 3.14 on Windows 10+
+          (Python 3.8 on legacy Windows) and Perl 5.42. ZoiteChat checks for
+          those runtime DLLs before auto-loading the bridge plugins.
+        -->
+      </Files>
+    </ComponentGroup>
+  </Fragment>
+
+  <Fragment>
+    <Component Id="StartMenuShortcuts" Directory="ApplicationProgramsFolder" Guid="*">
+      <Shortcut
+        Id="ZoiteChatShortcut"
+        Name="ZoiteChat"
+        Description="ZoiteChat IRC client"
+        Target="[INSTALLFOLDER]zoitechat.exe"
+        WorkingDirectory="INSTALLFOLDER"
+        Icon="ZoiteChat.ico">
+        <ShortcutProperty Key="System.AppUserModel.ID" Value="ZoiteChat.Desktop.Notify" />
+      </Shortcut>
+
+      <Shortcut
+        Id="ZoiteChatSafeModeShortcut"
+        Name="ZoiteChat Safe Mode"
+        Description="Start ZoiteChat without auto-connect or plugins"
+        Target="[INSTALLFOLDER]zoitechat.exe"
+        Arguments="--no-auto --no-plugins"
+        WorkingDirectory="INSTALLFOLDER"
+        Icon="ZoiteChat.ico" />
+
+      <Shortcut
+        Id="ZoiteChatChangelogShortcut"
+        Name="ZoiteChat ChangeLog"
+        Target="[INSTALLFOLDER]changelog.url" />
+
+      <Shortcut
+        Id="ZoiteChatReadmeShortcut"
+        Name="ZoiteChat ReadMe"
+        Target="[INSTALLFOLDER]readme.url" />
+
+      <Shortcut
+        Id="ZoiteChatUninstallShortcut"
+        Name="Uninstall ZoiteChat"
+        Target="[System64Folder]msiexec.exe"
+        Arguments="/x [ProductCode]" />
+
+      <RemoveFolder Id="RemoveApplicationProgramsFolder" On="uninstall" />
+      <RegistryValue
+        Root="HKLM"
+        Key="Software\ZoiteChat\Installer"
+        Name="StartMenuShortcuts"
+        Type="integer"
+        Value="1"
+        KeyPath="yes" />
+    </Component>
+  </Fragment>
+
+  <Fragment>
+    <Component Id="ProtocolAndThemeAssociations" Directory="INSTALLFOLDER" Guid="*">
+      <RegistryValue
+        Root="HKCR"
+        Key="irc"
+        Type="string"
+        Value="URL:IRC Protocol"
+        KeyPath="yes" />
+      <RegistryValue Root="HKCR" Key="irc" Name="URL Protocol" Type="string" Value="" />
+      <RegistryValue Root="HKCR" Key="irc\DefaultIcon" Type="string" Value="[INSTALLFOLDER]zoitechat.exe,0" />
+      <RegistryValue Root="HKCR" Key="irc\shell" Type="string" Value="open" />
+      <RegistryValue
+        Root="HKCR"
+        Key="irc\shell\open\command"
+        Type="string"
+        Value="&quot;[INSTALLFOLDER]zoitechat.exe&quot; --url=&quot;%1&quot;" />
+
+      <RegistryValue Root="HKCR" Key=".zct" Type="string" Value="ZoiteChat.Theme" />
+      <RegistryValue Root="HKCR" Key=".hct" Type="string" Value="ZoiteChat.Theme" />
+      <RegistryValue Root="HKCR" Key="ZoiteChat.Theme" Type="string" Value="ZoiteChat Theme" />
+      <RegistryValue
+        Root="HKCR"
+        Key="ZoiteChat.Theme\DefaultIcon"
+        Type="string"
+        Value="[INSTALLFOLDER]zoitechat.exe,0" />
+      <RegistryValue
+        Root="HKCR"
+        Key="ZoiteChat.Theme\shell\open\command"
+        Type="string"
+        Value="&quot;[INSTALLFOLDER]zoitechat.exe&quot; &quot;%1&quot;" />
+    </Component>
+  </Fragment>
+</Wix>