gui_tools:backport from https://github.com/QQxiaoming/quardCRT.git

Signed-off-by: xiaoming <[email protected]>
QQxiaoming · Nov 13, 2023 · 8e5b17a · 8e5b17a
1 parent 0d5acb7
commit 8e5b17a
Show file tree

Hide file tree

Showing 95 changed files with 26,834 additions and 8,214 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -30,15 +30,15 @@ jobs:
       - name: Install Qt android
         uses: jurplel/install-qt-action@v3
         with:
-          version: '6.5.2'
+          version: '6.5.3'
           modules: 'qt5compat qtwebsockets'
           aqtversion: ==3.1.7
 
       - name: Install Qt android
         uses: jurplel/install-qt-action@v3
         with:
-          version: '6.5.2'
-          modules: 'qt5compat qtwebsockets'
+          version: '6.5.3'
+          modules: 'qt5compat qtwebsockets qtmultimedia'
           aqtversion: ==3.1.7
           target: 'android'
           arch: 'android_arm64_v8a'
@@ -53,7 +53,7 @@ jobs:
       - name: Build all
         shell: bash -l {0}
         env:
-          QT_VERSION: 6.5.2
+          QT_VERSION: 6.5.3
         run: |
           export ANDROID_NDK_ROOT=$(pwd)/android-ndk-r25b
           export ANDROID_BUILD_DIR=$(pwd)/android-build

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -24,22 +24,22 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: '6.5.2'
+          version: '6.5.3'
           modules: 'qt5compat qtwebsockets'
           aqtversion: ==3.1.7
 
       - name: Install Qt ios
         uses: jurplel/install-qt-action@v3
         with:
-          version: '6.5.2'
-          modules: 'qt5compat qtwebsockets'
+          version: '6.5.3'
+          modules: 'qt5compat qtwebsockets qtmultimedia'
           aqtversion: ==3.1.7
           target: ios
 
       - name: Build all
         shell: bash -l {0}
         env:
-          QT_VERSION: 6.5.2
+          QT_VERSION: 6.5.3
         run: |
           cd quard_star_tools
           git describe --always --long --abbrev=10 --exclude '*' | awk '{print "\""$0"\""}' > git_tag.inc

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -63,9 +63,11 @@ jobs:
           mv ./gui_tools/quard_star_tools_macos/installer_background.png ./installer_background.png
           sudo hdiutil attach ./gui_tools/quard_star_tools_macos/quard_star_tools.dmg
           cp -R /Volumes/quard_star_tools/quard_star_tools.app ./
+          sudo hdiutil detach /Volumes/quard_star_tools
           mv ./output ./quard_star_tools.app/Contents/Frameworks/output
           mv run.sh ./quard_star_tools.app/Contents/Frameworks/run.sh
-          create-dmg --volname "quard_star_tools" --background "installer_background.png" --window-pos 200 120 --window-size 800 450 --icon-size 100 --icon "quard_star_tools.app" 200 190 --app-drop-link 600 185 "quard_star_tools.dmg" "quard_star_tools.app"
+          sudo create-dmg --volname "quard_star_tools" --background "installer_background.png" --window-pos 200 120 --window-size 800 450 --icon-size 100 --icon "quard_star_tools.app" 200 190 --app-drop-link 600 185 "quard_star_tools.dmg" "quard_star_tools.app"
+          sudo chmod 777 quard_star_tools.dmg
           tar -czf release_macos.tar.gz quard_star_tools.dmg
 
       - name: Upload build asserts

diff --git a/.github/workflows/main_ci.yml b/.github/workflows/main_ci.yml
@@ -193,8 +193,15 @@ jobs:
         run: |
           brew install libslirp libffi gettext glib pkg-config autoconf automake pixman ninja dylibbundler
 
+      - uses: conda-incubator/setup-miniconda@v2
+        with:
+          auto-activate-base: true
+          activate-environment: ""
+
       - name: Build all
         run: |
+          conda create -n build_env python=3.11.5 -y
+          conda activate build_env
           ./build.sh qemu_macos
           dylibbundler -od -b -x ./output/qemu_macos/bin/qemu-system-riscv64 -d ./output/qemu_macos/libs/
           tar -czf qemu_macos.tar.gz output/
@@ -215,8 +222,8 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: '6.5.2'
-          modules: 'qt5compat qtwebsockets'
+          version: '6.5.3'
+          modules: 'qt5compat qtwebsockets qtmultimedia'
           aqtversion: ==3.1.7
 
       - name: Install prerequisites
@@ -225,6 +232,16 @@ jobs:
           sudo apt update
           sudo apt install -y make gcc upx-ucl
 
