diff --git a/Makefile b/Makefile index 014f268..1c29b6e 100755 --- a/Makefile +++ b/Makefile @@ -91,11 +91,5 @@ install: remove: sudo apt purge spark-deepin-wine-runner -depend: - sudo apt update - sudo apt install python3 python3-pil python3-pil.imagetk\ - python3-pyquery deepin-terminal aria2 curl unrar unzip\ - python3-requests fakeroot bash python3-pyqt5 - run: python3 mainwindow.py diff --git a/README.md b/README.md index 5ca3aa2..07ae872 100755 --- a/README.md +++ b/README.md @@ -37,9 +37,9 @@ env WINEPREFIX=容器路径 wine(wine的路径) 可执行文件路径 11 directories, 6 files ``` +![star](https://gitee.com/gfdgd-xi/deep-wine-runner/badge/star.svg?theme=dark)](https://gitee.com/gfdgd-xi/deep-wine-runner/stargazers) ## 软件架构 -i386、amd64 和 arm64,deepin-wine、deepin-wine5、wine、wine64、deepin-wine5-stable、deepin-wine6-stable、spark-wine7-devel、ukylin-wine 运行在哪就运行在哪 理论上支持全架构,如果 Python 能运行的话 非 X86 架构会利用到 `box86`、`exagear`等技术 diff --git a/deepin-wine-easy-packager.py b/deepin-wine-easy-packager.py index e0d2a65..907bb95 100644 --- a/deepin-wine-easy-packager.py +++ b/deepin-wine-easy-packager.py @@ -608,9 +608,4 @@ if __name__ == "__main__": window.setCentralWidget(widget) window.setWindowTitle(f"Wine 运行器 {version}——简易打包器") window.show() - sys.exit(app.exec_()) -# ./wrestool ../Desktop/deep-wine-runner/geek.exe -x -t 14 > a.png -# Flag: -# 1、不想打包了,强制终止功能 -# 2、版本号自动识别 -# 3、包名自动识别 \ No newline at end of file + sys.exit(app.exec_()) \ No newline at end of file diff --git a/mainwindow.py b/mainwindow.py index 21694bd..f04e053 100755 --- a/mainwindow.py +++ b/mainwindow.py @@ -2403,7 +2403,8 @@ w4 = QtWidgets.QAction(QtCore.QCoreApplication.translate("U", "删除选择的 W cleanBottonUOS = QtWidgets.QAction(QtCore.QCoreApplication.translate("U", "清理 Wine 容器(基于 Wine 适配活动脚本)")) wineKeyboardLnk = QtWidgets.QAction(QtCore.QCoreApplication.translate("U", "Wine 快捷键映射")) w5 = QtWidgets.QAction(QtCore.QCoreApplication.translate("U", "打包 wine 应用")) -w6 = QtWidgets.QAction(QtCore.QCoreApplication.translate("U", "使用官方 Wine 适配活动的脚本进行打包(小白建议使用这个)")) +w6 = QtWidgets.QAction(QtCore.QCoreApplication.translate("U", "使用官方 Wine 适配活动的脚本进行打包")) +easyPackager = QtWidgets.QAction(QtCore.QCoreApplication.translate("U", "使用简易打包器进行打包(小白且无特殊需求建议使用这个)")) getDllOnInternet = QtWidgets.QAction(QtCore.QCoreApplication.translate("U", "从互联网获取DLL")) w7 = QtWidgets.QAction(QtCore.QCoreApplication.translate("U", "从镜像获取DLL(只支持官方安装镜像,DOS内核如 Windows 95 暂不支持)")) updateGeek = QtWidgets.QAction(QtCore.QCoreApplication.translate("U", "从 Geek Uninstaller 官网升级程序")) @@ -2417,6 +2418,7 @@ wineOption.addAction(cleanBottonUOS) wineOption.addSeparator() wineOption.addAction(w5) wineOption.addAction(w6) +wineOption.addAction(easyPackager) wineOption.addSeparator() wineOption.addAction(wineKeyboardLnk) wineOption.addSeparator() @@ -2521,6 +2523,7 @@ w4.triggered.connect(DeleteWineBotton) cleanBottonUOS.triggered.connect(CleanWineBottonByUOS) w5.triggered.connect(BuildExeDeb) w6.triggered.connect(UOSPackageScript) +easyPackager.triggered.connect() wineKeyboardLnk.triggered.connect(lambda: threading.Thread(target=os.system, args=[f"'{programPath}/key/key-add-gui.py'"]).start()) getDllOnInternet.triggered.connect(GetDllFromInternet) w7.triggered.connect(GetDllFromWindowsISO.ShowWindow)