Merge branch 'master' into release

# Conflicts: # Resources/Translations/xToolsCore_en.qm # Resources/Translations/xToolsCore_zh_CN.qm # Source/Tools/Tools/xToolsWebSocketClientTool.cpp # Source/Tools/Tools/xToolsWebSocketServerTool.cpp # Source/Tools/ToolsUI/xToolsSocketClientToolUi.cpp # Source/Tools/ToolsUI/xToolsTableModelToolUi.cpp
x-tools-author · Oct 3, 2024 · f97a6e2 · f97a6e2
2 parents ba02606 + b968138
commit f97a6e2
Show file tree

Hide file tree

Showing 555 changed files with 24,046 additions and 32,487 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,14 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
+custom: [https://www.microsoft.com/store/apps/9P29H1NDNKBB]
diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
@@ -2,43 +2,45 @@ name: build-android
 on:
   schedule:
     - cron: '0 0 * * *'
-#on:
+# on:
 #  push:
 #    branches:
 #      - master
 env:
   QT_VERSION: 6.5.3
-  QT_MODULES: 'qtcharts qtserialbus qtserialport qtwebsockets'
 jobs:
   build:
     name: Build for Android
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-      - name: Install Qt for Android
-        uses: jurplel/install-qt-action@v3
-        with:
-          target: android
-          arch: android_armv7
-          host: windows
-          dir: ${{ github.workspace }}
-          modules: ${{env.QT_MODULES}}
-          version: ${{env.QT_VERSION}}
+        uses: actions/checkout@v4
       - name: Install Qt for Desktop(mingw)
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
+        with:
+          aqtversion: '==3.1.*'
+          target: 'desktop'
+          arch: 'win64_mingw'
+          host: 'windows'
+          dir: '${{ github.workspace }}'
+          modules: 'qtcharts qtserialbus qtserialport qtwebsockets'
+          version:  '${{ env.QT_VERSION }}'
+      - name: Install Qt for Android
+        uses: jurplel/install-qt-action@v4
         with:
-          target: desktop
-          arch: win64_mingw
-          host: windows
-          dir: ${{ github.workspace }}
-          modules: ${{env.QT_MODULES}}
-          version: "${{env.QT_VERSION}}"
+          aqtversion: '==3.1.*'
+          target: 'android'
+          arch: 'android_armv7'
+          host: 'windows'
+          dir: '${{ github.workspace }}'
+          modules: 'qtcharts qtserialbus qtserialport qtwebsockets'
+          version: '${{ env.QT_VERSION }}'
       - name: CMake for Android
         shell: cmd
         run: |
+          git fetch --tags
           set JAVA_HOME=%JAVA_HOME_11_X64%
-          ${{ github.workspace }}\Qt\${{env.QT_VERSION}}\android_armv7\bin\qt-cmake.bat ^
+          ${{ github.workspace }}\Qt\${{ env.QT_VERSION }}\android_armv7\bin\qt-cmake.bat ^
           -G "MinGW Makefiles" ^
           -S . ^
           -B "build\armeabi_v7a" ^

diff --git a/.github/workflows/build-daily.yml b/.github/workflows/build-daily.yml
@@ -2,22 +2,21 @@ name: build-daily
 on:
   schedule:
     - cron: '0 0 * * *'
-#on:
+# on:
 #  push:
 #    branches:
 #      - master
 
-
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  QT_VERSION: 6.5.3
+  QT_VERSION: 6.8.*
   QT_MODULES: 'qtcharts qtserialbus qtserialport qtwebsockets'
 jobs:
   update-tag:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Update continuous tag
       run: |
         git config --global user.email "[email protected]"
@@ -30,34 +29,35 @@ jobs:
     needs: update-tag
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Delete Release
       run: |
         gh release delete continuous -y || true
     - name: Create Release
       run: |
         gh release create continuous --title "Continuous Build" --notes "Daily build of xTools"
   release-for-windows:
-    runs-on: windows-2019
+    runs-on: windows-2022
     needs: update-release
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Install Qt
-      uses: jurplel/install-qt-action@v3
+      uses: jurplel/install-qt-action@v4
       with:
-        version: '6.5.3'
+        version: '${{ env.QT_VERSION }}'
         target: 'desktop'
-        arch: 'win64_msvc2019_64'
-        dir: ${{ github.workspace }}
-        modules: 'qtcharts qtserialbus qtserialport qtwebsockets'
+        arch: 'win64_msvc2022_64'
+        dir: '${{ github.workspace }}'
+        modules: '${{env.QT_MODULES}}'
     - name: Build for Windows
       shell: cmd
       run: |
+        git fetch --tags
         mkdir build
         cd build
-        call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
-        cmake -DWITH_TOOLS:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_PREFIX_PATH='${{ github.workspace }}/Qt/6.5.3/win64_msvc2019_64' -DCMAKE_BUILD_TYPE=Release -G "NMake Makefiles" ../
+        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
+        cmake -DWITH_TOOLS:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_PREFIX_PATH='${{ github.workspace }}/Qt/${{env.QT_VERSION}}/win64_msvc2022_64' -DCMAKE_BUILD_TYPE=Release -G "NMake Makefiles" ../
         cmake --build . --target xTools
         dir && dir .\assets && dir .\assets\xTools
     - name: Upload Release Asset for Windnows
@@ -68,38 +68,39 @@ jobs:
     needs: update-release
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Install Qt
-      uses: jurplel/install-qt-action@v3
+      uses: jurplel/install-qt-action@v4
       with:
-        version: '6.5.3'
+        version: ${{env.QT_VERSION}}
         target: 'desktop'
-        arch: 'gcc_64'
+        arch: 'linux_gcc_64'
         dir: ${{ github.workspace }}
-        modules: 'qtcharts qtserialbus qtserialport qtwebsockets'
+        modules: ${{env.QT_MODULES}}
     - name: install-dependencies
       run: |
         sudo apt-get install -y libxcb-xinerama0 libxcb-cursor-dev
     - name: Build for Linux
       run: |
+        git fetch --tags
         mkdir build
         cd build
-        cmake ../ -DWITH_TOOLS:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_PREFIX_PATH='${{ github.workspace }}/Qt/6.5.3/gcc_64' -DCMAKE_BUILD_TYPE:STRING=Release -DX_TOOLS_LINUX_MAKE_APP_IMAGE_XTOOLS:BOOL=TRUE -G "Unix Makefiles"
+        cmake ../ -DCMAKE_PREFIX_PATH='${{ github.workspace }}/Qt/${{env.QT_VERSION}}/linux_gcc_64' -DCMAKE_BUILD_TYPE:STRING=Release -DX_TOOLS_LINUX_MAKE_APP_IMAGE_XTOOLS:BOOL=TRUE -G "Unix Makefiles"
         cmake --build . --target xTools
         dir && dir ./assets && dir ./assets/xTools
     - name: Upload Release Asset for Linux
       run: |
         dir && gh release upload continuous 'build/xtools-linux-x86_64.AppImage'
   release-for-macos:
-    runs-on: macos-11
+    runs-on: macos-12
     needs: update-release
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Install Qt for macOS
-      uses: jurplel/install-qt-action@v3
+      uses: jurplel/install-qt-action@v4
       with:
-        version: '6.5.3'
+        version: '${{env.QT_VERSION}}'
         target: 'desktop'
         arch: 'clang_64'
         dir: ${{ github.workspace }}
@@ -111,51 +112,53 @@ jobs:
       # ERROR: no file at "/Applications/Postgres.app/Contents/Versions/14/lib/libpq.5.dylib"
       # ln -s /usr/local/Cellar/postgresql@14/14.10/lib/postgresql@14/libpq.5.14.dylib /Applications/Postgres.app/Contents/Versions/14/lib/libpq.5.dylib
       run: |
+        git fetch --tags
         # brew unlink unixodbc
         # brew install libiodbc
         mkdir -p /Applications/Postgres.app/Contents/Versions/14/lib
         ln -s /usr/local/Cellar/postgresql@14/14.10/lib/postgresql@14/libpq.5.14.dylib /Applications/Postgres.app/Contents/Versions/14/lib/libpq.5.dylib
         mkdir build
         cd build
-        cmake ../ -DWITH_TOOLS:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_PREFIX_PATH='${{ github.workspace }}/Qt/6.5.3/clang_64/lib/cmake/Qt6' -DCMAKE_BUILD_TYPE:STRING=Release -G "Unix Makefiles"
+        cmake ../ -DCMAKE_PREFIX_PATH='${{ github.workspace }}/Qt/${{env.QT_VERSION}}/clang_64/lib/cmake/Qt6' -DCMAKE_BUILD_TYPE:STRING=Release -G "Unix Makefiles"
         cmake --build . --target xTools
         ls && ls ./assets && ls ./assets/xTools
     - name: Upload Release Asset for macOS
       run: |
-        ls && gh release upload continuous 'build/assets/xTools/xtools-macos-11.dmg'
+        ls && gh release upload continuous 'build/assets/xTools/xtools-macos-12.dmg'
   release-for-android:
-    runs-on: windows-2019
+    runs-on: windows-2022
     needs: update-release
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install Qt for Android
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           target: android
           arch: android_armv7
           host: windows
           dir: ${{ github.workspace }}
           modules: ${{env.QT_MODULES}}
-          version: ${{env.QT_VERSION}}
+          version: '6.5.3'
       - name: Install Qt for Desktop(mingw)
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           target: desktop
           arch: win64_mingw
           host: windows
           dir: ${{ github.workspace }}
           modules: ${{env.QT_MODULES}}
-          version: "${{env.QT_VERSION}}"
+          version: '6.5.3'
       - name: CMake for Android
         shell: cmd
         run: |
+          git fetch --tags
           set JAVA_HOME=%JAVA_HOME_11_X64%
-          ${{ github.workspace }}\Qt\${{env.QT_VERSION}}\android_armv7\bin\qt-cmake.bat ^
+          ${{ github.workspace }}\Qt\6.5.3\android_armv7\bin\qt-cmake.bat ^
           -G "MinGW Makefiles" ^
           -S . ^
           -B "build\armeabi_v7a" ^
-          -DQT_HOST_PATH:PATH="${{ github.workspace }}\Qt\${{env.QT_VERSION}}\mingw_64" ^
+          -DQT_HOST_PATH:PATH="${{ github.workspace }}\Qt\6.5.3\mingw_64" ^
           -DCMAKE_BUILD_TYPE:STRING=Release ^
           -DCMAKE_CXX_COMPILER:FILEPATH="%ANDROID_NDK_ROOT%/toolchains/llvm/prebuilt/windows-x86_64/bin/clang++.exe" ^
           -DANDROID_SDK_ROOT:PATH="%ANDROID_SDK_ROOT%" ^
@@ -174,7 +177,7 @@ jobs:
         run: |
           set JAVA_HOME=%JAVA_HOME_11_X64%
           echo %JAVA_HOME%
-          ${{ github.workspace }}\Qt\${{env.QT_VERSION}}\mingw_64\bin\androiddeployqt.exe ^
+          ${{ github.workspace }}\Qt\6.5.3\mingw_64\bin\androiddeployqt.exe ^
           --input build\armeabi_v7a\android-xTools-deployment-settings.json ^
           --output build\armeabi_v7a\android-build ^
           --android-platform android-34 ^

diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
@@ -1,8 +1,8 @@
-name: build-macos
+name: build-macos
 on:
   schedule:
     - cron: '0 0 * * *'
-#on:
+# on:
 #  push:
 #    branches:
 #      - master
@@ -12,29 +12,21 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-11, macos-12]
-        version: [5.15.2, 6.5.3]
-        arch: [clang_64]
-        include:
-          - version: 5.15.2
-            cmake-prefix-path: 'lib/cmake/Qt5'
-            modules: 'qtcharts'
-          - version: 6.5.3
-            cmake-prefix-path: 'lib/cmake/Qt6'
-            moudles: 'qtcharts qtserialbus qtserialport qtwebsockets'
+        os: [macos-12]
+        version: [6.8.*]
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: install qt
         uses: jurplel/install-qt-action@v3
         with:
           aqtversion: '==3.1.*'
