From 99539c58f7c691baced6151bd2079cc1dc5c325c Mon Sep 17 00:00:00 2001 From: gfdgd_xi <3025613752@qq.com> Date: Fri, 26 Jan 2024 13:14:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Espark=20wine9=E6=94=AF?= =?UTF-8?q?=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deepin-wine-easy-packager.py | 2 +- deepin-wine-packager.py | 4 ++-- mainwindow.py | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/deepin-wine-easy-packager.py b/deepin-wine-easy-packager.py index 434f572..43e2ce1 100755 --- a/deepin-wine-easy-packager.py +++ b/deepin-wine-easy-packager.py @@ -654,7 +654,7 @@ if __name__ == "__main__": "使用 Deepin Wine2 打包应用" ] wineChooserIndex = 2 - 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"] + wineList = ["deepin-wine8-stable", "spark-wine9-wow", "spark-wine9", "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 diff --git a/deepin-wine-packager.py b/deepin-wine-packager.py index 766e177..930518a 100755 --- a/deepin-wine-packager.py +++ b/deepin-wine-packager.py @@ -2188,7 +2188,7 @@ 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", "okylin-wine": "okylin-wine", "spark-wine8": "spark-wine8", "spark-wine8-wow": "spark-wine8-wow", "deepin-wine6-vannila": "deepin-wine6-vannila", "deepin-wine8-stable": "deepin-wine8-stable"} +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", "okylin-wine": "okylin-wine", "spark-wine8": "spark-wine8", "spark-wine8-wow": "spark-wine8-wow", "deepin-wine6-vannila": "deepin-wine6-vannila", "deepin-wine8-stable": "deepin-wine8-stable", "spark-wine9": "spark-wine9", "spark-wine9-wow": "spark-wine9-wow"} 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", "okylin-wine": "okylin-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"): @@ -2550,4 +2550,4 @@ SetFont(app) #window.setWindowFlag(QtGui.Qt) window.show() sys.exit(app.exec_()) -# Flag:解包只读control和解包全部读取 \ No newline at end of file +# Flag:解包只读control和解包全部读取 diff --git a/mainwindow.py b/mainwindow.py index 0295c0c..0a280e5 100755 --- a/mainwindow.py +++ b/mainwindow.py @@ -2347,6 +2347,8 @@ def CheckWine(): "spark-wine7-devel": "spark-wine7-devel", "spark-wine8": "spark-wine8", "spark-wine8-wow": "spark-wine8-wow", + "spark-wine9": "spark-wine9", + "spark-wine9-wow": "spark-wine9-wow", "deepin-wine": "deepin-wine", "deepin-wine5": "deepin-wine5", "wine": "wine",