+      - name: build depend
+        run: |
+          cd quard_star_tools/depend
+          sudo apt install fcitx-libs-dev qtbase5-private-dev libxkbcommon-dev extra-cmake-modules tree
+          export PATH=$Qt6_DIR/bin:$PATH
+          export PATH=$Qt6_DIR/../../Qt/Tools/CMake/bin:$PATH
+          export Qt6GuiTools_DIR=$Qt6_DIR
+          ./build_fcitx_qt6.sh
+          cp ./fcitx-qt5-1.2.7/build/qt6/platforminputcontext/libfcitxplatforminputcontextplugin-qt6.so ./
+          
       - name: Build all
         shell: bash -l {0}
         run: |
@@ -266,8 +283,8 @@ jobs:
         uses: jurplel/install-qt-action@v3
         with:
           arch: win64_mingw
-          version: '6.5.2'
-          modules: 'qt5compat qtwebsockets'
+          version: '6.5.3'
+          modules: 'qt5compat qtwebsockets qtmultimedia'
           aqtversion: ==3.1.7
 
       - name: Build all
@@ -279,8 +296,6 @@ jobs:
           qmake -makefile
           mingw32-make
           windeployqt.exe ./release/out/quard_star_tools.exe
-          Copy-Item C:/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64/bin/lib*.dll ./release/out/
-          Copy-Item C:/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64/lib/lib*.dll ./release/out/
           Rename-Item ./release/out quard_star_tools_w64
           Rename-Item ./release gui_tools
 
@@ -301,8 +316,8 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: '6.5.2'
-          modules: 'qt5compat qtwebsockets'
+          version: '6.5.3'
+          modules: 'qt5compat qtwebsockets qtmultimedia'
           aqtversion: ==3.1.7
 
       - name: Install prerequisites

diff --git a/.github/workflows/webassembly.yml b/.github/workflows/webassembly.yml
@@ -30,16 +30,16 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: '6.5.2'
-          modules: 'qt5compat qtwebsockets'
+          version: '6.6.0'
+          modules: 'qt5compat qtwebsockets qtmultimedia'
           aqtversion: ==3.1.7
 
       - name: Install Qt webassembly
         uses: jurplel/install-qt-action@v3
         with:
           arch: wasm_singlethread
-          version: '6.5.2'
-          modules: 'qt5compat qtwebsockets'
+          version: '6.6.0'
+          modules: 'qt5compat qtwebsockets qtmultimedia'
           aqtversion: ==3.1.7
 
       - name: Install emsdk
@@ -51,7 +51,7 @@ jobs:
       - name: Build all
         shell: bash -l {0}
         env:
-          QT_VERSION: 6.5.2
+          QT_VERSION: 6.6.0
         run: |
           cd quard_star_tools
           git describe --always --long --abbrev=10 --exclude '*' | awk '{print "\""$0"\""}' > git_tag.inc

diff --git a/quard_star_tools/README.md b/quard_star_tools/README.md
@@ -15,5 +15,7 @@ Quard Star Tools是Quard Star Tutorial项目的一个子项目。其基于Qt编
 - jffs2 fork自https://github.com/rickardp/jffs2extract
 - treemodel.cpp fork自https://github.com/chocoball/QTreeViewTest
 - QDarkStyleSheet fork自https://github.com/ColinDuquesnoy/QDarkStyleSheet
+- utf8proc fork自https://github.com/JuliaStrings/utf8proc
+- fcitx-qt5 fork自https://github.com/fcitx/fcitx-qt5
 
 本项目中最初查看分析文件系统映像文件的需求编写了qfsviewer.cpp等相关代码，后考虑该功能的通用性需求，将其拆分为单独的项目发布，详见https://github.com/QQxiaoming/QFSViewer.git，未来将该项目作为本项目的上游依赖同步更新。
diff --git a/quard_star_tools/depend/.gitignore b/quard_star_tools/depend/.gitignore
@@ -0,0 +1 @@
+!build_fcitx_qt6.sh
diff --git a/quard_star_tools/depend/build_fcitx_qt6.sh b/quard_star_tools/depend/build_fcitx_qt6.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+set -e
+
+# ubuntu20.04 need install 
+# sudo apt install fcitx-libs-dev qtbase5-private-dev libxkbcommon-dev extra-cmake-modules
+# export PATH="~Qt/6.2.0/gcc_64/bin":$PATH
+# export PATH="~/Qt/Tools/CMake/bin":$PATH
+# export Qt6GuiTools_DIR=/home/qqm/Qt/6.2.0/gcc_64
+SHELL_FOLDER=$(cd "$(dirname "$0")";pwd)
+tar -xzvf fcitx-qt5-1.2.7.tar.gz
+cd $SHELL_FOLDER/fcitx-qt5-1.2.7
+mkdir build
+cd build
+cmake .. -DENABLE_QT5=OFF -DENABLE_QT6=ON
+make -j4
diff --git a/quard_star_tools/depend/fcitx-qt5-1.2.7.tar.gz b/quard_star_tools/depend/fcitx-qt5-1.2.7.tar.gz