mirror of
https://gitee.com/gfdgd-xi/deep-wine-runner
synced 2025-11-03 23:12:24 +08:00
Compare commits
4 Commits
744d2aa262
...
a515570ee3
| Author | SHA1 | Date | |
|---|---|---|---|
| a515570ee3 | |||
| c73e32fa39 | |||
| ca88d5f62c | |||
| df561d3d03 |
@ -21,7 +21,7 @@ terminalList = [
|
|||||||
]
|
]
|
||||||
terminalEnd = {
|
terminalEnd = {
|
||||||
f"{programPath}/../launch.sh\" \"deepin-terminal": ["-e", 0],
|
f"{programPath}/../launch.sh\" \"deepin-terminal": ["-e", 0],
|
||||||
f"{programPath}/../launch.sh\" \"gxde-terminal": ["-e", 0],
|
"gxde-terminal": ["-e", 0],
|
||||||
"mate-terminal": ["-e", 1],
|
"mate-terminal": ["-e", 1],
|
||||||
"gnome-terminal": ["--", 0],
|
"gnome-terminal": ["--", 0],
|
||||||
"xfce4-terminal": ["-e", 1]
|
"xfce4-terminal": ["-e", 1]
|
||||||
|
|||||||
@ -204,6 +204,8 @@ Get_Dist_Name()
|
|||||||
DISTRO='Deepin'
|
DISTRO='Deepin'
|
||||||
elif grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release; then
|
elif grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release; then
|
||||||
DISTRO='UniontechOS'
|
DISTRO='UniontechOS'
|
||||||
|
elif grep -Eqi "GXDE" /etc/issue || grep -Eq "GXDE" /etc/*-release; then
|
||||||
|
DISTRO='GXDE'
|
||||||
elif grep -Eqi "UOS" /etc/issue || grep -Eq "UOS" /etc/*-release; then
|
elif grep -Eqi "UOS" /etc/issue || grep -Eq "UOS" /etc/*-release; then
|
||||||
DISTRO='UniontechOS'
|
DISTRO='UniontechOS'
|
||||||
else
|
else
|
||||||
@ -266,7 +268,7 @@ DISABLE_ATTACH_FILE_DIALOG=""
|
|||||||
##############<<<<<<<<<禁用文件选择工具开始
|
##############<<<<<<<<<禁用文件选择工具开始
|
||||||
Get_Dist_Name
|
Get_Dist_Name
|
||||||
#此功能实现参见开头函数段
|
#此功能实现参见开头函数段
|
||||||
if [ "$DISTRO" != "Deepin" ] && [ "$DISTRO" != "UniontechOS" ];then
|
if [ "$DISTRO" != "Deepin" ] && [ "$DISTRO" != "UniontechOS" ] && [ "$DISTRO" != "GXDE" ];then
|
||||||
DISABLE_ATTACH_FILE_DIALOG="1"
|
DISABLE_ATTACH_FILE_DIALOG="1"
|
||||||
echo "非deepin/UOS,默认关闭系统自带的文件选择工具,使用Wine的"
|
echo "非deepin/UOS,默认关闭系统自带的文件选择工具,使用Wine的"
|
||||||
echo "如果你想改变这个行为,请到/opt/apps/$DEB_PACKAGE_NAME/files/$0处修改"
|
echo "如果你想改变这个行为,请到/opt/apps/$DEB_PACKAGE_NAME/files/$0处修改"
|
||||||
|
|||||||
@ -629,7 +629,7 @@ Description: {e3_text.text()}
|
|||||||
["@@@APPRUN_CMD@@@", [
|
["@@@APPRUN_CMD@@@", [
|
||||||
wine[wineVersion.currentText()],
|
wine[wineVersion.currentText()],
|
||||||
f"/opt/apps/{e1_text.text()}/files/wine/bin/wine"
|
f"/opt/apps/{e1_text.text()}/files/wine/bin/wine"
|
||||||
][os.path.exists(f'{debPackagePath}/opt/apps/{e1_text.text()}/files/')]],
|
][os.path.exists(f'{debPackagePath}/opt/apps/{e1_text.text()}/files/wine/')]],
|
||||||
["@@@EXEC_NAME@@@", os.path.basename(e7_text.text().replace("\\", "/"))],
|
["@@@EXEC_NAME@@@", os.path.basename(e7_text.text().replace("\\", "/"))],
|
||||||
["@@@ARCH@@@", debFirstArch.currentText()],
|
["@@@ARCH@@@", debFirstArch.currentText()],
|
||||||
["@@@APP_NAME@@@", e8_text.text()],
|
["@@@APP_NAME@@@", e8_text.text()],
|
||||||
@ -676,7 +676,7 @@ Description: {e3_text.text()}
|
|||||||
["@@@APPRUN_CMD@@@", [
|
["@@@APPRUN_CMD@@@", [
|
||||||
wine[wineVersion.currentText()],
|
wine[wineVersion.currentText()],
|
||||||
f"/opt/apps/{e1_text.text()}/files/wine/bin/wine"
|
f"/opt/apps/{e1_text.text()}/files/wine/bin/wine"
|
||||||
][os.path.exists(f'{debPackagePath}/opt/apps/{e1_text.text()}/files/')]],
|
][os.path.exists(f'{debPackagePath}/opt/apps/{e1_text.text()}/files/wine/')]],
|
||||||
["@@@EXEC_NAME@@@", os.path.basename(i[0].text().replace("\\", "/"))],
|
["@@@EXEC_NAME@@@", os.path.basename(i[0].text().replace("\\", "/"))],
|
||||||
["@@@ARCH@@@", debFirstArch.currentText()],
|
["@@@ARCH@@@", debFirstArch.currentText()],
|
||||||
["@@@APP_NAME@@@", i[3].text()],
|
["@@@APP_NAME@@@", i[3].text()],
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"Version": "4.1.0.1",
|
"Version": "4.1.1.0",
|
||||||
"Time": "未知",
|
"Time": "未知",
|
||||||
"Thank": [
|
"Thank": [
|
||||||
"感谢 @り哥拽的冇气质° 和 @杨 提供了 3a5000(新世界的测试机器)",
|
"感谢 @り哥拽的冇气质° 和 @杨 提供了 3a5000(新世界的测试机器)",
|
||||||
|
|||||||
@ -2478,19 +2478,10 @@ exe路径\' 参数 \'
|
|||||||
5、wine 容器如果没有指定,则会默认为 ~/.wine;
|
5、wine 容器如果没有指定,则会默认为 ~/.wine;
|
||||||
6、如果可执行文件比较大的话,会出现点击“获取该程序运行情况”出现假死的情况,因为正在后台读取 SHA1,只需要等一下即可(读取速度依照您电脑处理速度、读写速度、可执行文件大小等有关);
|
6、如果可执行文件比较大的话,会出现点击“获取该程序运行情况”出现假死的情况,因为正在后台读取 SHA1,只需要等一下即可(读取速度依照您电脑处理速度、读写速度、可执行文件大小等有关);
|
||||||
7、如果非 X86 的用户的 UOS 专业版用户想要使用的话,只需要在应用商店安装一个 Wine 版本微信即可在本程序选择正确的 Wine 运行程序;''')
|
7、如果非 X86 的用户的 UOS 专业版用户想要使用的话,只需要在应用商店安装一个 Wine 版本微信即可在本程序选择正确的 Wine 运行程序;''')
|
||||||
updateThingsString = QtCore.QCoreApplication.translate("U", '''※1、修复在 GXDE OS 下无法正常调用 gxde-terminal 的问题
|
updateThingsString = QtCore.QCoreApplication.translate("U", '''※1、修复没有 dxvk 的问题
|
||||||
※2、修复部分机器无法打开应用的问题
|
※2、修复虚拟机功能异常的问题(https://gitee.com/gfdgd-xi/deep-wine-runner/issues/IASRHG)
|
||||||
※3、修改打包器 wine 集成封装 机制以便可以被 uos 商店正确签名
|
※3、修复打包器生成的 deb 不可用的问题(https://gitee.com/gfdgd-xi/deep-wine-runner/issues/IAXE1T)
|
||||||
※4、打包器支持内置 spark dwine helper
|
※4、打包器针对 GXDE OS 进行优化
|
||||||
※5、重构虚拟机安装模块以支持更多机器
|
|
||||||
6、修复打包器设置依赖无法生效的问题
|
|
||||||
※7、补充图标
|
|
||||||
※8、修复 deb 安装过程中可能出现 dpkg 卡死的问题
|
|
||||||
※9、优化 Wine 安装器检测机制
|
|
||||||
※10、删除部分废弃组件
|
|
||||||
※11、修复 AOSC、Termux 无法正常打开 Wine 运行器的问题
|
|
||||||
12、修改文案
|
|
||||||
13、修复其它 bug 若干
|
|
||||||
''')
|
''')
|
||||||
for i in information["Thank"]:
|
for i in information["Thank"]:
|
||||||
thankText += f"{i}\n"
|
thankText += f"{i}\n"
|
||||||
@ -2822,7 +2813,7 @@ programmenu.addAction(installWineHQ)
|
|||||||
programmenu.addAction(installWineHQOrg)
|
programmenu.addAction(installWineHQOrg)
|
||||||
programmenu.addAction(installMoreWine)
|
programmenu.addAction(installMoreWine)
|
||||||
programmenu.addAction(downloadChrootBottle)
|
programmenu.addAction(downloadChrootBottle)
|
||||||
programmenu.addAction(installBox86CN)
|
#programmenu.addAction(installBox86CN)
|
||||||
programmenu.addAction(installBox86)
|
programmenu.addAction(installBox86)
|
||||||
programmenu.addAction(installLat)
|
programmenu.addAction(installLat)
|
||||||
programmenu.addSeparator()
|
programmenu.addSeparator()
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"Version": "4.1.0.1",
|
"Version": "4.1.1.0",
|
||||||
"Time": "未知",
|
"Time": "未知",
|
||||||
"Thank": [
|
"Thank": [
|
||||||
"感谢 @り哥拽的冇气质° 和 @杨 提供了 3a5000(新世界的测试机器)",
|
"感谢 @り哥拽的冇气质° 和 @杨 提供了 3a5000(新世界的测试机器)",
|
||||||
|
|||||||
@ -24,6 +24,8 @@ Get_Dist_Name()
|
|||||||
DISTRO='UniontechOS'
|
DISTRO='UniontechOS'
|
||||||
elif grep -Eqi "UOS" /etc/issue || grep -Eq "UOS" /etc/*-release; then
|
elif grep -Eqi "UOS" /etc/issue || grep -Eq "UOS" /etc/*-release; then
|
||||||
DISTRO='UniontechOS'
|
DISTRO='UniontechOS'
|
||||||
|
elif grep -Eqi "GXDE" /etc/issue || grep -Eq "GXDE" /etc/*-release; then
|
||||||
|
DISTRO='GXDE'
|
||||||
else
|
else
|
||||||
DISTRO='OtherOS'
|
DISTRO='OtherOS'
|
||||||
fi
|
fi
|
||||||
@ -70,7 +72,7 @@ DISABLE_ATTACH_FILE_DIALOG=""
|
|||||||
##############<<<<<<<<<禁用文件选择工具开始
|
##############<<<<<<<<<禁用文件选择工具开始
|
||||||
Get_Dist_Name
|
Get_Dist_Name
|
||||||
#此功能实现参见开头函数段
|
#此功能实现参见开头函数段
|
||||||
if [ "$DISTRO" != "Deepin" ] && [ "$DISTRO" != "UniontechOS" ];then
|
if [ "$DISTRO" != "Deepin" ] && [ "$DISTRO" != "UniontechOS" ] && [ "$DISTRO" != "GXDE" ];then
|
||||||
DISABLE_ATTACH_FILE_DIALOG="1"
|
DISABLE_ATTACH_FILE_DIALOG="1"
|
||||||
echo "非deepin/UOS,默认关闭系统自带的文件选择工具,使用Wine的"
|
echo "非deepin/UOS,默认关闭系统自带的文件选择工具,使用Wine的"
|
||||||
echo "如果你想改变这个行为,请到/opt/apps/$DEB_PACKAGE_NAME/files/$0处修改"
|
echo "如果你想改变这个行为,请到/opt/apps/$DEB_PACKAGE_NAME/files/$0处修改"
|
||||||
|
|||||||
@ -48,6 +48,8 @@ Get_Dist_Name()
|
|||||||
DISTRO='Deepin'
|
DISTRO='Deepin'
|
||||||
elif grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release; then
|
elif grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release; then
|
||||||
DISTRO='UniontechOS'
|
DISTRO='UniontechOS'
|
||||||
|
elif grep -Eqi "GXDE" /etc/issue || grep -Eq "GXDE" /etc/*-release; then
|
||||||
|
DISTRO='GXDE'
|
||||||
elif grep -Eqi "UOS" /etc/issue || grep -Eq "UOS" /etc/*-release; then
|
elif grep -Eqi "UOS" /etc/issue || grep -Eq "UOS" /etc/*-release; then
|
||||||
DISTRO='UniontechOS'
|
DISTRO='UniontechOS'
|
||||||
else
|
else
|
||||||
@ -109,7 +111,7 @@ DISABLE_ATTACH_FILE_DIALOG=""
|
|||||||
##############<<<<<<<<<禁用文件选择工具开始
|
##############<<<<<<<<<禁用文件选择工具开始
|
||||||
Get_Dist_Name
|
Get_Dist_Name
|
||||||
#此功能实现参见开头函数段
|
#此功能实现参见开头函数段
|
||||||
if [ "$DISTRO" != "Deepin" ] && [ "$DISTRO" != "UniontechOS" ];then
|
if [ "$DISTRO" != "Deepin" ] && [ "$DISTRO" != "UniontechOS" ] && [ "$DISTRO" != "GXDE" ];then
|
||||||
DISABLE_ATTACH_FILE_DIALOG="1"
|
DISABLE_ATTACH_FILE_DIALOG="1"
|
||||||
echo "非deepin/UOS,默认关闭系统自带的文件选择工具,使用Wine的"
|
echo "非deepin/UOS,默认关闭系统自带的文件选择工具,使用Wine的"
|
||||||
echo "如果你想改变这个行为,请到/opt/apps/$DEB_PACKAGE_NAME/files/$0处修改"
|
echo "如果你想改变这个行为,请到/opt/apps/$DEB_PACKAGE_NAME/files/$0处修改"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user