+          dir: ${{ github.workspace }}
           version: ${{ matrix.version }}
           target: 'desktop'
-          arch: ${{ matrix.arch }}
-          dir: ${{ github.workspace }}
+          arch: 'clang_64'
           host: 'mac'
-          modules: ${{ matrix['moudles']}}
+          modules: 'qtcharts qtserialbus qtserialport qtwebsockets'
       - name: build for macos
         run: |
           # brew uninstall --force node
@@ -44,5 +36,5 @@ jobs:
           ln -s /usr/local/Cellar/postgresql@14/14.10/lib/postgresql@14/libpq.5.14.dylib /Applications/Postgres.app/Contents/Versions/14/lib/libpq.5.dylib
           mkdir build
           cd build
-          cmake -DWITH_TOOLS:BOOL=OFF -DCMAKE_PREFIX_PATH='${{ github.workspace }}/Qt/${{ matrix.version }}/${{ matrix.arch }}/${{ matrix.cmake-prefix-path }}' -DCMAKE_BUILD_TYPE=Release -G "Unix Makefiles" ../
+          cmake -DCMAKE_PREFIX_PATH='${{ github.workspace }}/Qt/${{ matrix.version }}/${{ matrix.arch }}' -DCMAKE_BUILD_TYPE=Release -G "Unix Makefiles" ../
           cmake --build . --target xTools