3.4.0

修改control
虚拟机安装工具提供LoongArch新世界版本
2025-12-15 03:22:04 +08:00 · 2023-08-11 11:22:06 +08:00 · 2023-08-11 10:13:34 +08:00 · 2023-08-11 09:36:22 +08:00 · 2023-08-10 18:38:07 +08:00 · 2023-08-10 14:36:41 +08:00
51 changed files with 25787 additions and 524 deletions
--- a/BuildDemoConfigFile/com.7zip.demo_23.01spark0_all.json
+++ b/BuildDemoConfigFile/com.7zip.demo_23.01spark0_all.json
@@ -0,0 +1,87 @@
+{
+    "Package": [
+        "L",
+        "com.7zip.demo"
+    ],
+    "Version": [
+        "L",
+        "23.01spark0"
+    ],
+    "Description": [
+        "L",
+        "7Zip For Deepin Wine6 Stable"
+    ],
+    "Maintainer": [
+        "L",
+        "gfdgd xi<3025613752@qq.com>"
+    ],
+    "BottleName": [
+        "L",
+        "Spark-7zip"
+    ],
+    "BottlePath": [
+        "L",
+        "/home/gfdgd_xi/.deepinwine/Spark-7zip"
+    ],
+    "WineVersion": [
+        "Co",
+        5
+    ],
+    "DebSavePath": [
+        "L",
+        "/home/gfdgd_xi/Desktop/com.7zip.demo_23.01spark0_all.deb"
+    ],
+    "Desktop": [
+        "List-Desktop",
+        [
+            [
+                "c:/Program Files/7-Zip/7zFM.exe",
+                11,
+                "",
+                "7Zip",
+                "/home/gfdgd_xi/Desktop/Icon_0001.png",
+                ""
+            ]
+        ]
+    ],
+    "UseInstallWineArch": [
+        "Co",
+        0
+    ],
+    "RemoveBash": [
+        "Ch",
+        true
+    ],
+    "CleanBottleByUOS": [
+        "Ch",
+        true
+    ],
+    "ChooseWineHelperValue": [
+        "Ch",
+        true
+    ],
+    "DisabledMono": [
+        "Ch",
+        true
+    ],
+    "DebDepends": [
+        "L",
+        "deepin-wine6-stable | deepin-wine6-stable-bcm | deepin-wine6-stable-dcm, spark-dwine-helper | store.spark-app.spark-dwine-helper, fonts-wqy-microhei, fonts-wqy-zenhei"
+    ],
+    "DebRecommend": [
+        "L",
+        ""
+    ],
+    "DebFirstArch": [
+        "Co",
+        0
+    ],
+    "DebArch": [
+        "Co",
+        0
+    ],
+    "SparkHelperConfigPath": [
+        "Str-SparkHelperConfigPath",
+        null
+    ]
+}
--- a/InstallBox86-cn.sh
+++ b/InstallBox86-cn.sh
@@ -21,27 +21,28 @@ if [[ $? == 0 ]]; then
 fi
 echo 使用国内源
 #sudo wget https://ryanfortner.github.io/box86-debs/box86.list -O /etc/apt/sources.list.d/box86.list
-sudo bash -c "echo deb http://jihulab.com/gfdgd-xi/box86-debs/-/raw/master/debian ./ > /etc/apt/sources.list.d/box86.list"
-wget -qO- http://jihulab.com/gfdgd-xi/box86-debs/-/raw/master/KEY.gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/box86-debs-archive-keyring.gpg 
+sudo bash -c "echo deb http://seafile.jyx2048.com:2345/spark-deepin-wine-runner/data/box86-debs/debian ./ > /etc/apt/sources.list.d/box86.list"
+wget -qO- http://seafile.jyx2048.com:2345/spark-deepin-wine-runner/data/box86-debs/KEY.gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/box86-debs-archive-keyring.gpg 
 echo "adding key..."
 installBox=box86-generic-arm
 if [[ $PCArch == "arm64" ]]; then
    sudo bash -c "echo deb http://seafile.jyx2048.com:2345/spark-deepin-wine-runner/data/box64-debs/debian ./ > /etc/apt/sources.list.d/box64.list"
    wget -qO- http://seafile.jyx2048.com:2345/spark-deepin-wine-runner/data/box64-debs/KEY.gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/box64-debs-archive-keyring.gpg
-    installBox="box86-generic-arm box64-generic-arm libc6:armhf"
+    installBox="box86-generic-arm box64-generic-arm"
    sudo dpkg --add-architecture armhf
 fi
 echo " + sudo apt update"
 sudo apt update
 sudo apt install binfmt-support -y
+sudo apt install libc6:armhf -y
 echo apt 源添加完毕！按回车键继续安装 Box86/Box64，若想要停止安装，则请按 Ctrl+C 或按终端右上角 ×（叉叉）退出
 echo 按回车键后将会自动安装包名为 box86-generic-arm、box64-generic-arm（box64 要在 aarch64 系统才可安装）的 Box86/Box64 包（适用于通用 ARM 系统）
 echo 其他特殊版本及其包名可见如下链接（如适用于 rk3399 的版本）：
 echo "    - Box64：https://github.com/ryanfortner/box64-debs/"
 echo "    - Box86：https://github.com/ryanfortner/box86-debs/"
-echo "    - Box64（国内镜像）：https://jihulab.com/gfdgd-xi/box64-debs"
-echo "    - Box64（国内镜像）：https://jihulab.com/gfdgd-xi/box86-debs"
+echo "    - Box64（国内镜像）：http://seafile.jyx2048.com:2345/spark-deepin-wine-runner/data/box64-debs"
+echo "    - Box64（国内镜像）：http://seafile.jyx2048.com:2345/spark-deepin-wine-runner/data/box86-debs"
 read
 sudo apt install -y $installBox
 echo 安装完成！按回车键退出
-read
+read
--- a/2
+++ b/2
@@ -50,6 +50,7 @@ package:
 	rm -rfv deb/opt/apps/deepin-wine-runner/wine/winelist.json
 	cp -rv req deb/opt/apps/deepin-wine-runner
 	cp -rv pardus-chroot deb/opt/apps/deepin-wine-runner
+	cp -rv winetricks deb/opt/apps/deepin-wine-runner
 	cp -rv WineLib deb/opt/apps/deepin-wine-runner
 	cp -rv InstallFoxpro.py deb/opt/apps/deepin-wine-runner
 	cp -rv BuildDesktop.py deb/opt/apps/deepin-wine-runner
@@ -151,7 +152,6 @@ package:
 	dpkg-deb -Z xz -b /tmp/spark-deepin-wine-runner-builder spark-deepin-wine-runner.deb
 	sudo rm -rfv /tmp/spark-deepin-wine-runner-builder
 	
-
 install:
 	make build -j$(nproc)
 	sudo apt update ; true
--- a/QemuSystemInstall.sh
+++ b/QemuSystemInstall.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
-pkexec apt install qemu-system -y
+sudo apt update
+sudo apt install qemu-system qemu-user qemu-efi -y
+sudo apt install qemu-user-static binfmt-support qemu-system-gui -y
 echo 安装完成！按回车键退出
-read
+read
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <p width=100px align="center"><img src="https://storage.deepin.org/thread/202208031419283599_deepin-wine-runner.png"></p>
-<h1 align="center">Wine 运行器 3.3.0</h1>
+<h1 align="center">Wine 运行器 3.4.0</h1>
 <hr>

 ## 介绍
