C# --> C++

.editorconfig

@@ -1,10 +1,7 @@
-[*.{sln,resx}]
-indent_style = tab
-
-[*.{cs,sh,py,json,page,cake}]
+[*.{h,cpp,py,json,page,txt}]
 indent_style = space
 indent_size = 4
 
-[*.{csproj,xml,css,md,blp,yml}]
+[*.{xml,css,md,blp,yml}]
 indent_style = space
 indent_size = 2

.gitattributes

@@ -1,9 +1,7 @@
 # Auto detect text files and perform LF normalization
 * text eol=lf
-*.csproj eol=crlf
-*.sln eol=crlf
 *.png binary
 *.jpg binary
 *.ico binary
 *.pdf binary
-*.exe binary
+*.exe binary

.github/workflows/flatpak.yml

@@ -6,31 +6,47 @@ on:
     types: [ "review_requested", "ready_for_review" ]
   workflow_dispatch:
 name: Flatpak
+permissions:
+  id-token: write
+  contents: read
 jobs:
   gnome-flatpak:
     name: "GNOME on Flatpak"
     runs-on: ubuntu-latest
     if: ${{ github.event.pull_request.user.login != 'weblate' }}
     container:
-      image: bilelmoussaoui/flatpak-github-actions:gnome-45
+      image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-47
       options: --privileged
     strategy:
       matrix:
-        # As of the time of writing (February 2023), GitHub Actions only provides x86_64 runners. While Flatpak does
-        # provide cross-building for other architectures, it uses QEMU to do so, and dotnet does not play well under
-        # QEMU for arm64. See below links for potential updates:
-        # - https://github.com/dotnet/runtime/issues/13648
-        # - https://github.com/actions/runner-images/issues/5631
         arch: [x86_64]
       fail-fast: false
     steps:
-      - uses: actions/[email protected]
+      - uses: actions/checkout@v4
+      - uses: flathub-infra/flatpak-github-actions/flatpak-builder@master
         with:
-          submodules: recursive
-      - uses: flatpak/flatpak-github-actions/[email protected]
+          bundle: org.nickvision.cavalier.gnome.flatpak
+          manifest-path: flatpak/org.nickvision.cavalier.gnome.json
+          cache-key: flatpak-builder-gnome-${{ github.sha }}
+          arch: ${{ matrix.arch }}
+          restore-cache: true
+  qt-flatpak:
+    name: "QT on Flatpak"
+    runs-on: ubuntu-latest
+    if: ${{ github.event.pull_request.user.login != 'weblate' }}
+    container:
+      image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.8
+      options: --privileged
+    strategy:
+      matrix:
+        arch: [x86_64]
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v4
+      - uses: flathub-infra/flatpak-github-actions/flatpak-builder@master
         with:
-          bundle: org.nickvision.cavalier.flatpak
-          manifest-path: flatpak/org.nickvision.cavalier.json
-          cache-key: flatpak-builder-${{ github.sha }}
+          bundle: org.nickvision.cavalier.qt.flatpak
+          manifest-path: flatpak/org.nickvision.cavalier.qt.json
+          cache-key: flatpak-builder-qt-${{ github.sha }}
           arch: ${{ matrix.arch }}
           restore-cache: true

.github/workflows/snap.yml

@@ -1,41 +1,27 @@
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
   pull_request:
-    branches: [ "main" ]
-    types: [ "review_requested", "ready_for_review" ]
+    branches: ["main"]
+    types: ["review_requested", "ready_for_review"]
   workflow_dispatch:
 name: Snap
 permissions:
   id-token: write
   contents: read
 jobs:
-  snap:
+  gnome-snap:
     name: "GNOME on Snap"
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        arch: [x86_64]
-      fail-fast: false
     steps:
-      - name: Checkout Git repository
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-      - name: Build Snap
+      - uses: actions/checkout@v4
+      - name: Build
         uses: snapcore/action-build@v1
         id: snapcraft-build
         with:
-          snapcraft-args: "-v"
+          snapcraft-args: "--verbosity debug"
+          snapcraft-channel: "edge"
       - uses: actions/upload-artifact@v4
         with:
-          name: ${{ steps.snapcraft-build.outputs.snap }}
+          name: cavalier-snap
           path: ${{ steps.snapcraft-build.outputs.snap }}
-      - name: Upload and release Cavalier Snap
-        uses: snapcore/action-publish@v1
-        if: ${{ github.event_name != 'pull_request' }}
-        env:
-          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.STORE_LOGIN }}
-        with:
-          snap: ${{ steps.snapcraft-build.outputs.snap }}
-          release: ${{'edge'}}

.github/workflows/spelling.yml

@@ -9,9 +9,9 @@ jobs:
   codespell:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: codespell-project/actions-codespell@master
         with:
           check_filenames: true
-          skip: cargo-sources.json,.git,*.po,*.svg
+          skip: cargo-sources.json,.git,*.svg,*.html,*.js,*.po,*.pot,*.page,*.map,sqlite3.h,sqlite3.c,pch.h,CONTRIBUTING.md
           ignore_words_list: gir

.github/workflows/windows.yml

@@ -0,0 +1,63 @@
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+    types: [ "review_requested", "ready_for_review" ]
+  workflow_dispatch:
+name: Windows
+permissions:
+  id-token: write
+  contents: read
+env:
+  GITHUB_ACTIONS: true
+  VCPKG_ROOT: ${{github.workspace}}/vcpkg
+jobs:
+  build:
+    name: "Build on x64"
+    runs-on: windows-latest
+    if: ${{ github.event.pull_request.user.login != 'weblate' }}
+    steps:
+      - name: "Checkout"  
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: "Setup Environment"
+        shell: pwsh
+        run: |
+          $ProgressPreference = 'SilentlyContinue'
+          mkdir build
+          Invoke-WebRequest https://github.com/mlocati/gettext-iconv-windows/releases/download/v0.21-v1.16/gettext0.21-iconv1.16-shared-64.zip -OutFile gettext.zip
+          Expand-Archive -Force 'gettext.zip'
+          move gettext\bin\* C:\Windows\System32
+          choco install innosetup
+      - name: "Vcpkg"
+        uses: johnwason/vcpkg-action@v6
+        id: vcpkg
+        with:
+          pkgs: glfw3 libnick skia[core,fontconfig,freetype,gl,harfbuzz,icu,vulkan] qtbase qtsvg qttools
+          triplet: x64-windows
+          revision: e946021fec2f993d6933f361e5b59e0433a750a7
+          token: ${{ secrets.GITHUB_TOKEN }}
+          github-binarycache: true
+      - name: "Build"
+        working-directory: ${{github.workspace}}/build
+        run: |
+          cmake -G "Visual Studio 17 2022" ..
+          cmake --build . --config Release
+      - name: "Create Installer"
+        working-directory: ${{github.workspace}}/inno
+        shell: pwsh
+        run: |
+          $ProgressPreference = 'SilentlyContinue'
+          Invoke-WebRequest https://aka.ms/vs/17/release/vc_redist.x64.exe -OutFile vc_redist.x64.exe
+          Invoke-WebRequest https://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x64.exe -OutFile vc_redist.2012.x64.exe
+          Invoke-WebRequest https://github.com/karlstav/cava/releases/download/0.10.4/cava_win.zip -OutFile cava.zip
+          Expand-Archive -Force 'cava.zip'
+          Remove-Item -Force cava\config
+          iscc setup.iss
+      - name: Upload
+        uses: actions/upload-artifact@v4
+        with:
+          path: ${{github.workspace}}/inno/NickvisionCavalierSetup.exe
+          name: Windows-x64-Release