4.1.2

Merge pull request !9 from shenmo/N/A

.github/workflows/auto-building-rpm.yml

@@ -21,7 +21,7 @@ jobs:
           make package-rpm
           mv spark-deepin-wine-runner*.rpm /home/runner/spark-deepin-wine-runner.rpm
       - name: upload result
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
           name: spark-deepin-wine-runner.rpm
           path: /home/runner/spark-deepin-wine-runner.rpm

.github/workflows/auto-building.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Building DEB (termux)
         run: |
           cd deep-wine-runner
-          make package-deb-termux -j4
+          make package-termux-deb -j4
           mv spark-deepin-wine-runner-termux.deb ~
       - name: upload result
         uses: actions/upload-artifact@v3

.github/workflows/building-off-line-package-arm.yml

@@ -71,7 +71,7 @@ jobs:
           cd ..
           xz -T $cpu spark-deepin-wine-runner-off-line.tar
       - name: upload result
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
           name: spark-deepin-wine-runner-off-line.tar.xz
           path: /home/runner/spark-deepin-wine-runner-off-line.tar.xz

.github/workflows/building-off-line-package.yml

@@ -70,7 +70,7 @@ jobs:
           cd ..
           xz -T $cpu spark-deepin-wine-runner-off-line.tar
       - name: upload result
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v3
         with:
           name: spark-deepin-wine-runner-off-line.tar.xz
           path: /home/runner/spark-deepin-wine-runner-off-line.tar.xz

DesktopIcon/spark-deepin-wine-runner.desktop

@@ -4,7 +4,7 @@ X-Categories=System;Wine;
 Exec=/usr/bin/deepin-wine-runner %F
 Icon=/opt/apps/deepin-wine-runner/deepin-wine-runner.svg
 Name=Wine Runner
-Name[zh]=Wine 运行器
+Name[zh_CN]=Wine 运行器
 Terminal=false
 StartupNotify=true
 Keywords=exe;scr;

Makefile

@@ -140,7 +140,8 @@ copy-files:
 	cp -rv local   deb/opt/apps/deepin-wine-runner
 	cp -rv WindowModule.py deb/opt/apps/deepin-wine-runner
 	cp -rv welcome.py deb/opt/apps/deepin-wine-runner
-	cp -rv main.py deb/opt/apps/deepin-wine-runner/deepin-wine-runner
+	#cp -rv main.py deb/opt/apps/deepin-wine-runner/deepin-wine-runner
+	cp -rv mainwindow.py deb/opt/apps/deepin-wine-runner/deepin-wine-runner
 	mkdir -pv deb/opt/apps/deepin-wine-runner/entries/
 	cp -rv deb/usr/share/applications deb/opt/apps/deepin-wine-runner/entries/applications
 	python3 UpdateTime.py

Model/__init__.py

