修复控件问题

This commit is contained in:
gfdgd xi 2023-08-10 18:38:07 +08:00
parent db622c93ba
commit 82b13b585d
8 changed files with 146 additions and 46 deletions

View File

@ -0,0 +1,87 @@
{
"Package": [
"L",
"com.7zip.demo"
],
"Version": [
"L",
"23.01spark0"
],
"Description": [
"L",
"7Zip For Deepin Wine6 Stable"
],
"Maintainer": [
"L",
"gfdgd xi<3025613752@qq.com>"
],
"BottleName": [
"L",
"Spark-7zip"
],
"BottlePath": [
"L",
"/home/gfdgd_xi/.deepinwine/Spark-7zip"
],
"WineVersion": [
"Co",
5
],
"DebSavePath": [
"L",
"/home/gfdgd_xi/Desktop/com.7zip.demo_23.01spark0_all.deb"
],
"Desktop": [
"List-Desktop",
[
[
"c:/Program Files/7-Zip/7zFM.exe",
11,
"",
"7Zip",
"/home/gfdgd_xi/Desktop/Icon_0001.png",
""
]
]
],
"UseInstallWineArch": [
"Co",
0
],
"RemoveBash": [
"Ch",
true
],
"CleanBottleByUOS": [
"Ch",
true
],
"ChooseWineHelperValue": [
"Ch",
true
],
"DisabledMono": [
"Ch",
true
],
"DebDepends": [
"L",
"deepin-wine6-stable | deepin-wine6-stable-bcm | deepin-wine6-stable-dcm, spark-dwine-helper | store.spark-app.spark-dwine-helper, fonts-wqy-microhei, fonts-wqy-zenhei"
],
"DebRecommend": [
"L",
""
],
"DebFirstArch": [
"Co",
0
],
"DebArch": [
"Co",
0
],
"SparkHelperConfigPath": [
"Str-SparkHelperConfigPath",
null
]
}

View File

@ -7,7 +7,7 @@
"-I",
"/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore",
"-I",
"/tmp/QtCreator-qyPOGG/clang-uiheader-fvNAaR",
"/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU",
"-nostdinc",
"-nostdinc++",
"-pipe",
@ -77,7 +77,7 @@
"-I",
"/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore",
"-I",
"/tmp/QtCreator-qyPOGG/clang-uiheader-fvNAaR",
"/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU",
"-nostdinc",
"-nostdinc++",
"-pipe",
@ -147,7 +147,7 @@
"-I",
"/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore",
"-I",
"/tmp/QtCreator-qyPOGG/clang-uiheader-fvNAaR",
"/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU",
"-nostdinc",
"-nostdinc++",
"-pipe",
@ -217,7 +217,7 @@
"-I",
"/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore",
"-I",
"/tmp/QtCreator-qyPOGG/clang-uiheader-fvNAaR",
"/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU",
"-nostdinc",
"-nostdinc++",
"-pipe",
@ -287,7 +287,7 @@
"-I",
"/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore",
"-I",
"/tmp/QtCreator-qyPOGG/clang-uiheader-fvNAaR",
"/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU",
"-nostdinc",
"-nostdinc++",
"-pipe",
@ -357,7 +357,7 @@
"-I",
"/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore",
"-I",
"/tmp/QtCreator-qyPOGG/clang-uiheader-fvNAaR",
"/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU",
"-nostdinc",
"-nostdinc++",
"-pipe",
@ -427,7 +427,7 @@
"-I",
"/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore",
"-I",
"/tmp/QtCreator-qyPOGG/clang-uiheader-fvNAaR",
"/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU",
"-nostdinc",
"-nostdinc++",
"-pipe",
@ -497,7 +497,7 @@
"-I",
"/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore",
"-I",
"/tmp/QtCreator-qyPOGG/clang-uiheader-fvNAaR",
"/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU",
"-nostdinc",
"-nostdinc++",
"-pipe",
@ -567,7 +567,7 @@
"-I",
"/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore",
"-I",
"/tmp/QtCreator-qyPOGG/clang-uiheader-fvNAaR",
"/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU",
"-nostdinc",
"-nostdinc++",
"-pipe",
@ -637,7 +637,7 @@
"-I",
"/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore",
"-I",
"/tmp/QtCreator-qyPOGG/clang-uiheader-fvNAaR",
"/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU",
"-nostdinc",
"-nostdinc++",
"-pipe",
@ -707,7 +707,7 @@
"-I",
"/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore",
"-I",
"/tmp/QtCreator-qyPOGG/clang-uiheader-fvNAaR",
"/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU",
"-nostdinc",
"-nostdinc++",
"-pipe",
@ -777,7 +777,7 @@
"-I",
"/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore",
"-I",
"/tmp/QtCreator-qyPOGG/clang-uiheader-fvNAaR",
"/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU",
"-nostdinc",
"-nostdinc++",
"-pipe",
@ -847,7 +847,7 @@
"-I",
"/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore",
"-I",
"/tmp/QtCreator-qyPOGG/clang-uiheader-fvNAaR",
"/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU",
"-nostdinc",
"-nostdinc++",
"-pipe",
@ -917,7 +917,7 @@
"-I",
"/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore",
"-I",
"/tmp/QtCreator-qyPOGG/clang-uiheader-fvNAaR",
"/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU",
"-nostdinc",
"-nostdinc++",
"-pipe",
@ -987,7 +987,7 @@
"-I",
"/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore",
"-I",
"/tmp/QtCreator-qyPOGG/clang-uiheader-fvNAaR",
"/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU",
"-nostdinc",
"-nostdinc++",
"-pipe",
@ -1057,7 +1057,7 @@
"-I",
"/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore",
"-I",
"/tmp/QtCreator-qyPOGG/clang-uiheader-fvNAaR",
"/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU",
"-nostdinc",
"-nostdinc++",
"-pipe",
@ -1127,7 +1127,7 @@
"-I",
"/usr/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore",
"-I",
"/tmp/QtCreator-qyPOGG/clang-uiheader-fvNAaR",
"/tmp/QtCreator-OUNQoP/clang-uiheader-OYkbQU",
"-nostdinc",
"-nostdinc++",
"-pipe",

