调整依赖

deb/DEBIAN/control

@@ -9,7 +9,7 @@ Check: binaries
 Type: binary, udeb
 Priority: optional
 Depends: python3, python3-pil, python3-pil.imagetk, python3-pyquery, aria2, curl, unrar | unrar-free , unzip, python3-requests, python3-pyqt5, python3-psutil, xfce4-terminal | deepin-terminal | mate-terminal | gnome-terminal, python3-dbus, python3-pip, p7zip-full | p7zip-legacy, sudo, python3-pyperclip, bubblewrap, zenity, tree, dpkg, fakeroot
-Recommends: winbind, wimtools, python3-pyqt5.qtwebengine, binfmt-support, libc6:i386, libc6:armhf, libwine, qemu-system, qemu-full, alien, spark-deepin-wine-runner-qemu-system-extra
+Recommends: winbind, wimtools, python3-pyqt5.qtwebengine, binfmt-support, libc6:i386, libc6:armhf, libwine, qemu-system, qemu-full, alien, spark-deepin-wine-runner-qemu-system-extra, deepin-wine8-stable | spark-wine | spark-wine9 | spark-wine9-wow | spark-wine8 | spark-wine8-wow | spark-wine7-devel | deepin-wine6-stable | deepin-wine5-stable | deepin-wine5 | deepin-wine | wine
 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

deepin-wine-packager.py

@@ -2247,7 +2247,14 @@ def DelTab():
 def ChangeBottleName():
     global bottleNameLock
     global bottleNameChangeLock
-    e1_text.setText(e1_text.text().replace(" ", ""))
+    replaceForum = [e1_text, e2_text]
+    for i in replaceForum:
+        if " " in i.text():
+            i.setText(i.text().replace(" ", ""))
+    # 进行版本号限制
+    if len(e2_text.text()) > 0:
+        if ord(e2_text.text()[0]) < 48 or ord(e2_text.text()[0]) > 57:
+            e2_text.setText(e2_text.text()[1:])
     if bottleNameLock:
         return
     if os.path.basename(e6_text.text()) == ".wine" or e6_text.text() == "":
@@ -2409,6 +2416,7 @@ build7z.clicked.connect(Build7zButton_Clicked)
 installDeb.clicked.connect(InstallDeb)
 wineFrame.addWidget(wineVersion)
 e1_text.textChanged.connect(ChangeBottleName)
+e2_text.textChanged.connect(ChangeBottleName)
 e5_text.textChanged.connect(LockBottleName)
 e6_text.textChanged.connect(ChangeBottleName)
 e7_text.textChanged.connect(ChangeTapTitle)

wine/installwine

@@ -272,6 +272,8 @@ class DownloadThread(QtCore.QThread):
         except:
             traceback.print_exc()
             self.MessageBoxError.emit(traceback.format_exc())
+            self.ChangeDialog.emit(self.dialog, 100, 100, 100)
+            self.Finish.emit()
 
 def MessageBoxInfo(info):
     QtWidgets.QMessageBox.information(window, "提示", info)