Merge branch 'master' into pr/259

.github/workflows/macos.yaml

@@ -0,0 +1,56 @@
+name: CI - macOS
+
+on:
+  push:
+    branches:
+      - 'master'
+    tags:
+      - '*'
+  pull_request:
+
+jobs:
+  ci:
+    name: Build 
+    runs-on: macos-12
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v4
+        with:
+          version: "6.7.1"
+          archives: qtbase qtsvg qttools
+          cache: true
+
+      - name: Configure CMake
+        run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DTEST=ON
+
+      - name: Build PokeFinder
+        run: cmake --build ${{github.workspace}}/build --config RELEASE
+
+      - name: Test PokeFinder
+        run: ctest --test-dir ${{github.workspace}}/build -V
+
+      - name: Package PokeFinder
+        run: |
+          mkdir upload
+          mv build/Source/PokeFinder.app .
+          macdeployqt PokeFinder.app -verbose=3
+          tar czf PokeFinder-macOS.tar.gz PokeFinder.app
+          mv PokeFinder-macOS.tar.gz upload
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: PokeFinder-macOS
+          path: upload
+
+      - name: Publish Release
+        uses: softprops/action-gh-release@v2
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          files: PokeFinder-macOS.tar.gz

.github/workflows/ubuntu.yaml

@@ -0,0 +1,55 @@
+name: CI - Ubuntu
+
+on:
+  push:
+    branches:
+      - 'master'
+    tags:
+      - '*'
+  pull_request:
+
+jobs:
+  ci:
+    name: Build
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v4
+        with:
+          version: "6.7.1"
+          archives: icu qtbase qtsvg qttools
+          cache: true
+
+      - name: Configure CMake
+        run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=RELEASE -DTEST=ON
+
+      - name: Build PokeFinder
+        run: cmake --build ${{github.workspace}}/build --config RELEASE
+
+      - name: Test PokeFinder
+        run: ctest --test-dir ${{github.workspace}}/build -V
+
+      - name: Package PokeFinder
+        run: |
+          mkdir upload
+          mv build/Source/PokeFinder .
+          tar czf PokeFinder-linux.tar.gz PokeFinder
+          mv PokeFinder upload
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: PokeFinder-linux
+          path: upload
+
+      - name: Publish Release
+        uses: softprops/action-gh-release@v2
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          files: PokeFinder-linux.tar.gz

.github/workflows/windows.yaml

@@ -0,0 +1,64 @@
+name: CI - Windows
+
+on:
+  push:
+    branches:
+      - 'master'
+    tags:
+      - '*'
+  pull_request:
+
+jobs:
+  ci:
+    name: Build
+    runs-on: windows-2022
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v4
+        with:
+          version: "6.7.1"
+          archives: qtbase qtsvg qttools
+          tools: tools_opensslv3_x64
+          cache: true
+
+      - name: Configure CMake
+        run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=RELEASE -DTEST=ON
+
+      - name: Build PokeFinder
+        run: cmake --build ${{github.workspace}}/build --config RELEASE
+
+      - name: Test PokeFinder
+        run: ctest --test-dir ${{github.workspace}}/build -C RELEASE -V
+
+      - name: Package PokeFinder
+        run: |
+          mkdir upload
+          mkdir PokeFinder
+          mkdir PokeFinder/platforms
+          mkdir PokeFinder/styles
+          mv build/Source/Release/PokeFinder.exe PokeFinder
+          windeployqt --no-translations --no-plugins --no-opengl-sw --no-system-d3d-compiler PokeFinder/PokeFinder.exe
+          rm PokeFinder/vc_redist*.exe
+          cp "${{ env.QT_ROOT_DIR }}/plugins/platforms/qwindows.dll" PokeFinder/platforms/
+          cp "${{ env.QT_ROOT_DIR }}/plugins/styles/qmodernwindowsstyle.dll" PokeFinder/styles/
+          cp "${{ env.QT_ROOT_DIR }}/../../Tools/OpenSSLv3/Win_x64/bin/lib*.dll" PokeFinder
+          7z a PokeFinder-win.zip PokeFinder
+          mv PokeFinder upload
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: PokeFinder-windows
+          path: upload
+
+      - name: Publish Release
+        uses: softprops/action-gh-release@v2
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          files: PokeFinder-win.zip

.gitignore

@@ -13,5 +13,10 @@ out
 
 # Resource files
 i18n.hpp
-Encounters.hpp
-Personal.hpp
+EncounterData*.hpp
+Personal.hpp
+*.pyc
+
+# Test resource files
+Enum.cpp
+Enum.hpp

.gitmodules

@@ -1,3 +1,9 @@
-[submodule "QDarkStyleSheet"]
-	path = Externals/QDarkStyleSheet
+[submodule "External/bzip2"]
+	path = Source/Core/External/bzip2
+	url = https://gitlab.com/bzip2/bzip2
+[submodule "External/QDarkStyleSheet"]
+	path = Source/Form/External/QDarkStyleSheet
 	url = https://github.com/ColinDuquesnoy/QDarkStyleSheet
+[submodule "Source/Core/Resources/EncounterTables"]
+	path = Source/Core/Resources/EncounterTables
+	url = https://github.com/Admiral-Fish/EncounterTableGenerator

CMakeLists.txt

@@ -1,10 +1,13 @@
-cmake_minimum_required(VERSION 3.16.0)
+cmake_minimum_required(VERSION 3.16)
 
 project(PokeFinder)
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/CMake")
+
+option(TEST "Run Tests" OFF)
 
 if (TEST)
+    add_compile_definitions(TEST)
     enable_testing()
 endif ()