Qt --> WinUI (#107)

* feat: Start Qt --> WinUI

* feat: Continue WinUI implementation

* feat: Better project structure

* feat: More WinUI implementation

* feat: More WinUI

* feat: WinUI AboutDialog

* feat: More WinUI Controls

* feat: Finish WinUI

* feat: Update docs

* feat: Better builds

* Update windows.yml

Author: nlogozzo

.github/ISSUE_TEMPLATE/bug.md

@@ -8,25 +8,22 @@ assignees: ''
 ---
 
 **Describe the bug**
+
 Describe the steps to reproduce the bug.
 
 **Describe the expected result**
+
 Describe what you expect to happen instead.
 
 **App Version**
 - [ ] GNOME on Linux
     - [ ] Flatpak
     - [ ] Snap
     - [ ] Source (Including AUR)
-- [ ] Qt on Linux
-    - [ ] Flatpak
-    - [ ] Snap
-    - [ ] Source (Including AUR)
-- [ ] Qt on Windows
-    - [ ] Installer
-    - [ ] Portable
+- [ ] WinUI on Windows
 
-Version Number: 
+Version Number:
 
 **Additional context**
+
 Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature-request.md

@@ -8,7 +8,9 @@ assignees: ''
 ---
 
 **Describe the feature**
+
 Describe what you would like us to add and how it will benefit users.
 
 **Mockup (Optional)**
+
 Provide a mockup of how you would like the feature to look.

.github/workflows/flatpak.yml

@@ -12,41 +12,25 @@ permissions:
 jobs:
   gnome-flatpak:
     name: "GNOME on Flatpak"
-    runs-on: ubuntu-latest
     if: ${{ github.event.pull_request.user.login != 'weblate' }}
     container:
       image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-48
       options: --privileged
     strategy:
       matrix:
-        arch: [x86_64]
-      fail-fast: false
+        variant:
+          - arch: x86_64
+            runner: ubuntu-latest
+          - arch: aarch64
+            runner: ubuntu-24.04-arm
+    runs-on: ${{ matrix.variant.runner }}
     steps:
       - uses: actions/checkout@v4
       - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
         with:
-          bundle: org.nickvision.application.gnome.flatpak
-          manifest-path: flatpak/org.nickvision.application.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.9
-      options: --privileged
-    strategy:
-      matrix:
-        arch: [x86_64]
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v4
-      - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
-        with:
-          bundle: org.nickvision.application.qt.flatpak
-          manifest-path: flatpak/org.nickvision.application.qt.json
-          cache-key: flatpak-builder-qt-${{ github.sha }}
-          arch: ${{ matrix.arch }}
+          bundle: org.nickvision.application.flatpak
+          manifest-path: flatpak/org.nickvision.application.json
+          cache-key: flatpak-builder-${{ github.sha }}
+          arch: ${{ matrix.variant.arch }}
           restore-cache: true
+          verbose: true

.github/workflows/windows.yml

@@ -11,14 +11,23 @@ permissions:
   contents: read
 env:
   GITHUB_ACTIONS: true
-  VCPKG_ROOT: ${{github.workspace}}/vcpkg
+  VCPKG_ROOT: ${{ github.workspace }}/vcpkg
 jobs:
-  build:
-    name: "Build on x64"
-    runs-on: windows-latest
+  winui-windows:
+    name: "WinUI on Windows"
     if: ${{ github.event.pull_request.user.login != 'weblate' }}
+    strategy:
+      matrix:
+        variant:
+          - arch: x64
+            runner: windows-latest
+            triplet: x64-windows
+          #- arch: arm64
+          #  runner: windows-11-arm
+          #  triplet: arm64-windows
+    runs-on: ${{ matrix.variant.runner }}
     steps:
-      - name: "Checkout"  
+      - name: "Checkout"
         uses: actions/checkout@v4
         with:
           submodules: recursive
@@ -27,21 +36,21 @@ jobs:
         run: |
           $ProgressPreference = 'SilentlyContinue'
           mkdir build
-          Invoke-WebRequest https://github.com/mlocati/gettext-iconv-windows/releases/download/v0.23-v1.17/gettext0.23-iconv1.17-shared-64.zip -OutFile gettext.zip
+          Invoke-WebRequest https://github.com/mlocati/gettext-iconv-windows/releases/download/v0.25-v1.17/gettext0.25-iconv1.17-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: libnick qtbase qtsvg qttools qlementine qlementine-icons
-          triplet: x64-windows
-          revision: bae8fe64fb89f07325480436d27a472d59413b40
+          pkgs: libnick
+          triplet: ${{ matrix.variant.triplet }}
+          revision: b0b4f9904e2791bc16b9fd8003243a9f55c42e6e
           token: ${{ github.token }}
           github-binarycache: true
       - name: "Build"
-        working-directory: ${{github.workspace}}/build
+        working-directory: ${{ github.workspace }}/build
         run: |
           cmake -G "Visual Studio 17 2022" ..
           cmake --build . --config Release
@@ -50,10 +59,11 @@ jobs:
         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://aka.ms/vs/17/release/vc_redist.${{ matrix.variant.arch }}.exe -OutFile vc_redist.exe
+          Invoke-WebRequest https://aka.ms/windowsappsdk/1.7/latest/windowsappruntimeinstall-${{ matrix.variant.arch }}.exe -OutFile windowsappruntimeinstall.exe
           iscc setup.iss
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
-          path: ${{github.workspace}}/inno/NickvisionApplicationSetup.exe
-          name: Windows-x64-Release
+          path: ${{ github.workspace }}/inno/NickvisionApplicationSetup.exe
+          name: Windows-${{ matrix.variant.arch }}-Release

CMakeLists.txt

@@ -21,15 +21,7 @@ include(GNUInstallDirs)
 
 add_subdirectory("lib${SHORT_NAME}")
 if(WIN32)
-    add_subdirectory("${PROJECT_NAME}.qt")
+    add_subdirectory("${PROJECT_NAME}.winui")
 else()
-    if(NOT DEFINED UI_PLATFORM)
-        if(LINUX)
-            add_subdirectory("${PROJECT_NAME}.gnome")
-        else()
-            add_subdirectory("${PROJECT_NAME}.qt")
-        endif()
-    else()
-        add_subdirectory("${PROJECT_NAME}.${UI_PLATFORM}")
-    endif()
+    add_subdirectory("${PROJECT_NAME}.gnome")
 endif()

CONTRIBUTING.md

@@ -25,7 +25,7 @@ All types of contributions are encouraged and valued. See the [Table of Contents
 
 ## I Have a Question
 
-Before you ask a question, it is best to search for existing [Discussions](https://github.com/NickvisionApps/Application/discussions) and [Issues](https://github.com/NickvisionApps/Application/issues) that might help you. 
+Before you ask a question, it is best to search for existing [Discussions](https://github.com/NickvisionApps/Application/discussions) and [Issues](https://github.com/NickvisionApps/Application/issues) that might help you.
 
 In case you have found a suitable existing issue/discussion and still need clarification, you can write your question in said post. It is also advisable to search the internet for answers first to common error messages.
 
@@ -39,22 +39,22 @@ We will then take care of the question as soon as possible and convert it to a p
 
 ## I Want To Contribute
 
-> ### Legal Notice
-> When contributing to this project, you must agree that you have authored 100% of the content and/or that you have the necessary rights to the content and that the content you contribute may be provided under the project [license](COPYING).
+### Legal Notice
+When contributing to this project, you must agree that you have authored 100% of the content and/or that you have the necessary rights to the content and that the content you contribute may be provided under the project [license](COPYING).
 
 ### Reporting Bugs
 
 #### Before Submitting a Bug Report
 
-A good bug report shouldn't leave others needing to chase you up for more information. Therefore, we ask that you to investigate carefully, collect information and describe the issue in detail in your report. Please complete the following steps in advance to help us fix any potential bug as fast as possible:
+A good bug report shouldn't leave others needing to chase you up for more information. Therefore, we ask that you investigate carefully, collect necessary information and describe the issue in detail in your report. Please complete the following steps in advanced to help us fix any potential bug as fast as possible:
 
-- Make sure that you are using the latest released version.
+- Make sure that you are using the latest released stable version.
 - Determine if your bug is really a bug and not an error on your side. If you are looking for support, you might want to check [this section](#i-have-a-question).
 - See if other users have experienced (and potentially already solved) the same issue you are having, check if there is not already a bug report existing for your bug or error in both the [Discussions](https://github.com/NickvisionApps/Application/discussions) and [Issues](https://github.com/NickvisionApps/Application/issues) sections.
 - Collect information about the bug:
   - Debug information provided by the application
     - GNOME: From the main hamburger menu, open About Application → Troubleshooting → Debugging Information and copy the information to the clipboard to paste in your issue.
-    - WinUI: From the Help item in the left-side navigation, click the gear/wrench icon in the top right corner of the flyout to copy the information to the clipboard to paste in your issue.
+    - WinUI: From the Help item in the left-side navigation, open About -> Debugging and copy the information to the clipboard to paste in your issue.
   - Stack trace (Traceback)
     - Including any error messages thrown by the application
     - You may need to start the application via the terminal/console to receive an error message for a crash.
@@ -65,7 +65,7 @@ A good bug report shouldn't leave others needing to chase you up for more inform
 
 #### How Do I Submit a Good Bug Report?
 
-> You must never report security related issues, vulnerabilities and bugs (including sensitive information) to the issue tracker nor elsewhere in public. Instead sensitive issues must be reported and handled via email to <nlogozzo225@gmail.com>.
+You must never report security related issues, vulnerabilities and bugs (including sensitive information) to the issue tracker nor elsewhere in public. Instead, sensitive issues must be reported and handled via email to <nlogozzo225@gmail.com>.
 
 We use GitHub issues to track bugs and errors. If you run into an issue with the project:
 
@@ -76,7 +76,7 @@ We use GitHub issues to track bugs and errors. If you run into an issue with the
 Once it has been opened:
 
 - The project team will label the issue accordingly.
-- A team member will try to reproduce the issue with your provided steps. If there are no reproduction steps or no obvious way to reproduce the issue, the team will ask you for those steps. 
+- A team member will try to reproduce the issue with your provided steps. If there are no reproduction steps or no obvious way to reproduce the issue, the team will ask you for those steps.
     - Bugs that are not able to be reproduced will not be addressed until they are reproduced. Therefore, it is important to include steps to speed up the fixing process.
 
 ### Suggesting Enhancements
@@ -111,11 +111,13 @@ Application is available to translate on [Weblate](https://hosted.weblate.org/en
 
 To start translating the app, fork the repository and clone it locally.
 
-Application uses [gettext](https://www.gnu.org/software/gettext/manual/gettext.html#PO-Files) for translations. In the `resources/po` folder you will find files that can be edited in your favourite `*.po` files editor (or with any plain text editor). 
+Application uses [gettext](https://www.gnu.org/software/gettext/manual/gettext.html#PO-Files) for translations. In the `resources/po` folder you will find files that can be edited in your favourite `*.po` files editor (or with any plain text editor).
+
+If you want to create a new translation, copy the `application.pot` file and rename said copy as `<lang_code>.po`, where `<lang_code>` is the language code for your translation. Usually the code is two letters, but it can also be a specific locale code to differentiate between versions of the same language (for example, `pt` and `pt_BR`).
 
-If you want to create a new translation, copy the `application.pot` file and rename said copy as `<lang_code>.po`, where `<lang_code>` is the language code for your translation. Usually the code is two letters, but it can also be a specific locale code to differentiate between versions of the same language (for example, `pt` and `pt_BR`). **Also, add the language code to `LINGUAS` file** (keeping this file in alphabetical order).
+**Also, add the language code to `LINGUAS` file** (keeping this file in alphabetical order).
 
-Edit your new translation file with correct translations for the English messages. 
+Edit your new translation file with correct translations for the English messages.
 
 To check your translation file, make sure your system is in the locale of the language you are translating and [locally build and run the app](README#building-manually). If all steps were carried out successfully, you should see your translation in action!
 
@@ -125,12 +127,12 @@ Once all changes to your translated file are made, commit these changes and crea
 
 #### Structure
 
-Application is built using C++20 and platform-native user interface libraries. With these technologies, Application is built for all desktop platforms.
+Application is built using C++20 and platform-native user interface libraries. With these technologies, Application is built for the Windows and Linux operating systems.
 
 The project is split up into the following sub-projects:
  - [libapplication](#libapplication)
  - [org.nickvision.application.gnome](#org.nickvision.application.gnome)
- - [org.nickvision.application.qt](org.nickvision.application.qt)
+ - [org.nickvision.application.winui](org.nickvision.application.qt)
 
 The whole project utilizes the [MVC](https://en.wikipedia.org/wiki/Model%E2%80%93view%E2%80%93controller) pattern for separating data models and UI views.
 
@@ -143,28 +145,25 @@ This project contains all of the code used by all platforms of the app:
 
 ##### org.nickvision.application.gnome
 
-This project contains all of the code used for the GNOME platform version of the app, including flathub manifest and desktop files:
+This project contains all of the code used for the GNOME platform version of the app:
 - `blueprints` => UI design files written in [Blueprint markup language](https://jwestman.pages.gitlab.gnome.org/blueprint-compiler/).
 - `controls` => Generic controls for the app.
     - These UI objects are separate from views in that they should not be backed by a controller and should be easily ported to any other app.
 - `helpers` => Useful objects and functions specific for the GNOME platform version of the app.
 - `resources` => Extra icons and other files specific for the GNOME platform version of the app.
 - `views` => The views (pages, windows, dialogs, etc...) of the app.
 
-##### org.nickvision.application.qt
+##### org.nickvision.application.winui
 
-This project contains all of the code used for the Qt platform (Windows, KDE) version of the app:
+This project contains all of the code used for the WinUI platform version of the app:
 - `controls` => Generic controls for the app.
     - These UI objects are separate from views in that they should not be backed by a controller and should be easily ported to any other app.
 - `helpers` => Useful objects and functions specific for the Qt platform version of the app.
-- `resources` => Extra icons and other files specific for the Qt platform version of the app.
 - `views` => The views (pages, windows, dialogs, etc...) of the app.
 
 #### Developing and Testing
 
-Application simply relies on `cmake` to configure and manage the correct projects for the running platform. Meaning, on Linux the `.gnome` variant of the app will be built by default and on Windows the `.qt` variant.
-
-Although on Linux, you can specify the `-DUI_PLATFORM=qt` flag to cmake and build and run the `.qt` variant.
+Application simply relies on `cmake` to configure and manage the correct projects for the running platform. Meaning, on Linux the `.gnome` variant of the app will be built and on Windows the `.winui` variant.
 
 [See the readme](README#building-manually) for instructions on building and running the app locally.
 
@@ -183,10 +182,10 @@ Application uses the following coding styles:
     #define FILENAME_H
     ...
     #endif //FILENAME_H
-  ``` 
-  used as the guards to a header file. 
+  ```
+  used as the guards to a header file.
   - `#pragma once` should not be used.
-- Brackets `{}` should be placed on individual new lines and never inline. 
+- Brackets `{}` should be placed on individual new lines and never inline.
     - This applies for any type of structure (`if`, `switch`, `class`, etc...) that requires brackets.
     - *Single-line if statements should also be wrapped by brackets.*
 - Proper indentation using spacing with spaces and not tabs.

README.md

@@ -5,8 +5,8 @@
 
 ## Features
 - A template for creating cross-platform desktop apps in C++
-    - GNOME (Linux) support through GTK4/libadwaita
-    - Universal (Windows, Linux) support through QT
+    - Linux support through GTK4/libadwaita
+    - Windows support through WindowsAppSDK/WinUI
 
 ## Chat
 <a href='https://matrix.to/#/#nickvision:matrix.org'><img width='140' alt='Join our room' src='https://user-images.githubusercontent.com/17648453/196094077-c896527d-af6d-4b43-a5d8-e34a00ffd8f6.png'/></a>
@@ -22,36 +22,29 @@ Ensure both `vcpkg` and `cmake` are installed on your system before building.
 
 A C++20 compiler is also required to build Application.
 
-**If building the GNOME version, `blueprint-compiler` must be installed from your system package manager as it is not available on `vcpkg`.**
+**If building the Linux version, `blueprint-compiler` must be installed from your system package manager as it is not available on `vcpkg`.**
 
 ### Configuring vcpkg
 1. Set the `VCPKG_ROOT` environment variable to the path of your vcpkg installation's root directory.
 #### Windows
 1. Set the `VCPKG_DEFAULT_TRIPLET` environment variable to `x64-windows`
-1. Run `vcpkg install libnick qtbase qtsvg qttools qlementine qlementine-icons`
-#### Linux (GNOME)
+1. Run `vcpkg install libnick`
+#### Linux
 1. Set the `VCPKG_DEFAULT_TRIPLET` environment variable to `x64-linux`
 1. Run `vcpkg install libnick libxmlpp`
-#### Linux (Qt)
-1. Set the `VCPKG_DEFAULT_TRIPLET` environment variable to `x64-linux`
-1. Run `vcpkg install libnick qtbase qtsvg qttools qlementine qlementine-icons`
 
 ### Building
 1. First, clone/download the repo.
 1. Open a terminal and navigate to the repo's root directory.
-1. Create a new `build` directory and `cd` into it. 
+1. Create a new `build` directory and `cd` into it.
 #### Windows
 1. From the `build` folder, run `cmake .. -G "Visual Studio 17 2022"`.
 1. From the `build` folder, run `cmake --build . --config Release`.
-1. After these commands complete, Application will be successfully built and its binaries can be found in the `org.nickvision.application.qt/Release` folder of the `build` folder.
-#### Linux (GNOME)
-1. From the `build` folder, run `cmake .. -DCMAKE_BUILD_TYPE=Release -DUI_PLATFORM=gnome`.
+1. After these commands complete, Application will be successfully built and its binaries can be found in the `org.nickvision.application.winui/Release` folder of the `build` folder.
+#### Linux
+1. From the `build` folder, run `cmake .. -DCMAKE_BUILD_TYPE=Release`.
 1. From the `build` folder, run `cmake --build .`.
 1. After these commands complete, Application will be successfully built and its binaries can be found in the `org.nickvision.application.gnome` folder of the `build` folder.
-#### Linux (Qt)
-1. From the `build` folder, run `cmake .. -DCMAKE_BUILD_TYPE=Release -DUI_PLATFORM=qt`.
-1. From the `build` folder, run `cmake --build .`.
-1. After these commands complete, Application will be successfully built and its binaries can be found in the `org.nickvision.application.qt` folder of the `build` folder.
 
 ## Code of Conduct