Merge pull request #103 from ZoiteChat/theme-features-fixes

Theme update

.github/workflows/appimage-build.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   appimage_build:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
 
     permissions:
       contents: read
@@ -29,10 +29,13 @@ jobs:
             build-essential pkg-config meson ninja-build cmake \
             gettext \
             libcanberra-dev libdbus-glib-1-dev libglib2.0-dev \
-            libgtk2.0-dev libgtk-3-dev \
+            libarchive-dev \
+            libgtk-3-dev \
+            libwayland-client0 libwayland-cursor0 libwayland-egl1 \
+            libxkbcommon0 \
             libgtk-3-bin libglib2.0-bin shared-mime-info gsettings-desktop-schemas \
-            libluajit-5.1-dev libpci-dev libperl-dev libssl-dev \
+            libluajit-5.1-dev libpci-dev libperl-dev libssl-dev libayatana-appindicator3-dev \
-            python3-dev python3-cffi mono-devel desktop-file-utils \
+            perl python3 python3-minimal python3-dev python3-cffi mono-devel desktop-file-utils \
             patchelf file curl
 
       - name: Configure
@@ -44,7 +47,8 @@ jobs:
             -Dtext-frontend=true \
             -Dwith-perl=perl \
             -Dwith-python=python3 \
-            -Dauto_features=enabled
+            -Dauto_features=enabled \
+            -Dappindicator=enabled
 
       - name: Build
         run: |
@@ -57,6 +61,60 @@ jobs:
           rm -rf AppDir
           DESTDIR="${PWD}/AppDir" ninja -C build install
 
+      - name: Bundle scripting runtimes in AppDir
+        run: |
+          set -eux
+
+          python3_version="$(python3 -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")')"
+
+          install -Dm755 "$(command -v python3)" "AppDir/usr/bin/python3"
+          if [ -x "/usr/bin/perl" ]; then
+            install -Dm755 /usr/bin/perl AppDir/usr/bin/perl
+          fi
+
+          install -d AppDir/usr/lib
+          cp -a "/usr/lib/python${python3_version}" "AppDir/usr/lib/"
+
+          if [ -d "/usr/lib/python3/dist-packages" ]; then
+            install -d AppDir/usr/lib/python3
+            cp -a /usr/lib/python3/dist-packages AppDir/usr/lib/python3/
+          fi
+
+          if [ -d "/usr/lib/x86_64-linux-gnu/python3/dist-packages" ]; then
+            install -d AppDir/usr/lib/x86_64-linux-gnu/python3
+            cp -a /usr/lib/x86_64-linux-gnu/python3/dist-packages AppDir/usr/lib/x86_64-linux-gnu/python3/
+          fi
+
+          if [ -d "/usr/lib/x86_64-linux-gnu/perl" ]; then
+            install -d AppDir/usr/lib/x86_64-linux-gnu
+            cp -a /usr/lib/x86_64-linux-gnu/perl AppDir/usr/lib/x86_64-linux-gnu/
+          fi
+
+          if [ -d "/usr/share/perl" ]; then
+            install -d AppDir/usr/share
+            cp -a /usr/share/perl AppDir/usr/share/
+          fi
+
+          if [ -d "/usr/share/perl5" ]; then
+            install -d AppDir/usr/share
+            cp -a /usr/share/perl5 AppDir/usr/share/
+          fi
+          if compgen -G '/usr/lib/x86_64-linux-gnu/libpython3*.so*' > /dev/null; then
+            install -d AppDir/usr/lib/x86_64-linux-gnu
+            cp -a /usr/lib/x86_64-linux-gnu/libpython3*.so* AppDir/usr/lib/x86_64-linux-gnu/
+          fi
+
+      - name: Verify bundled plugins
+        run: |
+          set -eux
+
+          # Include every built-in plugin except the Windows-only update plugin.
+          find AppDir/usr/lib -maxdepth 4 -type f -name '*.so' -path '*/zoitechat/plugins/*' -print | sort
+
+          for plugin in checksum fishlim lua perl python sysinfo; do
+            find "AppDir/usr/lib" -maxdepth 4 -type f -name "${plugin}.so" -path '*/zoitechat/plugins/*' -print -quit | grep -q .
+          done
+
       - name: Build AppImage
         env:
           APPIMAGE_EXTRACT_AND_RUN: 1
@@ -74,21 +132,25 @@ jobs:
           chmod +x linuxdeploy-plugin-gtk
           export PATH="${PWD}:${PATH}"
 
-          # Bundle CA certificates into the AppDir
           install -Dm644 /etc/ssl/certs/ca-certificates.crt \
             AppDir/etc/ssl/certs/ca-certificates.crt
 
-          # Custom AppRun: preserve typical AppDir runtime paths AND force CA bundle
           cat > AppRun <<'EOF'
           #!/bin/sh
           set -eu
 
           APPDIR="${APPDIR:-$(dirname "$(readlink -f "$0")")}"
 
-          export PATH="$APPDIR/usr/bin:${PATH:-/usr/bin:/bin}"
+          export PATH="${PATH:-/usr/bin:/bin}:$APPDIR/usr/bin"
           export LD_LIBRARY_PATH="$APPDIR/usr/lib:$APPDIR/usr/lib/x86_64-linux-gnu:${LD_LIBRARY_PATH:-}"
           export XDG_DATA_DIRS="$APPDIR/usr/share:${XDG_DATA_DIRS:-/usr/local/share:/usr/share}"
 