View File

@ -1,5 +1,5 @@
Package: spark-deepin-wine-runner
Version: 3.3.0.1
Version: 3.4.0
Maintainer: gfdgd xi <3025613752@qq.com>
Homepage: https://gitee.com/gfdgd-xi/deep-wine-runner
Architecture: all

View File

@ -9,7 +9,7 @@
#################################################################################################################
# 非强制性的必应组件,所以成功不成功都行
# 程序版本号
version=3.3.0
version=3.4.0
echo 安装组件
python3 -m pip install --upgrade pynput --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple --break-system-packages > /dev/null 2>&1 | true
python3 -m pip install --upgrade xpinyin --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple --break-system-packages > /dev/null 2>&1 | true

View File

@ -77,6 +77,9 @@ def disabled_or_NORMAL_all(choose):
buildDebDir.setDisabled(choose)
debDepends.setDisabled(choose)
debRecommend.setDisabled(choose)
debFirstArch.setDisabled(choose)
helperConfigPathButton.setDisabled(choose)
helperConfigPathText.setDisabled(choose)
#if not choose:
# ChangeArchCombobox()
# ChangeWine()
@ -2420,6 +2423,10 @@ else:
uploadSparkStoreProgram.setDisabled(True)
tip = QtWidgets.QAction(transla.transe("U", "小提示"))
getPdfHelp = QtWidgets.QAction(transla.transe("U", "Wine运行器和Wine打包器傻瓜式使用教程小白专用\nBy @雁舞白沙"))
videoHelp = menu.addMenu(transla.transe("U", "视频教程(&V)"))
videoHelpAction = QtWidgets.QAction(QtWidgets.QApplication.style().standardIcon(20), transla.transe("U", "视频教程"))
videoHelpAction.triggered.connect(lambda: webbrowser.open_new_tab("https://space.bilibili.com/695814694/channel/collectiondetail?sid=1610353"))
videoHelp.addAction(videoHelpAction)
openFile.triggered.connect(OpenConfigFile)
saveFile.triggered.connect(SaveConfigList)
setMiniFont.triggered.connect(lambda: SetFont(1.2))
@ -2463,16 +2470,17 @@ window.setCentralWidget(widget)
window.setWindowTitle(f"wine 应用打包器 {version}")
window.setWindowIcon(QtGui.QIcon(iconPath))
window.resize(int(window.frameSize().width() * 2.1), int(window.frameSize().height()))
e1_text.setWhatsThis("""com.XXX.deepin
XXX指windows软件的英文名称可以自定义名称但最好是用软件解压安装后自动生成的英文名称dingtalk包名只能含有小写字母a-z数字0-9加号+和减号-以及点号(.)软件包名最短长度为两个字符且包名必须以字母开头""")
e1_text.setWhatsThis("""安装包的包名,推荐类似 com.xxx.spark 这种倒置域名的格式,当然类似 spark-xxx 这种也可以,但是包名只能含有<b>小写字母a-z、数字0-9、加号+)和减号(-)、以及点号(.)</b>,软件包名最短长度为两个字符,且包名必须以字母开头。""")
# 创建控件
e2_text.setWhatsThis(transla.transe("U", """6.5.50随便填写或填写该软件的windows版本的版本号6.5.50只是示例)。"""))
e3_text.setWhatsThis(transla.transe("U", """随便填写或使用该软件的windows版本的软件简介。"""))
e4_text.setWhatsThis(transla.transe("U", """填写自己的网名,若是自用软件,不上架至应用商店,不进行后续维护,可随便填写。"""))
e2_text.setWhatsThis(transla.transe("U", """安装包的版本号,一般推荐格式为 <b><u>程序版本号</u>spark<u>修订号</u></b>,例如 23.01spark023.01 就是程序版本号0 为修订号,代表第一版版本"""))
e3_text.setWhatsThis(transla.transe("U", """安装包的说明,随意但最好能程序的介绍之类方便用户快速了解安装包内容的文字,推荐只用英文"""))
e4_text.setWhatsThis(transla.transe("U", """安装包的维护者,推荐格式为:<b><u>打包者</u>&lt;<u>邮箱</u>&gt;</b> ,例如 gfdgd xi&lt;3025613752@qq.com&gt;,多个打包者用半角符号“,”分隔"""))
e5_text.setWhatsThis(f"<p>解压容器到其它机器的容器名称,一般自动带出</p><p><img src='{programPath}/Icon/Screen/202211121646232464_image.png'></p>")
e6_text.setWhatsThis(transla.transe("U", f"要打包的容器所在路径,也可以选择已经好打包的 7z 文件,一般自动带出"))
e7_text.setWhatsThis("""可执行文件的运行路径格式是“C:/XXX/XXX.exe”不包含引号""")
e7_text.setWhatsThis("""程序在 wine 容器的路径,格式一般为 c:/xxx/xxx.exe""")
debArch.setWhatsThis(transla.transe("U", "选择生成 deb 包所对应的架构"))
wineVersion.setWhatsThis("deb 包使用的 Wine")
option1_text.setWhatsThis("程序在启动器的快捷方式分类")
rmBash.setWhatsThis(transla.transe("U", "清理容器无用内容,一般建议勾选,最新版本默认勾选,如果有特殊需求(如容器内有 mono、gecko 等)建议取消勾选"))
debDepends.setWhatsThis(transla.transe("U", "生成 deb 包所需的依赖,一般情况下默认即可"))
debRecommend.setWhatsThis(transla.transe("U", "生成 deb 包的推荐依赖,一般情况下为空即可"))
@ -2482,15 +2490,20 @@ option1_text.setWhatsThis("""点击右侧的下拉箭头,选择该软件所属
Network=网络应用
Chat=即时通讯或社交沟通
Video=视频播放
Audio=音乐欣赏
AudioVideo=视频播放
Graphics=图形图像
Game=游戏娱乐
Office=办公学习
Translation=阅读翻译
Development=软件开发
Reading=阅读翻译
System=系统管理
Utility=工具软件或其他应用
不明白英文的可以百度查询一下软件分类名称的意思
注意此时选择的软件分类名称决定了该软件打包后再安装时会安装在启动器中的哪个软件分类目录中""")
e8_text.setWhatsThis(transla.transe("U", """填写该软件的中文或英文名称。"""))
e9_text.setWhatsThis(transla.transe("U", """图标只支持PNG格式和SVG格式其他格式无法显示。"""))
e8_text.setWhatsThis(transla.transe("U", """在启动器快捷方式的名称"""))
e9_text.setWhatsThis(transla.transe("U", """在启动器快捷方式的图标(不支持 ico 格式,推荐使用 svg、png 格式)"""))
e10_text.setWhatsThis(transla.transe("U", "快捷方式的 MimeType 项,一般为空即可"))
option1_text.setWhatsThis(transla.transe("U", "打包的 Wine 版本,根据实际情况选择(如果打包 arm 包将不会提供选择)"))
e12_text.setWhatsThis(transla.transe("U", "打包出的 deb 生成的位置,一般自动生成"))

