diff --git a/Icon/Program/wine运行器.png b/Icon/Program/AboutIcon0.png similarity index 100% rename from Icon/Program/wine运行器.png rename to Icon/Program/AboutIcon0.png diff --git a/Icon/Program/AboutIcon1.png b/Icon/Program/AboutIcon1.png new file mode 100755 index 0000000..e3e9c24 Binary files /dev/null and b/Icon/Program/AboutIcon1.png differ diff --git a/deepin-wine-packager.py b/deepin-wine-packager.py index baa2aa5..74aa6e3 100755 --- a/deepin-wine-packager.py +++ b/deepin-wine-packager.py @@ -1584,9 +1584,9 @@ StartupNotify=false if helperConfigPath != None and helperConfigPath != "": os.makedirs(f"{debPackagePath}/opt/deepinwine/tools/spark_run_v4_app_configs") if e6_text.text()[-3: ] == ".7z": - shutil.copy(helperConfigPath, f"{debPackagePath}/opt/deepinwine/tools/spark_run_v4_app_configs/{os.path.splitext(e6_text.text())[0]}.sh") + shutil.copy(helperConfigPath, f"{debPackagePath}/opt/deepinwine/tools/spark_run_v4_app_configs/{os.path.splitext(os.path.basename(e6_text.text()))[0]}.sh") else: - shutil.copy(helperConfigPath, f"{debPackagePath}/opt/deepinwine/tools/spark_run_v4_app_configs/{e6_text.text()}.sh") + shutil.copy(helperConfigPath, f"{debPackagePath}/opt/deepinwine/tools/spark_run_v4_app_configs/{os.path.basename(e6_text.text())}.sh") ################ # 修改文件权限 ################ diff --git a/mainwindow.py b/mainwindow.py index 3de2d8a..e2cc0df 100755 --- a/mainwindow.py +++ b/mainwindow.py @@ -414,7 +414,9 @@ def about_this_program()->"显示“关于这个程序”窗口": messageWidget = QtWidgets.QWidget() QT.message.setWindowTitle(f"关于 {title}") messageLayout = QtWidgets.QGridLayout() - messageLayout.addWidget(QtWidgets.QLabel(f""), 0, 0, 1, 1, QtCore.Qt.AlignTop) + iconShow = QtWidgets.QLabel(f"") + iconShow.linkActivated.connect(lambda: iconShow.setText(f"")) + messageLayout.addWidget(iconShow, 0, 0, 1, 1, QtCore.Qt.AlignTop) aboutInfo = QtWidgets.QTextBrowser(messageWidget) aboutInfo.setFocusPolicy(QtCore.Qt.NoFocus) #aboutInfo.copyAvailable.connect(lambda: print("b")) @@ -2546,6 +2548,11 @@ else: pass app.installTranslator(trans) iconPath = "{}/deepin-wine-runner.svg".format(programPath) +iconPathList = [ + "{}/deepin-wine-runner.svg".format(programPath), + f"{programPath}/Icon/Program/AboutIcon0.png", + f"{programPath}/Icon/Program/AboutIcon1.png" +] #iconPath = "{}/Icon/Program/wine运行器.png".format(programPath) programUrl = "https://gitee.com/gfdgd-xi/deep-wine-runner\nhttps://github.com/gfdgd-xi/deep-wine-runner\nhttps://gfdgd-xi.github.io" information = json.loads(readtxt(f"{programPath}/information.json")) @@ -2563,19 +2570,7 @@ exe路径\' 参数 \' 6、如果可执行文件比较大的话,会出现点击“获取该程序运行情况”出现假死的情况,因为正在后台读取 SHA1,只需要等一下即可(读取速度依照您电脑处理速度、读写速度、可执行文件大小等有关); 7、如果非 X86 的用户的 UOS 专业版用户想要使用的话,只需要在应用商店安装一个 Wine 版本微信即可在本程序选择正确的 Wine 运行程序;''') updateThingsString = QtCore.QCoreApplication.translate("U", '''3.5.0 更新内容: -※1、虚拟机工具支持 kvm 检测 -※2、修改虚拟机工具提示文本,新增对 UOS 3a4000 用户无法正常使用 Qemu 的解决方案 -※3、在主界面点击“安装”按钮后自动切换至帮助页面 -※4、新增虚拟机日志输出和读取功能 -※5、新增Qemu测试测试功能 -※6、虚拟机工具支持安装/运行 arm32、arm64 架构的系统 -※7、修复虚拟机工具在系统版本选择第 5 项及以后出现不会挂载 ISO 的问题(使用 Qemu 的情况下) -※8、修复简易打包器无法打开的问题 https://gitee.com/gfdgd-xi/deep-wine-runner/issues/I85F9M -※9、生态适配脚本打包器支持正确根据打包结果显示打包成功/失败 https://gitee.com/gfdgd-xi/deep-wine-runner/issues/I7D83Z -10、生态适配脚本打包器设置使用 xz 格式打包 deb -11、新增 ace 包 -12、虚拟机工具支持强制关闭 VirtualBox/Qemu,并增加了对 Windows 7 安装脚本的检测 -13、新增 lat 翻译器安装选项''') +※1、修复高级打包器选择软件适配脚本后无法打包的问题 https://gitee.com/gfdgd-xi/deep-wine-runner/issues/I8I110''') for i in information["Thank"]: thankText += f"{i}\n" updateTime = "2023年11月17日" @@ -2619,6 +2614,7 @@ Deepin 论坛:https://bbs.deepin.org gfdgd xi:https://gfdgd-xi.github.io