+          if [ -d "$APPDIR/usr/lib/x86_64-linux-gnu/zoitechat/plugins" ]; then
+            export ZOITECHAT_LIBDIR="$APPDIR/usr/lib/x86_64-linux-gnu/zoitechat/plugins"
+          elif [ -d "$APPDIR/usr/lib/zoitechat/plugins" ]; then
+            export ZOITECHAT_LIBDIR="$APPDIR/usr/lib/zoitechat/plugins"
+          fi
+
           if [ -d "$APPDIR/usr/share/glib-2.0/schemas" ]; then
             export GSETTINGS_SCHEMA_DIR="$APPDIR/usr/share/glib-2.0/schemas${GSETTINGS_SCHEMA_DIR:+:$GSETTINGS_SCHEMA_DIR}"
           fi
@@ -99,15 +161,42 @@ jobs:
             export GIO_EXTRA_MODULES="$APPDIR/usr/lib/gio/modules${GIO_EXTRA_MODULES:+:$GIO_EXTRA_MODULES}"
           fi
 
-          # OpenSSL trust store override (fixes “unable to get local issuer certificate (20)”)
+          export PYTHONHOME="$APPDIR/usr"
+          python_stdlib_dir="$(find "$APPDIR/usr/lib" -maxdepth 1 -type d -name 'python3.*' | head -n 1 || true)"
+          pythonpath_entries=""
+          if [ -n "$python_stdlib_dir" ] && [ -d "$python_stdlib_dir/dist-packages" ]; then
+            pythonpath_entries="$python_stdlib_dir/dist-packages"
+          fi
+          if [ -d "$APPDIR/usr/lib/python3/dist-packages" ]; then
+            pythonpath_entries="${pythonpath_entries:+$pythonpath_entries:}$APPDIR/usr/lib/python3/dist-packages"
+          fi
+          if [ -d "$APPDIR/usr/lib/x86_64-linux-gnu/python3/dist-packages" ]; then
+            pythonpath_entries="${pythonpath_entries:+$pythonpath_entries:}$APPDIR/usr/lib/x86_64-linux-gnu/python3/dist-packages"
+          fi
+          if [ -n "$pythonpath_entries" ]; then
+            export PYTHONPATH="$pythonpath_entries${PYTHONPATH:+:$PYTHONPATH}"
+          fi
+
+          # OpenSSL trust store override
           export SSL_CERT_FILE="${SSL_CERT_FILE:-$APPDIR/etc/ssl/certs/ca-certificates.crt}"
           export SSL_CERT_DIR="${SSL_CERT_DIR:-$APPDIR/etc/ssl/certs}"
           export CURL_CA_BUNDLE="${CURL_CA_BUNDLE:-$SSL_CERT_FILE}"
 
+          # Prefer Wayland if the session provides it, but keep X11 fallback.
+          # Don't override if the user already set GDK_BACKEND explicitly.
+          if [ -z "${GDK_BACKEND:-}" ]; then
+            if [ -n "${WAYLAND_DISPLAY:-}" ] || [ "${XDG_SESSION_TYPE:-}" = "wayland" ]; then
+              export GDK_BACKEND="wayland,x11"
+            else
+              export GDK_BACKEND="x11"
+            fi
+          fi
+
           exec "$APPDIR/usr/bin/zoitechat" "$@"
           EOF
           chmod +x AppRun
 
+
           VERSION="$(git describe --tags --always)"
 
           ./linuxdeploy-x86_64.AppImage \

.github/workflows/debian-build.yml

@@ -1,59 +0,0 @@
-name: Debian Build
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-    branches: [master]
-
-jobs:
-  debian_build:
-    runs-on: ubuntu-24.04
-    container:
-      image: debian:bookworm
-
-    steps:
-      - name: Install base tooling (git + deps)
-        run: |
-          set -eux
-          export DEBIAN_FRONTEND=noninteractive
-          apt-get update
-          apt-get install -y --no-install-recommends \
-                git ca-certificates \
-                build-essential pkg-config meson ninja-build cmake \
-                gettext \
-                libcanberra-dev libdbus-glib-1-dev libglib2.0-dev libgtk2.0-dev \
-                libluajit-5.1-dev libpci-dev libperl-dev libssl-dev \
-                python3-dev python3-cffi mono-devel desktop-file-utils
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-
-      - name: Configure
-        run: |
-          set -eux
-          rm -rf build
-          meson setup build \
-            -Dtext-frontend=true \
-            -Dauto_features=enabled
-        # If configure fails, show the project's actual option names in the log.
-      - name: Show Meson options (on failure)
-        if: failure()
-        run: |
-          set -eux
-          meson configure build || true
-
-      - name: Build
-        run: |
-          set -eux
-          ninja -C build
-
-      - name: Test
-        run: |
-          set -eux
-          ninja -C build test
-
-      - name: Install
-        run: |
-          set -eux
-          ninja -C build install

.github/workflows/flatpak-build.yml

@@ -31,7 +31,8 @@ jobs:
         with:
           bundle: zoitechat.flatpak
           manifest-path: flatpak/net.zoite.Zoitechat.json