@@ -136,6 +136,36 @@ desktop文件中StartupWMClass字段。用于让桌面组件将窗口类名与de
 ![image.png](https://storage.deepin.org/thread/202207190822204627_image.png)

 ## 更新日志 
+### 3.4.0（2023年08月11日）
+**※1、修复简易打包器无法打开的问题以及 Wine 识别错误的问题**  
+**※2、高级打包器支持多 .desktop 分别设置不同的 MimeType**  
+**※3、修复运行器在 Ubuntu 23 的安装问题**  
+**※4、高级打包器支持导出/导入填写信息**  
+**※5、Deepin 23 支持使用 Winetricks**  
+**※6、新增视频教程**  
+**※7、修复虚拟机工具在检测到 Qemu 磁盘但没有安装 Qemu 时无法启动的问题**  
+**※8、修复虚拟机工具的一些问题并调整部分设置**  
+**※9、虚拟机工具支持设置 UEFI 启动**  
+**※10、虚拟机安装工具提供 LoongArch 新世界版本**  
+11、高级打包器支持隐藏输入框以及使用小字体  
+12、打包器提供 bcm 和 dcm wine 支持  
+13、修复星火 wine 配置错误问题  
+14、打包器支持多线程打包  
+15、修复升级工具问题：https://gitee.com/gfdgd-xi/uengine-runner/issues/I6ZRZX  
+16、跟进打包器 run.sh 模板  
+17、云沙箱新增 cloud.vdnel.cn  
+18、打包器新增分类 Game、System、AudioVideo  
+19、修复安装 Box64 时源里没有 libc6:armhf 导致无法安装的问题  
+
+
+![图片.png](https://storage.deepin.org/thread/2023081111212518_图片.png)
+
+
+
+### 3.3.0.1（2023年07月25日）
+**※1、修复运行器打开主界面不进行任何操作但 CPU 占用率过高的问题**  
+**※2、修复运行器运行器（局部）无法正常移除的问题**  
+
 ### 3.3.0（2023年07月12日）
 **※1、简易打包器支持选择 Wine 版本以及修改打包生成的 deb 包的架构为 all；**  
 **※2、修改容器自动配置脚本的 Gitlink 源为 Gitee 源**  
@@ -154,6 +184,7 @@ desktop文件中StartupWMClass字段。用于让桌面组件将窗口类名与de
 15、修复部分组件没完全换源的问题，部分组件支持自动换可用源  
 ![图片.png](https://storage.deepin.org/thread/202307121216143835_图片.png)  
 ![图片.png](https://storage.deepin.org/thread/202307121221299140_图片.png)  
+
 ### 3.2.2（2023年05月12日）
 **※1. 修改源地址（迁出 Gitlink）；**  
 **※2. 修复非 X86 架构运行器主页面虚拟机工具禁用的问题；**  
--- a/StartVM.sh
+++ b/StartVM.sh
@@ -14,13 +14,29 @@ if [[ 0 == $? ]]; then
    exit
 fi
 # 检查是否有 QEMU
-if [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
+which qemu-system-x86_64
+if [[ $? == 0 ]] && [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
    if [[ -f "$HOME/.config/deepin-wine-runner/QemuSetting.json" ]]; then
        echo 有设置文件，读设置文件
        cd `dirname $0`
        python3 ./VM/StartQemu.py
        exit
    fi
+    if [[ -f $HOME/.config/deepin-wine-runner/QEMU-EFI ]]; then
+        echo 使用 UEFI 启动
+        if [[ -f /usr/share/qemu/OVMF.fd ]]; then
+            qemuUEFI="--bios /usr/share/qemu/OVMF.fd"
+        else
+            if [[ -f `dirname $0`/VM/OVMF.fd ]]; then   
+                qemuUEFI="--bios `dirname $0`/VM/OVMF.fd"
+            fi
+        fi
+        echo $qemuUEFI
+    fi
+    # 查看CPU个数
+    CpuSocketNum=`cat /proc/cpuinfo | grep "cpu cores" | uniq | wc -l`
+    # 查看CPU核心数
+    CpuCoreNum=`grep 'core id' /proc/cpuinfo | sort -u | wc -l`
    # 查看逻辑CPU的个数
    CpuCount=`cat /proc/cpuinfo| grep "processor"| wc -l`
 
@@ -29,11 +45,11 @@ if [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
    use=$(echo "scale=4; $MemTotal / 3" | bc)
    if [[ `arch` == "x86_64" ]]; then
        echo X86 架构，使用 kvm 加速
-        kvm --hda "$HOME/Qemu/Windows/Windows.qcow2" -soundhw all -smp $CpuCount -m ${use}G -net user,hostfwd=tcp::3389-:3389 -display vnc=:5 -display gtk -usb -nic model=rtl8139
+        kvm -cpu host --hda "$HOME/Qemu/Windows/Windows.qcow2" -soundhw all -smp $CpuCount,sockets=$CpuSocketNum,cores=$(($CpuCoreNum / $CpuSocketNum)),threads=$(($CpuCount / $CpuCoreNum / $CpuSocketNum)) -m ${use}G -net user,hostfwd=tcp::3389-:3389 -display vnc=:5 -display gtk -usb -nic model=rtl8139 $qemuUEFI
        exit
    fi
    echo 非 X86 架构，不使用 kvm 加速
-    qemu-system-x86_64 --hda "$HOME/Qemu/Windows/Windows.qcow2" -soundhw all -smp $CpuCount -m ${use}G -net user,hostfwd=tcp::3389-:3389 -display vnc=:5 -display gtk -usb -nic model=rtl8139
+    qemu-system-x86_64 --hda "$HOME/Qemu/Windows/Windows.qcow2" -soundhw all -smp $CpuCount,sockets=$CpuSocketNum,cores=$(($CpuCoreNum / $CpuSocketNum)),threads=$(($CpuCount / $CpuCoreNum / $CpuSocketNum)) -m ${use}G -net user,hostfwd=tcp::3389-:3389 -display vnc=:5 -display gtk -usb -nic model=rtl8139 $qemuUEFI
    exit
 fi
 zenity --question --no-wrap --text="检查到您未创建所指定的虚拟机，是否创建虚拟机并继续？\n如果不创建将无法使用"
--- a/VM-source/.qtc_clangd/compile_commands.json
+++ b/VM-source/.qtc_clangd/compile_commands.json
--- a/VM-source/Makefile
+++ b/VM-source/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: VirtualMachine
-# Generated by qmake (3.1) (Qt 5.15.8)
+# Generated by qmake (3.1) (Qt 5.15.7)
 # Project:  VirtualMachine.pro
 # Template: app
 # Command: /usr/lib/qt5/bin/qmake -o Makefile VirtualMachine.pro
@@ -84,74 +84,15 @@ DIST          = /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_Attica.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_BluezQt.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KAuth.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KBookmarks.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCodecs.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCompletion.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KConfigCore.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KConfigGui.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KConfigWidgets.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCoreAddons.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KDBusAddons.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KGlobalAccel.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KGuiAddons.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KI18n.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIconThemes.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIdleTime.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOCore.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOFileWidgets.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOGui.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOWidgets.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KItemViews.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KJobWidgets.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KNTLM.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KScreen.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KService.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KSyntaxHighlighting.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KTextWidgets.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KWaylandClient.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KWaylandServer.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KWidgetsAddons.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KWindowSystem.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KXmlGui.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3danimation.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3danimation_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dcore.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dcore_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dextras.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dextras_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dinput.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dinput_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dlogic.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dlogic_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquick.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquick_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickanimation.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickanimation_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickextras.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickextras_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickinput.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickinput_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickrender.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickrender_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickscene2d.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickscene2d_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3drender.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3drender_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_accessibility_support_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_charts.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_designer.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_devicediscovery_support_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dtkgui.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_edid_support_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_egl_support_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_eglfs_kms_support_private.pri \
@@ -162,12 +103,9 @@ DIST          = /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_glx_support_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_help.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_input_support_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_kms_support_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_linuxaccessibility_support_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \
@@ -175,53 +113,21 @@ DIST          = /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformcompositor_support_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_positioning.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_positioningquick.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qml.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qmlmodels.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qmltest.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qmlworkerscript.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quick.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quickcontrols2.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quicktemplates2.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quickwidgets.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_script.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_scripttools.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sensors.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_service_support_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_theme_support_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_uiplugin.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_uitools.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_vulkan_support_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_waylandclient.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_waylandclient_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_waylandcompositor.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_waylandcompositor_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webchannel.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webengine.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webenginecore.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webenginewidgets.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_x11extras.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xkbcommon_support_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xmlpatterns.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_ModemManagerQt.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_NetworkManagerQt.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_QApt.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_Solid.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_SonnetCore.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_SonnetUi.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake.conf \
@@ -279,74 +185,15 @@ Makefile: VirtualMachine.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qma
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_Attica.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_BluezQt.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KAuth.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KBookmarks.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCodecs.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCompletion.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KConfigCore.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KConfigGui.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KConfigWidgets.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCoreAddons.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KDBusAddons.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KGlobalAccel.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KGuiAddons.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KI18n.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIconThemes.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIdleTime.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOCore.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOFileWidgets.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOGui.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOWidgets.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KItemViews.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KJobWidgets.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KNTLM.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KScreen.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KService.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KSyntaxHighlighting.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KTextWidgets.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KWaylandClient.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KWaylandServer.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KWidgetsAddons.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KWindowSystem.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KXmlGui.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3danimation.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3danimation_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dcore.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dcore_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dextras.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dextras_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dinput.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dinput_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dlogic.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dlogic_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquick.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquick_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickanimation.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickanimation_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickextras.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickextras_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickinput.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickinput_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickrender.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickrender_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickscene2d.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickscene2d_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3drender.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3drender_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_accessibility_support_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_charts.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_designer.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_devicediscovery_support_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dtkgui.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_edid_support_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_egl_support_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_eglfs_kms_support_private.pri \
@@ -357,12 +204,9 @@ Makefile: VirtualMachine.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qma
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_glx_support_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_help.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_input_support_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_kms_support_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_linuxaccessibility_support_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \
@@ -370,53 +214,21 @@ Makefile: VirtualMachine.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qma
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformcompositor_support_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_positioning.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_positioningquick.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qml.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qmlmodels.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qmltest.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qmlworkerscript.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quick.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quickcontrols2.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quicktemplates2.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quickwidgets.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_script.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_scripttools.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sensors.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_service_support_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_theme_support_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_uiplugin.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_uitools.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_vulkan_support_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_waylandclient.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_waylandclient_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_waylandcompositor.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_waylandcompositor_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webchannel.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webengine.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webenginecore.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webenginewidgets.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_x11extras.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xkbcommon_support_private.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xmlpatterns.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_ModemManagerQt.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_NetworkManagerQt.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_QApt.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_Solid.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_SonnetCore.pri \
-		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_SonnetUi.pri \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \
 		/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake.conf \
@@ -452,74 +264,15 @@ Makefile: VirtualMachine.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qma
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-base.conf:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/g++-unix.conf:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/qconfig.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_Attica.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_BluezQt.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KAuth.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KBookmarks.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCodecs.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCompletion.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KConfigCore.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KConfigGui.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KConfigWidgets.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KCoreAddons.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KDBusAddons.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KGlobalAccel.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KGuiAddons.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KI18n.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIconThemes.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIdleTime.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOCore.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOFileWidgets.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOGui.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KIOWidgets.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KItemViews.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KJobWidgets.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KNTLM.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KScreen.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KService.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KSyntaxHighlighting.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KTextWidgets.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KWaylandClient.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KWaylandServer.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KWidgetsAddons.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KWindowSystem.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_KXmlGui.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3danimation.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3danimation_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dcore.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dcore_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dextras.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dextras_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dinput.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dinput_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dlogic.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dlogic_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquick.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquick_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickanimation.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickanimation_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickextras.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickextras_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickinput.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickinput_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickrender.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickrender_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickscene2d.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3dquickscene2d_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3drender.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_3drender_private.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_accessibility_support_private.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_charts.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_concurrent_private.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_core_private.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_designer.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_devicediscovery_support_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dtkgui.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_edid_support_private.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_egl_support_private.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_eglfs_kms_support_private.pri:
@@ -530,12 +283,9 @@ Makefile: VirtualMachine.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qma
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_glx_support_private.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_gui_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_help.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_input_support_private.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_kms_support_private.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_linuxaccessibility_support_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri:
@@ -543,53 +293,21 @@ Makefile: VirtualMachine.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qma
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_platformcompositor_support_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_positioning.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_positioningquick.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_printsupport_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qml.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qmlmodels.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qmltest.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_qmlworkerscript.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quick.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quickcontrols2.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quicktemplates2.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_quickwidgets.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_script.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_scripttools.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sensors.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_service_support_private.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_theme_support_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_uiplugin.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_uitools.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_vulkan_support_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_waylandclient.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_waylandclient_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_waylandcompositor.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_waylandcompositor_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webchannel.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webengine.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webenginecore.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_webenginewidgets.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_x11extras.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xkbcommon_support_private.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml_private.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xmlpatterns.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_ModemManagerQt.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_NetworkManagerQt.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_QApt.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_Solid.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_SonnetCore.pri:
-/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_SonnetUi.pri:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_functions.prf:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf:
 /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake.conf:
@@ -694,17 +412,17 @@ compiler_moc_header_clean:
 moc_mainwindow.cpp: mainwindow.h \
 		moc_predefs.h \
 		/usr/lib/qt5/bin/moc
-	/usr/lib/qt5/bin/moc $(DEFINES) --include /home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/gfdgd_xi/Desktop/deep-wine-runner/VM-source -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/include/c++/8 -I/usr/include/x86_64-linux-gnu/c++/8 -I/usr/include/c++/8/backward -I/usr/lib/gcc/x86_64-linux-gnu/8/include -I/usr/local/include -I/usr/lib/gcc/x86_64-linux-gnu/8/include-fixed -I/usr/include/x86_64-linux-gnu -I/usr/include mainwindow.h -o moc_mainwindow.cpp
+	/usr/lib/qt5/bin/moc $(DEFINES) --include /home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/gfdgd_xi/Desktop/deep-wine-runner/VM-source -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include mainwindow.h -o moc_mainwindow.cpp

 moc_infoutils.cpp: infoutils.h \
 		moc_predefs.h \
 		/usr/lib/qt5/bin/moc
-	/usr/lib/qt5/bin/moc $(DEFINES) --include /home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/gfdgd_xi/Desktop/deep-wine-runner/VM-source -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/include/c++/8 -I/usr/include/x86_64-linux-gnu/c++/8 -I/usr/include/c++/8/backward -I/usr/lib/gcc/x86_64-linux-gnu/8/include -I/usr/local/include -I/usr/lib/gcc/x86_64-linux-gnu/8/include-fixed -I/usr/include/x86_64-linux-gnu -I/usr/include infoutils.h -o moc_infoutils.cpp
+	/usr/lib/qt5/bin/moc $(DEFINES) --include /home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/gfdgd_xi/Desktop/deep-wine-runner/VM-source -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include infoutils.h -o moc_infoutils.cpp

 moc_qemusetting.cpp: qemusetting.h \
 		moc_predefs.h \
 		/usr/lib/qt5/bin/moc
-	/usr/lib/qt5/bin/moc $(DEFINES) --include /home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/gfdgd_xi/Desktop/deep-wine-runner/VM-source -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/include/c++/8 -I/usr/include/x86_64-linux-gnu/c++/8 -I/usr/include/c++/8/backward -I/usr/lib/gcc/x86_64-linux-gnu/8/include -I/usr/local/include -I/usr/lib/gcc/x86_64-linux-gnu/8/include-fixed -I/usr/include/x86_64-linux-gnu -I/usr/include qemusetting.h -o moc_qemusetting.cpp
+	/usr/lib/qt5/bin/moc $(DEFINES) --include /home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/gfdgd_xi/Desktop/deep-wine-runner/VM-source -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/include/c++/11 -I/usr/include/x86_64-linux-gnu/c++/11 -I/usr/include/c++/11/backward -I/usr/lib/gcc/x86_64-linux-gnu/11/include -I/usr/local/include -I/usr/include/x86_64-linux-gnu -I/usr/include qemusetting.h -o moc_qemusetting.cpp

 compiler_moc_objc_header_make_all:
 compiler_moc_objc_header_clean:
--- a/VM-source/OVMF.fd
+++ b/VM-source/OVMF.fd
--- a/VM-source/VirtualMachine.pro.user
+++ b/VM-source/VirtualMachine.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.8.2, 2023-04-29T19:59:36. -->
+<!-- Written by QtCreator 7.0.1, 2023-08-09T22:56:49. -->
 <qtcreator>
 <data>
  <variable>EnvironmentId</variable>
@@ -37,6 +37,7 @@
   <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
   <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
   <value type="int" key="EditorConfiguration.PaddingMode">1</value>
+   <value type="bool" key="EditorConfiguration.PreferSingleLineComments">false</value>
   <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
   <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
   <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
@@ -45,23 +46,49 @@
   <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
   <value type="int" key="EditorConfiguration.TabSize">8</value>
   <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
+   <value type="bool" key="EditorConfiguration.UseIndenter">false</value>
   <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
   <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
   <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
   <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
+   <value type="QString" key="EditorConfiguration.ignoreFileTypes">*.md, *.MD, Makefile</value>
   <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
+   <value type="bool" key="EditorConfiguration.skipTrailingWhitespace">true</value>
  </valuemap>
 </data>
 <data>
  <variable>ProjectExplorer.Project.PluginSettings</variable>
  <valuemap type="QVariantMap">
+   <valuemap type="QVariantMap" key="AutoTest.ActiveFrameworks">
+    <value type="bool" key="AutoTest.Framework.Boost">true</value>
+    <value type="bool" key="AutoTest.Framework.CTest">false</value>
+    <value type="bool" key="AutoTest.Framework.Catch">true</value>
+    <value type="bool" key="AutoTest.Framework.GTest">true</value>
+    <value type="bool" key="AutoTest.Framework.QtQuickTest">true</value>
+    <value type="bool" key="AutoTest.Framework.QtTest">true</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="AutoTest.CheckStates"/>
+   <value type="int" key="AutoTest.RunAfterBuild">0</value>
+   <value type="bool" key="AutoTest.UseGlobal">true</value>
   <valuelist type="QVariantList" key="ClangCodeModel.CustomCommandLineKey"/>
   <value type="bool" key="ClangCodeModel.UseGlobalConfig">true</value>
+   <value type="QString" key="ClangCodeModel.WarningConfigId">Builtin.BuildSystem</value>
+   <valuemap type="QVariantMap" key="ClangTools">
+    <value type="bool" key="ClangTools.AnalyzeOpenFiles">true</value>
+    <value type="bool" key="ClangTools.BuildBeforeAnalysis">true</value>
+    <value type="QString" key="ClangTools.DiagnosticConfig">Builtin.DefaultTidyAndClazy</value>
+    <value type="int" key="ClangTools.ParallelJobs">2</value>
+    <valuelist type="QVariantList" key="ClangTools.SelectedDirs"/>
+    <valuelist type="QVariantList" key="ClangTools.SelectedFiles"/>
+    <valuelist type="QVariantList" key="ClangTools.SuppressedDiagnostics"/>
+    <value type="bool" key="ClangTools.UseGlobalSettings">true</value>
+   </valuemap>
  </valuemap>
 </data>
 <data>
  <variable>ProjectExplorer.Project.Target.0</variable>
  <valuemap type="QVariantMap">
+   <value type="QString" key="DeviceType">Desktop</value>
   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 5.15.6 in PATH (qt5)</value>
   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Qt 5.15.6 in PATH (qt5)</value>
   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{ab20853c-9d79-473a-820e-8e95c145170e}</value>
@@ -73,127 +100,67 @@
    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
-      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
+      <valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
     </valuemap>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
-      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
-      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
-      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
     </valuemap>
     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Build</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
-      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
-      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
-      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
     </valuemap>
     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Clean</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
    </valuemap>
    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value>
    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
-    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
   </valuemap>
   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">1</value>
   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">部署</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
    </valuemap>
    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy Configuration</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.DeployConfiguration.CustomData"/>
+    <value type="bool" key="ProjectExplorer.DeployConfiguration.CustomDataEnabled">false</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
   </valuemap>
   <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
-    <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
-    <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
-    <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
-    <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
+    <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
-    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
-    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
-    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
-    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
-    <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
-    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
-    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
-    <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
-    <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
-    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
-    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
-    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
-     <value type="int">0</value>
-     <value type="int">1</value>
-     <value type="int">2</value>
-     <value type="int">3</value>
-     <value type="int">4</value>
-     <value type="int">5</value>
-     <value type="int">6</value>
-     <value type="int">7</value>
-     <value type="int">8</value>
-     <value type="int">9</value>
-     <value type="int">10</value>
-     <value type="int">11</value>
-     <value type="int">12</value>
-     <value type="int">13</value>
-     <value type="int">14</value>
-    </valuelist>
+    <valuelist type="QVariantList" key="CustomOutputParsers"/>
    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">VirtualMachine</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/VirtualMachine.pro</value>
-    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">VirtualMachine.pro</value>
-    <value type="QString" key="RunConfiguration.Arguments"></value>
-    <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
+    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">/home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/VirtualMachine.pro</value>
    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
    <value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
-    <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
    <value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/gfdgd_xi/Desktop/deep-wine-runner/VM-source</value>
   </valuemap>
   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
@@ -205,10 +172,10 @@
 </data>
 <data>
  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
-  <value type="int">20</value>
+  <value type="int">22</value>
 </data>
 <data>
  <variable>Version</variable>
-  <value type="int">20</value>
+  <value type="int">22</value>
 </data>
 </qtcreator>
--- a/VM-source/VirtualMachine.pro.user.4.9-pre1
+++ b/VM-source/VirtualMachine.pro.user.4.9-pre1
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorProject>
+<!-- Written by QtCreator 4.8.2, 2023-07-12T19:05:39. -->
+<qtcreator>
+ <data>
+  <variable>EnvironmentId</variable>
+  <value type="QByteArray">{4ffd6df9-1365-4837-81b1-582e0e2d1f21}</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.ActiveTarget</variable>
+  <value type="int">0</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.EditorSettings</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
+   <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
+   <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
+    <value type="QString" key="language">Cpp</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
+    </valuemap>
+   </valuemap>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
+    <value type="QString" key="language">QmlJS</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
+    </valuemap>
+   </valuemap>
+   <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
+   <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
+   <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
+   <value type="int" key="EditorConfiguration.IndentSize">4</value>
+   <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
+   <value type="int" key="EditorConfiguration.MarginColumn">80</value>
+   <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
+   <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
+   <value type="int" key="EditorConfiguration.PaddingMode">1</value>
+   <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
+   <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
+   <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
+   <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
+   <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
+   <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
+   <value type="int" key="EditorConfiguration.TabSize">8</value>
+   <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
+   <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
+   <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
+   <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
+   <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
+   <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.PluginSettings</variable>
+  <valuemap type="QVariantMap">
+   <valuelist type="QVariantList" key="ClangCodeModel.CustomCommandLineKey"/>
+   <value type="bool" key="ClangCodeModel.UseGlobalConfig">true</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Target.0</variable>
+  <valuemap type="QVariantMap">
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 5.15.6 in PATH (qt5)</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Qt 5.15.6 in PATH (qt5)</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{ab20853c-9d79-473a-820e-8e95c145170e}</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/gfdgd_xi/Desktop/deep-wine-runner/VM-source</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
+      <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
+      <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.BuildTargets"/>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+      <value type="bool" key="Qt4ProjectManager.MakeStep.OverrideMakeflags">false</value>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">1</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy Configuration</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
+    <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
+    <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
+    <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
+    <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
+    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+    <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
+    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+    <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
+    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+    <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
+    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+     <value type="int">0</value>
+     <value type="int">1</value>
+     <value type="int">2</value>
+     <value type="int">3</value>
+     <value type="int">4</value>
+     <value type="int">5</value>
+     <value type="int">6</value>
+     <value type="int">7</value>
+     <value type="int">8</value>
+     <value type="int">9</value>
+     <value type="int">10</value>
+     <value type="int">11</value>
+     <value type="int">12</value>
+     <value type="int">13</value>
+     <value type="int">14</value>
+    </valuelist>
+    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
+    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">VirtualMachine</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/VirtualMachine.pro</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">VirtualMachine.pro</value>
+    <value type="QString" key="RunConfiguration.Arguments"></value>
+    <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
+    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+    <value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
+    <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/gfdgd_xi/Desktop/deep-wine-runner/VM-source</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.TargetCount</variable>
+  <value type="int">1</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
+  <value type="int">20</value>
+ </data>
+ <data>
+  <variable>Version</variable>
+  <value type="int">20</value>
+ </data>
+</qtcreator>
--- a/VM-source/buildvbox.cpp
+++ b/VM-source/buildvbox.cpp
@@ -12,6 +12,7 @@
 #include <QCoreApplication>
 #include <infoutils.h>
 #include "qemu.h"
+#include <QProcess>
 // 懒得用 QThread 了（要继承）
 #include <thread>
 using namespace std;
@@ -27,6 +28,37 @@ void buildvbox::CleanScreen(){
    system("cls");
 }

+// 获取 CPU 个数
+int buildvbox::GetCPUSocket(){
+    // 获取命令返回值
+    QProcess process;
+    process.start("bash", QStringList() << "-c" << "cat /proc/cpuinfo | grep \"cpu cores\" | uniq | wc -l");
+    process.waitForStarted();
+    process.waitForFinished();
+    int value = process.readAllStandardOutput().toInt();
+    process.close();
+    // 判断异常值，例如没挂载 /proc
+    if(value <= 0){
+        value = 1;
+    }
+    return value;
+}
+
+// 获取 CPU 核心数
+int buildvbox::GetCPUCore(){
+    QProcess process;
+    process.start("bash", QStringList() << "-c" << "grep 'core id' /proc/cpuinfo | sort -u | wc -l");
+    process.waitForStarted();
+    process.waitForFinished();
+    int value = process.readAllStandardOutput().toInt();
+    process.close();
+    // 判断异常值，例如没挂载 /proc
+    if(value <= 0){
+        value = 1;
+    }
+    return value;
+}
+
 QString buildvbox::GetNet(){
    QList<QNetworkInterface> netList = QNetworkInterface::allInterfaces();
    foreach(QNetworkInterface net, netList){
@@ -82,7 +114,13 @@ buildvbox::buildvbox(QString isoPath, int id, int vm){
            case 1:
                vm.Create("Windows7_64");
                break;
-            vm.Create("WindowsNT_64");
+            case 2:
+                vm.Create("WindowsNT_64");
+                break;
+            case 3:
+                vm.Create("WindowsNT_64");
+                vm.EnabledUEFI(true);
+                break;
        }
        vm.CreateDiskControl();
        //vm.CreateDiskControl("storage_controller_2");
@@ -112,7 +150,7 @@ buildvbox::buildvbox(QString isoPath, int id, int vm){
            vm.MountISO("/usr/share/virtualbox/VBoxGuestAdditions.iso", "storage_controller_1", 1, 1);
        }*/

-        vm.SetCPU(get_nprocs());
+        vm.SetCPU(get_nprocs(), GetCPUSocket(), GetCPUCore());
        long memory = 0;
        long memoryAll = 0;
        long swap = 0;
@@ -146,7 +184,13 @@ buildvbox::buildvbox(QString isoPath, int id, int vm){
            case 1:
                vm.Create("Windows7_64");
                break;
-            vm.Create("WindowsNT_64");
+            case 2:
+                vm.Create("WindowsNT_64");
+                break;
+            case 3:
+                vm.Create("WindowsNT_64");
+                vm.EnabledUEFI(true);
+                break;
        }
        QDir dir("/home/gfdgd_xi/Qemu/Windows/");
        dir.mkpath("/home/gfdgd_xi/Qemu/Windows/");
@@ -170,7 +214,7 @@ buildvbox::buildvbox(QString isoPath, int id, int vm){
            vm.MountISO("/usr/share/virtualbox/VBoxGuestAdditions.iso", "storage_controller_1", 1, 1);
        }

-        vm.SetCPU(get_nprocs_conf());
+        vm.SetCPU(get_nprocs(), GetCPUSocket(), GetCPUCore());
        long memory = 0;
        long memoryAll = 0;
        long swap = 0;
--- a/VM-source/buildvbox.h
+++ b/VM-source/buildvbox.h
@@ -14,6 +14,8 @@ public:
    void CleanScreen();
    QString GetNet();
    int Download(QString url, QString path, QString fileName);
+    int GetCPUSocket();
+    int GetCPUCore();
 };

 #endif // BUILDVBOX_H
--- a/VM-source/mainwindow.cpp
+++ b/VM-source/mainwindow.cpp
@@ -177,6 +177,30 @@ void MainWindow::on_install_clicked()
        }
        break;
    }
+    QFile file(QDir::homePath() + "/.config/deepin-wine-runner/QEMU-EFI");
+    QDir dir(QDir::homePath() + "/.config/deepin-wine-runner");
+    switch (ui->systemVersion->currentIndex()) {
+        case 3:
+            if(!QFile::exists("/usr/share/qemu/OVMF.fd") && !QFile::exists(QCoreApplication::applicationDirPath() + "/OVMF.fd") && ui->vmChooser->currentIndex() == 0){
+                if(QMessageBox::question(this, "提示", "似乎无法找到 UEFI 固件，是否继续创建虚拟机？\nQemu 固件可以在“安装 Qemu”处安装") == QMessageBox::No){
+                    return;
+                }
+            }
+            if(!dir.exists()){
+                dir.mkpath(QDir::homePath() + "/.config/deepin-wine-runner");
+            }
+            if(!QFile::exists(QDir::homePath() + "/.config/deepin-wine-runner/QEMU-EFI")){
+                // 写入用于识别的空文件
+                file.open(QIODevice::WriteOnly);
+                file.write("1");
+                file.close();
+            }
+            break;
+        default:
+            if(ui->vmChooser->currentIndex() == 0 && QFile::exists(QDir::homePath() + "/.config/deepin-wine-runner/QEMU-EFI")){
+                QFile::remove(QDir::homePath() + "/.config/deepin-wine-runner/QEMU-EFI");
+            }
+    }
    buildvbox(ui->isoPath->text(), ui->systemVersion->currentIndex(), ui->vmChooser->currentIndex());
    return;
 }
@@ -188,7 +212,7 @@ void MainWindow::on_getvbox_clicked()

 void MainWindow::on_getQemu_clicked()
 {
-    system(("python3 '" + QCoreApplication::applicationDirPath() + "/../RunCommandWithTerminal.py' '" + QCoreApplication::applicationDirPath() + "/../QemuSystemInstall.sh'").toLatin1());
+    system(("python3 '" + QCoreApplication::applicationDirPath() + "/../RunCommandWithTerminal.py' pkexec '" + QCoreApplication::applicationDirPath() + "/../QemuSystemInstall.sh'").toLatin1());
 }

 void MainWindow::on_vmChooser_currentIndexChanged(int index)
--- a/VM-source/mainwindow.ui
+++ b/VM-source/mainwindow.ui
@@ -25,7 +25,7 @@
       <enum>QTabWidget::Rounded</enum>
      </property>
      <property name="currentIndex">
-       <number>2</number>
+       <number>0</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
@@ -86,7 +86,12 @@
            </item>
            <item>
             <property name="text">
-              <string>其它 Windows 系统（不支持自动安装）</string>
+              <string>其它 Windows 系统（不支持自动安装，传统启动，推荐 Windows 7 及以下）</string>
+             </property>
+            </item>
+            <item>
+             <property name="text">
+              <string>其他 Windows 系统（不支持自动安装，UEFI 启动，推荐 Windows 8 及以上）</string>
             </property>
            </item>
           </widget>
--- a/VM-source/qemu.cpp
+++ b/VM-source/qemu.cpp
@@ -53,8 +53,14 @@ int qemu::BootFirst(QString bootDrive){
 int qemu::SetNetBridge(QString netDriver){
    return 0;
 }
-int qemu::SetCPU(int number){
-    commandOption += "-smp " + QString::number(number) + " ";
+int qemu::SetCPU(int number, int cpuNum, int coreNum){
+    // commandOption += "-smp " + QString::number(number) + " ";
+    // 调整调用方法
+    //qDebug() << number << " " << cpuNum << " " << coreNum;
+    qDebug() << "Socket: " << cpuNum;
+    qDebug() << "Core: " << coreNum;
+    qDebug() << "Threads: " << number;
+    commandOption += "-smp " + QString::number(number) + ",sockets=" + QString::number(cpuNum) + ",cores=" + QString::number(coreNum / cpuNum) + ",threads=" + QString::number(number / cpuNum / coreNum) + " ";
    return 0;
 }
 int qemu::SetMemory(int memory){
@@ -70,7 +76,7 @@ int qemu::SetRemoteConnectSetting(int port){
 int qemu::Start(bool unShown){
    qDebug() << commandOption;
    if(Command().GetCommand("arch").replace("\n", "").replace(" ", "") == "x86_64"){
-        return system(("kvm " + commandOption + " &").toLatin1());
+        return system(("kvm -cpu host " + commandOption + " &").toLatin1());
    }
    return system(("qemu-system-x86_64 -nic model=rtl8139 " + commandOption + " &").toLatin1());
 }
@@ -113,3 +119,17 @@ int qemu::SetKeyboardPS2(){
 int qemu::OpenUSB(){
    return 0;
 }
+int qemu::EnabledUEFI(bool status){
+    if(!status){
+        return 0;
+    }
+    if(QFile::exists("/usr/share/qemu/OVMF.fd")){
+        commandOption += "--bios /usr/share/qemu/OVMF.fd ";
+        return 0;
+    }
+    if(QFile::exists(QCoreApplication::applicationDirPath() + "/OVMF.fd")){
+        commandOption += "--bios '" + QCoreApplication::applicationDirPath() + "/OVMF.fd' ";
+        return 0;
+    }
+    return 1;
+}
--- a/VM-source/qemu.h
+++ b/VM-source/qemu.h
@@ -21,7 +21,7 @@ public:
    int MountISO(QString isoPath, QString controlName="storage_controller_1", int port=1, int device=0);
    int BootFirst(QString bootDrive);
    int SetNetBridge(QString netDriver);
-    int SetCPU(int number);
+    int SetCPU(int number, int cpuNum, int coreNum);
    int SetMemory(int memory);
    int SetRemote(bool setting);
    int SetRemoteConnectSetting(int port=5540);
@@ -38,8 +38,9 @@ public:
    int SetMousePS2();
    int SetKeyboardPS2();
    int OpenUSB();
+    int EnabledUEFI(bool status);
 private:
-    QString commandOption;
+    QString commandOption = "";

 };

--- a/VM-source/vbox.cpp
+++ b/VM-source/vbox.cpp
@@ -44,7 +44,7 @@ int vbox::SetNetBridge(QString netDriver){
    return system(("\"" + managerPath + "\" modifyvm \"" + name +
                   "\" --nic1 bridged --cableconnected1 on --nictype1 82540EM --bridgeadapter1 \"" + netDriver + "\" --intnet1 brigh1 --macaddress1 auto").toLatin1());
 }
-int vbox::SetCPU(int number){
+int vbox::SetCPU(int number, int cpuNum, int coreNum){
    return system(("\"" + managerPath + "\" modifyvm \"" + name + "\" --cpus " + QString::number(number)).toLatin1());
 }
 int vbox::SetMemory(int memory){
@@ -101,3 +101,10 @@ int vbox::SetKeyboardPS2(){
 int vbox::OpenUSB(){
    return system(("\"" + managerPath + "\" modifyvm \"" + name + "\" --usbohci on").toLatin1());
 }
+
+int vbox::EnabledUEFI(bool status){
+    if(status){
+        return system(("\"" + managerPath + "\" modifyvm \"" + name + "\" --firmware=efi").toLatin1());
+    }
+    return system(("\"" + managerPath + "\" modifyvm \"" + name + "\" --firmware=bios").toLatin1());
+}
--- a/VM-source/vbox.h
+++ b/VM-source/vbox.h
@@ -21,7 +21,7 @@ public:
    int MountISO(QString isoPath, QString controlName="storage_controller_1", int port=1, int device=0);
    int BootFirst(QString bootDrive);
    int SetNetBridge(QString netDriver);
-    int SetCPU(int number);
+    int SetCPU(int number, int cpuNum, int coreNum);
    int SetMemory(int memory);
    int SetRemote(bool setting);
    int SetRemoteConnectSetting(int port=5540);
@@ -38,6 +38,7 @@ public:
    int SetMousePS2();
    int SetKeyboardPS2();
    int OpenUSB();
+    int EnabledUEFI(bool status);

 private:

--- a/VM/OVMF.fd
+++ b/VM/OVMF.fd
--- a/VM/StartQemu.py
+++ b/VM/StartQemu.py
@@ -13,7 +13,7 @@ def ReadTXT(file: str):
 command = "qemu-system-x86_64"
 #if "--kvm" in sys.argv:
 #    command = "kvm"
-
+programPath = os.path.split(os.path.realpath(__file__))[0]  # 返回 string
 homePath = os.path.expanduser('~')
 try:
    setting = json.loads(ReadTXT(f"{homePath}/.config/deepin-wine-runner/QemuSetting.json"))
@@ -30,4 +30,9 @@ if setting["EnableVNC"]:
    option += f"-display gtk -display vnc=:{setting['VNC']} "
 if setting["EnableSound"]:
    option += "-soundhw all "
+if os.path.exists(f"{homePath}/.config/deepin-wine-runner/QEMU-EFI"):
+    if os.path.exists("/usr/share/qemu/OVMF.fd"):
+        option += "--bios /usr/share/qemu/OVMF.fd "
+    elif os.path.exists(f"{programPath}/OVMF.fd"):
+        option += f"--bios {programPath}/OVMF.fd "
 os.system(f"{command} {option}")
--- a/VM/VirtualMachine
+++ b/VM/VirtualMachine
@@ -2,7 +2,7 @@
 import os
 import subprocess
 programPath = os.path.split(os.path.realpath(__file__))[0]  # 返回 string
-arch = subprocess.getoutput("arch").replace(" ", "").replace("\n", "")
+arch = subprocess.getoutput("dpkg --print-architecture").replace(" ", "").replace("\n", "")
 if os.path.exists(f"{programPath}/VirtualMachine-{arch}"):
    os.system(f"{programPath}/VirtualMachine-{arch}")
    exit()
--- a/VM/VirtualMachine-x86_64
+++ b/VM/VirtualMachine-x86_64
--- a/VM/VirtualMachine-aarch64
+++ b/VM/VirtualMachine-aarch64
--- a/VM/VirtualMachine-armv7l
+++ b/VM/VirtualMachine-armv7l
--- a/VM/VirtualMachine-i386
+++ b/VM/VirtualMachine-i386
--- a/VM/VirtualMachine-loong64
+++ b/VM/VirtualMachine-loong64
--- a/VM/VirtualMachine-loongarch64
+++ b/VM/VirtualMachine-loongarch64
--- a/VM/VirtualMachine-mips64el
+++ b/VM/VirtualMachine-mips64el
--- a/VM/VirtualMachine-mipsel
+++ b/VM/VirtualMachine-mipsel
--- a/VM/VirtualMachine-powerpc
+++ b/VM/VirtualMachine-powerpc
--- a/VM/VirtualMachine-ppc64el
+++ b/VM/VirtualMachine-ppc64el
--- a/VM/VirtualMachine-riscv64
+++ b/VM/VirtualMachine-riscv64
--- a/VM/VirtualMachine-s390x
+++ b/VM/VirtualMachine-s390x
--- a/WineLib/remove.sh
+++ b/WineLib/remove.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 CURRENT_DIR=$(cd $(dirname $0); pwd)
 cd $CURRENT_DIR
-if [[ ! -f $CURRENT_DIR/usr/ ]]; then
+if [[ ! -d $CURRENT_DIR/usr/ ]]; then
    echo 运行库未安装，按回车键退出
    read
    exit
--- a/deb/DEBIAN/control
+++ b/deb/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: spark-deepin-wine-runner
-Version: 3.3.0
+Version: 3.4.0
 Maintainer: gfdgd xi <3025613752@qq.com>
 Homepage: https://gitee.com/gfdgd-xi/deep-wine-runner
 Architecture: all
@@ -9,7 +9,7 @@ Check: binaries
 Type: binary, udeb
 Priority: optional
 Depends: python3, python3-pil, libc6, python3-pil.imagetk, python3-pyquery, aria2, curl, unrar | unrar-free , unzip, python3-requests, python3-pyqt5, python3-psutil, deepin-terminal | mate-terminal | gnome-terminal | xfce4-terminal, python3-dbus, python3-pip, p7zip-full, sudo, python3-pyperclip, bubblewrap, zenity
-Recommends: winbind, wimtools, python3-pyqt5.qtwebengine, binfmt-support, libc6:i386
+Recommends: winbind, wimtools, python3-pyqt5.qtwebengine, binfmt-support, libc6:i386, libc6:armhf
 Section: utils
 Conflicts: spark.deepin-venturi-setter, spark-deepin-wine5-application-packer, spark-deepin-wine-runner-52
 Replaces: spark.deepin-venturi-setter, spark-deepin-wine5-application-packer, spark-deepin-wine-runner-52
--- a/deb/DEBIAN/postinst
+++ b/deb/DEBIAN/postinst
@@ -9,10 +9,10 @@
 #################################################################################################################
 # 非强制性的必应组件，所以成功不成功都行
 # 程序版本号
-version=3.3.0
+version=3.4.0
 echo 安装组件
-python3 -m pip install --upgrade pynput --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple > /dev/null 2>&1 | true
-python3 -m pip install --upgrade xpinyin --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple > /dev/null 2>&1 | true
+python3 -m pip install --upgrade pynput --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple --break-system-packages > /dev/null 2>&1 | true
+python3 -m pip install --upgrade xpinyin --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple --break-system-packages > /dev/null 2>&1 | true
 echo 执行完成
 echo 移除旧组件
 if [ -d /opt/apps/deepin-wine-runner/arm-package ]; then
@@ -51,8 +51,8 @@ if [ `arch` != "x86_64" ]; then
 	rm -rf /opt/apps/deepin-wine-runner/InstallNewWineHQ.sh
 fi
 # 处理 VM 工具
-vmPath=/opt/apps/deepin-wine-runner/VM/VirtualMachine-`arch`
-echo 当前架构为：`arch`
+vmPath=/opt/apps/deepin-wine-runner/VM/VirtualMachine-`dpkg --print-architecture`
+echo 当前架构为：`dpkg --print-architecture`
 if [ -f $vmPath ]; then
 	echo 虚拟机工具有该架构的预编译文件
 	# 移除辅助文件
@@ -65,19 +65,24 @@ else
 	rm -f /opt/apps/deepin-wine-runner/VM/VirtualMachine-*
 fi
 echo 处理完成！
-# 到时候切换 gpg 源会方便很多
-if [ -r /etc/apt/sources.list.d/better-dde.list ]; then
-	if [ -d /usr/share/deepin-installer ]; then
-		# 用于修复 Deepin Community Live CD Install 版签名过期的问题
-		wget -P /tmp/gfdgd-xi-sources https://code.gitlink.org.cn/gfdgd_xi/gfdgd-xi-apt-mirrors/raw/branch/master/gpg.asc
-		rm -rfv /etc/apt/trusted.gpg.d/gfdgdxi-list.gpg | true
-		cp -v /tmp/gfdgd-xi-sources/gpg.asc.gpg /etc/apt/trusted.gpg.d/gfdgdxi-list.gpg
-    	# 用于修复 2022.11.25 Better DDE 导致的 Deepin Community Live CD Install 版问题
-		# 移除 Better DDE 源
-    	rm -rfv /etc/apt/sources.list.d/better-dde.list
-		apt update > /dev/null 2>&1 | true
-	fi
+# 修复 3.3.0.1 Box86 源挂了的问题
+if [ -f /etc/apt/sources.list.d/box86.list ]; then
+	bash -c "echo deb http://seafile.jyx2048.com:2345/spark-deepin-wine-runner/data/box86-debs/debian ./ > /etc/apt/sources.list.d/box86.list"
 fi
+# Gitlink 源挂了
+# 到时候切换 gpg 源会方便很多
+#if [ -r /etc/apt/sources.list.d/better-dde.list ]; then
+#	if [ -d /usr/share/deepin-installer ]; then
+#		# 用于修复 Deepin Community Live CD Install 版签名过期的问题
+#		wget -P /tmp/gfdgd-xi-sources https://code.gitlink.org.cn/gfdgd_xi/gfdgd-xi-apt-mirrors/raw/branch/master/gpg.asc
+#		rm -rfv /etc/apt/trusted.gpg.d/gfdgdxi-list.gpg | true
+#		cp -v /tmp/gfdgd-xi-sources/gpg.asc.gpg /etc/apt/trusted.gpg.d/gfdgdxi-list.gpg
+#   	# 用于修复 2022.11.25 Better DDE 导致的 Deepin Community Live CD Install 版问题
+#		# 移除 Better DDE 源
+#    	rm -rfv /etc/apt/sources.list.d/better-dde.list
+#		apt update > /dev/null 2>&1 | true
+#	fi
+#fi
 # 设置目录权限，让用户可读可写，方便后续删除组件
 chmod 777 -R /opt/apps/deepin-wine-runner
 # 向服务器返回安装数加1（不显示内容且忽略错误）
--- a/deepin-wine-easy-packager.py
+++ b/deepin-wine-easy-packager.py
@@ -183,12 +183,15 @@ Get_Dist_Name()
        DISTRO='Deepin'
    elif grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release; then
        DISTRO='UniontechOS'
+    elif grep -Eqi "UOS" /etc/issue || grep -Eq "UOS" /etc/*-release; then
+        DISTRO='UniontechOS'
    else
 	 DISTRO='OtherOS'
 	fi
 }}


+
 ####获得发行版名称

 #########################预设值段
@@ -200,13 +203,17 @@ APPVER="@@@Version@@@"
 EXEC_PATH="@@@EXEC_PATH@@@"
 ##### 软件在wine中的启动路径
 START_SHELL_PATH="/opt/deepinwine/tools/spark_run_v4.sh"
+ENABLE_DOT_NET=""
+####若使用spark-wine时需要用到.net，则请把ENABLE_DOT_NET设为true，同时在依赖中写spark-wine7-mono
 export MIME_TYPE=""
-#####没什么用
+
 export DEB_PACKAGE_NAME="@@@Package@@@"
 ####这里写包名才能在启动的时候正确找到files.7z,似乎也和杀残留进程有关
-export APPRUN_CMD="{chooseWine}"
+export APPRUN_CMD="@@Wine@@"
 #####wine启动指令，建议
-EXPORT_ENVS=""
+#EXPORT_ENVS="wine的动态链接库路径"
+##例如我的wine应用是使用的dwine6的32位容器，那么我要填LD_LIBRARY_PATH=$LD_LIBRARY;/opt/deepin-wine6-stable/lib
+## 如果用不到就不填，不要删除前面的注释用的#

 export SPECIFY_SHELL_DIR=`dirname $START_SHELL_PATH`

@@ -224,7 +231,7 @@ DISABLE_ATTACH_FILE_DIALOG=""

 ##############<<<<<<<<<禁用文件选择工具开始
 Get_Dist_Name
-#此功能实现参见结尾函数段
+#此功能实现参见开头函数段
 if [ "$DISTRO" != "Deepin" ] && [ "$DISTRO" != "UniontechOS" ];then
 DISABLE_ATTACH_FILE_DIALOG="1"
 echo "非deepin/UOS，默认关闭系统自带的文件选择工具，使用Wine的"
@@ -236,12 +243,13 @@ fi

 ##############<<<<<<<<<屏蔽mono和gecko安装器开始
 ##默认屏蔽mono和gecko安装器
-#if [ "$APPRUN_CMD" = "spark-wine7-devel" ];then
+if [ "$APPRUN_CMD" = "spark-wine7-devel" ] || [ "$APPRUN_CMD" = "spark-wine" ]|| [ "$APPRUN_CMD" = "spark-wine8" ] && [ -z "$ENABLE_DOT_NET" ];then

-#export WINEDLLOVERRIDES="mscoree,mshtml="
-#echo "为了降低打包体积，默认关闭gecko和momo，如有需要，注释此行（仅对spark-wine7-devel有效）"
+export WINEDLLOVERRIDES="mscoree=d,mshtml=d"
+export WINEDLLOVERRIDES="control.exe=d"
+#### "为了降低打包体积，默认关闭gecko和momo，如有需要，注释此行（仅对spark-wine7-devel有效）"

-#fi
+fi
 ##############>>>>>>>>>屏蔽mono和gecko安装器结束

 #########################执行段
@@ -261,11 +269,12 @@ if [ -n "$EXEC_PATH" ];then
    if [ -z "${{EXEC_PATH##*.lnk*}}" ];then
        $START_SHELL_PATH $BOTTLENAME $APPVER "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
    else
-        $START_SHELL_PATH $BOTTLENAME $APPVER "$EXEC_PATH" "$@"
+        $START_SHELL_PATH $BOTTLENAME $APPVER "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
    fi
 else
    $START_SHELL_PATH $BOTTLENAME $APPVER "uninstaller.exe" "$@"
-fi'''
+fi
+'''

 desktopFile = f'''#!/usr/bin/env xdg-open
 [Desktop Entry]
@@ -506,8 +515,8 @@ class RunThread(QtCore.QThread):
                # 拷贝文件到容器
                self.RunCommand(f"cp -rv '{folderExePath}' '{bottlePath}/drive_c/Program Files'")
                debPackageVersion = self.GetEXEVersion(exePath.text(), bottlePath)
-            debDescription = f"{exeName} By Deepin Wine 6 Stable And Build By Wine Runner Easy Packager"
-            debDepends = f"{chooseWine}, spark-dwine-helper | store.spark-app.spark-dwine-helper, fonts-wqy-microhei, fonts-wqy-zenhei"
+            debDescription = f"{exeName} By Build By Wine Runner Easy Packager"
+            debDepends = f"{chooseWine} | {chooseWine}-bcm | {chooseWine}-dcm, spark-dwine-helper | store.spark-app.spark-dwine-helper, fonts-wqy-microhei, fonts-wqy-zenhei"
            self.RunCommand(f"mkdir -pv '{debBuildPath}/DEBIAN'")
            self.RunCommand(f"mkdir -pv '{debBuildPath}/opt/apps/{debPackageName}/files'")
            self.RunCommand(f"mkdir -pv '{debBuildPath}/opt/apps/{debPackageName}/entries/applications'")
@@ -542,7 +551,8 @@ class RunThread(QtCore.QThread):
                ["@@@Installed-Size@@@", str(int(buildProgramSize))],
                ["@@@Name@@@", exeName],
                ["@@@EXEC_PATH@@@", exePathInBottle],
-                ["@@@Icon@@@", programIconPath]
+                ["@@@Icon@@@", programIconPath],
+                ["@@@Wine@@@", chooseWine]
            ]
            debControl = ReplaceText(control, replaceMap)
            debPostrm = ReplaceText(postrm, replaceMap)
@@ -562,7 +572,7 @@ class RunThread(QtCore.QThread):
            self.RunCommand(f"chmod -Rv 755 '{debBuildPath}/opt/apps/{debPackageName}/entries/applications/'*.desktop")
            ########### 打包 deb
            print(debPackageVersion)
-            self.RunCommand(f"dpkg-deb -Z xz -b '{debBuildPath}' '{desktopPath}/{debPackageName}_{debPackageVersion}_all.deb'")
+            self.RunCommand(f"dpkg-deb -Z xz -z $(($(grep -c processor < /proc/cpuinfo)*2)) -b '{debBuildPath}' '{desktopPath}/{debPackageName}_{debPackageVersion}_all.deb'")
            self.info.emit("打包完成！")
            self.disbledAll.emit(False)
            ########### 移除临时文件
@@ -634,12 +644,13 @@ if __name__ == "__main__":
        "使用 Deepin Wine5 打包应用",
        "使用 Deepin Wine2 打包应用"
    ]
-    wineChooserIndex = 0
+    wineChooserIndex = 2
    wineList = ["spark-wine8", "spark-wine7-devel", "deepin-wine6-stable", "deepin-wine5-stable", "deepin-wine5", "deepin-wine"]
-    for i in range(len(wineList)):
-        if not os.system(f"which '{wineList[i]}'"):
-            wineChooserIndex = i
-            break
+    if os.system("which deepin-wine6-stable"):
+        for i in range(len(wineList)):
+            if not os.system(f"which '{wineList[i]}'"):
+                wineChooserIndex = i
+                break
    chooseWine = wineList[wineChooserIndex]
    wineChooserList[wineChooserIndex] = f"{wineChooserList[wineChooserIndex]}（推荐，如无特殊需求不建议更换）"
    wineChooser.addItems(wineChooserList)
--- a/deepin-wine-packager.py
+++ b/deepin-wine-packager.py
@@ -77,6 +77,9 @@ def disabled_or_NORMAL_all(choose):
    buildDebDir.setDisabled(choose)
    debDepends.setDisabled(choose)
    debRecommend.setDisabled(choose)
+    debFirstArch.setDisabled(choose)
+    helperConfigPathButton.setDisabled(choose)
+    helperConfigPathText.setDisabled(choose)
    #if not choose:
    #    ChangeArchCombobox()
    #    ChangeWine()
@@ -497,12 +500,15 @@ Get_Dist_Name()
        DISTRO='Deepin'
    elif grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release; then
        DISTRO='UniontechOS'
+    elif grep -Eqi "UOS" /etc/issue || grep -Eq "UOS" /etc/*-release; then
+        DISTRO='UniontechOS'
    else
 	 DISTRO='OtherOS'
 	fi
 }}


+
 ####获得发行版名称

 #########################预设值段
@@ -514,13 +520,18 @@ APPVER="@@@APPVER@@@"
 EXEC_PATH="@@@EXEC_PATH@@@"
 ##### 软件在wine中的启动路径
 START_SHELL_PATH="/opt/deepinwine/tools/spark_run_v4.sh"
+{['''ENABLE_DOT_NET=true''', 'ENABLE_DOT_NET=""'][int(disabledMono.isChecked())]}
+####若使用spark-wine时需要用到.net，则请把ENABLE_DOT_NET设为true，同时在依赖中写spark-wine7-mono
 export MIME_TYPE=""
-#####没什么用
+
+
 export DEB_PACKAGE_NAME="@@@DEB_PACKAGE_NAME@@@"
 ####这里写包名才能在启动的时候正确找到files.7z,似乎也和杀残留进程有关
 export APPRUN_CMD="@@@APPRUN_CMD@@@"
 #####wine启动指令，建议
-EXPORT_ENVS=""
+#EXPORT_ENVS="wine的动态链接库路径"
+##例如我的wine应用是使用的dwine6的32位容器，那么我要填LD_LIBRARY_PATH=$LD_LIBRARY;/opt/deepin-wine6-stable/lib
+## 如果用不到就不填，不要删除前面的注释用的#

 export SPECIFY_SHELL_DIR=`dirname $START_SHELL_PATH`

@@ -538,7 +549,7 @@ DISABLE_ATTACH_FILE_DIALOG=""

 ##############<<<<<<<<<禁用文件选择工具开始
 Get_Dist_Name
-#此功能实现参见结尾函数段
+#此功能实现参见开头函数段
 if [ "$DISTRO" != "Deepin" ] && [ "$DISTRO" != "UniontechOS" ];then
 DISABLE_ATTACH_FILE_DIALOG="1"
 echo "非deepin/UOS，默认关闭系统自带的文件选择工具，使用Wine的"
@@ -550,17 +561,13 @@ fi

 ##############<<<<<<<<<屏蔽mono和gecko安装器开始
 ##默认屏蔽mono和gecko安装器
-{['''#if [ "$APPRUN_CMD" = "spark-wine7-devel" ];then
+if [ "$APPRUN_CMD" = "spark-wine7-devel" ] || [ "$APPRUN_CMD" = "spark-wine" ]|| [ "$APPRUN_CMD" = "spark-wine8" ] && [ -z "$ENABLE_DOT_NET" ];then

-#export WINEDLLOVERRIDES="mscoree,mshtml="
-#echo "为了降低打包体积，默认关闭gecko和momo，如有需要，注释此行（仅对spark-wine7-devel有效）"
+export WINEDLLOVERRIDES="mscoree=d,mshtml=d"
+export WINEDLLOVERRIDES="control.exe=d"
+#### "为了降低打包体积，默认关闭gecko和momo，如有需要，注释此行（仅对spark-wine7-devel有效）"

-#fi''', '''if [ "$APPRUN_CMD" = "spark-wine7-devel" ];then
-
-export WINEDLLOVERRIDES="mscoree,mshtml="
-echo "为了降低打包体积，默认关闭gecko和momo，如有需要，注释此行（仅对spark-wine7-devel有效）"
-
-fi'''][int(disabledMono.isChecked())]}
+fi
 ##############>>>>>>>>>屏蔽mono和gecko安装器结束

 #########################执行段
@@ -580,11 +587,12 @@ if [ -n "$EXEC_PATH" ];then
    if [ -z "${{EXEC_PATH##*.lnk*}}" ];then
        $START_SHELL_PATH $BOTTLENAME $APPVER "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
    else
-        $START_SHELL_PATH $BOTTLENAME $APPVER "$EXEC_PATH" "$@"
+        $START_SHELL_PATH $BOTTLENAME $APPVER "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
    fi
 else
    $START_SHELL_PATH $BOTTLENAME $APPVER "uninstaller.exe" "$@"
-fi"""
+fi
+"""
                        ][chooseWineHelperValue.isChecked()],
                        "info": f'''{{
    "appid": "{e1_text.text()}",
@@ -1514,7 +1522,7 @@ Icon={a[i]}
 Exec="/opt/apps/{e1_text.text()}/files/{os.path.splitext(os.path.basename(iconUiList[i][0].text().replace(line, "/")))[0]}.sh" {command}
 Name={iconUiList[i][3].text()}
 Comment={e3_text.text()}
-MimeType={e10_text.text()}
+MimeType={iconUiList[i][5].text()}
 GenericName={e1_text.text()}
 Terminal=false
 StartupNotify=false
@@ -1556,6 +1564,12 @@ StartupNotify=false
                        #write_txt(f"{debPackagePath}/opt/apps/{e1_text.text()}/files/{os.path.splitext(os.path.basename(i[0].text().replace(line, '/')))[0]}_with_exagear.sh", ReplaceText(debInformation[debArch.currentIndex()]["run_with_exagear.sh"], replaceMap))
            if debArch.currentIndex() != 2:                    
                write_txt("{}/opt/apps/{}/info".format(debPackagePath, e1_text.text()), debInformation[debArch.currentIndex()]["info"])
+            if helperConfigPath != None and helperConfigPath != "":
+                os.makedirs(f"{debPackagePath}/opt/deepinwine/tools/spark_run_v4_app_configs")
+                if e6_text.text()[-3: ] == ".7z":
+                    shutil.copy(helperConfigPath, f"{debPackagePath}/opt/deepinwine/tools/spark_run_v4_app_configs/{os.path.splitext(e6_text.text())[0]}.sh")
+                else:
+                    shutil.copy(helperConfigPath, f"{debPackagePath}/opt/deepinwine/tools/spark_run_v4_app_configs/{e6_text.text()}.sh")
            ################
            # 修改文件权限
            ################
@@ -1575,7 +1589,7 @@ StartupNotify=false
            ################
            if not self.build:
                self.label.emit("正在构建 deb 包……")
-                self.run_command("bash -c 'dpkg-deb -Z xz -b \"{}\" \"{}\"'".format(debPackagePath, e12_text.text()))
+                self.run_command("bash -c 'dpkg-deb -Z xz -z $(($(grep -c processor < /proc/cpuinfo)*2)) -b \"{}\" \"{}\"'".format(debPackagePath, e12_text.text()))
            ################
            # 删除临时文件
            ################
@@ -1670,19 +1684,119 @@ def ChangeArchCombobox():
 def InstallDeb():
    os.system(f"xdg-open '{e12_text.text()}'")

+def OpenConfigFile():
+    path = QtWidgets.QFileDialog.getOpenFileName(window, "打开列表", get_home(), "JSON 文件(*.json);;所有文件(*.*)")
+    try:
+        if path[0] == "" and path[0] == None:
+            return
+        try:
+            with open(path[0], "r") as file:
+                openInfo = json.loads(file.read())
+        except:
+            traceback.print_exc()
+            QtWidgets.QMessageBox.critical(window, "错误", traceback.format_exc())
+            return
+        for i in openInfo:
+            option = openInfo[i][0]
+            if option == "L":
+                allInfoList[i][1].setText(openInfo[i][1])
+            elif option == "Co":
+                allInfoList[i][1].setCurrentIndex(openInfo[i][1])
+            elif option == "Ch":
+                allInfoList[i][1].setChecked(openInfo[i][1])
+            elif option == "Str-SparkHelperConfigPath":
+                allInfoList[i][1] = openInfo[i][1]
+                if openInfo[i][1] != None:
+                    helperConfigPathText.setText(os.path.basename(openInfo[i][1]))
+            elif option == "List-Desktop":
+                if len(openInfo[i][1]) > 1:
+                    for k in openInfo[i][1][1:]:
+                        AddTab(k)
+            
+                for k in range(len(openInfo[i][1][0])):
+                    try:
+                        iconUiList[0][k].setText(openInfo[i][1][0][k])
+                    except:
+                        try:
+                            iconUiList[0][k].setCurrentIndex(openInfo[i][1][0][k])
+                        except:
+                            print(k)
+                            traceback.print_exc()
+    except:
+        traceback.print_exc()
+        QtWidgets.QMessageBox.critical(window, "错误", traceback.format_exc())
+
+def SaveConfigList():
+    saveInfo = {}
+    try:
+        for i in allInfoList:
+            option = allInfoList[i][0]
+            print(i)
+            if option == "L":
+                saveInfo[i] = ["L", allInfoList[i][1].text()]
+            elif option == "Co":
+                saveInfo[i] = ["Co", allInfoList[i][1].currentIndex()]
+            elif option == "Ch":
+                saveInfo[i] = ["Ch", allInfoList[i][1].isChecked()]
+            elif option == "Str-SparkHelperConfigPath":
+                saveInfo[i] = ["Str-SparkHelperConfigPath", allInfoList[i][1]]
+            elif option == "List-Desktop":
+                print("aaa")
+                desktopTabList = []
+            
+                for d in allInfoList[i][1]:
+                    desktopInfoList = []
+                    for k in d:
+                        try:
+                            desktopInfoList.append(k.text())
+                        except:
+                            try:
+                                desktopInfoList.append(k.currentIndex())
+                            except:
+                                traceback.print_exc()
+                    desktopTabList.append(desktopInfoList)
+                saveInfo[i] = ["List-Desktop", desktopTabList]
+        path = QtWidgets.QFileDialog.getSaveFileName(window, "保存列表", get_home(), "JSON 文件(*.json);;所有文件(*.*)")
+        print(path)
+        if path[0] != "" and path[0] != None:
+            try:
+                with open(path[0], "w") as file:
+                    file.write(json.dumps(saveInfo, ensure_ascii=False, indent=4))
+            except:
+                traceback.print_exc()
+                QtWidgets.QMessageBox.critical(window, "错误", traceback.format_exc())
+    except:
+        traceback.print_exc()
+        QtWidgets.QMessageBox.critical(window, "错误", traceback.format_exc())
+
+def ClearHelperConfigPathText():
+    global helperConfigPath
+    helperConfigPath = None
+    helperConfigPathText.setText("点击浏览按钮指定软件包适配脚本")
+
+def BrowserHelperConfigPathText():
+    global helperConfigPath
+    path = QtWidgets.QFileDialog.getOpenFileName(window, "选择 sh 文件", get_home(), "shell 脚本(*.sh);;所有文件(*.*)")[0]
+    if path == "" or path == None:
+        return
+    helperConfigPath = path
+    helperConfigPathText.setText(os.path.basename(path))
+
 def ChangeWine():
    useInstallWineArch.setEnabled(os.path.exists(wine[wineVersion.currentText()]))
-    debDepends.setText([f"{wine[wineVersion.currentText()]}, deepin-wine-helper (>= 5.1.30-1), fonts-wqy-microhei, fonts-wqy-zenhei",
-                        f"{wine[wineVersion.currentText()]}, spark-dwine-helper | store.spark-app.spark-dwine-helper, fonts-wqy-microhei, fonts-wqy-zenhei"
+    debDepends.setText([f"{wine[wineVersion.currentText()]} | {wine[wineVersion.currentText()]}-bcm | {wine[wineVersion.currentText()]}-dcm, deepin-wine-helper (>= 5.1.30-1), fonts-wqy-microhei, fonts-wqy-zenhei",
+                        f"{wine[wineVersion.currentText()]} | {wine[wineVersion.currentText()]}-bcm | {wine[wineVersion.currentText()]}-dcm, spark-dwine-helper | store.spark-app.spark-dwine-helper, fonts-wqy-microhei, fonts-wqy-zenhei"
                        ][int(chooseWineHelperValue.isChecked())])
    debRecommend.setText("")
+    helperConfigPathText.setEnabled(chooseWineHelperValue.isChecked())
+    helperConfigPathButton.setEnabled(chooseWineHelperValue.isChecked())
    if os.path.exists(wine[wineVersion.currentText()]):
        debDepends.setText(["deepin-wine-helper (>= 5.1.30-1)",
                        "spark-dwine-helper | store.spark-app.spark-dwine-helper"
                        ][int(chooseWineHelperValue.isChecked())])
-        if "deepin-wine5-stable" in wine[wineVersion.currentText()]:
-            debDepends.setText("libasound2 (>= 1.0.16), libc6 (>= 2.28), libglib2.0-0 (>= 2.12.0), libgphoto2-6 (>= 2.5.10), libgphoto2-port12 (>= 2.5.10), libgstreamer-plugins-base1.0-0 (>= 1.0.0), libgstreamer1.0-0 (>= 1.4.0), liblcms2-2 (>= 2.2+git20110628), libldap-2.4-2 (>= 2.4.7), libmpg123-0 (>= 1.13.7), libopenal1 (>= 1.14), libpcap0.8 (>= 0.9.8), libpulse0 (>= 0.99.1), libudev1 (>= 183), libvkd3d1 (>= 1.0), libx11-6, libxext6, libxml2 (>= 2.9.0), ocl-icd-libopencl1 | libopencl1, udis86, zlib1g (>= 1:1.1.4), libasound2-plugins, libncurses6 | libncurses5 | libncurses, deepin-wine-plugin-virtual")
-            debRecommend.setText("libcapi20-3, libcups2, libdbus-1-3, libfontconfig1, libfreetype6, libglu1-mesa | libglu1, libgnutls30 | libgnutls28 | libgnutls26, libgsm1, libgssapi-krb5-2, libjpeg62-turbo | libjpeg8, libkrb5-3, libodbc1, libosmesa6, libpng16-16 | libpng12-0, libsane | libsane1, libsdl2-2.0-0, libtiff5, libv4l-0, libxcomposite1, libxcursor1, libxfixes3, libxi6, libxinerama1, libxrandr2, libxrender1, libxslt1.1, libxxf86vm1")
+        #if "deepin-wine5-stable" in wine[wineVersion.currentText()]:
+        #    debDepends.setText("libasound2 (>= 1.0.16), libc6 (>= 2.28), libglib2.0-0 (>= 2.12.0), libgphoto2-6 (>= 2.5.10), libgphoto2-port12 (>= 2.5.10), libgstreamer-plugins-base1.0-0 (>= 1.0.0), libgstreamer1.0-0 (>= 1.4.0), liblcms2-2 (>= 2.2+git20110628), libldap-2.4-2 (>= 2.4.7), libmpg123-0 (>= 1.13.7), libopenal1 (>= 1.14), libpcap0.8 (>= 0.9.8), libpulse0 (>= 0.99.1), libudev1 (>= 183), libvkd3d1 (>= 1.0), libx11-6, libxext6, libxml2 (>= 2.9.0), ocl-icd-libopencl1 | libopencl1, udis86, zlib1g (>= 1:1.1.4), libasound2-plugins, libncurses6 | libncurses5 | libncurses, deepin-wine-plugin-virtual")
+        #    debRecommend.setText("libcapi20-3, libcups2, libdbus-1-3, libfontconfig1, libfreetype6, libglu1-mesa | libglu1, libgnutls30 | libgnutls28 | libgnutls26, libgsm1, libgssapi-krb5-2, libjpeg62-turbo | libjpeg8, libkrb5-3, libodbc1, libosmesa6, libpng16-16 | libpng12-0, libsane | libsane1, libsdl2-2.0-0, libtiff5, libv4l-0, libxcomposite1, libxcursor1, libxfixes3, libxi6, libxinerama1, libxrandr2, libxrender1, libxslt1.1, libxxf86vm1")

 # 获取用户桌面目录
 def get_desktop_path():
@@ -1953,12 +2067,13 @@ def ChangeTapTitle():

 mapLink = []

-def AddTab():
+def AddTab(defaultValue=[]):
    global mapLink
    button2 = QtWidgets.QPushButton(transla.transe("U", "浏览……"))
    e7_text = QtWidgets.QLineEdit()
    e8_text = QtWidgets.QLineEdit()
    e9_text = QtWidgets.QLineEdit()
+    e10_text = QtWidgets.QLineEdit()
    e15_text = QtWidgets.QLineEdit()
    iconTab1 = QtWidgets.QWidget()
    option1_text = QtWidgets.QComboBox()
@@ -1974,6 +2089,7 @@ def AddTab():
    desktopIconTabLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "wine 容器里需要运行的可执行文件的参数：")), 8, 0, 1, 1)
    desktopIconTabLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "要显示的 .desktop 文件的名称（※必填）：")), 9, 0, 1, 1)
    desktopIconTabLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "要显示的 .desktop 文件的图标：")), 10, 0, 1, 1)
+    desktopIconTabLayout.addWidget(QtWidgets.QLabel(transla.transe("U", ".desktop 的 MimeType：")), 11, 0, 1, 1)
    iconTab1.setLayout(desktopIconTabLayout)
    desktopIconTab.addTab(iconTab1, f"图标{desktopIconTab.count() + 1}")
    desktopIconTabLayout.addWidget(e7_text, 6, 1, 1, 1)
@@ -1982,6 +2098,7 @@ def AddTab():
    desktopIconTabLayout.addWidget(e8_text, 9, 1, 1, 1)
    desktopIconTabLayout.addWidget(e9_text, 10, 1, 1, 1)
    desktopIconTabLayout.addWidget(button2, 10, 2, 1, 1)
+    desktopIconTabLayout.addWidget(e10_text, 11, 1, 1, 1)
    e8_text.setWhatsThis(transla.transe("U", """填写该软件的中文或英文名称。"""))
    e9_text.setWhatsThis(transla.transe("U", """图标只支持PNG格式和SVG格式，其他格式无法显示。"""))
    e15_text.setWhatsThis(transla.transe("U", "程序参数，如%u，一般不需要"))
@@ -2000,7 +2117,17 @@ Utility=工具软件或其他应用。
    e7_text.textChanged.connect(ChangeTapTitle)
    e7_text.setPlaceholderText("例如 c:/Program Files/Tencent/QQ/Bin/QQ.exe")
    e9_text.setPlaceholderText(transla.transe("U", "支持 png 和 svg 格式，不支持 ico 格式"))
-    iconUiList.append([e7_text, option1_text, e15_text, e8_text, e9_text])
+    e10_text.setWhatsThis(transla.transe("U", "快捷方式的 MimeType 项，一般为空即可"))
+    iconUiList.append([e7_text, option1_text, e15_text, e8_text, e9_text, e10_text])
+    if defaultValue != []:
+        for i in range(len(iconUiList[-1])):
+            try:
+                iconUiList[-1][i].setText(defaultValue[i])
+            except:
+                try:
+                    iconUiList[-1][i].setCurrentIndex(defaultValue[i])
+                except:
+                    traceback.print_exc()
    print(iconUiList)

 def DelTab():
@@ -2033,6 +2160,16 @@ def LockBottleName():
 def get_now_lang()->"获取当前语言":
    return os.getenv('LANG')

+def SetFont(size):
+    font = QtGui.QFont(defaultFont)
+    if size == 1:
+        window.setFont(defaultFont)    
+        return
+    font.setPixelSize(int(defaultFont.pixelSize() / size))
+    font.setPointSize(int(defaultFont.pointSize() / size))
+    window.setFont(font)
+
+
 bottleNameLock = False
 ###############
 # 程序信息
@@ -2062,6 +2199,7 @@ except:
    pass
 os.chdir("/")
 iconUiList = []
+helperConfigPath = None
 iconPath = "{}/deepin-wine-runner.svg".format(programPath)
 information = json.loads(readtxt(f"{programPath}/information.json"))
 version = information["Version"]
@@ -2089,6 +2227,11 @@ tips = transla.transe("U", """提示：
 app = QtWidgets.QApplication(sys.argv)
 window = QtWidgets.QMainWindow()
 widget = QtWidgets.QWidget()
+defaultFont = window.font()
+#hScroll = QtWidgets.QScrollArea()
+#hScroll.setWidget(widget)
+#hScroll.verticalScrollBar().setValue(hScroll.verticalScrollBar().maximum())
+#hScroll.horizontalScrollBar().setValue(hScroll.horizontalScrollBar().maximum())
 widgetLayout = QtWidgets.QGridLayout()
 # 设置变量以修改和获取值项
 wineVersion = QtWidgets.QComboBox()
@@ -2125,10 +2268,22 @@ debArch = QtWidgets.QComboBox()
 debArch.addItems(["默认选项", "arm64(box86+exagear)"])
 #debArch.addItems(["i386", "arm64(box86+exagear)", "all(crossover)"])
 textbox1 = QtWidgets.QTextBrowser()
-option1_text.addItems(["Network", "Chat", "Audio", "Video", "Graphics", "Office", "Translation", "Development", "Utility"])
+option1_text.addItems(["Network", "Chat", "Audio", "Video", "Graphics", "Office", "Translation", "Development", "Utility", "Game", "AudioVideo", "System"])
 option1_text.setCurrentText("Network")
 wineFrame = QtWidgets.QHBoxLayout()
 chooseWineHelperValue = QtWidgets.QCheckBox(transla.transe("U", "使用星火wine helper\n（如不勾选默认为deepin-wine-helper）"))
+helperConfigPathLayout = QtWidgets.QHBoxLayout()
+helperConfigPathButton = QtWidgets.QPushButton("浏览")
+helperConfigPathText = QtWidgets.QLabel("点击浏览按钮指定软件包适配脚本")
+helperConfigPathLayout.addWidget(helperConfigPathButton)
+helperConfigPathLayout.addWidget(helperConfigPathText)
+helperConfigPathButton.clicked.connect(BrowserHelperConfigPathText)
+helperConfigPathButton.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
+helperConfigPathMenu = QtWidgets.QMenu(window)
+delHelperConfigPath = QtWidgets.QAction("取消选择")
+delHelperConfigPath.triggered.connect(ClearHelperConfigPathText)
+helperConfigPathMenu.addAction(delHelperConfigPath)
+helperConfigPathButton.customContextMenuRequested.connect(lambda: helperConfigPathMenu.exec_(QtGui.QCursor.pos()))
 button1.clicked.connect(button1_cl)
 button2.clicked.connect(lambda: button2_cl(0))
 mapLink.append(e9_text)
@@ -2167,6 +2322,7 @@ desktopIconTabLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "要显示
 desktopIconTabLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "wine 容器里需要运行的可执行文件的参数：")), 8, 0, 1, 1)
 desktopIconTabLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "要显示的 .desktop 文件的名称（※必填）：")), 9, 0, 1, 1)
 desktopIconTabLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "要显示的 .desktop 文件的图标：")), 10, 0, 1, 1)
+desktopIconTabLayout.addWidget(QtWidgets.QLabel(transla.transe("U", ".desktop 的 MimeType：")), 11, 0, 1, 1)
 iconTab1.setLayout(desktopIconTabLayout)
 #desktopIconTab.setTabPosition(QtWidgets.QTabWidget.East)
 desktopIconTab.addTab(iconTab1, "默认图标")
@@ -2187,7 +2343,8 @@ desktopIconTabLayout.addWidget(e15_text, 8, 1, 1, 1)
 desktopIconTabLayout.addWidget(e8_text, 9, 1, 1, 1)
 desktopIconTabLayout.addWidget(e9_text, 10, 1, 1, 1)
 desktopIconTabLayout.addWidget(button2, 10, 2, 1, 1)
-iconUiList.append([e7_text, option1_text, e15_text, e8_text, e9_text])
+desktopIconTabLayout.addWidget(e10_text, 11, 1, 1, 1)
+iconUiList.append([e7_text, option1_text, e15_text, e8_text, e9_text, e10_text])
 print(iconUiList)
 widgetLayout.addLayout(wineFrame, 6, 1, 1, 1)
 widgetLayout.addWidget(e12_text, 7, 1, 1, 1)
@@ -2217,13 +2374,12 @@ moreSettingLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "deb 包选项
 moreSettingLayout.addWidget(rmBash)
 moreSettingLayout.addWidget(cleanBottonByUOS)
 moreSettingLayout.addWidget(chooseWineHelperValue)
+moreSettingLayout.addLayout(helperConfigPathLayout)
 moreSettingLayout.addWidget(disabledMono)
 moreSettingLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "deb 的依赖(强制，如无特殊需求默认即可)：")))
 moreSettingLayout.addWidget(debDepends)
 moreSettingLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "deb 的推荐依赖(非强制，一般默认即可)：")))
 moreSettingLayout.addWidget(debRecommend)
-moreSettingLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "要显示的 .desktop 文件的 MimeType：")))
-moreSettingLayout.addWidget(e10_text)
 moreSettingLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "打包 deb 架构：")))
 moreSettingLayout.addWidget(debFirstArch)
 moreSettingLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "打包选项：")))
@@ -2246,10 +2402,16 @@ e7_text.setPlaceholderText("例如 c:/Program Files/Tencent/QQ/Bin/QQ.exe")
 e9_text.setPlaceholderText(transla.transe("U", "支持 png 和 svg 格式，不支持 ico 格式"))
 # 菜单栏
 menu = window.menuBar()
-programmenu = menu.addMenu(transla.transe("U", "程序"))
+programmenu = menu.addMenu(transla.transe("U", "程序（&P）"))
 debMenu = menu.addMenu(transla.transe("U", "deb 包"))
 uploadSparkStore = menu.addMenu(transla.transe("U", "投稿到星火应用商店"))
 help = menu.addMenu(transla.transe("U", "帮助"))
+openFile = QtWidgets.QAction(transla.transe("U", "打开配置文件"))
+saveFile = QtWidgets.QAction(transla.transe("U", "保存配置文件"))
+setMiniFont = QtWidgets.QAction(transla.transe("U", "使用小字体"))
+setDefaultFont = QtWidgets.QAction(transla.transe("U", "使用默认大小字体"))
+hideShowText = QtWidgets.QAction(transla.transe("U", "隐藏输出框"))
+hideShowText.setCheckable(True)
 exit = QtWidgets.QAction(transla.transe("U", "退出程序"))
 debE = QtWidgets.QAction(transla.transe("U", "只读取 Control 信息"))
 debX = QtWidgets.QAction(transla.transe("U", "读取所有（需解包，时间较久）"))
@@ -2261,8 +2423,24 @@ else:
    uploadSparkStoreProgram.setDisabled(True)
 tip = QtWidgets.QAction(transla.transe("U", "小提示"))
 getPdfHelp = QtWidgets.QAction(transla.transe("U", "Wine运行器和Wine打包器傻瓜式使用教程（小白专用）\nBy @雁舞白沙"))
+videoHelp = menu.addMenu(transla.transe("U", "视频教程(&V)"))
+videoHelpAction = QtWidgets.QAction(QtWidgets.QApplication.style().standardIcon(20), transla.transe("U", "视频教程"))
+videoHelpAction.triggered.connect(lambda: webbrowser.open_new_tab("https://space.bilibili.com/695814694/channel/collectiondetail?sid=1610353"))
+videoHelp.addAction(videoHelpAction)
+openFile.triggered.connect(OpenConfigFile)
+saveFile.triggered.connect(SaveConfigList)
+setMiniFont.triggered.connect(lambda: SetFont(1.2))
+setDefaultFont.triggered.connect(lambda: SetFont(1))
+hideShowText.triggered.connect(lambda: textbox1.setHidden(hideShowText.isChecked()))
 exit.triggered.connect(window.close)
 tip.triggered.connect(helps)
+programmenu.addAction(openFile)
+programmenu.addAction(saveFile)
+programmenu.addSeparator()
+programmenu.addAction(setMiniFont)
+programmenu.addAction(setDefaultFont)
+programmenu.addAction(hideShowText)
+programmenu.addSeparator()
 programmenu.addAction(exit)
 debMenu.addAction(debE)
 debMenu.addAction(debX)
@@ -2292,16 +2470,17 @@ window.setCentralWidget(widget)
 window.setWindowTitle(f"wine 应用打包器 {version}")
 window.setWindowIcon(QtGui.QIcon(iconPath))
 window.resize(int(window.frameSize().width() * 2.1), int(window.frameSize().height()))
-e1_text.setWhatsThis("""com.XXX.deepin
-XXX指windows软件的英文名称，可以自定义名称，但最好是用软件解压安装后自动生成的英文名称，如：dingtalk。包名只能含有小写字母（a-z）、数字（0-9）、加号（+）和减号（-）、以及点号(.)，软件包名最短长度为两个字符，且包名必须以字母开头。""")
+e1_text.setWhatsThis("""安装包的包名，推荐类似 com.xxx.spark 这种倒置域名的格式，当然类似 spark-xxx 这种也可以，但是包名只能含有<b>小写字母（a-z）、数字（0-9）、加号（+）和减号（-）、以及点号(.)</b>，软件包名最短长度为两个字符，且包名必须以字母开头。""")
 # 创建控件
-e2_text.setWhatsThis(transla.transe("U", """6.5.50（随便填写或填写该软件的windows版本的版本号，6.5.50只是示例）。"""))
-e3_text.setWhatsThis(transla.transe("U", """随便填写或使用该软件的windows版本的软件简介。"""))
-e4_text.setWhatsThis(transla.transe("U", """填写自己的网名，若是自用软件，不上架至应用商店，不进行后续维护，可随便填写。"""))
+e2_text.setWhatsThis(transla.transe("U", """安装包的版本号，一般推荐格式为 <b><u>程序版本号</u>spark<u>修订号</u></b>，例如 23.01spark0，23.01 就是程序版本号，0 为修订号，代表第一版版本"""))
+e3_text.setWhatsThis(transla.transe("U", """安装包的说明，随意但最好能程序的介绍之类方便用户快速了解安装包内容的文字，推荐只用英文"""))
+e4_text.setWhatsThis(transla.transe("U", """安装包的维护者，推荐格式为：<b><u>打包者</u>&lt;<u>邮箱</u>&gt;</b> ，例如 gfdgd xi&lt;3025613752@qq.com&gt;，多个打包者用半角符号“,”分隔"""))
 e5_text.setWhatsThis(f"<p>解压容器到其它机器的容器名称，一般自动带出</p><p><img src='{programPath}/Icon/Screen/202211121646232464_image.png'></p>")
 e6_text.setWhatsThis(transla.transe("U", f"要打包的容器所在路径，也可以选择已经好打包的 7z 文件，一般自动带出"))
-e7_text.setWhatsThis("""可执行文件的运行路径格式是“C:/XXX/XXX.exe”（不包含引号）""")
+e7_text.setWhatsThis("""程序在 wine 容器的路径，格式一般为 c:/xxx/xxx.exe""")
 debArch.setWhatsThis(transla.transe("U", "选择生成 deb 包所对应的架构"))
+wineVersion.setWhatsThis("deb 包使用的 Wine")
+option1_text.setWhatsThis("程序在启动器的快捷方式分类")
 rmBash.setWhatsThis(transla.transe("U", "清理容器无用内容，一般建议勾选，最新版本默认勾选，如果有特殊需求（如容器内有 mono、gecko 等）建议取消勾选"))
 debDepends.setWhatsThis(transla.transe("U", "生成 deb 包所需的依赖，一般情况下默认即可"))
 debRecommend.setWhatsThis(transla.transe("U", "生成 deb 包的推荐依赖，一般情况下为空即可"))
@@ -2311,15 +2490,20 @@ option1_text.setWhatsThis("""点击右侧的下拉箭头，选择该软件所属
 Network=网络应用；
 Chat=即时通讯或社交沟通；
 Video=视频播放；
+Audio=音乐欣赏；
+AudioVideo=视频播放；
 Graphics=图形图像；
+Game=游戏娱乐；
 Office=办公学习；
 Translation=阅读翻译；
 Development=软件开发；
+Reading=阅读翻译；
+System=系统管理；
 Utility=工具软件或其他应用。
 不明白英文的可以百度查询一下软件分类名称的意思。
 注意：此时选择的软件分类名称决定了该软件打包后再安装时会安装在启动器中的哪个软件分类目录中。""")
-e8_text.setWhatsThis(transla.transe("U", """填写该软件的中文或英文名称。"""))
-e9_text.setWhatsThis(transla.transe("U", """图标只支持PNG格式和SVG格式，其他格式无法显示。"""))
+e8_text.setWhatsThis(transla.transe("U", """在启动器快捷方式的名称"""))
+e9_text.setWhatsThis(transla.transe("U", """在启动器快捷方式的图标（不支持 ico 格式，推荐使用 svg、png 格式）"""))
 e10_text.setWhatsThis(transla.transe("U", "快捷方式的 MimeType 项，一般为空即可"))
 option1_text.setWhatsThis(transla.transe("U", "打包的 Wine 版本，根据实际情况选择（如果打包 arm 包将不会提供选择）"))
 e12_text.setWhatsThis(transla.transe("U", "打包出的 deb 生成的位置，一般自动生成"))
@@ -2329,6 +2513,28 @@ buildDebDir.setWhatsThis(transla.transe("U", "构建 deb 包目录，但不打
 textbox1.setWhatsThis(transla.transe("U", "查看打包过程中命令返回内容"))
 button5.setWhatsThis(transla.transe("U", "点击该按钮打包生成 deb"))
 installDeb.setWhatsThis(transla.transe("U", "调用默认的 deb 安装工具安装生成的 deb"))
+
+allInfoList = {
+    "Package": ["L", e1_text],
+    "Version": ["L", e2_text],
+    "Description": ["L", e3_text],
+    "Maintainer": ["L", e4_text],
+    "BottleName": ["L", e5_text],
+    "BottlePath": ["L", e6_text],
+    "WineVersion": ["Co", wineVersion],
+    "DebSavePath": ["L", e12_text],
+    "Desktop": ["List-Desktop", iconUiList],
+    "UseInstallWineArch": ["Co", useInstallWineArch],
+    "RemoveBash": ["Ch", rmBash],
+    "CleanBottleByUOS": ["Ch", cleanBottonByUOS],
+    "ChooseWineHelperValue": ["Ch", chooseWineHelperValue],
+    "DisabledMono": ["Ch", disabledMono],
+    "DebDepends": ["L", debDepends],
+    "DebRecommend": ["L", debRecommend],
+    "DebFirstArch": ["Co", debFirstArch],
+    "DebArch": ["Co", debArch],
+    "SparkHelperConfigPath": ["Str-SparkHelperConfigPath", helperConfigPath]
+}
 #window.setWindowFlag(QtGui.Qt)
 window.show()
 sys.exit(app.exec_())
--- a/information.json
+++ b/information.json
@@ -1,5 +1,5 @@
 {
-    "Version": "3.3.0",
+    "Version": "3.4.0",
    "Time": "未知",
    "Thank": [
        "感谢 RacoonGX 的付出与贡献",
--- a/mainwindow.py
+++ b/mainwindow.py
@@ -54,6 +54,14 @@ if sys.version_info[1] < 6:
 # 程序所需事件
 ###################

+def MiniMode(mode):
+    for i in [sparkWineSetting, qemuMenu, installLib, log, safeWebsize,
+              checkValue, virtualMachine, killProgram, killBottonProgram,
+              fontAppStore, wineConfig, trasButton, button5,
+              saveDesktopFileOnLauncher, label_r_2, combobox1,
+              leftDown]:
+        i.setVisible(not mode)
+
 # 打开程序官网
 def OpenProgramURL():
    webbrowser.open_new_tab(programUrl)
@@ -782,7 +790,9 @@ def RunWineProgram(wineProgram, history = False, Disbled = True):

 class RunWinetricksThread(QtCore.QThread):
    signal = QtCore.pyqtSignal(str)
-    def __init__(self):
+    bwrap = QtCore.pyqtSignal(str)
+    def __init__(self, bwrap):
+        self.bwrap = bwrap
        super().__init__()

    def run(self):
@@ -803,13 +813,40 @@ class RunWinetricksThread(QtCore.QThread):
                    QtWidgets.QMessageBox.critical(widget, "错误", "无法解压资源")
                    return
                os.remove(f"{programPath}/dlls-arm.7z")
+        ## 获取 WineServer 路径
+        wineServer = None
+        winePath = wine[o1.currentText()]
+        winePath = winePath.replace(f"bash '{programPath}/WineLib/run.sh'", "").strip()
+        # 判断类似 xxx-server 的 WineServer
+        if not os.system(f"{winePath}-server") >> 8:
+            wineServer = f"{winePath}-server"
+        # 判断类似 deepin-wine6-stable 的 WineServer
+        elif os.path.exists(f"/opt/{winePath}/bin/wineserver"):
+            wineServer = f"/opt/{winePath}/bin/wineserver"
+        elif os.path.exists(winePath):
+            wineServer = os.path.normpath(f"{winePath}/../wineserver")
+        runtime = ""
+        if self.bwrap:
+            runtime = f"'{programPath}/WineLib/run.sh'"
+        winetricksPath = "winetricks"
+        if os.system("which winetricks") >> 8:
+            winetricksPath = f"'{programPath}/winetricks'"
+        print(wineServer)
+        wineProgramP = wine[o1.currentText()].replace(f"bash '{programPath}/WineLib/run.sh'", "").strip()
+        wineProgramP = subprocess.getoutput(f"which {wineProgramP}").strip()
        if setting["TerminalOpen"]:
            res = ""
            # 用终端开应该不用返回输出内容了
-            OpenTerminal(f"WINEPREFIX='{wineBottonPath}' {option} WINE=" + subprocess.getoutput(f"which {wine[o1.currentText()]}").replace(" ", "").replace("\n", "") + f" winetricks --gui {wineUsingOption}")
+            if wineServer == None:
+                OpenTerminal(f"WINEPREFIX='{wineBottonPath}' {option} WINE='{wineProgramP}' {runtime} {winetricksPath} --gui {wineUsingOption}")
+            else:
+                OpenTerminal(f"WINEPREFIX='{wineBottonPath}' {option} WINESERVER='{wineServer}' WINE='{wineProgramP}' {runtime} {winetricksPath} --gui {wineUsingOption}")
            #res = subprocess.Popen([f"'{programPath}/launch.sh' deepin-terminal -C \"WINEPREFIX='{wineBottonPath}' {option} WINE=" + subprocess.getoutput(f"which {wine[o1.currentText()]}").replace(" ", "").replace("\n", "") + f" winetricks --gui {wineUsingOption}\" --keep-open"], shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
        else:    
-            res = subprocess.Popen([f"WINEPREFIX='{wineBottonPath}' {option} WINE='" + subprocess.getoutput(f"which {wine[o1.currentText()]}").replace(" ", "").replace("\n", "") + "' winetricks --gui"], shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+            if wineServer == None:
+                res = subprocess.Popen([f"WINEPREFIX='{wineBottonPath}' {option} WINE='{wineProgramP}' {runtime} {winetricksPath} --gui"], shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+            else:
+                res = subprocess.Popen([f"WINEPREFIX='{wineBottonPath}' {option} WINESERVER='{wineServer}' WINE='{wineProgramP}' {runtime} {winetricksPath} --gui"], shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
        # 实时读取程序返回
        while res.poll() is None:
            try:
@@ -823,6 +860,24 @@ class RunWinetricksThread(QtCore.QThread):
        DisableButton(False)

 runWinetricks = None
+def RunWinetricksWithWineLib():
+    global runWinetricks
+    DisableButton(True)
+    if not CheckProgramIsInstall(wine[o1.currentText()]) and o1.currentText() != "基于 linglong 的 deepin-wine6-stable（不推荐）" and o1.currentText() != "基于 UOS exagear 的 deepin-wine6-stable" and o1.currentText() != "基于 UOS box86 的 deepin-wine6-stable":
+        if not CheckProgramIsInstall(wine[o1.currentText()]) and not o1.currentText() in untipsWine:
+            DisableButton(False)
+            return
+    if o1.currentText() == "基于 UOS box86 的 deepin-wine6-stable" or o1.currentText() == "基于 UOS exagear 的 deepin-wine6-stable":
+        if not os.path.exists(f"{programPath}/dlls-arm"):
+            if os.system(f"7z x -y \"{programPath}/dlls-arm.7z\" -o\"{programPath}\""):
+                QtWidgets.QMessageBox.critical(widget, "错误", "无法解压资源")
+                return
+            os.remove(f"{programPath}/dlls-arm.7z")
+    returnText.setText("")
+    runWinetricks = RunWinetricksThread(False)
+    runWinetricks.signal.connect(QT.ShowWineReturn)
+    runWinetricks.start()
+
 def RunWinetricks():
    global runWinetricks
    DisableButton(True)
@@ -837,7 +892,7 @@ def RunWinetricks():
                return
            os.remove(f"{programPath}/dlls-arm.7z")
    returnText.setText("")
-    runWinetricks = RunWinetricksThread()
+    runWinetricks = RunWinetricksThread(False)
    runWinetricks.signal.connect(QT.ShowWineReturn)
    runWinetricks.start()

@@ -1971,6 +2026,8 @@ def getFileFolderSize(fileOrFolderPath):
        if os.path.isfile(fileOrFolderPath):
            totalSize = os.path.getsize(fileOrFolderPath)  # 5041481
            return totalSize
+        if os.path.islink(fileOrFolderPath):
+            return 0
        if os.path.isdir(fileOrFolderPath):
            with os.scandir(fileOrFolderPath) as dirEntryList:
                for curSubEntry in dirEntryList:
@@ -2219,13 +2276,13 @@ def CheckWine():
    global untipsWine
    global canUseWine
    try:
-        
        wine = {
            "基于 UOS box86 的 deepin-wine6-stable": f"WINEPREDLL='{programPath}/dlls-arm' WINEDLLPATH=/opt/deepin-wine6-stable/lib BOX86_NOSIGSEGV=1 /opt/deepin-box86/box86 /opt/deepin-wine6-stable/bin/wine ",
            "基于 UOS exagear 的 deepin-wine6-stable": f"WINEPREDLL='{programPath}/dlls-arm' WINEDLLPATH=/opt/deepin-wine6-stable/lib /opt/exagear/bin/ubt_x64a64_al --path-prefix {get_home()}/.deepinwine/debian-buster --utmp-paths-list {get_home()}/.deepinwine/debian-buster/.exagear/utmp-list --vpaths-list {get_home()}/.deepinwine/debian-buster/.exagear/vpaths-list --opaths-list {get_home()}/.deepinwine/debian-buster/.exagear/opaths-list --smo-mode fbase --smo-severity smart --fd-limit 8192 --foreign-ubt-binary /opt/exagear/bin/ubt_x32a64_al -- /opt/deepin-wine6-stable/bin/wine ",
            "使用 Flatpak 安装的 Wine": "flatpak run org.winehq.Wine",
            "deepin-wine6 stable": "deepin-wine6-stable", 
            "deepin-wine5 stable": "deepin-wine5-stable", 
+            "spark-wine": "spark-wine",
            "spark-wine7-devel": "spark-wine7-devel", 
            "spark-wine8": "spark-wine8",
            "deepin-wine": "deepin-wine", 
@@ -2484,35 +2541,31 @@ exe路径\' 参数 \'
 即可（单引号需要输入）；
 5、wine 容器如果没有指定，则会默认为 ~/.wine；
 6、如果可执行文件比较大的话，会出现点击“获取该程序运行情况”出现假死的情况，因为正在后台读取 SHA1，只需要等一下即可（读取速度依照您电脑处理速度、读写速度、可执行文件大小等有关）；
-7、对于非 X86 的用户来说，请不要使用本程序自带的 Wine 安装程序和 Windows 虚拟机安装功能（检测到为非 X86 架构会自动禁用）；
-8、如果非 X86 的用户的 UOS 专业版用户想要使用的话，只需要在应用商店安装一个 Wine 版本微信即可在本程序选择正确的 Wine 运行程序；
-9、在使用 linglong 包的 Wine 应用时，必须安装至少一个 linglong 的使用 Wine 软件包才会出现该选项，
-而程序识别到的 Wine 是按 linglong 的使用 Wine 软件包名的字母排序第一个的 Wine，且生成的容器不在用户目录下，而是在容器的用户目录下（~/.deepinwine、/tmp、桌面、下载、文档等被映射的目录除外），
-同理需要运行的 EXE 也必须在被映射的目录内；
-10、如果是使用 Deepin 23 的 Wine 安装脚本，请切记——安装过程会临时添加 Deepin 20 的 apt 源，不要中断安装以及
-<b>千万不要中断后不删除源的情况下 apt upgrade ！！！</b>中断后只需重新打开脚本输入 repair 或者随意安装一个 Wine（会自动执行恢复操作）即可
-以及此脚本安装的 Wine 无法保证 100% 能使用，以及副作用是会提示；
-<code>N: 鉴于仓库 'https://community-packages.deepin.com/beige beige InRelease' 不支持 'i386' 体系结构，跳过配置文件 'main/binary-i386/Packages' 的获取。</code>''')
-updateThingsString = transla.transe("U", '''※1、简易打包器支持选择 Wine 版本以及修改打包生成的 deb 包的架构为 all；
-※2、修改容器自动配置脚本的 Gitlink 源为 Gitee 源
-※3、在安装更多 Wine 处安装 Wine 后主窗口 Wine 版本下拉框自动更新
-※4、设置打包器在 Ubuntu 依旧打包 xz 格式的 deb 包
-※5、修复 Wine 简易打包器 control 文件 Installed-Size 格式不规范的问题
-※6、更换 Box86 源并支持安装 Box64（如果为 aarch64 架构）
-※7、新增 Wine 自建源（支持 Debian10、Deepin20）
-※8、修改 WineHQ 安装器使其支持选择国内清华大学镜像源或 WineHQ 官方源
-※9、新增 Visual FoxPro 安装器
-※10、新增安装局部运行库以解决部分低版本系统运行高版本 Wine 的问题且不与其他运行库和兼容层冲突
-※11、支持调用原版的 Exagear 以及 Qemu User（i386、x86_64） 运行 Wine
-12、新增自动构建：https://github.com/gfdgd-xi/deep-wine-runner/actions/workflows/auto-building.yml（只供尝鲜）
-13、新增 Wine 日构建（在“安装更多 Wine”处可以获取，目前有 i386、amd64、i386+amd64、amd64+wow64 mode、aarch64）
-14、优化容器清理脚本
-15、修复部分组件没完全换源的问题，部分组件支持自动换可用源''')
+7、如果非 X86 的用户的 UOS 专业版用户想要使用的话，只需要在应用商店安装一个 Wine 版本微信即可在本程序选择正确的 Wine 运行程序；''')
+updateThingsString = transla.transe("U", '''※1、修复简易打包器无法打开的问题以及 Wine 识别错误的问题
+※2、高级打包器支持多 .desktop 分别设置不同的 MimeType
+※3、修复运行器在 Ubuntu 23 的安装问题
+※4、高级打包器支持导出/导入填写信息
+※5、Deepin 23 支持使用 Winetricks
+※6、新增视频教程
+※7、修复虚拟机工具在检测到 Qemu 磁盘但没有安装 Qemu 时无法启动的问题
+※8、修复虚拟机工具的一些问题并调整部分设置
+※9、虚拟机工具支持设置 UEFI 启动
+※10、虚拟机安装工具提供 LoongArch 新世界版本
+11、高级打包器支持隐藏输入框以及使用小字体
+12、打包器提供 bcm 和 dcm wine 支持
+13、修复星火 wine 配置错误问题
+14、打包器支持多线程打包
+15、修复升级工具问题：https://gitee.com/gfdgd-xi/uengine-runner/issues/I6ZRZX
+16、跟进打包器 run.sh 模板
+17、云沙箱新增 cloud.vdnel.cn
+18、打包器新增分类 Game、System、AudioVideo
+19、修复安装 Box64 时源里没有 libc6:armhf 导致无法安装的问题''')
 for i in information["Thank"]:
    thankText += f"{i}\n"
-updateTime = "2023年07月12日"
+updateTime = "2023年08月11日"
 aboutProgram = transla.transe("U", """<p>Wine运行器是一个能让Linux用户更加方便地运行Windows应用的程序，内置了对Wine图形化的支持、各种Wine工具、自制的Wine程序打包器和运行库安装工具等。</p>
-<p>它同时还内置了基于VirtualBox制作的、专供小白使用的Windows虚拟机安装工具，可以做到只需下载系统镜像并点击安装即可，无需考虑虚拟机的安装、创建、分区等操作。</p>
+<p>它同时还内置了基于VirtualBox/Qemu制作的、专供小白使用的Windows虚拟机安装工具，可以做到只需下载系统镜像并点击安装即可，无需考虑虚拟机的安装、创建、分区等操作。</p>
 <pre>

 一个图形化了如下命令的程序（最简单格式）
@@ -2689,11 +2742,14 @@ button_r_6 = QtWidgets.QPushButton(transla.transe("U", "RegShot"))
 button_r_6.clicked.connect(lambda: RunWineProgram(f"{programPath}/RegShot/regshot.exe"))
 programManager.addWidget(button_r_6, 3, 4, 1, 1)
 sparkWineSetting = QtWidgets.QPushButton(transla.transe("U", "星火wine配置"))
-sparkWineSetting.clicked.connect(lambda: threading.Thread(target=os.system, args=["/opt/durapps/spark-dwine-helper/spark-dwine-helper-settings/settings.sh"]).start())
+sparkWineSetting.clicked.connect(lambda: threading.Thread(target=os.system, args=["bash /opt/durapps/spark-dwine-helper/spark-dwine-helper-settings/settings.sh"]).start())
 programManager.addWidget(sparkWineSetting, 3, 6, 1, 1)
 wineAutoConfig = QtWidgets.QPushButton(transla.transe("U", "自动/手动配置 Wine 容器"))
 wineAutoConfig.clicked.connect(WineBottonAutoConfig)
 programManager.addWidget(wineAutoConfig, 3, 8, 1, 1)
+wineBottleReboot = QtWidgets.QPushButton(transla.transe("U", "重启指定Wine容器"))
+wineBottleReboot.clicked.connect(lambda: RunWineProgram(f"wineboot' '-k"))
+programManager.addWidget(wineBottleReboot, 3, 10, 1, 1)
 # 权重
 button5.setSizePolicy(size)
 saveDesktopFileOnLauncher.setSizePolicy(size)
@@ -2871,11 +2927,14 @@ w8 = QtWidgets.QAction(transla.transe("U", "设置 run_v3.sh 的文管为 Deepin
 w9 = QtWidgets.QAction(transla.transe("U", "设置 run_v3.sh 的文管为 Wine 默认文管"))
 w10 = QtWidgets.QAction(transla.transe("U", "重新安装 deepin-wine-helper"))
 w11 = QtWidgets.QAction(QtGui.QIcon.fromTheme("winetricks"), transla.transe("U", "使用winetricks打开指定容器"))
+w11WithWineLib = QtWidgets.QAction(QtGui.QIcon.fromTheme("winetricks"), transla.transe("U", "使用winetricks打开指定容器（使用Wine运行器运行库）"))
+w11WithWineLib.setDisabled(True)
 settingRunV3Sh.addAction(w8)
 settingRunV3Sh.addAction(w9)
 settingRunV3Sh.addAction(w10)
 wineOption.addSeparator()
 wineOption.addAction(w11)
+#wineOption.addAction(w11WithWineLib)
 wineOption.addSeparator()
 optionCheckDemo = wineOption.addMenu(transla.transe("U", "组件功能测试"))
 vbDemo = QtWidgets.QAction(transla.transe("U", "测试 Visual Basic 6 程序"))
@@ -2952,6 +3011,7 @@ w8.triggered.connect(SetDeepinFileDialogDeepin)
 w9.triggered.connect(SetDeepinFileDialogDefult)
 w10.triggered.connect(SetDeepinFileDialogRecovery)
 w11.triggered.connect(lambda: RunWinetricks())
+w11WithWineLib.triggered.connect(lambda: RunWinetricksWithWineLib())
 wm1_1.triggered.connect(lambda: threading.Thread(target=InstallNetFramework).start())
 wm1_2.triggered.connect(lambda: threading.Thread(target=InstallVisualStudioCPlusPlus).start())
 wm1_8.triggered.connect(lambda: threading.Thread(target=InstallFoxPro).start())
@@ -3018,12 +3078,15 @@ safeWebsize = menu.addMenu(transla.transe("U", "云沙箱(&C)"))
 s1 = QtWidgets.QAction(QtWidgets.QApplication.style().standardIcon(9), transla.transe("U", "360 沙箱云"))
 s2 = QtWidgets.QAction(QtWidgets.QApplication.style().standardIcon(9), transla.transe("U", "微步云沙箱"))
 s3 = QtWidgets.QAction(QtWidgets.QApplication.style().standardIcon(9), transla.transe("U", "VIRUSTOTAL"))
+s4 = QtWidgets.QAction(QtWidgets.QApplication.style().standardIcon(9), transla.transe("U", "计算机病毒防御技术国家工程实验室"))
 safeWebsize.addAction(s1)
 safeWebsize.addAction(s2)
 safeWebsize.addAction(s3)
+safeWebsize.addAction(s4)
 s1.triggered.connect(lambda: webbrowser.open_new_tab("https://ata.360.net/"))
 s2.triggered.connect(lambda: webbrowser.open_new_tab("https://s.threatbook.cn/"))
 s3.triggered.connect(lambda: webbrowser.open_new_tab("https://www.virustotal.com/"))
+s4.triggered.connect(lambda: webbrowser.open_new_tab("https://cloud.vdnel.cn/"))

 log = menu.addMenu(transla.transe("U", "日志(&L)"))
 getDllInfo = QtWidgets.QAction(transla.transe("U", "查询 Dll"))
@@ -3078,6 +3141,7 @@ if os.path.exists(f"{programPath}/WineLib/usr"):
    installRunnerLib.setDisabled(True)
    removeRunnerLib.setEnabled(True)
    diyRunnerLib.setEnabled(True)
+    w11WithWineLib.setEnabled(True)
    statusRunnerLib.setText("当前状态：已安装")
    libPathList = []
    mapLink = []
@@ -3139,6 +3203,11 @@ if len(qemuBottleList) >= 1:
    configMenu.triggered.connect(ConfigQemu)
    print(qemuBottleList)

+videoHelp = menu.addMenu(transla.transe("U", "视频教程(&V)"))
+videoHelpAction = QtWidgets.QAction(QtWidgets.QApplication.style().standardIcon(20), transla.transe("U", "视频教程"))
+videoHelpAction.triggered.connect(lambda: webbrowser.open_new_tab("https://space.bilibili.com/695814694/channel/collectiondetail?sid=1610353"))
+videoHelp.addAction(videoHelpAction)
+
 help = menu.addMenu(transla.transe("U", "帮助(&H)"))
 runStatusWebSize = QtWidgets.QAction(QtWidgets.QApplication.style().standardIcon(20), transla.transe("U", "查询程序在 Wine 的运行情况"))
 h1 = help.addMenu(QtWidgets.QApplication.style().standardIcon(20), transla.transe("U", "程序官网"))
@@ -3174,10 +3243,7 @@ help.addSeparator()
 wikiHelp = QtWidgets.QAction(QtWidgets.QApplication.style().standardIcon(20), transla.transe("U", "程序 Wiki"))
 help.addAction(wikiHelp)
 videoHelp = help.addMenu(QtWidgets.QApplication.style().standardIcon(20), transla.transe("U", "视频教程"))
-easyHelp = QtWidgets.QAction(QtWidgets.QApplication.style().standardIcon(20), transla.transe("U", "简易使用教程"))
-buildHelp = QtWidgets.QAction(QtWidgets.QApplication.style().standardIcon(20), transla.transe("U", "打包教程"))
-videoHelp.addAction(easyHelp)
-videoHelp.addAction(buildHelp)
+videoHelp.addAction(videoHelpAction)
 help.addSeparator()
 help.addAction(h5)
 help.addAction(h6)
@@ -3200,8 +3266,6 @@ h3.triggered.connect(UpdateThings)
 wineRunnerHelp.triggered.connect(lambda: webbrowser.open_new_tab("https://bbs.deepin.org/post/246837"))
 h4.triggered.connect(ThankWindow)
 wikiHelp.triggered.connect(lambda: webbrowser.open_new_tab("https://gfdgd-xi.github.io/wine-runner-wiki"))
-easyHelp.triggered.connect(lambda: webbrowser.open_new_tab("https://www.bilibili.com/video/BV1ma411972Y"))
-buildHelp.triggered.connect(lambda: webbrowser.open_new_tab("https://www.bilibili.com/video/BV1EU4y1k7zr"))
 h5.triggered.connect(UpdateWindow.ShowWindow)
 h6.triggered.connect(WineRunnerBugUpload)
 fenUpload.triggered.connect(lambda: threading.Thread(target=os.system, args=[f"python3 '{programPath}/ProgramFen.py'"]).start())
@@ -3264,5 +3328,6 @@ if o1.currentText() == "":
    canUseWine.append("没有识别到任何Wine，请在菜单栏“程序”安装Wine或安装任意Wine应用")
    o1.addItem("没有识别到任何Wine，请在菜单栏“程序”安装Wine或安装任意Wine应用")

-
+# Mini 模式
+# MiniMode(True)
 sys.exit(app.exec_())
--- a/package-script/debian/postrm
+++ b/package-script/debian/postrm
@@ -2,26 +2,57 @@
 if [ "$1" = "remove" ] || [ "$1" = "purge" ];then

 echo "清理卸载残留"
-CONTAINER_NAME="@deb_package_name@"
+BOTTLE_NAME="@public_bottle_name@" #在引号中填写容器名
+PACK_NAME="@deb_package_name@"   #在引号中填写软件包名
+ACTIVEX_NAME="" #activex相关，若未使用，可不设置
+MAKE_AUTOSTART="" #如果先前设置了开机自启，则在此处填写1

-if [ -z $CONTAINER_NAME ];then
+
+
+### 以下为功能段，若只用于打包则以下内容可不看，只填写上方即可
+
+make_autostart()
+{
+for username in $(ls /home)  
+    do
+      echo /home/$username
+        if [ -d "/home/$username/.config/autostart" ]
+        then
+            rm /home/$username/.config/autostart/$PACK_NAME.desktop
+        fi
+    done
+}
+
+
+
+if [ -n "$MAKE_AUTOSTART" ]; then
+    make_autostart
+fi
+
+
+if [ -n "$ACTIVEX_NAME" ]; then
+    rm /usr/lib/mozilla/plugins/libpipelight-$ACTIVEX_NAME.so
+fi
+
+
+if [ -z $BOTTLE_NAME ];then
 echo "W: 没有指定容器，跳过清理容器。请手动前往 ~/.deepinwine/ 下删除"
 exit
 fi

-if [ -e /opt/deepinwine/tools/kill.sh ];then
-/opt/deepinwine/tools/kill.sh $CONTAINER_NAME
-###这里注意，如果没写CONTAINER_NAME,会把QQ杀了
+if [ -e /opt/deepinwine/tools/spark_kill.sh ];then
+/opt/deepinwine/tools/spark_kill.sh $BOTTLE_NAME
+###这里注意，如果没写BOTTLE_NAME,会把QQ杀了
 fi

 for username in $(ls /home)  
    do
      echo /home/$username
-        if [ -d /home/$username/.deepinwine/$CONTAINER_NAME ]  
+        if [ -d /home/$username/.deepinwine/$BOTTLE_NAME ]  
        then
-        rm -rf /home/$username/.deepinwine/$CONTAINER_NAME
+        rm -rf /home/$username/.deepinwine/$BOTTLE_NAME
        fi
    done
 else
 echo "非卸载，跳过清理"
-fi
+fi
--- a/package-script/information.json
+++ b/package-script/information.json
@@ -1,5 +1,5 @@
 {
-    "Version": "3.3.0",
+    "Version": "3.4.0",
    "Time": "未知",
    "Thank": [
        "感谢 RacoonGX 的付出与贡献",
--- a/package-script/package.py
+++ b/package-script/package.py
@@ -82,9 +82,9 @@ export deb_version_string="{versionName.text()}"
 #读取和最终解压的包名
 export bottle_name="{bottonName.text()}"

-export package_depends="deepin-wine6-stable:amd64 (>= 6.0.0.12-1), spark-dwine-helper | store.spark-app.spark-dwine-helper"
+export package_depends="deepin-wine6-stable | deepin-wine6-stable-bcm | deepin-wine6-stable-dcm, spark-dwine-helper | store.spark-app.spark-dwine-helper"
 export apprun_cmd="deepin-wine6-stable"
-#export package_depends="deepin-wine5-stable:amd64 (>= 5.0.29-1), spark-dwine-helper | store.spark-app.spark-dwine-helper"
+#export package_depends="deepin-wine5-stable | deepin-wine5-stable-bcm | deepin-wine5-stable-dcm, spark-dwine-helper | store.spark-app.spark-dwine-helper"
 #export apprun_cmd="deepin-wine5-stable"

 # rm -fr final.dir/
@@ -201,7 +201,7 @@ debPath = QtWidgets.QPushButton(transla.transe("U", "deb 包生成目录"))
 buildDeb.setSizePolicy(size)
 debPath.setSizePolicy(size)
 commandReturn = QtWidgets.QTextBrowser()
-typeName.addItems(["Network", "Chat", "Audio", "Video", "Graphics", "Office", "Translation", "Development", "Utility", "System"])
+typeName.addItems(["Network", "Chat", "Audio", "Video", "Graphics", "Office", "Translation", "Development", "Utility", "Game", "AudioVideo", "System"])
 controlFrame.addWidget(buildDeb)
 controlFrame.addWidget(debPath)
 widgetLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "程序中文名：")), 0, 0, 1, 1)
@@ -245,6 +245,10 @@ uploadSparkStore.addAction(uploadSparkStoreProgram)
 uploadSparkStore.addAction(uploadSparkStoreWebsize)
 uploadSparkStoreWebsize.triggered.connect(lambda: webbrowser.open_new_tab("https://upload.deepinos.org"))
 uploadSparkStoreProgram.triggered.connect(lambda: threading.Thread(target=os.system, args=["/opt/spark-store-submitter/bin/spark-store-submitter"]).start())
+videoHelp = menu.addMenu(transla.transe("U", "视频教程(&V)"))
+videoHelpAction = QtWidgets.QAction(QtWidgets.QApplication.style().standardIcon(20), transla.transe("U", "视频教程"))
+videoHelpAction.triggered.connect(lambda: webbrowser.open_new_tab("https://space.bilibili.com/695814694/channel/collectiondetail?sid=1610353"))
+videoHelp.addAction(videoHelpAction)
 helpMenu = menu.addMenu(transla.transe("U", "帮助"))
 help = QtWidgets.QAction(transla.transe("U", "帮助"))
 help.triggered.connect(ShowHelp)
--- a/package-script/script-packager.sh
+++ b/package-script/script-packager.sh
@@ -2,7 +2,7 @@
 #export elephant_deb_package_name=""
 run_sh_dir=""
 elephant_run_sh_dir=""
-start_shell="/opt/deepinwine/tools/run_v4.sh"
+start_shell="/opt/deepinwine/tools/spark_run_v4.sh"
 if [[ -n "$SPECIFY_SHELL_PATH" ]] && [[ "$SPECIFY_SHELL_PATH" == "/opt/apps"* ]];then
    start_shell="$SPECIFY_SHELL_PATH"
 fi
--- a/package-script/template/run.sh
+++ b/package-script/template/run.sh
@@ -4,18 +4,113 @@
 #
 #   Author:     Li LongYu <lilongyu@linuxdeepin.com>
 #               Peng Hao <penghao@linuxdeepin.com>
+#
+#
+#   Copyright (C) 2022 The Spark Project
+#
+#
+#   Modifier    shenmo <shenmo@spark-app.store>
+#
+#
+#

+#######################函数段。下文调用的额外功能会在此处声明
+
+Get_Dist_Name()
+{
+    if grep -Eqii "Deepin" /etc/issue || grep -Eq "Deepin" /etc/*-release; then
+        DISTRO='Deepin'
+    elif grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release; then
+        DISTRO='UniontechOS'
+    elif grep -Eqi "UOS" /etc/issue || grep -Eq "UOS" /etc/*-release; then
+        DISTRO='UniontechOS'
+    else
+	 DISTRO='OtherOS'
+	fi
+}
+
+
+####获得发行版名称
+
+#########################预设值段
+
+version_gt() { test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; }
+####用于比较版本？未实装
 BOTTLENAME="@public_bottle_name@"
 APPVER="@deb_version_string@"
 EXEC_PATH="@exec_path@"
+##### 软件在wine中的启动路径
 START_SHELL_PATH="@start_shell_path@"
+ENABLE_DOT_NET=""
+####若使用spark-wine时需要用到.net，则请把ENABLE_DOT_NET设为true，同时在依赖中写spark-wine7-mono
 export MIME_TYPE="@mime_type@"
+
 export DEB_PACKAGE_NAME="@deb_package_name@"
+####这里写包名才能在启动的时候正确找到files.7z,似乎也和杀残留进程有关
 export APPRUN_CMD="@apprun_cmd@"
-export PATCH_LOADER_ENV="@patch_loader@"
+#####wine启动指令，建议
+#EXPORT_ENVS="wine的动态链接库路径"
+##例如我的wine应用是使用的dwine6的32位容器，那么我要填LD_LIBRARY_PATH=$LD_LIBRARY;/opt/deepin-wine6-stable/lib
+## 如果用不到就不填，不要删除前面的注释用的#
+
+export SPECIFY_SHELL_DIR=`dirname $START_SHELL_PATH`
+
+ARCHIVE_FILE_DIR="/opt/apps/$DEB_PACKAGE_NAME/files"
+
+export WINEDLLPATH=/opt/$APPRUN_CMD/lib:/opt/$APPRUN_CMD/lib64
+
+export WINEPREDLL="$ARCHIVE_FILE_DIR/dlls"
+
+DISABLE_ATTACH_FILE_DIALOG=""
+##默认为空。若为1，则不使用系统自带的文件选择，而是使用wine的
+##对于deepin/UOS，大部分的应用都不需要使用wine的，如果有需求（比如wine应用选择的限定种类文件系统的文管不支持）
+##请填1。
+##注意：因为非DDE的环境不确定，所以默认会在非Deepin/UOS发行版上禁用这个功能。如果你确认在适配的发行版上可以正常启动，请注释或者删除下面这段
+
+##############<<<<<<<<<禁用文件选择工具开始
+Get_Dist_Name
+#此功能实现参见开头函数段
+if [ "$DISTRO" != "Deepin" ] && [ "$DISTRO" != "UniontechOS" ];then
+DISABLE_ATTACH_FILE_DIALOG="1"
+echo "非deepin/UOS，默认关闭系统自带的文件选择工具，使用Wine的"
+echo "如果你想改变这个行为，请到/opt/apps/$DEB_PACKAGE_NAME/files/$0处修改"
+echo "To打包者：如果你要打开自带请注意在适配的发行版上进行测试"
+echo "To用户：打包者没有打开这个功能，这证明启用这个功能可能造成运行问题。如果你要修改这个行为，请确保你有一定的动手能力"
+fi
+##############>>>>>>>>>禁用文件选择工具结束
+
+##############<<<<<<<<<屏蔽mono和gecko安装器开始
+##默认屏蔽mono和gecko安装器
+if [ "$APPRUN_CMD" = "spark-wine7-devel" ] || [ "$APPRUN_CMD" = "spark-wine" ]|| [ "$APPRUN_CMD" = "spark-wine8" ] && [ -z "$ENABLE_DOT_NET" ];then
+
+export WINEDLLOVERRIDES="mscoree=d,mshtml=d"
+export WINEDLLOVERRIDES="control.exe=d"
+#### "为了降低打包体积，默认关闭gecko和momo，如有需要，注释此行（仅对spark-wine7-devel有效）"
+
+fi
+##############>>>>>>>>>屏蔽mono和gecko安装器结束
+
+#########################执行段
+
+
+
+
+if [ -z "$DISABLE_ATTACH_FILE_DIALOG" ];then
+    export ATTACH_FILE_DIALOG=1
+fi
+
+if [ -n "$EXPORT_ENVS" ];then
+    export $EXPORT_ENVS
+fi

 if [ -n "$EXEC_PATH" ];then
-    $START_SHELL_PATH $BOTTLENAME $APPVER "$EXEC_PATH" "$@"
+    if [ -z "${EXEC_PATH##*.lnk*}" ];then
+        $START_SHELL_PATH $BOTTLENAME $APPVER "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
+    else
+        $START_SHELL_PATH $BOTTLENAME $APPVER "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
+    fi
 else
    $START_SHELL_PATH $BOTTLENAME $APPVER "uninstaller.exe" "$@"
 fi
+
+
--- a/updatekiller.py
+++ b/updatekiller.py
@@ -8,9 +8,10 @@ PIDFILE = '/tmp/deepin-wine-runner.pid'
 #程序结束时清理pid
@atexit.register
 def remove_pid():
+    '''程序结束时清理pid'''
    with open(PIDFILE) as pidfile:
        pidlst = pidfile.readlines()
-    pidlst.remove(str(PID)+'\n')
+    pidlst.remove(str(PID)+'\n')    #移除记录中的pid
    with open(PIDFILE,'w') as pidfile:
        pidfile.writelines(pidlst)

@@ -21,7 +22,7 @@ def main():
            os.kill(int(i),15)
        except ProcessLookupError:
            pass
-    os.remove(PIDFILE)
+##    os.remove(PIDFILE)    #因修复#I6ZRZX而注释

 #当该程序被直接执行时，执行结束进程操作。如果是导入的形式，则只是记录pid
 if __name__ == '__main__':
--- a/15
+++ b/15
@@ -74,4 +74,17 @@ if not choose == "N":
    os.system("apt update -o Dir::Etc::sourcelist=\"sources.list.d/sparkstore.list\"     -o Dir::Etc::sourceparts=\"-\" -o APT::Get::List-Cleanup=\"0\"")
    os.system("sudo apt update")
    os.system("sudo apt install spark-wine7-devel -y")
-print("全部完成！")
+print("请问是否要安裝 spark-wine8-wow及其套件？（需要添加星火应用商店的仓库）[Y/N]", end=' ')
+choose = input().upper()
+if not choose == "N":
+    if os.path.exists("/etc/apt/sources.list.d/sparkstore.list"):
+        os.system("sudo apt install spark-wine8-wow -y")
+    os.system("sudo touch /etc/apt/sources.list.d/sparkstore.list")
+    os.system("echo 'deb [by-hash=force] https://d.store.deepinos.org.cn/ /' | sudo tee '/etc/apt/sources.list.d/sparkstore.list'")
+    os.system("mkdir -p /tmp/spark-store-install")
+    os.system("wget -O /tmp/spark-store-install/spark-store.asc https://d.store.deepinos.org.cn/dcs-repo.gpg-key.asc")
+    os.system("cp -f /tmp/spark-store-install/spark-store.asc.gpg /etc/apt/trusted.gpg.d/spark-store.gpg")
+    os.system("apt update -o Dir::Etc::sourcelist=\"sources.list.d/sparkstore.list\"     -o Dir::Etc::sourceparts=\"-\" -o APT::Get::List-Cleanup=\"0\"")
+    os.system("sudo apt update")
+    os.system("sudo apt install spark-wine8-wow -y")
+print("全部完成！")
--- a/wineautobuild-action.sh
+++ b/wineautobuild-action.sh
@@ -21,4 +21,4 @@ cd */
 dpkg-buildpackage -b -nc
 # 移除无用包
 rm ../*dbg*.deb -vrf
-rm ../*dbgsym*.deb -vrf
+rm ../*dbgsym*.deb -vrf
--- a/23492
+++ b/23492
--- a/3
+++ b/3
@@ -0,0 +1,3 @@
+[main acff44e] 修复选择vbox-
+ 2 files changed, 1198 insertions(+), 2 deletions(-)
+ create mode 100644 VM-source/.qtc_clangd/compile_commands.json
Author	SHA1	Message	Date
gfdgd_xi	a2424e08ba	3.4.0	2023-08-11 11:22:06 +08:00
gfdgd_xi	2cf1266190	修改control	2023-08-11 10:13:34 +08:00
gfdgd_xi	8a709ce7e2	虚拟机安装工具提供LoongArch新世界版本	2023-08-11 09:36:22 +08:00
gfdgd_xi	82b13b585d	修复控件问题	2023-08-10 18:38:07 +08:00
gfdgd_xi	db622c93ba	启动器图标支持启动UEFI	2023-08-10 14:36:41 +08:00
gfdgd_xi	e642d17828	新增UEFI固件	2023-08-09 23:08:19 +08:00
gfdgd_xi	f2d766d0f9	支持UEFI启动	2023-08-09 22:57:14 +08:00
gfdgd_xi	01fe3ed3ab	更新更新内容	2023-08-09 22:35:17 +08:00
gfdgd_xi	c05371b856	修复核心数和线程数识别问题	2023-08-09 22:25:54 +08:00
gfdgd_xi	afefb854b6	优化虚拟机（kvm）性能	2023-08-09 22:19:56 +08:00
gfdgd_xi	acff44eb2d	修复选择vbox-	2023-08-09 20:19:05 +08:00
gfdgd_xi	8699f74087	部分错误	2023-08-09 19:59:15 +08:00
gfdgd_xi	1a78a98d8e	修改apt源	2023-08-09 19:57:00 +08:00
gfdgd_xi	7794df8170	修复虚拟机工具在检测到 Qemu 磁盘但没有安装 Qemu 时无法启动的问题	2023-08-09 14:54:53 +08:00
gfdgd_xi	226db3dfd6	新增视频教程地址	2023-08-09 14:44:52 +08:00
gfdgd_xi	0124c4a304	写一下新版本更新内容	2023-08-09 10:51:00 +08:00
gfdgd_xi	bbf47b8120	修复ubuntu23安装问题？	2023-08-08 21:07:16 +08:00
gfdgd_xi	1942299850	修改简易打包器打包策略	2023-08-08 20:53:32 +08:00
gfdgd_xi	47cffa0637	修复简易打包器识别wine错误的问题	2023-08-08 20:44:39 +08:00
gfdgd_xi	96fa417b3b	完整打包器支持导入/导出配置文件	2023-08-08 17:32:30 +08:00
gfdgd_xi	3fd2b14a2a	修复在调用运行库的情况下无法正常使用 winetricks	2023-08-08 14:32:26 +08:00
gfdgd_xi	8bdb45a87f	打包器支持为不同的.desktop设置不同的MimeType	2023-08-08 13:20:14 +08:00
gfdgd_xi	fd36c84d74	高级打包器支持小字	2023-08-07 18:48:54 +08:00
gfdgd_xi	34a5ae629e	修复简易打包器无法打开的问题	2023-08-07 16:03:41 +08:00
gfdgd_xi	0dda0870c0	云沙箱新增cloud.vdnel.cn	2023-08-06 15:58:59 +08:00
gfdgd_xi	2689bc1cfb	打包器新增Game和System这两个常用分类	2023-08-05 23:02:18 +08:00
gfdgd_xi	8607de0fb0	初步支持在deepin23调用winetricks	2023-08-05 22:30:35 +08:00
gfdgd_xi	0d2e59b9fe	dcm/bcm包支持	2023-08-05 08:57:55 +08:00
gfdgd_xi	8ba8953aef	修复apt源没libc6:armhf时box86安装错误的问题	2023-08-04 16:31:05 +08:00
gfdgd_xi	b665842e89	Merge branch 'main' of https://gitee.com/gfdgd-xi/deep-wine-runner	2023-07-29 14:12:55 +08:00
gfdgd_xi	ddd65bbf5f	修复星火wine配置调用解释器错误的问题	2023-07-29 14:12:46 +08:00
Bail	6768cf9e7b	修复updatekiller的pid路径 Signed-off-by: Bail <2915289604@qq.com>	2023-07-28 09:31:38 +00:00
gfdgd_xi	0de3547af0	路径错误	2023-07-26 22:55:37 +08:00
gfdgd_xi	6fb473f5d1	deb打包支持多线程	2023-07-26 22:16:28 +08:00
gfdgd_xi	c5e63f3699	支持调用spark-wine	2023-07-26 15:32:09 +08:00
gfdgd_xi	878e7f6b2a	初步支持 spark dwine helper 2.4.0 特性：https://bbs.deepin.org/post/259455	2023-07-26 15:29:21 +08:00
gfdgd_xi	caa73c3bde	跟进 https://gitee.com/deepin-community-store/spark-wine/blob/master/spark-dwine-launch/run-template_v1.sh	2023-07-26 14:50:02 +08:00
gfdgd_xi	3c6bb5042f	修复问题：https://gitee.com/gfdgd-xi/uengine-runner/issues/I6ZRZX	2023-07-26 10:09:07 +08:00
gfdgd_xi	881ff84efd	3.3.0.1	2023-07-25 13:52:11 +08:00
gfdgd_xi	38fed35de8	修复3.3.0 deb包CPU吃满1个核心的问题	2023-07-25 13:16:50 +08:00
gfdgd_xi	60836b448f	不指定特定版本	2023-07-22 10:48:48 +08:00
gfdgd_xi	89627200ad	指定版本	2023-07-21 12:22:15 +08:00
gfdgd_xi	40de39fd19	制作了打包器打包时在软件包内自带适配脚本的UI	2023-07-17 09:57:52 +08:00
gfdgd_xi	16386b8557	新增容器重启功能	2023-07-15 10:22:08 +08:00
gfdgd_xi	c1dc157c71	打包器合入 https://gitee.com/deepin-community-store/spark-wine/pulls/16	2023-07-13 09:58:27 +08:00
gfdgd_xi	851105e7bd	新增QEMU USER	2023-07-12 18:24:46 +08:00
gfdgd_xi	45594618f8	Qemu安装器缺少apt update	2023-07-12 18:24:20 +08:00
gfdgd xi	0960218c64	Merge pull request #4 from MacMonterey/main Add spark-wine8-wow install option	2023-07-12 17:41:53 +08:00
穿越Arch的追念	1964dfc866	Update wine install	2023-07-10 15:50:34 +08:00
穿越Arch的追念	efd22ba3a6	Update wine install	2023-07-10 15:49:56 +08:00
穿越Arch的追念	2a9ece428a	Update wine install 『wow』	2023-07-10 15:49:18 +08:00