mirror of
https://gitee.com/gfdgd-xi/deep-wine-runner
synced 2025-01-13 01:58:27 +08:00
完成“安装其他wine版本后 运行器主界面选择wine版本下拉框没有刷新 还要重启一下wine运行器程序,这导致我上面选择的wine容器路径又被重置 重新选择 From Jokul”,https://gitee.com/gfdgd-xi/deep-wine-runner/issues/I7E8Q4
This commit is contained in:
parent
2de9de6633
commit
58400ed5ff
@ -2207,7 +2207,12 @@ programPath = os.path.split(os.path.realpath(__file__))[0] # 返回 string
|
|||||||
#############
|
#############
|
||||||
# 检测 Wine
|
# 检测 Wine
|
||||||
#############
|
#############
|
||||||
|
def CheckWine():
|
||||||
|
global wine
|
||||||
|
global untipsWine
|
||||||
|
global canUseWine
|
||||||
try:
|
try:
|
||||||
|
|
||||||
wine = {
|
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 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 ",
|
"基于 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 ",
|
||||||
@ -2250,6 +2255,8 @@ try:
|
|||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
# 读取自定义安装的 Wine(需要解包的才能使用)
|
# 读取自定义安装的 Wine(需要解包的才能使用)
|
||||||
|
global qemuBottleList
|
||||||
|
global qemuPath
|
||||||
qemuBottleList = []
|
qemuBottleList = []
|
||||||
qemuPath = f"{get_home()}/.deepin-wine-runner-ubuntu-images"
|
qemuPath = f"{get_home()}/.deepin-wine-runner-ubuntu-images"
|
||||||
if not os.system("which qemu-i386-static"):
|
if not os.system("which qemu-i386-static"):
|
||||||
@ -2266,6 +2273,13 @@ try:
|
|||||||
d,
|
d,
|
||||||
bottlePath
|
bottlePath
|
||||||
])
|
])
|
||||||
|
|
||||||
|
global shellHistory
|
||||||
|
global findExeHistory
|
||||||
|
global wineBottonHistory
|
||||||
|
global isoPath
|
||||||
|
global isoPathFound
|
||||||
|
global setting
|
||||||
shellHistory = list(json.loads(readtxt(get_home() + "/.config/deepin-wine-runner/ShellHistory.json")).values())
|
shellHistory = list(json.loads(readtxt(get_home() + "/.config/deepin-wine-runner/ShellHistory.json")).values())
|
||||||
findExeHistory = list(json.loads(readtxt(get_home() + "/.config/deepin-wine-runner/FindExeHistory.json")).values())
|
findExeHistory = list(json.loads(readtxt(get_home() + "/.config/deepin-wine-runner/FindExeHistory.json")).values())
|
||||||
wineBottonHistory = list(json.loads(readtxt(get_home() + "/.config/deepin-wine-runner/WineBottonHistory.json")).values())
|
wineBottonHistory = list(json.loads(readtxt(get_home() + "/.config/deepin-wine-runner/WineBottonHistory.json")).values())
|
||||||
@ -2380,6 +2394,7 @@ except:
|
|||||||
app = QtWidgets.QApplication(sys.argv)
|
app = QtWidgets.QApplication(sys.argv)
|
||||||
QtWidgets.QMessageBox.critical(None, "错误", f"无法读取配置,无法继续\n{traceback.format_exc()}")
|
QtWidgets.QMessageBox.critical(None, "错误", f"无法读取配置,无法继续\n{traceback.format_exc()}")
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
CheckWine()
|
||||||
|
|
||||||
# transla.transe
|
# transla.transe
|
||||||
|
|
||||||
@ -2686,7 +2701,17 @@ p1.triggered.connect(InstallWine)
|
|||||||
installWineOnDeepin23.triggered.connect(InstallWineOnDeepin23)
|
installWineOnDeepin23.triggered.connect(InstallWineOnDeepin23)
|
||||||
installWineOnDeepin23Alpha.triggered.connect(InstallWineOnDeepin23Alpha)
|
installWineOnDeepin23Alpha.triggered.connect(InstallWineOnDeepin23Alpha)
|
||||||
installWineHQ.triggered.connect(InstallWineHQ)
|
installWineHQ.triggered.connect(InstallWineHQ)
|
||||||
installMoreWine.triggered.connect(lambda: threading.Thread(target=os.system, args=[f"'{programPath}/wine/installwine'"]).start())
|
def InstallMoreWine():
|
||||||
|
os.system(f"'{programPath}/wine/installwine'")
|
||||||
|
# 更新 Wine 列表
|
||||||
|
CheckWine()
|
||||||
|
o1.clear()
|
||||||
|
if setting["AutoWine"]:
|
||||||
|
o1.addItems(canUseWine)
|
||||||
|
else:
|
||||||
|
o1.addItems(wine.keys())
|
||||||
|
#installMoreWine.triggered.connect(lambda: threading.Thread(target=os.system, args=[f"'{programPath}/wine/installwine'"]).start())
|
||||||
|
installMoreWine.triggered.connect(InstallMoreWine)
|
||||||
downloadChrootBottle.triggered.connect(lambda: threading.Thread(target=os.system, args=[f"'{programPath}/QemuDownload.py'"]).start())
|
downloadChrootBottle.triggered.connect(lambda: threading.Thread(target=os.system, args=[f"'{programPath}/QemuDownload.py'"]).start())
|
||||||
p2.triggered.connect(ProgramSetting.ShowWindow)
|
p2.triggered.connect(ProgramSetting.ShowWindow)
|
||||||
enabledAll.triggered.connect(lambda: DisableButton(False))
|
enabledAll.triggered.connect(lambda: DisableButton(False))
|
||||||
|
Loading…
Reference in New Issue
Block a user