-          cache-key: flatpak-builder-${{ github.sha }}
+          cache: false
+          restore-cache: false
 
       - name: Upload Flatpak Bundle
         id: upload_flatpak

.github/workflows/manjaro-package-build.yml

@@ -0,0 +1,81 @@
+name: Manjaro Package Build
+
+on:
+  push:
+    branches: [master, main]
+  pull_request:
+    branches: [master, main]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  manjaro-package:
+    runs-on: ubuntu-latest
+    container:
+      image: manjarolinux/base:latest
+
+    steps:
+      - name: Install packaging toolchain
+        run: |
+          set -euxo pipefail
+          pacman -Syu --noconfirm
+          pacman -S --noconfirm --needed \
+            base-devel \
+            git \
+            namcap \
+            meson \
+            ninja \
+            pkgconf \
+            glib2 \
+            glib2-devel \
+            gtk3 \
+            openssl \
+            dbus-glib \
+            libcanberra \
+            libayatana-appindicator \
+            luajit \
+            iso-codes \
+            lua \
+            perl \
+            python \
+            python-cffi \
+            pciutils
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          submodules: true
+
+      - name: Build package and generate .SRCINFO (non-root)
+        run: |
+          set -euxo pipefail
+          id -u builder >/dev/null 2>&1 || useradd -m builder
+          chown -R builder:builder "$GITHUB_WORKSPACE"
+          su builder -c "cd '$GITHUB_WORKSPACE/packaging/manjaro' && makepkg --noconfirm --syncdeps --cleanbuild"
+          su builder -c "cd '$GITHUB_WORKSPACE/packaging/manjaro' && makepkg --printsrcinfo > .SRCINFO"
+
+      - name: Lint PKGBUILD and package with namcap
+        run: |
+          set -euxo pipefail
+          cd "$GITHUB_WORKSPACE/packaging/manjaro"
+          namcap PKGBUILD
+          pkg_file="$(find . -maxdepth 1 -type f -name '*.pkg.tar.*' | head -n1)"
+          namcap "$pkg_file"
+
+      - name: Collect artifacts
+        run: |
+          set -euxo pipefail
+          mkdir -p artifacts
+          cp -v "$GITHUB_WORKSPACE"/packaging/manjaro/*.pkg.tar.* artifacts/
+          cp -v "$GITHUB_WORKSPACE"/packaging/manjaro/PKGBUILD artifacts/
+          cp -v "$GITHUB_WORKSPACE"/packaging/manjaro/.SRCINFO artifacts/
+
+      - name: Upload package artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: zoitechat-manjaro-package
+          path: artifacts/*
+          if-no-files-found: error

.github/workflows/msys-build.yml

@@ -1,56 +0,0 @@
-name: MSYS2 Build
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-    branches: [master]
-
-jobs:
-  msys2_build:
-    runs-on: windows-latest
-    defaults:
-      run:
-        shell: msys2 {0}
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: msys2/setup-msys2@v2
-        with:
-          msystem: MINGW64
-          update: true
-          install: >-
-            mingw-w64-x86_64-gcc
-            mingw-w64-x86_64-pkg-config
-            mingw-w64-x86_64-python-cffi
-            mingw-w64-x86_64-meson
-            mingw-w64-x86_64-ninja
-            mingw-w64-x86_64-gtk2
-            mingw-w64-x86_64-gtk-update-icon-cache
-            mingw-w64-x86_64-luajit
-            mingw-w64-x86_64-desktop-file-utils
-            mingw-w64-x86_64-gettext-tools
-
-      - name: Sanity check gettext ITS rules
-        run: |
-          set -eux
-          which msgfmt || true
-          msgfmt --version
-          ls -la /mingw64/share/gettext-*/its || true
-
-      - name: Configure
-        run: |
-          set -eux
-          rm -rf build
-          meson setup build \
-            -Dtext-frontend=true \
-            -Ddbus=disabled \
-            -Dwith-upd=false \
-            -Dwith-perl=false
-
-      - name: Build
-        run: ninja -C build
-
-      - name: Test
-        run: ninja -C build test

.github/workflows/openbsd-build.yml