@@ -13,15 +13,15 @@ programPath = os.path.split(os.path.realpath(__file__))[0]  # 返回 string
 # 优先为深度终端
 terminal = ""
 terminalList = [
-    "deepin-terminal",
     "gxde-terminal",
+    "deepin-terminal",
     "mate-terminal",
     "gnome-terminal",
     "xfce4-terminal"
 ]
 terminalEnd = {
     f"{programPath}/../launch.sh\" \"deepin-terminal": ["-e", 0],
-    f"{programPath}/../launch.sh\" \"gxde-terminal": ["-e", 0],
+    "gxde-terminal": ["-e", 0],
     "mate-terminal": ["-e", 1],
     "gnome-terminal": ["--", 0],
     "xfce4-terminal": ["-e", 1]

README.md

@@ -157,6 +157,21 @@ desktop文件中StartupWMClass字段。用于让桌面组件将窗口类名与de
 ![image.png](https://storage.deepin.org/thread/202207190822204627_image.png)
 
 ## 更新日志 
+### 4.1.0（2024/09/15）
+**※1、修复在 GXDE OS 下无法正常调用 gxde-terminal 的问题**  
+**※2、修复部分机器无法打开应用的问题**  
+**※3、修改打包器 wine 集成封装 机制以便可以被 uos 商店正确签名**  
+**※4、打包器支持内置 spark dwine helper**  
+**※5、重构虚拟机安装模块以支持更多机器**  
+**6、修复打包器设置依赖无法生效的问题**  
+**※7、补充图标**  
+**※8、修复 deb 安装过程中可能出现 dpkg 卡死的问题**  
+**※9、优化 Wine 安装器检测机制**  
+**※10、删除部分废弃组件**  
+**※11、修复 AOSC、Termux 无法正常打开 Wine 运行器的问题**  
+12、修改文案  
+13、修复其它 bug 若干  
+
 ### 4.0.0（2024/07/22）
 **※1、优化运行器窗口大小机制**  
 **※2、Wine 安装器支持根据机器实际情况自动推荐适合的 Wine**  
@@ -830,11 +845,9 @@ make install -j4
 ## 请作者喝杯茶
 如果您觉得 Wine 运行器对你有帮助，可以请作者喝杯茶  
 <img src="Icon/QR/Wechat.png" width="250"  /> 
-<img src="Icon/QR/Alipay.jpg" width="250"  />
-<img src="Icon/QR/QQ.png" width="250" >
 
 ### 广告
 支付宝官方活动，扫描获得支付红包！  
 <p><img src="Icon/QR/advertisement0.jpg" width="250" ></p>
 
-# ©2020-Now gfdgd xi
+# ©2020-Now gfdgd xi

StartVM.sh

@@ -70,7 +70,7 @@ if [[ $? == 0 ]] && [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
             echo X86 架构，使用 kvm 加速
             $qemuMore qemu-system-x86_64 --enable-kvm -cpu host --hda "$HOME/Qemu/Windows/Windows.qcow2" \
                 -smp $CpuCount,sockets=$CpuSocketNum,cores=$(($CpuCoreNum / $CpuSocketNum)),threads=$(($CpuCount / $CpuCoreNum / $CpuSocketNum)) \
-                -m ${use}G  -display vnc=:5 -display gtk -nic model=rtl8139 $qemuUEFI \
+                -m ${use}G  -display gtk -nic model=rtl8139 $qemuUEFI \
                 -device AC97 -device ES1370 -device intel-hda -device hda-duplex  \
                 --boot 'splash=VM/boot.jpg,menu=on,splash-time=2000' \
                 -usb \
@@ -100,7 +100,7 @@ if [[ $? == 0 ]] && [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
         echo 不使用 kvm 加速
         $qemuPath --hda "$HOME/Qemu/Windows/Windows.qcow2" \
             -smp $CpuCount,sockets=$CpuSocketNum,cores=$(($CpuCoreNum / $CpuSocketNum)),threads=$(($CpuCount / $CpuCoreNum / $CpuSocketNum)) \
-            -m ${use}G  -display vnc=:5 -display gtk -nic model=rtl8139 $qemuUEFI \
+            -m ${use}G -display gtk -nic model=rtl8139 $qemuUEFI \
             -device AC97 -device ES1370 -device intel-hda -device hda-duplex  \
             --boot 'splash=VM/boot.jpg,menu=on,splash-time=2000' \
             > $TMPDIR/tmp/windows-virtual-machine-installer-for-wine-runner-run.log 2>&1 # 最新的 qemu 已经移除参数 -soundhw all 
@@ -122,7 +122,7 @@ if [[ $? == 0 ]] && [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
         if [[ $? == 0 ]] && [[ `arch` == "aarch64" ]]; then
             $qemuMore qemu-system-arm --enable-kvm --hda "$HOME/Qemu/Windows/Windows.qcow2" \
                 -smp $CpuCount,sockets=$CpuSocketNum,cores=$(($CpuCoreNum / $CpuSocketNum)),threads=$(($CpuCount / $CpuCoreNum / $CpuSocketNum)) \
-                -m ${use}G  -display vnc=:5 -display gtk -usb -nic model=rtl8139 $qemuUEFI \
+                -m ${use}G -display gtk -usb -nic model=rtl8139 $qemuUEFI \
                 -cpu max -M virt -device virtio-gpu-pci \
                 -device nec-usb-xhci,id=xhci,addr=0x1b \
                 -device usb-tablet,id=tablet,bus=xhci.0,port=1 \
@@ -134,7 +134,7 @@ if [[ $? == 0 ]] && [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
         fi
         $qemuMore qemu-system-arm --hda "$HOME/Qemu/Windows/Windows.qcow2" \
             -smp $CpuCount,sockets=$CpuSocketNum,cores=$(($CpuCoreNum / $CpuSocketNum)),threads=$(($CpuCount / $CpuCoreNum / $CpuSocketNum)) \
-            -m ${use}G  -display vnc=:5 -display gtk -usb -nic model=rtl8139 $qemuUEFI \
+            -m ${use}G -display gtk -usb -nic model=rtl8139 $qemuUEFI \
             -cpu max -M virt -device virtio-gpu-pci \
             -device nec-usb-xhci,id=xhci,addr=0x1b \
             -device usb-tablet,id=tablet,bus=xhci.0,port=1 \
@@ -160,7 +160,7 @@ if [[ $? == 0 ]] && [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
         if [[ $? == 0 ]] && [[ `arch` == "aarch64" ]]; then
             $qemuMore qemu-system-aarch64 --enable-kvm --hda "$HOME/Qemu/Windows/Windows.qcow2" \
                 -smp $CpuCount,sockets=$CpuSocketNum,cores=$(($CpuCoreNum / $CpuSocketNum)),threads=$(($CpuCount / $CpuCoreNum / $CpuSocketNum)) \
-                -m ${use}G  -display vnc=:5 -display gtk -usb -nic model=rtl8139 $qemuUEFI \
+                -m ${use}G -display gtk -usb -nic model=rtl8139 $qemuUEFI \
                 -cpu max -M virt \
                 -device virtio-gpu-pci \
                 -device nec-usb-xhci,id=xhci,addr=0x1b \
@@ -173,7 +173,7 @@ if [[ $? == 0 ]] && [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
         fi
         $qemuMore qemu-system-aarch64 --hda "$HOME/Qemu/Windows/Windows.qcow2" \
             -smp $CpuCount,sockets=$CpuSocketNum,cores=$(($CpuCoreNum / $CpuSocketNum)),threads=$(($CpuCount / $CpuCoreNum / $CpuSocketNum)) \
-            -m ${use}G  -display vnc=:5 -display gtk -usb -nic model=rtl8139 $qemuUEFI \
+            -m ${use}G -display gtk -usb -nic model=rtl8139 $qemuUEFI \
             -cpu max -M virt \
             -device virtio-gpu-pci \
             -device nec-usb-xhci,id=xhci,addr=0x1b \

VM/buildvbox.py

@@ -119,7 +119,7 @@ class buildvbox:
 
             #vm.MountDisk(self.homePath() + "/Qemu/Windows/Windows.qcow2")
             vm.MountMainDisk(self.homePath() + "/Qemu/Windows/Windows.qcow2")
-            if(os.system("/opt/apps/deepin-wine-runner-qemu-system-extra/files/resources/virtio-win.iso")):
+            if(os.path.exists("/opt/apps/deepin-wine-runner-qemu-system-extra/files/resources/virtio-win.iso")):
                 vm.MountISO("/opt/apps/deepin-wine-runner-qemu-system-extra/files/resources/virtio-win.iso", "storage_controller_2", 1, 3)
             if(not setISOAlready):
                 vm.MountISO(isoPath, "storage_controller_1", 0, 1)

VM/mainwindow.py

@@ -148,7 +148,7 @@ def on_install_clicked():
             QMessageBox.warning(this, ("提示"), ("VirtualBox 不支持该选项！"))
             return
         archFile.open(QIODevice.WriteOnly)
-        archFile.write("aarch64")
+        #archFile.write("aarch64")
         archFile.close()
     else:
         if(ui.vmChooser.currentIndex() == 0 and QFile.exists(QDir.homePath() + "/.config/deepin-wine-runner/QEMU-EFI")):
@@ -330,4 +330,4 @@ if (subprocess.getoutput("arch") != "x86_64"):
         i.setVisible(False)
 window.show()
 if (__name__ == "__main__"):
-    sys.exit(app.exec_())
+    sys.exit(app.exec_())

VM/qemu.py

@@ -24,8 +24,8 @@ class qemu:
         self.qemuPath = "qemu-system-i386"
         if (os.path.exists("/opt/apps/deepin-wine-runner-qemu-system-extra/files/run.sh")):
             # 如果存在拓展 Qemu，则调用此
-            qemuPath = "/opt/apps/deepin-wine-runner-qemu-system-extra/files/run.sh qemu-system-i386"
-        self.vboxVersion = subprocess.getoutput(qemuPath + " --version")
+            self.qemuPath = "/opt/apps/deepin-wine-runner-qemu-system-extra/files/run.sh qemu-system-i386"
+        self.vboxVersion = subprocess.getoutput(self.qemuPath + " --version")
 
     def Create(self, type = "Windows7"):
         if(not os.path.exists(self.name)):
@@ -35,7 +35,7 @@ class qemu:
     def CreateDisk(self, path: str, size: int):
         if(os.path.exists(path)):
             return 0
-        return os.system(("qemu-img create -f qcow2 '" + self.path + "' " + str(size) + "M"))
+        return os.system(("qemu-img create -f qcow2 '" + path + "' " + str(size) + "M"))
 
     def CreateDiskControl(self, controlName = "storage_controller_1"):
         return 0
@@ -86,9 +86,9 @@ class qemu:
             # 如果存在拓展 Qemu，则调用此
             qemuPath = "/opt/apps/deepin-wine-runner-qemu-system-extra/files/run.sh qemu-system-arm"
         if(subprocess.getoutput("arch").replace("\n", "").replace(" ", "") == "aarch64" and not os.system((self.applicationDirPath() + "/kvm-ok"))):
-            return os.system((qemuPath + " --boot 'splash=" + self.GetBootLogoPath() + ",order=d,menu=on,splash-time=2000' -display vnc=:5 -display gtk --enable-kvm -cpu host -M virt " + self.commandOption + " -device virtio-gpu-pci -device nec-usb-xhci,id=xhci,addr=0x1b -device usb-tablet,id=tablet,bus=xhci.0,port=1 -device usb-kbd,id=keyboard,bus=xhci.0,port=2 > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &"))
+            return os.system((qemuPath + " --boot 'splash=" + self.GetBootLogoPath() + ",order=d,menu=on,splash-time=2000' -display gtk --enable-kvm -cpu host -M virt " + self.commandOption + " -device virtio-gpu-pci -device nec-usb-xhci,id=xhci,addr=0x1b -device usb-tablet,id=tablet,bus=xhci.0,port=1 -device usb-kbd,id=keyboard,bus=xhci.0,port=2 > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &"))
     
-        return os.system((qemuPath + " --boot 'splash=" + self.GetBootLogoPath() + ",order=d,menu=on,splash-time=2000'  -display vnc=:5 -display gtk -cpu max -M virt " + self.commandOption + " -device virtio-gpu-pci -device nec-usb-xhci,id=xhci,addr=0x1b -device usb-tablet,id=tablet,bus=xhci.0,port=1 -device usb-kbd,id=keyboard,bus=xhci.0,port=2 > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &"))
+        return os.system((qemuPath + " --boot 'splash=" + self.GetBootLogoPath() + ",order=d,menu=on,splash-time=2000' -display gtk -cpu max -M virt " + self.commandOption + " -device virtio-gpu-pci -device nec-usb-xhci,id=xhci,addr=0x1b -device usb-tablet,id=tablet,bus=xhci.0,port=1 -device usb-kbd,id=keyboard,bus=xhci.0,port=2 > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &"))
 
     def StartAarch64(self):
         bootScreenLogo = ""
@@ -107,9 +107,9 @@ class qemu:
     
         print(self.commandOption)
         if(subprocess.getoutput("arch").replace("\n", "").replace(" ", "") == "aarch64" and not os.system((self.applicationDirPath() + "/kvm-ok"))):
-            return os.system((qemuPath + " --boot 'splash=" + self.GetBootLogoPath() + ",order=d,menu=on,splash-time=2000' -display vnc=:5 -display gtk --enable-kvm -cpu host -M virt " + self.commandOption + " -device virtio-gpu-pci -device nec-usb-xhci,id=xhci,addr=0x1b -device usb-tablet,id=tablet,bus=xhci.0,port=1 -device usb-kbd,id=keyboard,bus=xhci.0,port=2 > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &"))
+            return os.system((qemuPath + " --boot 'splash=" + self.GetBootLogoPath() + ",order=d,menu=on,splash-time=2000' -display gtk --enable-kvm -cpu host -M virt " + self.commandOption + " -device virtio-gpu-pci -device nec-usb-xhci,id=xhci,addr=0x1b -device usb-tablet,id=tablet,bus=xhci.0,port=1 -device usb-kbd,id=keyboard,bus=xhci.0,port=2 > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &"))
     
-        return os.system((qemuPath + " --boot 'splash=" + self.GetBootLogoPath() + ",order=d,menu=on,splash-time=2000'  -display vnc=:5 -display gtk -cpu max -M virt " + self.commandOption + " -device virtio-gpu-pci -device nec-usb-xhci,id=xhci,addr=0x1b -device usb-tablet,id=tablet,bus=xhci.0,port=1 -device usb-kbd,id=keyboard,bus=xhci.0,port=2 > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &"))
+        return os.system((qemuPath + " --boot 'splash=" + self.GetBootLogoPath() + ",order=d,menu=on,splash-time=2000' -display gtk -cpu max -M virt " + self.commandOption + " -device virtio-gpu-pci -device nec-usb-xhci,id=xhci,addr=0x1b -device usb-tablet,id=tablet,bus=xhci.0,port=1 -device usb-kbd,id=keyboard,bus=xhci.0,port=2 > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &"))
 
     def StartLoong64(self):
         return 1
@@ -134,8 +134,8 @@ class qemu:
             qemuPath = "/opt/apps/deepin-wine-runner-qemu-system-extra/files/run.sh qemu-system-x86_64"
         print(self.commandOption)
         if(subprocess.getoutput("arch").replace("\n", "").replace(" ", "") == "x86_64" and not os.system((self.applicationDirPath() + "/kvm-ok"))):
-            return os.system((qemuPath + " --boot 'splash=" + self.GetBootLogoPath() + ",order=d,menu=on,splash-time=2000' -display vnc=:5 -display gtk --enable-kvm -cpu host " + newCommandOption + " > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &"))
-        return os.system((qemuPath + " --boot 'splash=" + self.GetBootLogoPath() + ",order=d,menu=on,splash-time=2000' -display vnc=:5 -display gtk -nic model=rtl8139 " + newCommandOption + " > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &"))
+            return os.system((qemuPath + " --boot 'splash=" + self.GetBootLogoPath() + ",order=d,menu=on,splash-time=2000' -display gtk --enable-kvm -cpu host " + newCommandOption + " > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &"))
+        return os.system((qemuPath + " --boot 'splash=" + self.GetBootLogoPath() + ",order=d,menu=on,splash-time=2000' -display gtk -nic model=rtl8139 " + newCommandOption + " > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &"))
 
     def Stop(self):
         os.system("killall qemu-system-x86_64 -9")
@@ -245,4 +245,4 @@ class qemu:
 
     def GetArch(self) -> str:
         return subprocess.getoutput("uname -m").replace("\n", "").replace(" ", "")
-    
+    

deb/DEBIAN/control

@@ -18,7 +18,7 @@ Depends: python3,
  python3-requests, 
  python3-pyqt5 | pyqt5, 
  python3-psutil | pypsutil, 
- xfce4-terminal | gxde-terminal | deepin-terminal | mate-terminal | gnome-terminal, 
+ gxde-terminal |xfce4-terminal |  deepin-terminal | mate-terminal | gnome-terminal, 
  python3-dbus, 
  python3-pip | pip, p7zip-full | p7zip-legacy | p7zip, 
  sudo, 

deb/DEBIAN/postinst

@@ -19,12 +19,14 @@ python3 -m pip install --upgrade xpinyin --trusted-host https://repo.huaweicloud
 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
 # 修改 box86/64 国内源错误数据
-if [ -f /etc/apt/sources.list.d/box64.list ]; then
-	sed -i 's/http:\/\/seafile.jyx2048.com:2345/http:\/\/gfdgdxi.v5.idcfengye.com/g' /etc/apt/sources.list.d/box64.list
-fi
-if [ -f /etc/apt/sources.list.d/box86.list ]; then
-	sed -i 's/http:\/\/seafile.jyx2048.com:2345/http:\/\/gfdgdxi.v5.idcfengye.com/g' /etc/apt/sources.list.d/box86.list
-fi
+sudo rm /etc/apt/sources.list.d/box64.list -rfv
+sudo rm /etc/apt/sources.list.d/box86.list -rfv
+#if [ -f /etc/apt/sources.list.d/box64.list ]; then
+#	sed -i 's/http:\/\/seafile.jyx2048.com:2345/http:\/\/gfdgdxi.v5.idcfengye.com/g' /etc/apt/sources.list.d/box64.list
+#fi
+#if [ -f /etc/apt/sources.list.d/box86.list ]; then
+#	sed -i 's/http:\/\/seafile.jyx2048.com:2345/http:\/\/gfdgdxi.v5.idcfengye.com/g' /etc/apt/sources.list.d/box86.list
+#fi
 echo 执行完成
 echo 移除旧组件
 if [ -d /opt/apps/deepin-wine-runner/arm-package ]; then
@@ -36,9 +38,6 @@ fi
 if [ -d /opt/apps/deepin-wine-runner/exa ]; then
 	rm -rf /opt/apps/deepin-wine-runner/exa
 fi
-if [ -d /opt/apps/deepin-wine-runner/dxvk ]; then
-	rm -rf /opt/apps/deepin-wine-runner/dxvk
-fi
 echo 移除完成
 # 如果为非 X86 PC，可以删除掉一些无用组件（主要是用不了）
 if [[ `arch` != "x86_64" ]]; then
@@ -63,6 +62,6 @@ if [[ `arch` != "x86_64" ]]; then
 	rm -rf /opt/apps/deepin-wine-runner/InstallNewWineHQ.sh
 fi
 # 设置目录权限，让用户可读可写，方便后续删除组件
-chmod 777 -R /opt/apps/deepin-wine-runner > /dev/null 2>&1 | true
+#chmod 777 -R /opt/apps/deepin-wine-runner > /dev/null 2>&1 | true
 # 向服务器返回安装数加1（不显示内容且忽略错误）
 python3 /opt/apps/deepin-wine-runner/Download.py $version > /dev/null 2>&1 | true

deb/usr/share/applications/spark-deepin-wine-package-builder.desktop

@@ -4,7 +4,7 @@ X-Categories=System;Wine;
 Exec=/usr/bin/deepin-wine-package-builder "~/.wine" %F
 Icon=/opt/apps/deepin-wine-runner/deepin-wine-runner.svg
 Name=Wine Package Builder
-Name[zh]=Wine 打包器
+Name[zh_CN]=Wine 打包器
 Terminal=false
 StartupNotify=true
 NoDisplay=true

deb/usr/share/applications/spark-deepin-wine-packager-easy-builder.desktop

@@ -4,7 +4,7 @@ X-Categories=System;Wine;
 Exec=/usr/bin/deepin-wine-packager-easy-builder %F
 Icon=/opt/apps/deepin-wine-runner/deepin-wine-runner.svg
 Name=Wine Package Builder
-Name[zh]=Wine 简易打包器
+Name[zh_CN]=Wine 简易打包器
 Terminal=false
 StartupNotify=true
 NoDisplay=true

deb/usr/share/applications/spark-deepin-wine-packager-with-script.desktop

@@ -5,6 +5,6 @@ Exec=/usr/bin/deepin-wine-packager-with-script
 Icon=/opt/apps/deepin-wine-runner/deepin-wine-runner.svg
 Name=Wine Package Builder For UOS
 NoDisplay=true
-Name[zh]=Wine 打包器(基于活动脚本)
+Name[zh_CN]=Wine 打包器(基于活动脚本)
 Terminal=false
 StartupNotify=true

deb/usr/share/applications/spark-deepin-wine-runner-control-vm.desktop

@@ -4,7 +4,7 @@ X-Categories=System;Wine;
 Exec=/opt/apps/deepin-wine-runner/RunVM.sh %F
 Icon=/opt/apps/deepin-wine-runner/deepin-wine-runner.svg
 Name=Setting VirtualMachine
-Name[zh]=设置 Windows 虚拟机
+Name[zh_CN]=设置 Windows 虚拟机
 NoDisplay=true
 Terminal=false
 StartupNotify=true

deb/usr/share/applications/spark-deepin-wine-runner-start-vm.desktop

@@ -4,6 +4,6 @@ X-Categories=System;
 Exec=/opt/apps/deepin-wine-runner/StartVM.sh %F
 Icon=/opt/apps/deepin-wine-runner/deepin-wine-runner.svg
 Name=Start Windows VirtualMachine
-Name[zh]=开启 Windows 虚拟机
+Name[zh_CN]=开启 Windows 虚拟机
 Terminal=false
 StartupNotify=true

deb/usr/share/applications/spark-deepin-wine-runner.desktop

@@ -4,7 +4,7 @@ X-Categories=System;Wine;
 Exec=/usr/bin/deepin-wine-runner %F
 Icon=/opt/apps/deepin-wine-runner/deepin-wine-runner.svg
 Name=Wine Runner
-Name[zh]=Wine 运行器
+Name[zh_CN]=Wine 运行器
 Terminal=false
 StartupNotify=true
 Keywords=exe;scr;

deepin-wine-easy-packager.py

@@ -204,6 +204,8 @@ Get_Dist_Name()
         DISTRO='Deepin'
     elif grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release; then
         DISTRO='UniontechOS'
+    elif grep -Eqi "GXDE" /etc/issue || grep -Eq "GXDE" /etc/*-release; then
+        DISTRO='GXDE'
     elif grep -Eqi "UOS" /etc/issue || grep -Eq "UOS" /etc/*-release; then
         DISTRO='UniontechOS'
     else
@@ -266,7 +268,7 @@ DISABLE_ATTACH_FILE_DIALOG=""
 ##############<<<<<<<<<禁用文件选择工具开始
 Get_Dist_Name
 #此功能实现参见开头函数段
-if [ "$DISTRO" != "Deepin" ] && [ "$DISTRO" != "UniontechOS" ];then
+if [ "$DISTRO" != "Deepin" ] && [ "$DISTRO" != "UniontechOS" ] && [ "$DISTRO" != "GXDE" ];then
 DISABLE_ATTACH_FILE_DIALOG="1"
 echo "非deepin/UOS，默认关闭系统自带的文件选择工具，使用Wine的"
 echo "如果你想改变这个行为，请到/opt/apps/$DEB_PACKAGE_NAME/files/$0处修改"
@@ -303,7 +305,7 @@ 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 "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
+        $START_SHELL_PATH $BOTTLENAME $APPVER "$EXEC_PATH" "$@"
     fi
 else
     $START_SHELL_PATH $BOTTLENAME $APPVER "uninstaller.exe" "$@"
@@ -319,7 +321,7 @@ Encoding=UTF-8
 Type=Application
 X-Created-By=@@@Maintainer@@@
 Icon=@@@Icon@@@
-Exec="/opt/apps/@@@Package@@@/files/run.sh"
+Exec="/opt/apps/@@@Package@@@/files/run.sh --uri %F"
 Name=@@@Name@@@
 Comment=@@@Description@@@
 MimeType=

deepin-wine-packager.py

@@ -620,7 +620,7 @@ Description: {e3_text.text()}
             if iconUiList[0][2].text().replace(" ", "") == "":
                 command = f"--uri {iconUiList[0][2].text()}"
             else:
-                command = iconUiList[0][2].text()
+                command = f"--uri {iconUiList[0][2].text()}" # 若要传参进入wine容器，必须--uri，否则是传给run.sh的
             replaceMap = [
                 ["@@@BOTTLENAME@@@", e5_text.text()],
                 ["@@@APPVER@@@", e2_text.text()],
@@ -629,14 +629,14 @@ Description: {e3_text.text()}
                 ["@@@APPRUN_CMD@@@", [
                     wine[wineVersion.currentText()], 
                     f"/opt/apps/{e1_text.text()}/files/wine/bin/wine"
-                ][os.path.exists(f'{debPackagePath}/opt/apps/{e1_text.text()}/files/')]],
+                ][os.path.exists(f'{debPackagePath}/opt/apps/{e1_text.text()}/files/wine/')]],
                 ["@@@EXEC_NAME@@@", os.path.basename(e7_text.text().replace("\\", "/"))],
                 ["@@@ARCH@@@", debFirstArch.currentText()],
                 ["@@@APP_NAME@@@", e8_text.text()],
                 ["@@@MAINTAINER@@@", e4_text.text()],
                 ["@@@DESCRIPTION@@@", e3_text.text()],
                 ["@@@DESKTOP_EXEC@@@", 
-                 f'''"/opt/apps/{e1_text.text()}/files/run.sh" {command}'''],
+                 f'''"/opt/apps/{e1_text.text()}/files/run.sh" {command} %F'''],
                 ["@@@DESKTOP_NAME@@@", iconUiList[0][3].text()],
                 ["@@@DESKTOP_MIMETYPE@@@", iconUiList[0][5].text()],
                 ["@@@DESKTOP_CATEGORIES@@@", iconUiList[0][1].currentText()]
@@ -676,7 +676,7 @@ Description: {e3_text.text()}
                             ["@@@APPRUN_CMD@@@", [
                                 wine[wineVersion.currentText()], 
                                 f"/opt/apps/{e1_text.text()}/files/wine/bin/wine"
-                            ][os.path.exists(f'{debPackagePath}/opt/apps/{e1_text.text()}/files/')]],
+                            ][os.path.exists(f'{debPackagePath}/opt/apps/{e1_text.text()}/files/wine/')]],
                             ["@@@EXEC_NAME@@@", os.path.basename(i[0].text().replace("\\", "/"))],
                             ["@@@ARCH@@@", debFirstArch.currentText()],
                             ["@@@APP_NAME@@@", i[3].text()],
@@ -1356,6 +1356,15 @@ try:
             wine[f"{programPath}/wine/{i}"] = f"{programPath}/wine/{i}"
 except:
     pass
+try:
+    for i in json.loads(readtxt(f"{get_home()}/.deepwinerunner/wine/winelist.json")):
+        if os.path.exists(f"{get_home()}/.deepwinerunner/wine/{i}.7z"):
+            wine[f"{get_home()}/.deepwinerunner/wine/{i}.7z"] = f"{get_home()}/.deepwinerunner/wine/{i}.7z"
+            continue
+        if os.path.exists(f"{get_home()}/.deepwinerunner/wine/{i}"):
+            wine[f"{get_home()}/.deepwinerunner/wine/{i}"] = f"{get_home()}/.deepwinerunner/wine/{i}"
+except:
+    pass
 os.chdir("/")
 iconUiList = []
 helperConfigPath = None

information.json

@@ -1,5 +1,5 @@
 {
-    "Version": "4.0.0.2",
+    "Version": "4.1.2",
     "Time": "未知",
     "Thank": [
         "感谢 @り哥拽的冇气质° 和 @杨 提供了 3a5000（新世界的测试机器）",

mainwindow.py

@@ -2162,6 +2162,20 @@ def TransLog():
 # 加载配置
 ###########################
 
+if not os.path.exists(get_home() + "/.deepwinerunner/wine/"):  # 如果没有配置文件夹
+    os.makedirs(get_home() + "/.deepwinerunner/wine/")  # 创建配置文件夹
+try:
+    shutil.copy(f"{programPath}/wine/installwine.py", get_home() + "/.deepwinerunner/wine/installwine.py")
+    shutil.copy(f"{programPath}/globalenv.py", get_home() + "/.deepwinerunner/globalenv.py")
+    shutil.copy(f"{programPath}/launch.sh", get_home() + "/.deepwinerunner/launch.sh")
+    if os.path.exists(get_home() + "/.deepwinerunner/Model"):
+        shutil.rmtree(get_home() + "/.deepwinerunner/Model")
+    shutil.copytree(f"{programPath}/Model", get_home() + "/.deepwinerunner/Model")
+    os.system(f"chmod 777 -Rv '{get_home()}/.deepwinerunner/launch.sh'")
+except:
+    traceback.print_exc()
+    exit()
+
 if not os.path.exists(get_home() + "/.config/"):  # 如果没有配置文件夹
     os.mkdir(get_home() + "/.config/")  # 创建配置文件夹
 if not os.path.exists(get_home() + "/.config/deepin-wine-runner"):  # 如果没有配置文件夹
@@ -2304,9 +2318,10 @@ def CheckWine():
                 traceback.print_exc()    
 
             # 不再从列表读取，直接读目录
-            for i in os.listdir(f"{programPath}/wine/"):
+            for i in os.listdir(f"{programPath}/wine/") + os.listdir(f"{get_home()}/.deepwinerunner/wine/"):
             #for i in json.loads(readtxt(f"{programPath}/wine/winelist.json")):
-                if os.path.exists(f"{programPath}/wine/{i}") and os.path.isdir(f"{programPath}/wine/{i}"):
+                if ((os.path.exists(f"{programPath}/wine/{i}") and os.path.isdir(f"{programPath}/wine/{i}")) or
+                    (os.path.exists(f"{get_home()}/.deepwinerunner/wine/{i}") and os.path.isdir(f"{get_home()}/.deepwinerunner/wine/{i}"))):
                     name = ""
                     qemuInstall = False
                     nameValue = [["", ""]]
@@ -2394,6 +2409,10 @@ def CheckWine():
                                 wine[f"{k[0]}{chrootProgramPath}/wine/{i}/bin/{j}"] = f"{k[1]}{chrootProgramPath}/wine/{i}/bin/{j}"
                                 canUseWine.append(f"{k[0]}{chrootProgramPath}/wine/{i}/bin/{j}")
                                 untipsWine.append(f"{k[0]}{chrootProgramPath}/wine/{i}/bin/{j}")
+                            if os.path.exists(f"{get_home()}/.deepwinerunner/wine/{i}/bin/{j}"):        
+                                wine[f"{k[0]}{get_home()}/.deepwinerunner/wine/{i}/bin/{j}"] = f"{k[1]}{get_home()}/.deepwinerunner/wine/{i}/bin/{j}"
+                                canUseWine.append(f"{k[0]}{get_home()}/.deepwinerunner/wine/{i}/bin/{j}")
+                                untipsWine.append(f"{k[0]}{get_home()}/.deepwinerunner/wine/{i}/bin/{j}")
             
         except:
             traceback.print_exc()
@@ -2478,23 +2497,13 @@ exe路径\' 参数 \'
 5、wine 容器如果没有指定，则会默认为 ~/.wine；
 6、如果可执行文件比较大的话，会出现点击“获取该程序运行情况”出现假死的情况，因为正在后台读取 SHA1，只需要等一下即可（读取速度依照您电脑处理速度、读写速度、可执行文件大小等有关）；
 7、如果非 X86 的用户的 UOS 专业版用户想要使用的话，只需要在应用商店安装一个 Wine 版本微信即可在本程序选择正确的 Wine 运行程序；''')
-updateThingsString = QtCore.QCoreApplication.translate("U", '''※1、优化运行器窗口大小机制
-※2、Wine 安装器支持根据机器实际情况自动推荐适合的 Wine
-※3、Wine 安装器支持手动导入 Wine 7z 包并提供相应 7z 包的网盘下载地址
-※4、兼容 Deepin 终端（deepin 15 经典版本，deepin-terminal-gtk）
-※5、跟进 dxvk 2.4
-※6、修复 deepin 23 无法使用 Mono/Gecko 安装器的问题
-※7、修复 debian testing 打包时会把 / 打入 .7z 包内导致系统死机的问题
-※8、支持 AOSC（安同）、小小电脑、proot 容器
-※9、支持在 Termux 直接运行（单独提供安装包）
-10、修复虚拟机启动器入口不会调用安装的 Qemu Extra 的问题
-11、优化高级打包器容器名称生成机制
-12、修复部分机器无法正常打开高级打包器的问题
-13、修复高级打包器选择Wine封装入deb模式时helper只能使用spark dwine helper的问题
+updateThingsString = QtCore.QCoreApplication.translate("U", '''※1、修复安全问题
+※2、更新 dxvk 版本至 2.5
+※3、修复打包器生成的 deb 包参数问题                                                                                          
 ''')
 for i in information["Thank"]:
     thankText += f"{i}\n"
-updateTime = "2024年07月22日"
+updateTime = "2024年09月15日"
 aboutProgram = QtCore.QCoreApplication.translate("U", """<p>Wine运行器是一个能让Linux用户更加方便地运行Windows应用的程序。原版的 Wine 只能使用命令操作，且安装过程较为繁琐，对小白不友好。于是该运行器为了解决该痛点，内置了对Wine图形化的支持、Wine 安装器、微型应用商店、各种Wine工具、自制的Wine程序打包器、运行库安装工具等。</p>
 <p>它同时还内置了基于Qemu/VirtualBox制作的、专供小白使用的Windows虚拟机安装工具，可以做到只需下载系统镜像并点击安装即可，无需考虑虚拟机的安装、创建、分区等操作，也能在非 X86 架构安装 X86 架构的 Windows 操作系统（但是效率较低，可以运行些老系统）。</p>
 <p>而且对于部分 Wine 应用适配者来说，提供了图形化的打包工具，以及提供了一些常用工具以及运行库的安装方式，以及能安装多种不同的 Wine 以测试效果，能极大提升适配效率。</p>
@@ -2822,7 +2831,7 @@ programmenu.addAction(installWineHQ)
 programmenu.addAction(installWineHQOrg)
 programmenu.addAction(installMoreWine)
 programmenu.addAction(downloadChrootBottle)
-programmenu.addAction(installBox86CN)
+#programmenu.addAction(installBox86CN)
 programmenu.addAction(installBox86)
 programmenu.addAction(installLat)
 programmenu.addSeparator()
@@ -2843,7 +2852,7 @@ installWineHQ.triggered.connect(InstallWineHQ)
 installWineHQOrg.triggered.connect(lambda: threading.Thread(target=OpenTerminal, args=[f"{programPath}/InstallNewWineHQOrg.sh"]).start())
 installLat.triggered.connect(lambda: threading.Thread(target=OpenTerminal, args=[f"{programPath}/InstallLat.sh"]).start())
 def InstallMoreWine():
-    os.system(f"'{programPath}/wine/installwine'")
+    os.system(get_home() + "/.deepwinerunner/wine/installwine.py")
     # 更新 Wine 列表
     CheckWine()
     o1.clear()

package-script/information.json

@@ -1,5 +1,5 @@
 {
-    "Version": "4.0.0.2",
+    "Version": "4.1.1.2",
     "Time": "未知",
     "Thank": [
         "感谢 @り哥拽的冇气质° 和 @杨 提供了 3a5000（新世界的测试机器）",

package-script/template/run.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 #   Copyright (C) 2016 Deepin, Inc.
 #
@@ -24,6 +24,8 @@ Get_Dist_Name()
         DISTRO='UniontechOS'
     elif grep -Eqi "UOS" /etc/issue || grep -Eq "UOS" /etc/*-release; then
         DISTRO='UniontechOS'
+    elif grep -Eqi "GXDE" /etc/issue || grep -Eq "GXDE" /etc/*-release; then
+        DISTRO='GXDE'
     else
 	 DISTRO='OtherOS'
 	fi
@@ -70,7 +72,7 @@ DISABLE_ATTACH_FILE_DIALOG=""
 ##############<<<<<<<<<禁用文件选择工具开始
 Get_Dist_Name
 #此功能实现参见开头函数段
-if [ "$DISTRO" != "Deepin" ] && [ "$DISTRO" != "UniontechOS" ];then
+if [ "$DISTRO" != "Deepin" ] && [ "$DISTRO" != "UniontechOS" ] && [ "$DISTRO" != "GXDE" ];then
 DISABLE_ATTACH_FILE_DIALOG="1"
 echo "非deepin/UOS，默认关闭系统自带的文件选择工具，使用Wine的"
 echo "如果你想改变这个行为，请到/opt/apps/$DEB_PACKAGE_NAME/files/$0处修改"
@@ -107,7 +109,7 @@ 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 "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
+        $START_SHELL_PATH $BOTTLENAME $APPVER "$EXEC_PATH" "$@"
     fi
 else
     $START_SHELL_PATH $BOTTLENAME $APPVER "uninstaller.exe" "$@"

packager-config/run.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 #   Copyright (C) 2016 Deepin, Inc.
 #
@@ -48,6 +48,8 @@ Get_Dist_Name()
         DISTRO='Deepin'
     elif grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release; then
         DISTRO='UniontechOS'
+    elif grep -Eqi "GXDE" /etc/issue || grep -Eq "GXDE" /etc/*-release; then
+        DISTRO='GXDE'
     elif grep -Eqi "UOS" /etc/issue || grep -Eq "UOS" /etc/*-release; then
         DISTRO='UniontechOS'
     else
@@ -109,7 +111,7 @@ DISABLE_ATTACH_FILE_DIALOG=""
 ##############<<<<<<<<<禁用文件选择工具开始
 Get_Dist_Name
 #此功能实现参见开头函数段
-if [ "$DISTRO" != "Deepin" ] && [ "$DISTRO" != "UniontechOS" ];then
+if [ "$DISTRO" != "Deepin" ] && [ "$DISTRO" != "UniontechOS" ] && [ "$DISTRO" != "GXDE" ];then
 DISABLE_ATTACH_FILE_DIALOG="1"
 echo "非deepin/UOS，默认关闭系统自带的文件选择工具，使用Wine的"
 echo "如果你想改变这个行为，请到/opt/apps/$DEB_PACKAGE_NAME/files/$0处修改"
@@ -154,7 +156,7 @@ 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 "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
+        $START_SHELL_PATH $BOTTLENAME $APPVER "$EXEC_PATH" "$@"
     fi
 else
     $START_SHELL_PATH $BOTTLENAME $APPVER "uninstaller.exe" "$@"