View File

@ -2547,21 +2547,22 @@ updateThingsString = transla.transe("U", '''※1、修复简易打包器无法
3修复运行器在 Ubuntu 23 的安装问题
4高级打包器支持导出/导入填写信息
5Deepin 23 支持使用 Winetricks
6新增视频教程入库
6新增视频教程
7修复虚拟机工具在检测到 Qemu 磁盘但没有安装 Qemu 时无法启动的问题
8修复虚拟机工具的一些问题并调整部分设置
9高级打包器支持隐藏输入框以及使用小字体
10打包器提供 bcm dcm wine 支持
11修复星火 wine 配置错误问题
12打包器支持多线程打包
13修复升级工具问题https://gitee.com/gfdgd-xi/uengine-runner/issues/I6ZRZX
14跟进打包器 run.sh 模板
15云沙箱新增 cloud.vdnel.cn
16打包器新增分类 GameSystemAudioVideo
17修复安装 Box64 时源里没有 libc6:armhf 导致无法安装的问题''')
9虚拟机工具支持设置 UEFI 启动
10高级打包器支持隐藏输入框以及使用小字体
11打包器提供 bcm dcm wine 支持
12修复星火 wine 配置错误问题
13打包器支持多线程打包
14修复升级工具问题https://gitee.com/gfdgd-xi/uengine-runner/issues/I6ZRZX
15跟进打包器 run.sh 模板
16云沙箱新增 cloud.vdnel.cn
17打包器新增分类 GameSystemAudioVideo
18修复安装 Box64 时源里没有 libc6:armhf 导致无法安装的问题''')
for i in information["Thank"]:
thankText += f"{i}\n"
updateTime = "2023年08月09"
updateTime = "2023年08月10日"
aboutProgram = transla.transe("U", """<p>Wine运行器是一个能让Linux用户更加方便地运行Windows应用的程序内置了对Wine图形化的支持、各种Wine工具、自制的Wine程序打包器和运行库安装工具等。</p>
<p>它同时还内置了基于VirtualBox/Qemu制作的专供小白使用的Windows虚拟机安装工具可以做到只需下载系统镜像并点击安装即可无需考虑虚拟机的安装创建分区等操作</p>
<pre>
@ -3202,7 +3203,7 @@ if len(qemuBottleList) >= 1:
print(qemuBottleList)
videoHelp = menu.addMenu(transla.transe("U", "视频教程(&V)"))
videoHelpAction = QtWidgets.QAction(transla.transe("U", "视频教程"))
videoHelpAction = QtWidgets.QAction(QtWidgets.QApplication.style().standardIcon(20), transla.transe("U", "视频教程"))
videoHelpAction.triggered.connect(lambda: webbrowser.open_new_tab("https://space.bilibili.com/695814694/channel/collectiondetail?sid=1610353"))
videoHelp.addAction(videoHelpAction)
@ -3241,10 +3242,7 @@ help.addSeparator()
wikiHelp = QtWidgets.QAction(QtWidgets.QApplication.style().standardIcon(20), transla.transe("U", "程序 Wiki"))
help.addAction(wikiHelp)
videoHelp = help.addMenu(QtWidgets.QApplication.style().standardIcon(20), transla.transe("U", "视频教程"))
easyHelp = QtWidgets.QAction(QtWidgets.QApplication.style().standardIcon(20), transla.transe("U", "简易使用教程"))
buildHelp = QtWidgets.QAction(QtWidgets.QApplication.style().standardIcon(20), transla.transe("U", "打包教程"))
videoHelp.addAction(easyHelp)
videoHelp.addAction(buildHelp)
videoHelp.addAction(videoHelpAction)
help.addSeparator()
help.addAction(h5)
help.addAction(h6)
@ -3267,8 +3265,6 @@ h3.triggered.connect(UpdateThings)
wineRunnerHelp.triggered.connect(lambda: webbrowser.open_new_tab("https://bbs.deepin.org/post/246837"))
h4.triggered.connect(ThankWindow)
wikiHelp.triggered.connect(lambda: webbrowser.open_new_tab("https://gfdgd-xi.github.io/wine-runner-wiki"))
easyHelp.triggered.connect(lambda: webbrowser.open_new_tab("https://www.bilibili.com/video/BV1ma411972Y"))
buildHelp.triggered.connect(lambda: webbrowser.open_new_tab("https://www.bilibili.com/video/BV1EU4y1k7zr"))
h5.triggered.connect(UpdateWindow.ShowWindow)
h6.triggered.connect(WineRunnerBugUpload)
fenUpload.triggered.connect(lambda: threading.Thread(target=os.system, args=[f"python3 '{programPath}/ProgramFen.py'"]).start())

View File

@ -1,5 +1,5 @@
{
"Version": "3.3.0.1",
"Version": "3.4.0",
"Time": "未知",
"Thank": [
"感谢 RacoonGX 的付出与贡献",

View File

@ -245,6 +245,10 @@ uploadSparkStore.addAction(uploadSparkStoreProgram)
uploadSparkStore.addAction(uploadSparkStoreWebsize)
uploadSparkStoreWebsize.triggered.connect(lambda: webbrowser.open_new_tab("https://upload.deepinos.org"))
uploadSparkStoreProgram.triggered.connect(lambda: threading.Thread(target=os.system, args=["/opt/spark-store-submitter/bin/spark-store-submitter"]).start())
videoHelp = menu.addMenu(transla.transe("U", "视频教程(&V)"))
videoHelpAction = QtWidgets.QAction(QtWidgets.QApplication.style().standardIcon(20), transla.transe("U", "视频教程"))
videoHelpAction.triggered.connect(lambda: webbrowser.open_new_tab("https://space.bilibili.com/695814694/channel/collectiondetail?sid=1610353"))
videoHelp.addAction(videoHelpAction)
helpMenu = menu.addMenu(transla.transe("U", "帮助"))
help = QtWidgets.QAction(transla.transe("U", "帮助"))
help.triggered.connect(ShowHelp)