@@ -1,117 +0,0 @@
-name: OpenBSD Build
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-    branches: [master]
-
-jobs:
-  openbsd_package:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: true
-
-      - name: Build OpenBSD package
-        uses: vmactions/openbsd-vm@v1
-        with:
-          release: '7.5'
-          usesh: true
-          sync: rsync
-          run: |
-            set -eux
-
-            rdate -n pool.ntp.org
-            export PKG_PATH="https://ftp.openbsd.org/pub/OpenBSD/7.5/packages/$(uname -m)/"
-
-            pkg_add -U \
-              git \
-              meson ninja pkgconf gmake \
-              gettext-tools \
-              glib2 gtk+2 dbus-glib libcanberra \
-              luajit mono libgdiplus openssl
-
-            work="$(mktemp -d /tmp/zoitechat.XXXXXX)"
-            trap 'rm -rf "$work"' EXIT
-
-            rsync -a --delete "$GITHUB_WORKSPACE"/ "$work/src/"
-            cd "$work/src"
-
-            rm -rf build
-            meson setup build \
-              --prefix=/usr/local \
-              -Dtext-frontend=true \
-              -Dplugin=false \
-              -Dauto_features=enabled
-
-            ninja -C build
-
-            staging="$work/staging"
-            rm -rf "$staging"
-            mkdir -p "$staging"
-
-            # Staged install
-            DESTDIR="$staging" meson install -C build --no-rebuild
-
-            # If these exist, something ignored DESTDIR (install scripts are leaking)
-            ls -l /usr/local/bin/zoitechat /usr/local/bin/thememan 2>/dev/null || true
-
-            sync
-            sleep 1
-            sync
-
-            # Freeze staged tree so pkg_create doesn't see moving targets
-            snap="$work/staging-snap"
-            rm -rf "$snap"
-            mkdir -p "$snap"
-            (cd "$staging" && pax -rw -pe . "$snap")
-
-            version="$(meson introspect --projectinfo build | sed -n 's/.*"version"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/p')"
-            pkg_name="zoitechat-${version}"
-            pkg_file="${pkg_name}.tgz"
-            plist="$work/openbsd-plist"
-            desc="$work/DESCR"
-
-            cat >"$desc" <<'EOF'
-            ZoiteChat is an IRC client (HexChat-derived) with a GTK UI and optional tools.
-            EOF
-
-            {
-              echo "@cwd /usr/local"
-
-              # Files + symlinks
-              find "$snap/usr/local" \( -type f -o -type l \) -print \
-                | LC_ALL=C sort \
-                | sed "s#^$snap/usr/local/##"
-
-              # Directories (reverse so children removed first)
-              find "$snap/usr/local" -mindepth 1 -type d -print \
-                | LC_ALL=C sort -r \
-                | sed "s#^$snap/usr/local/##" \
-                | sed 's#^#@dir #'
-            } > "$plist"
-
-            # OpenBSD pkg_create: COMMENT is set via -D COMMENT=... (mandatory), no -c flag exists.
-            # Create the .tgz in $work so we can copy it back out.
-            cd "$work"
-            pkg_create \
-              -B "$snap" \
-              -p /usr/local \
-              -f "$plist" \
-              -d "$desc" \
-              -D "COMMENT=ZoiteChat IRC client" \
-              -D "FULLPKGPATH=net/zoitechat" \
-              "$pkg_file"
-
-            mkdir -p "$GITHUB_WORKSPACE/artifacts"
-            cp "$work/$pkg_file" "$GITHUB_WORKSPACE/artifacts/"
-
-      - name: Upload OpenBSD package
-        uses: actions/upload-artifact@v4
-        with:
-          name: openbsd-package
-          path: artifacts/*.tgz

.github/workflows/windows-build.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   windows_build:
-    runs-on: windows-2019
+    runs-on: windows-2022
 
     permissions:
       contents: read
@@ -20,13 +20,8 @@ jobs:
 
     strategy:
       matrix:
-        platform: [x64, win32]
+        platform: [x64]
-        arch: [x64, x86]
+        arch: [x64]
-        exclude:
-          - platform: x64
-            arch: x86
-          - platform: win32
-            arch: x64
       fail-fast: false
 
     steps:
@@ -39,31 +34,81 @@ jobs:
 
       - name: Install Dependencies
         run: |
-          New-Item -Name "deps" -ItemType "Directory"
+          New-Item -Name "deps" -ItemType "Directory" -Force | Out-Null
 
-          Invoke-WebRequest http://files.jrsoftware.org/is/5/innosetup-5.5.9-unicode.exe -OutFile deps\innosetup-unicode.exe
+          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))
+              }
+            }
+          }
+
+          Download-WithRetry -Url https://files.jrsoftware.org/is/6/innosetup-6.7.0.exe -OutFile deps\innosetup-unicode.exe
           & deps\innosetup-unicode.exe /VERYSILENT | Out-Null
 
-          Invoke-WebRequest https://github.com/zoitechat/gvsbuild/releases/download/zoitechat-2.17.0/idpsetup-1.5.1.exe -OutFile deps\idpsetup.exe
+          Download-WithRetry -Url https://github.com/zoitechat/gvsbuild/releases/download/zoitechat-2.17.0/idpsetup-1.5.1.exe -OutFile deps\idpsetup.exe
           & deps\idpsetup.exe /VERYSILENT
 
-          Invoke-WebRequest https://github.com/zoitechat/gvsbuild/releases/download/zoitechat-2.17.0/gtk-${{ matrix.platform }}-2018-08-29-openssl1.1.7z -OutFile deps\gtk-${{ matrix.arch }}.7z
+          Download-WithRetry -Url https://github.com/ZoiteChat/gvsbuild/releases/download/zoitechat-2.18.0-pre1/GTK3_Gvsbuild_zoitechat-2.18.0-pre1_${{ matrix.platform }}.7z -OutFile deps\gtk-${{ matrix.arch }}.7z
-          & 7z.exe x deps\gtk-${{ matrix.arch }}.7z -oC:\gtk-build\gtk
+          & 7z.exe x deps\gtk-${{ matrix.arch }}.7z -oC:\gtk-build\gtk\x64\release
 
-          Invoke-WebRequest https://github.com/zoitechat/gvsbuild/releases/download/zoitechat-2.17.0/gendef-20111031.7z -OutFile deps\gendef.7z
+          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.1-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.17.0/gendef-20111031.7z -OutFile deps\gendef.7z
           & 7z.exe x deps\gendef.7z -oC:\gtk-build
 
-          Invoke-WebRequest https://github.com/zoitechat/gvsbuild/releases/download/zoitechat-2.17.0/WinSparkle-20151011.7z -OutFile deps\WinSparkle.7z
+          Download-WithRetry -Url https://github.com/zoitechat/gvsbuild/releases/download/zoitechat-2.17.0/WinSparkle-20151011.7z -OutFile deps\WinSparkle.7z
           & 7z.exe x deps\WinSparkle.7z -oC:\gtk-build\WinSparkle
 
-          Invoke-WebRequest https://github.com/zoitechat/gvsbuild/releases/download/zoitechat-2.17.0/perl-5.20.0-${{ matrix.arch }}.7z -OutFile deps\perl-${{ matrix.arch }}.7z
+          Download-WithRetry -Url https://github.com/zoitechat/gvsbuild/releases/download/zoitechat-2.17.0/perl-5.20.0-${{ matrix.arch }}.7z -OutFile deps\perl-${{ matrix.arch }}.7z
           & 7z.exe x deps\perl-${{ matrix.arch }}.7z -oC:\gtk-build\perl-5.20\${{ matrix.platform }}
 
-          # Resolve python root from setup-python
           $pyRoot = $env:pythonLocation
           if (-not $pyRoot) { $pyRoot = & python -c "import sys; print(sys.prefix)" }
 
-          # Create BOTH paths because the .vcxproj hard-codes python-3.14\...
           foreach ($pyDir in @("C:\gtk-build\python-3.14.2", "C:\gtk-build\python-3.14")) {
             New-Item -Path $pyDir -ItemType Directory -Force | Out-Null
             $target = Join-Path $pyDir "${{ matrix.platform }}"
@@ -71,12 +116,9 @@ jobs:
             New-Item -Path $pyDir -Name "${{ matrix.platform }}" -ItemType Junction -Value $pyRoot | Out-Null
           }
 
-          python -m pip install --upgrade pip
-          python -m pip install cffi
-
       - name: Build
         run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat"
+          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
 
           set "PYTHON_DIR=C:\gtk-build\python-3.14.2\${{ matrix.platform }}"
           if not exist "%PYTHON_DIR%\libs\python314.lib" (
@@ -88,12 +130,14 @@ jobs:
           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 }}
         shell: cmd
 
       - name: Preparing Artifacts
         run: |
-          move ..\zoitechat-build\${{ matrix.platform }}\ZoiteChat*.exe .\
+          move ..\zoitechat-build\${{ matrix.platform }}\ZoiteChat-*.exe .\
           move ..\zoitechat-build .\
         shell: cmd
 
@@ -102,7 +146,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: Installer ${{ matrix.arch }}
-          path: ZoiteChat*.exe
+          path: ZoiteChat-*.exe
 
       - name: Attest Installer (Artifact Attestation)
         if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository }}

Makefile

@@ -2,7 +2,9 @@ PREFIX ?= /usr/local
 BUILD_DIR ?= build
 MESON ?= meson
 NINJA ?= ninja
+C_STD ?= c17
 MESON_SETUP_ARGS ?=
+MESON_SETUP_ARGS += -Dc_std=$(C_STD)
 MESON_COMPILE_ARGS ?=
 MESON_INSTALL_ARGS ?=
 
@@ -12,7 +14,6 @@ CONFIG_STAMP := $(BUILD_DIR)/build.ninja
 
 all: build
 
-# Only run initial meson setup if we don't have a configured build dir yet.
 $(CONFIG_STAMP):
 	@mkdir -p $(BUILD_DIR)
 	@env NINJA=$(NINJA) $(MESON) setup $(BUILD_DIR) --prefix=$(PREFIX) $(MESON_SETUP_ARGS)

changelog.rst

@@ -1,6 +1,25 @@
 ZoiteChat ChangeLog
 =================
 
+2.18.0~pre2 (2026-02-25)
+------------------------
+
+- Added HexChat plugin compatibility improvements.
+- Fixed the user info right-click menu so it updates properly.
+- Added support for emoji characters in alert highlights.
+- clicking links in chat window with appimage build now works.
+- Removed remaining unused GTK2 code paths.
+- Continued GTK3 cleanup and packaging alignment work.
+
+2.18.0-pre1 (2026-02-16)
+------------------------
+
+- Switched Debian packaging/builds to GTK 3 (Build-Depends, Meson flags, and package metadata).
+- Added Debian package split install manifests so files are assigned to the correct binary packages.
+- Fixed Debian packaging coverage for the man page and MIME XML to avoid unassigned-file (dh_missing) failures.
+- Updated Debian CI packaging workflow and artifact upload paths for actions/upload-artifact@v4 compatibility.
+- Improved GTK3 font consistency by applying the configured input font to channel tree and user list theming paths.
+
 2.17.4 (2026-02-03)
 -------------------
 

data/icons/menu/dark/about.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<circle cx="8" cy="8" r="5.5" fill="none" stroke="#e5e7eb" stroke-width="1.3"/>
+<path d="M8 7v4" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/>
+<circle cx="8" cy="4.8" r=".9" fill="#e5e7eb"/>
+</svg>

data/icons/menu/dark/add.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<circle cx="8" cy="8" r="4.8" fill="none" stroke="#e5e7eb" stroke-width="1.3"/><path d="M8 5.8v4.4M5.8 8h4.4" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/>
+</svg>

data/icons/menu/dark/chanlist.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<rect x="2.5" y="3" width="11" height="10" rx="1.2" fill="none" stroke="#e5e7eb" stroke-width="1.3"/>
+<path d="M4.5 5.5h7M4.5 8h7M4.5 10.5h5" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/>
+<circle cx="3.5" cy="5.5" r=".2" fill="#e5e7eb"/>
+</svg>

data/icons/menu/dark/clear.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M3.2 5.2h9.6" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/>
+<path d="M5 5.2v7.3c0 .6.4 1 1 1h4c.6 0 1-.4 1-1V5.2" fill="none" stroke="#e5e7eb" stroke-width="1.3"/>
+<path d="M6.5 3.5h3" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/>
+<path d="M6.8 7v4M9.2 7v4" stroke="#e5e7eb" stroke-width="1.2" stroke-linecap="round"/>
+</svg>

data/icons/menu/dark/close.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<rect x="2.5" y="2.5" width="11" height="11" rx="1.6" fill="none" stroke="#e5e7eb" stroke-width="1.3"/>
+<path d="M5.2 5.2l5.6 5.6M10.8 5.2 5.2 10.8" stroke="#e5e7eb" stroke-width="1.5" stroke-linecap="round"/>
+</svg>

data/icons/menu/dark/connect.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M2.5 8a5.5 5.5 0 0 1 11 0" fill="none" stroke="#e5e7eb" stroke-width="1.3"/>
+<path d="M4.5 10.5h7" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/>
+<circle cx="8" cy="8" r="1.1" fill="#e5e7eb"/>
+</svg>

data/icons/menu/dark/copy.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M6 4.5h6.5v8H6z" fill="none" stroke="#e5e7eb" stroke-width="1.3"/><path d="M3.5 2.5H10v1.8" fill="none" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/><path d="M3.5 2.5v8.8H5.3" fill="none" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/>
+</svg>

data/icons/menu/dark/delete.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M5.2 5.3h5.6v7.2H5.2z" fill="none" stroke="#e5e7eb" stroke-width="1.3"/><path d="M4 5.3h8" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/><path d="M6.3 3.7h3.4" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/><path d="M7.1 6.6v4.6M8.9 6.6v4.6" stroke="#e5e7eb" stroke-width="1.1" stroke-linecap="round"/>
+</svg>

data/icons/menu/dark/detach.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<rect x="2" y="4" width="8" height="8" rx="1.2" fill="none" stroke="#e5e7eb" stroke-width="1.3"/>
+<path d="M8 8h5M10.5 5.5 13 8l-2.5 2.5" fill="none" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

data/icons/menu/dark/disconnect.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M2.5 8a5.5 5.5 0 0 1 11 0" fill="none" stroke="#e5e7eb" stroke-width="1.3"/>
+<path d="M4.5 10.5h7" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/>
+<path d="M5 5l6 6" stroke="#e5e7eb" stroke-width="1.4" stroke-linecap="round"/>
+</svg>

data/icons/menu/dark/emoji.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><circle cx="8" cy="8" r="5.6" fill="rgb(255,199,64)" stroke="rgb(240,240,240)" stroke-width="1"/><circle cx="6" cy="7" r="0.8" fill="rgb(240,240,240)"/><circle cx="10" cy="7" r="0.8" fill="rgb(240,240,240)"/><path d="M5.5 9.4c.6 1 1.4 1.6 2.5 1.6s1.9-.6 2.5-1.6" fill="none" stroke="rgb(240,240,240)" stroke-width="1" stroke-linecap="round"/></svg>

data/icons/menu/dark/find.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<circle cx="7" cy="7" r="3.5" fill="none" stroke="#e5e7eb" stroke-width="1.4"/>
+<path d="M9.8 9.8 13 13" stroke="#e5e7eb" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M7 5.4v3.2M5.4 7h3.2" stroke="#e5e7eb" stroke-width="1.2" stroke-linecap="round"/>
+</svg>

data/icons/menu/dark/help.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<circle cx="8" cy="8" r="5.5" fill="none" stroke="#e5e7eb" stroke-width="1.3"/>
+<path d="M6.4 6.2a1.8 1.8 0 1 1 2.8 1.5c-.7.5-1.2.9-1.2 1.8" fill="none" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/>
+<circle cx="8" cy="11.8" r=".8" fill="#e5e7eb"/>
+</svg>

data/icons/menu/dark/join.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M2.5 8h6" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/>
+<path d="M6 5l3 3-3 3" fill="none" stroke="#e5e7eb" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"/>
+<rect x="10" y="3" width="3.5" height="10" rx="1" fill="none" stroke="#e5e7eb" stroke-width="1.3"/>
+</svg>

data/icons/menu/dark/load-plugin.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M2.5 8h6" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/>
+<path d="M6 5l2.8 3L6 11" fill="none" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
+<rect x="9" y="4" width="4.5" height="8" rx="1" fill="none" stroke="#e5e7eb" stroke-width="1.3"/>
+<path d="M11.25 6v1.8" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/>
+</svg>

data/icons/menu/dark/network-list.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<rect x="2.5" y="3" width="11" height="10" rx="1.2" fill="none" stroke="#e5e7eb" stroke-width="1.3"/>
+<path d="M4.5 5.5h7M4.5 8h7M4.5 10.5h5" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/>
+<circle cx="3.5" cy="5.5" r=".2" fill="#e5e7eb"/>
+</svg>

data/icons/menu/dark/new.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M3 2.5h6l4 4V13.5a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1z" fill="none" stroke="#e5e7eb" stroke-width="1.3"/>
+<path d="M9 2.5v4h4" fill="none" stroke="#e5e7eb" stroke-width="1.3"/>
+<path d="M8 8v4M6 10h4" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/>
+</svg>

data/icons/menu/dark/next.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M5.5 3.5 10.5 8l-5 4.5" fill="none" stroke="#e5e7eb" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

data/icons/menu/dark/preferences.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<circle cx="8" cy="8" r="2.1" fill="none" stroke="#e5e7eb" stroke-width="1.3"/>
+<path d="M8 2.8v1.4M8 11.8v1.4M13.2 8h-1.4M4.2 8H2.8M11.7 4.3l-1 1M5.3 10.7l-1 1M11.7 11.7l-1-1M5.3 5.3l-1-1" stroke="#e5e7eb" stroke-width="1.2" stroke-linecap="round"/>
+</svg>

data/icons/menu/dark/previous.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M10.5 3.5 5.5 8l5 4.5" fill="none" stroke="#e5e7eb" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

data/icons/menu/dark/quit.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M8 2.5v5" stroke="#e5e7eb" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M5 4.3a5 5 0 1 0 6 0" fill="none" stroke="#e5e7eb" stroke-width="1.4" stroke-linecap="round"/>
+</svg>

data/icons/menu/dark/refresh.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M12.8 7.4A4.8 4.8 0 1 0 8 12.8" fill="none" stroke="#e5e7eb" stroke-width="1.4" stroke-linecap="round"/><path d="M13 3.5v3.7H9.3" fill="none" stroke="#e5e7eb" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

data/icons/menu/dark/remove.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<circle cx="8" cy="8" r="4.8" fill="none" stroke="#e5e7eb" stroke-width="1.3"/><path d="M5.8 8h4.4" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round"/>
+</svg>

data/icons/menu/dark/save-as.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M3 2.5h8l2 2v9a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1z" fill="none" stroke="#e5e7eb" stroke-width="1.3"/>
+<rect x="5" y="3.5" width="4.5" height="2.5" fill="none" stroke="#e5e7eb" stroke-width="1.2"/>
+<rect x="5" y="9" width="3.4" height="3" fill="none" stroke="#e5e7eb" stroke-width="1.2"/>
+<path d="M9.8 8.9v3.6M8.1 10.7l1.7-1.8 1.8 1.8" fill="none" stroke="#e5e7eb" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

data/icons/menu/dark/save.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M3 2.5h8l2 2v9a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1z" fill="none" stroke="#e5e7eb" stroke-width="1.3"/>
+<rect x="5" y="3.5" width="4.5" height="2.5" fill="none" stroke="#e5e7eb" stroke-width="1.2"/>
+<rect x="5" y="9" width="6" height="3" fill="none" stroke="#e5e7eb" stroke-width="1.2"/>
+</svg>

data/icons/menu/dark/search.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<circle cx="7" cy="7" r="3.5" fill="none" stroke="#e5e7eb" stroke-width="1.4"/>
+<path d="M9.8 9.8 13 13" stroke="#e5e7eb" stroke-width="1.5" stroke-linecap="round"/>
+</svg>

data/icons/menu/dark/spell-check.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M4 4.2h4M6 4.2v7.4M3.2 7.2h5.6" fill="none" stroke="#e5e7eb" stroke-width="1.2" stroke-linecap="round"/><path d="m8.9 9.3 1.5 1.5 2.8-3" fill="none" stroke="#e5e7eb" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

data/icons/menu/dark/update.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><g fill="none" stroke="rgb(240,240,240)" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M13 5.8A5.5 5.5 0 1 0 5 13"/><path d="M13 2.2v3h-3"/><path d="M3 10.2A5.5 5.5 0 1 0 11 3"/><path d="M3 13.8v-3h3"/></g></svg>

data/icons/menu/light/about.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<circle cx="8" cy="8" r="5.5" fill="none" stroke="#1f2937" stroke-width="1.3"/>
+<path d="M8 7v4" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/>
+<circle cx="8" cy="4.8" r=".9" fill="#1f2937"/>
+</svg>

data/icons/menu/light/add.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<circle cx="8" cy="8" r="4.8" fill="none" stroke="#1f2937" stroke-width="1.3"/><path d="M8 5.8v4.4M5.8 8h4.4" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/>
+</svg>

data/icons/menu/light/chanlist.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<rect x="2.5" y="3" width="11" height="10" rx="1.2" fill="none" stroke="#1f2937" stroke-width="1.3"/>
+<path d="M4.5 5.5h7M4.5 8h7M4.5 10.5h5" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/>
+<circle cx="3.5" cy="5.5" r=".2" fill="#1f2937"/>
+</svg>

data/icons/menu/light/clear.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M3.2 5.2h9.6" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/>
+<path d="M5 5.2v7.3c0 .6.4 1 1 1h4c.6 0 1-.4 1-1V5.2" fill="none" stroke="#1f2937" stroke-width="1.3"/>
+<path d="M6.5 3.5h3" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/>
+<path d="M6.8 7v4M9.2 7v4" stroke="#1f2937" stroke-width="1.2" stroke-linecap="round"/>
+</svg>

data/icons/menu/light/close.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<rect x="2.5" y="2.5" width="11" height="11" rx="1.6" fill="none" stroke="#1f2937" stroke-width="1.3"/>
+<path d="M5.2 5.2l5.6 5.6M10.8 5.2 5.2 10.8" stroke="#1f2937" stroke-width="1.5" stroke-linecap="round"/>
+</svg>

data/icons/menu/light/connect.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M2.5 8a5.5 5.5 0 0 1 11 0" fill="none" stroke="#1f2937" stroke-width="1.3"/>
+<path d="M4.5 10.5h7" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/>
+<circle cx="8" cy="8" r="1.1" fill="#1f2937"/>
+</svg>

data/icons/menu/light/copy.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M6 4.5h6.5v8H6z" fill="none" stroke="#1f2937" stroke-width="1.3"/><path d="M3.5 2.5H10v1.8" fill="none" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/><path d="M3.5 2.5v8.8H5.3" fill="none" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/>
+</svg>

data/icons/menu/light/delete.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M5.2 5.3h5.6v7.2H5.2z" fill="none" stroke="#1f2937" stroke-width="1.3"/><path d="M4 5.3h8" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/><path d="M6.3 3.7h3.4" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/><path d="M7.1 6.6v4.6M8.9 6.6v4.6" stroke="#1f2937" stroke-width="1.1" stroke-linecap="round"/>
+</svg>

data/icons/menu/light/detach.svg

@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<rect x="2" y="4" width="8" height="8" rx="1.2" fill="none" stroke="#1f2937" stroke-width="1.3"/>
+<path d="M8 8h5M10.5 5.5 13 8l-2.5 2.5" fill="none" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

data/icons/menu/light/disconnect.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M2.5 8a5.5 5.5 0 0 1 11 0" fill="none" stroke="#1f2937" stroke-width="1.3"/>
+<path d="M4.5 10.5h7" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/>
+<path d="M5 5l6 6" stroke="#1f2937" stroke-width="1.4" stroke-linecap="round"/>
+</svg>

data/icons/menu/light/emoji.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><circle cx="8" cy="8" r="5.6" fill="rgb(255,211,67)" stroke="rgb(56,56,56)" stroke-width="1"/><circle cx="6" cy="7" r="0.8" fill="rgb(56,56,56)"/><circle cx="10" cy="7" r="0.8" fill="rgb(56,56,56)"/><path d="M5.5 9.4c.6 1 1.4 1.6 2.5 1.6s1.9-.6 2.5-1.6" fill="none" stroke="rgb(56,56,56)" stroke-width="1" stroke-linecap="round"/></svg>

data/icons/menu/light/find.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<circle cx="7" cy="7" r="3.5" fill="none" stroke="#1f2937" stroke-width="1.4"/>
+<path d="M9.8 9.8 13 13" stroke="#1f2937" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M7 5.4v3.2M5.4 7h3.2" stroke="#1f2937" stroke-width="1.2" stroke-linecap="round"/>
+</svg>

data/icons/menu/light/help.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<circle cx="8" cy="8" r="5.5" fill="none" stroke="#1f2937" stroke-width="1.3"/>
+<path d="M6.4 6.2a1.8 1.8 0 1 1 2.8 1.5c-.7.5-1.2.9-1.2 1.8" fill="none" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/>
+<circle cx="8" cy="11.8" r=".8" fill="#1f2937"/>
+</svg>

data/icons/menu/light/join.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M2.5 8h6" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/>
+<path d="M6 5l3 3-3 3" fill="none" stroke="#1f2937" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"/>
+<rect x="10" y="3" width="3.5" height="10" rx="1" fill="none" stroke="#1f2937" stroke-width="1.3"/>
+</svg>

data/icons/menu/light/load-plugin.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M2.5 8h6" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/>
+<path d="M6 5l2.8 3L6 11" fill="none" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round" stroke-linejoin="round"/>
+<rect x="9" y="4" width="4.5" height="8" rx="1" fill="none" stroke="#1f2937" stroke-width="1.3"/>
+<path d="M11.25 6v1.8" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/>
+</svg>

data/icons/menu/light/network-list.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<rect x="2.5" y="3" width="11" height="10" rx="1.2" fill="none" stroke="#1f2937" stroke-width="1.3"/>
+<path d="M4.5 5.5h7M4.5 8h7M4.5 10.5h5" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/>
+<circle cx="3.5" cy="5.5" r=".2" fill="#1f2937"/>
+</svg>

data/icons/menu/light/new.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+<path d="M3 2.5h6l4 4V13.5a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1z" fill="none" stroke="#1f2937" stroke-width="1.3"/>
+<path d="M9 2.5v4h4" fill="none" stroke="#1f2937" stroke-width="1.3"/>
+<path d="M8 8v4M6 10h4" stroke="#1f2937" stroke-width="1.3" stroke-linecap="round"/>
+</svg>