diff --git a/DefaultSetting.py b/DefaultSetting.py index 905256d..93331b6 100644 --- a/DefaultSetting.py +++ b/DefaultSetting.py @@ -18,7 +18,7 @@ def readtxt(path): defultProgramList = { "Architecture": "Auto", "Debug": True, - "DefultWine": "deepin-wine6 stable", + "DefultWine": "deepin-wine8-stable", "DefultBotton" : get_home() + "/.wine", "TerminalOpen": False, "WineOption": "", diff --git a/deepin-wine-easy-packager.py b/deepin-wine-easy-packager.py index a5070fb..01418cb 100755 --- a/deepin-wine-easy-packager.py +++ b/deepin-wine-easy-packager.py @@ -642,6 +642,7 @@ if __name__ == "__main__": color: white; """) wineChooserList = [ + "使用 Deepin Wine8 Stable 打包应用", "使用 Spark Wine8 打包应用", "使用 Spark Wine7 Devel 打包应用", "使用 Deepin Wine6 Stable 打包应用", @@ -650,12 +651,11 @@ if __name__ == "__main__": "使用 Deepin Wine2 打包应用" ] wineChooserIndex = 2 - wineList = ["spark-wine8", "spark-wine7-devel", "deepin-wine6-stable", "deepin-wine6-vannila", "spark-wine8-wow", "deepin-wine5-stable", "deepin-wine5", "deepin-wine"] - if os.system("which deepin-wine6-stable"): - for i in range(len(wineList)): - if not os.system(f"which '{wineList[i]}'"): - wineChooserIndex = i - break + wineList = ["deepin-wine8-stable", "spark-wine8", "spark-wine7-devel", "deepin-wine6-stable", "deepin-wine6-vannila", "spark-wine8-wow", "deepin-wine5-stable", "deepin-wine5", "deepin-wine"] + 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) diff --git a/deepin-wine-packager.py b/deepin-wine-packager.py index 74aa6e3..5d52f8c 100755 --- a/deepin-wine-packager.py +++ b/deepin-wine-packager.py @@ -2183,8 +2183,8 @@ bottleNameLock = False ############### programPath = os.path.split(os.path.realpath(__file__))[0] # 返回 string # 如果要添加其他 wine,请在字典添加其名称和执行路径 -wine = {"deepin-wine": "deepin-wine", "deepin-wine5": "deepin-wine5", "wine": "wine", "wine64": "wine64", "deepin-wine5 stable": "deepin-wine5-stable", "deepin-wine6 stable": "deepin-wine6-stable", "spark-wine7-devel": "spark-wine7-devel", "ukylin-wine": "ukylin-wine", "spark-wine8": "spark-wine8", "spark-wine8-wow": "spark-wine8-wow", "deepin-wine6-vannila": "deepin-wine6-vannila"} -wineValue = {"deepin-wine": "deepin-wine", "deepin-wine5": "deepin-wine5", "wine": "wine", "wine64": "wine64", "deepin-wine5-stable": "deepin-wine5 stable", "deepin-wine6-stable": "deepin-wine6 stable", "spark-wine7-devel": "spark-wine7-devel", "ukylin-wine": "ukylin-wine", "spark-wine8": "spark-wine8", "spark-wine8-wow": "spark-wine8-wow", "deepin-wine6-vannila": "deepin-wine6-vannila"} +wine = {"deepin-wine": "deepin-wine", "deepin-wine5": "deepin-wine5", "wine": "wine", "wine64": "wine64", "deepin-wine5 stable": "deepin-wine5-stable", "deepin-wine6 stable": "deepin-wine6-stable", "spark-wine7-devel": "spark-wine7-devel", "ukylin-wine": "ukylin-wine", "spark-wine8": "spark-wine8", "spark-wine8-wow": "spark-wine8-wow", "deepin-wine6-vannila": "deepin-wine6-vannila", "deepin-wine8-stable": "deepin-wine8-stable"} +wineValue = {"deepin-wine": "deepin-wine", "deepin-wine5": "deepin-wine5", "wine": "wine", "wine64": "wine64", "deepin-wine5-stable": "deepin-wine5 stable", "deepin-wine6-stable": "deepin-wine6 stable", "spark-wine7-devel": "spark-wine7-devel", "ukylin-wine": "ukylin-wine", "spark-wine8": "spark-wine8", "spark-wine8-wow": "spark-wine8-wow", "deepin-wine6-vannila": "deepin-wine6-vannila", "deepin-wine8-stable": "deepin-wine8-stable"} # 读取 wine 本地列表 for i in os.listdir("/opt"): if os.path.exists(f"/opt/{i}/bin/wine"): @@ -2243,7 +2243,7 @@ widgetLayout = QtWidgets.QGridLayout() # 设置变量以修改和获取值项 wineVersion = QtWidgets.QComboBox() wineVersion.addItems(wine.keys()) -wineVersion.setCurrentText("deepin-wine6 stable") +wineVersion.setCurrentText("deepin-wine8-stable") e1_text = QtWidgets.QLineEdit() e2_text = QtWidgets.QLineEdit() e3_text = QtWidgets.QLineEdit() diff --git a/mainwindow.py b/mainwindow.py index 9881c5a..a6c17ff 100755 --- a/mainwindow.py +++ b/mainwindow.py @@ -2317,6 +2317,7 @@ def CheckWine(): "基于 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-wine8-stable": "deepin-wine8-stable", "deepin-wine6 stable": "deepin-wine6-stable", "deepin-wine6-vannila": "deepin-wine6-vannila", "deepin-wine5 stable": "deepin-wine5-stable",