Compare commits

...

64 Commits
3.9.0 ... 4.0.0

Author SHA1 Message Date
20fdb2aa76 4.0.0 2024-07-22 10:28:42 +08:00
4ff16d1cb8 替换一些图标 2024-07-22 09:40:32 +08:00
d7f7dd47cc 新增图标 2024-07-22 09:32:59 +08:00
3e77dcc1a3 移除废弃标签 2024-07-22 08:24:35 +08:00
811fc0b2dc 修复打包器在部分机器上的适配问题 2024-07-22 08:11:21 +08:00
d169d96329 新增输出提示文本(termux)
Some checks are pending
Auto Building Wine Runner(rpm) / Explore-GitHub-Actions (push) Waiting to run
Auto Building Wine Runner(deb) / Explore-GitHub-Actions (push) Waiting to run
2024-07-21 22:42:41 +08:00
58f9117e45 安装过程中允许设置vnc密码 2024-07-21 22:40:48 +08:00
55aeae22af 新增开启VNC公共访问选项
Some checks are pending
Auto Building Wine Runner(rpm) / Explore-GitHub-Actions (push) Waiting to run
Auto Building Wine Runner(deb) / Explore-GitHub-Actions (push) Waiting to run
2024-07-21 19:30:03 +08:00
1bdf8de39c 调整更新功能 2024-07-21 18:44:42 +08:00
8f37bfd3b8 优化更新逻辑 2024-07-21 18:12:30 +08:00
7a175c957a 修复/tmp问题 2024-07-21 17:49:45 +08:00
6ac4a191ca 修复无法打开的问题 2024-07-21 13:11:39 +08:00
9296914ed5 修改tmp路径以兼容termux 2024-07-21 12:44:10 +08:00
df5d08cd68 应用运行库新增bwrap识别
Some checks are pending
Auto Building Wine Runner(rpm) / Explore-GitHub-Actions (push) Waiting to run
Auto Building Wine Runner(deb) / Explore-GitHub-Actions (push) Waiting to run
2024-07-21 11:46:54 +08:00
2357c646a1 优化在termux的使用体验 2024-07-21 11:34:44 +08:00
0b0a757765 添加NOVNC 2024-07-21 09:36:40 +08:00
104d197e4b 调整依赖关系以在termux可以获得更好的体验
Some checks are pending
Auto Building Wine Runner(rpm) / Explore-GitHub-Actions (push) Waiting to run
Auto Building Wine Runner(deb) / Explore-GitHub-Actions (push) Waiting to run
2024-07-20 22:53:49 +08:00
60f838144d 初步termux支持 2024-07-20 22:26:35 +08:00
3146467477 新增proot和android识别
Some checks are pending
Auto Building Wine Runner(rpm) / Explore-GitHub-Actions (push) Waiting to run
Auto Building Wine Runner(deb) / Explore-GitHub-Actions (push) Waiting to run
2024-07-20 09:37:26 +08:00
30d4986214 调整系统判断机制
Some checks are pending
Auto Building Wine Runner(rpm) / Explore-GitHub-Actions (push) Waiting to run
Auto Building Wine Runner(deb) / Explore-GitHub-Actions (push) Waiting to run
2024-07-19 22:59:46 +08:00
11ad6f3766 新增Wine tag 取反逻辑(!) 2024-07-19 22:54:12 +08:00
046fe2c103 修复AOSC loong64 因为 pyperclip 问题导致无法正常打开运行器的问题 2024-07-19 22:16:55 +08:00
b672fd93e6 修复打包器选择Wine封装入deb模式时helper只能使用spark dwine helper的问题 2024-07-19 21:59:46 +08:00
a7d478ab93 更改 Wine git 仓库地址以修复 Wine 日构建问题
Some checks are pending
Auto Building Wine Runner(rpm) / Explore-GitHub-Actions (push) Waiting to run
Auto Building Wine Runner(deb) / Explore-GitHub-Actions (push) Waiting to run
2024-07-19 11:22:03 +08:00
c4987b4ce6 适配AOSC
Some checks are pending
Auto Building Wine Runner(rpm) / Explore-GitHub-Actions (push) Waiting to run
Auto Building Wine Runner(deb) / Explore-GitHub-Actions (push) Waiting to run
2024-07-18 21:13:28 +08:00
6ac4fa72ad 修改下更新日志
Some checks are pending
Auto Building Wine Runner(rpm) / Explore-GitHub-Actions (push) Waiting to run
Auto Building Wine Runner(deb) / Explore-GitHub-Actions (push) Waiting to run
2024-07-17 21:37:48 +08:00
15946ccb4e 适配debian testing的7z以修复打包时会把/打入.7z包导致死机的问题 2024-07-17 21:16:36 +08:00
e109502c34 新增开关选项
Some checks are pending
Auto Building Wine Runner(rpm) / Explore-GitHub-Actions (push) Waiting to run
Auto Building Wine Runner(deb) / Explore-GitHub-Actions (push) Waiting to run
2024-07-17 14:54:37 +08:00
97f944f4b9 安装更多wine工具支持根据当前机器实际情况自动推荐适合的wine 2024-07-17 14:45:30 +08:00
a447fa6343 清空下过时的helper
Some checks are pending
Auto Building Wine Runner(rpm) / Explore-GitHub-Actions (push) Waiting to run
Auto Building Wine Runner(deb) / Explore-GitHub-Actions (push) Waiting to run
2024-07-16 22:39:04 +08:00
3018f4276e 调整run.sh 2024-07-16 22:37:36 +08:00
c3bfb33dd9 推荐安装helper 2024-07-16 22:32:48 +08:00
f1decf51d1 支持导入.7z包时自动移除部分特殊符号
Some checks are pending
Auto Building Wine Runner(rpm) / Explore-GitHub-Actions (push) Waiting to run
Auto Building Wine Runner(deb) / Explore-GitHub-Actions (push) Waiting to run
2024-07-15 21:46:24 +08:00
e3c54ffc32 支持手动导入7z包 2024-07-15 20:46:21 +08:00
10db5c042d 安装wine出新增网盘入口
Some checks are pending
Auto Building Wine Runner(rpm) / Explore-GitHub-Actions (push) Waiting to run
Auto Building Wine Runner(deb) / Explore-GitHub-Actions (push) Waiting to run
2024-07-15 15:14:20 +08:00
18ce8a080f 支持调用GXDE的deepin-terminal-gtk 2024-07-15 12:52:51 +08:00
f9e9a4eb72 调整运行器缩放机制
Some checks are pending
Auto Building Wine Runner(rpm) / Explore-GitHub-Actions (push) Waiting to run
Auto Building Wine Runner(deb) / Explore-GitHub-Actions (push) Waiting to run
2024-07-14 18:48:30 +08:00
ebb6c2c5fa 修改打包器包名生成机制以及文本提示 2024-07-14 18:27:01 +08:00
de98af8c99 漏调Makefile
Some checks failed
Auto Building Wine Runner(rpm) / Explore-GitHub-Actions (push) Has been cancelled
Auto Building Wine Runner(deb) / Explore-GitHub-Actions (push) Has been cancelled
2024-07-12 19:06:19 +08:00
5f41d73dbd 跟进dxvk 2024-07-12 19:05:25 +08:00
7aff330137 忘记改启动器虚拟机入口的qemu调用了,现在支持调用Qemu Extra了
Some checks failed
Auto Building Wine Runner(rpm) / Explore-GitHub-Actions (push) Has been cancelled
Auto Building Wine Runner(deb) / Explore-GitHub-Actions (push) Has been cancelled
2024-06-30 09:22:16 +08:00
6c53446134 修复deepin23无法正常使用Mono/gecko安装器的问题
Some checks are pending
Auto Building Wine Runner(rpm) / Explore-GitHub-Actions (push) Waiting to run
Auto Building Wine Runner(deb) / Explore-GitHub-Actions (push) Waiting to run
2024-06-29 18:50:56 +08:00
8683ee1730 3.9.2
Some checks are pending
Auto Building Wine Runner(rpm) / Explore-GitHub-Actions (push) Waiting to run
Auto Building Wine Runner(deb) / Explore-GitHub-Actions (push) Waiting to run
2024-06-29 15:44:14 +08:00
f4bce0e99f 调整run.sh问题 2024-06-29 12:51:56 +08:00
380cf74bbf 新增拖动条 2024-06-29 12:04:46 +08:00
535232ac5f 优化小屏幕使用体验 2024-06-29 11:45:02 +08:00
6509a89658 精简组建*2 2024-06-29 11:15:40 +08:00
962fec1ca9 精简组件 2024-06-29 11:03:04 +08:00
89c61eeef2 移除废弃组建、wine虚拟机工具支持读取extra包的virtio-win.iso 2024-06-29 10:51:16 +08:00
ae119a7d1a 调整依赖
Some checks are pending
Auto Building Wine Runner(rpm) / Explore-GitHub-Actions (push) Waiting to run
Auto Building Wine Runner(deb) / Explore-GitHub-Actions (push) Waiting to run
2024-06-29 09:01:32 +08:00
f5a65ec92f 修复wine安装器在文件下载失败后无法自动关闭进度条和解除控件禁用的问题 2024-06-29 08:50:36 +08:00
fc9f2f05d2 不允许版本号开头输入首字母以及版本号不允许出现空格 2024-06-29 08:46:13 +08:00
c55ba35827 新增推荐依赖
Some checks are pending
Auto Building Wine Runner(rpm) / Explore-GitHub-Actions (push) Waiting to run
Auto Building Wine Runner(deb) / Explore-GitHub-Actions (push) Waiting to run
2024-06-28 21:27:46 +08:00
5aca3fb038 生成的deb同时支持使用spark-dwine-helper和deepin-wine-helper(未测试) 2024-06-28 16:31:13 +08:00
0ca24b773c 支持调用拓展qemu 2024-06-17 22:38:45 +08:00
f43ffa0fac 调整README 2024-06-16 22:09:19 +08:00
5736dd0bfa 更新README 2024-06-15 19:55:29 +08:00
d0071a9e5d 新增readme 2024-06-15 19:36:50 +08:00
dbb7a6f9b2 3.9.1初步 2024-06-07 13:38:12 +08:00
8870ec6764 处理UOS arm dwine6不同的问题 2024-06-07 12:37:07 +08:00
006b8ae773 处理UOS arm dwine6不同的问题 2024-06-07 11:17:31 +08:00
3cd38c0032 调整helper以单包支持UOS arm 2024-06-06 22:04:19 +08:00
d19453bb22 新增应急脚本 2024-06-06 21:11:15 +08:00
cca44603c2 新增一点点英文翻译 2024-06-02 22:38:01 +08:00
185 changed files with 2499 additions and 6221 deletions

3
.gitignore vendored
View File

@@ -4,3 +4,6 @@ __pycache__
VM-source/Makefile
*.rpm
*.pro.user
.vscode
package-script.zip
build-*-Debug

3
.gitmodules vendored Normal file
View File

@@ -0,0 +1,3 @@
[submodule "novnc"]
path = novnc
url = https://github.com/novnc/noVNC

View File

@@ -1,21 +0,0 @@
#!/bin/bash
echo 网址http://deb.wine.wine-runner.gfdgdxi.top/
if [[ ! -f /etc/apt/sources.list.d/gfdgdxi-list-winehq.list ]]; then
echo 未添加源,现在开始添加!
sudo apt update
sudo apt install wget gpg
if [[ -f /tmp/github.sh ]]; then
rm -v /tmp/github.sh
fi
cd /tmp
wget http://deb.wine.wine-runner.gfdgdxi.top/sources/github.sh
bash github.sh
rm github.sh
echo 添加完成,现在安装 Wine
else
echo 已添加源,忽略,现在安装 Wine
sudo apt update
fi
sudo apt install winehq-devel -y
echo 安装完成,按回车键退出!
read

View File

@@ -40,400 +40,11 @@ urlSourcesList = [
urlSources = urlSourcesList[0]
lists = []
class ProgramRunStatusUpload():
msgWindow = None
starLayout = None
fen = None
starList = []
sha1Value = ""
programName = None
def ChangeStar():
if ProgramRunStatusUpload.fen.currentIndex() > 5:
for i in ProgramRunStatusUpload.starList:
i.setText(f"<img src='{programPath}/Icon/BadStar.svg' width=25>")
return
for i in range(ProgramRunStatusUpload.fen.currentIndex()):
ProgramRunStatusUpload.starList[i].setText(f"<img src='{programPath}/Icon/Star.svg' width=25>")
head = ProgramRunStatusUpload.fen.currentIndex()
end = len(ProgramRunStatusUpload.starList)
for i in range(head, end):
ProgramRunStatusUpload.starList[i].setText(f"<img src='{programPath}/Icon/UnStar.svg' width=25>")
def ShowWindow(sha="", title=""):
ProgramRunStatusUpload.starList = []
ProgramRunStatusUpload.sha1Value = sha
ProgramRunStatusUpload.msgWindow = QtWidgets.QMainWindow()
msgWidget = QtWidgets.QWidget()
msgWidgetLayout = QtWidgets.QGridLayout()
ProgramRunStatusUpload.programName = QtWidgets.QLineEdit()
ProgramRunStatusUpload.fen = QtWidgets.QComboBox()
ProgramRunStatusUpload.starLayout = QtWidgets.QHBoxLayout()
upload = QtWidgets.QPushButton(QtCore.QCoreApplication.translate("U", "上传"))
upload.clicked.connect(ProgramRunStatusUpload.Upload)
if title != "":
ProgramRunStatusUpload.programName.setText(title)
ProgramRunStatusUpload.programName.setDisabled(True)
# 生成星星列表
for i in [1, 1, 1, 1, 0]:
ProgramRunStatusUpload.starList.append(QtWidgets.QLabel(f"<img src='{programPath}/Icon/{['Un', ''][i]}Star.svg' width=25>"))
ProgramRunStatusUpload.starLayout.addWidget(ProgramRunStatusUpload.starList[-1])
ProgramRunStatusUpload.starLayout.addItem(QtWidgets.QSpacerItem(20, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum))
ProgramRunStatusUpload.programName.setPlaceholderText(QtCore.QCoreApplication.translate("U", "如果这个程序和程序名确实是合法还是检测到敏感词改为“NULL”即可"))
ProgramRunStatusUpload.fen.addItems(["0分", "1分", "2分", "3分", "4分", "5分"])
ProgramRunStatusUpload.fen.setCurrentIndex(4)
ProgramRunStatusUpload.fen.currentIndexChanged.connect(ProgramRunStatusUpload.ChangeStar)
msgWidgetLayout.addWidget(QtWidgets.QLabel(QtCore.QCoreApplication.translate("U", "程序名:")), 0, 0)
msgWidgetLayout.addWidget(QtWidgets.QLabel(QtCore.QCoreApplication.translate("U", "评分:")), 1, 0)
msgWidgetLayout.addWidget(ProgramRunStatusUpload.programName, 0, 1)
msgWidgetLayout.addWidget(ProgramRunStatusUpload.fen, 1, 1)
msgWidgetLayout.addLayout(ProgramRunStatusUpload.starLayout, 2, 1)
msgWidgetLayout.addWidget(upload, 3, 1)
msgWidget.setLayout(msgWidgetLayout)
ProgramRunStatusUpload.msgWindow.setCentralWidget(msgWidget)
ProgramRunStatusUpload.msgWindow.setWindowTitle(QtCore.QCoreApplication.translate("U", "上传程序运行情况"))
ProgramRunStatusUpload.msgWindow.setWindowIcon(QtGui.QIcon(iconPath))
ProgramRunStatusUpload.msgWindow.show()
def Upload():
try:
#if ProgramRunStatusUpload.sha1Value == "":
#ProgramRunStatusUpload.sha1Value = ProgramRunStatusUpload.GetSHA1(e2.currentText())
QtWidgets.QMessageBox.information(None, QtCore.QCoreApplication.translate("U", "提示"), requests.post(base64.b64decode("aHR0cDovLzEyMC4yNS4xNTMuMTQ0OjMwMjUwL2Jhc2g=").decode("utf-8"), {
"BashName": ProgramRunStatusUpload.sha1Value,
"Fen": ProgramRunStatusUpload.fen.currentIndex()
}).json()["Error"])
except:
traceback.print_exc()
QtWidgets.QMessageBox.critical(None, QtCore.QCoreApplication.translate("U", "错误"), QtCore.QCoreApplication.translate("U", "数据上传失败!"))
class InformationWindow():
def ShowWindow():
#webeng = False
# 获取选中项
try:
choose = ui.searchList.selectionModel().selectedIndexes()[0].data()
except:
QtWidgets.QMessageBox.critical(window, "错误", "您未选择任何配置文件")
return
fileName = ""
for i in lists:
print(i)
if i[0] == choose:
fileName = i[1]
break
aboutHtml = ""
try:
get = requests.get(f"{urlSources}/information/{fileName}.txt")
if get.status_code / 100 != 2 and get.status_code / 100 != 3:
int("Bad")
about = get.text
aboutHtml = str(about)
if not "<" in about:
# 非 Html 标签
for i in about.splitlines():
about += f"<p>{i}</p>\n"
#about = f"<pre>{about}</pre>"
about = f"<h1>关于“{choose}”的介绍</h1>\n{about}"
except:
traceback.print_exc()
about = f"<h1>关于“{choose}”的介绍</h1>\n<p>暂无此程序的介绍</p>"
try:
import requests as r
fenlists = requests.get("http://data.download.gfdgdxi.top/BashAppFen/" + urllib.request.quote(fileName) + base64.b64decode("L2FsbC5qc29u").decode("utf-8"), timeout=1000).json()
tipsInfo = ""
except:
fenlists = [0, 0, 0, 0, 0]
tipsInfo = "暂时无人提交此脚本运行情况,是否立即提交?"
maxHead = fenlists.index(max(fenlists))
allNumber = 0
for i in fenlists:
allNumber += i
try:
maxNumber = max(fenlists) / allNumber * 100
if tipsInfo == "":
tipsInfo = f"{maxNumber}%的用户选择了这个评分"
except:
pass
end = 5
starHtml = ""
if maxHead > 5:
for i in range(end):
if webeng:
starHtml += f"<img src='http://wine-runner.gfdgdxi.top/BadStar.svg' width=50>\n"
else:
starHtml += f"<img src='{programPath}/Icon/BadStar.svg' width=50>\n"
else:
for i in range(maxHead):
if webeng:
starHtml += f"<img src='http://wine-runner.gfdgdxi.top/Star.svg' width=50>\n"
else:
starHtml += f"<img src='{programPath}/Icon/Star.svg' width=50>\n"
head = maxHead
for i in range(head, end):
if webeng:
starHtml += f"<img src='http://wine-runner.gfdgdxi.top/UnStar.svg' width=50>"
else:
starHtml += f"<img src='{programPath}/Icon/UnStar.svg' width=50>"
about += f"\n<hr/><h1>评分情况</h1>\n<p align='center'>{starHtml}</p>\n<p align='center'>{tipsInfo}</p>"
message = QtWidgets.QDialog()
messageLayout = QtWidgets.QVBoxLayout()
if webeng:
informationText = QtWebEngineWidgets.QWebEngineView()
print(aboutHtml)
if aboutHtml[:7] == "Visit: ":
url = aboutHtml[7:].splitlines()[0]
print(url)
informationText.setUrl(QtCore.QUrl(url.strip()))
else:
#informationText.linkClicked.connect(lambda: print("a"))
try:
with open("/tmp/deepin-wine-runner-information.html", "w") as file:
file.write(about)
informationText.setUrl(QtCore.QUrl("file:///tmp/deepin-wine-runner-information.html"))
except:
traceback.print_exc()
informationText.setHtml(about)
#informationText.urlChanged.connect(lambda: informationText.setUrl(QtCore.QUrl("https://gfdgd-xi.github.io")))
else:
informationText = QtWidgets.QTextBrowser()
informationText.setHtml(about)
uploadFen = QtWidgets.QPushButton("提交评分")
uploadFen.clicked.connect(lambda: ProgramRunStatusUpload.ShowWindow(fileName, choose))
#informationText.setUrl(QtCore.QUrl("https://gfdgd-xi.github.io"))
messageLayout.addWidget(informationText)
messageLayout.addWidget(uploadFen)
message.setWindowTitle(f"关于“{choose}”的介绍")
message.resize(int(message.frameSize().width() * 1.5), int(message.frameSize().height()))
message.setLayout(messageLayout)
#message.setWindowModality(ApplicationModal);
message.show()
message.exec_()
def Add(lists: list):
global pinLunLayout
pinLunLayout1 = QtWidgets.QVBoxLayout()
pinLunLayout = QtWidgets.QWidget()
pinLunLayout.setLayout(pinLunLayout1)
for i in range(pinLunLayout1.count()):
pinLunLayout1.removeItem(pinLunLayout1.itemAt(i))
for i in lists:
widget = QtWidgets.QWidget()
inLayout = QtWidgets.QGridLayout()
inLayout.addWidget(QtWidgets.QLabel("<hr>"), 0, 0, 1, 3)
inLayout.addWidget(QtWidgets.QLabel(f"<b>{i[0]}</b>"), 1, 0)
inLayout.addWidget(QtWidgets.QLabel(f"<p align='right'><b>第{i[1]}层</b></p>"), 1, 2)
inLayout.addWidget(QtWidgets.QLabel(i[2]), 2, 0, 1, 3)
widget.setLayout(inLayout)
pinLunLayout1.addWidget(widget)
#pinLunLayout.addWidget(QtWidgets.QLabel("<hr/>"))
# pinLunLayout = widget
all = 0
now = 0
class ProgramRunStatusShow():
msgWindow = None
pingLunLayout = None
def ShowWindow():
global lists
global all
global now
global leftButton
global rightButton
# 获取选中项
try:
choose = ui.searchList.selectionModel().selectedIndexes()[0].data()
except:
QtWidgets.QMessageBox.critical(window, "错误", "您未选择任何配置文件")
return
fileName = ""
for i in lists:
print(i)
if i[0] == choose:
fileName = i[1]
break
try:
fenlists = requests.get("http://data.download.gfdgdxi.top/BashAppFen/" + urllib.request.quote(fileName) + base64.b64decode("L2FsbC5qc29u").decode("utf-8")).json()
tipsInfo = ""
except:
#traceback.print_exc()
fenlists = [0, 0, 0, 0, 0]
tipsInfo = "暂时无人提交此脚本评分,是否立即提交?"
maxHead = fenlists.index(max(fenlists))
allNumber = 0
for i in fenlists:
allNumber += i
try:
maxNumber = max(fenlists) / allNumber * 100
if tipsInfo == "":
tipsInfo = f"{maxNumber}%的用户选择了这个评分"
except:
pass
ProgramRunStatusShow.msgWindow = QtWidgets.QMainWindow()
msgWidget = QtWidgets.QWidget()
msgWidgetLayout = QtWidgets.QGridLayout()
starLayout = QtWidgets.QHBoxLayout()
uploadButton = QtWidgets.QPushButton(QtCore.QCoreApplication.translate("U", "点此提交评分"))
uploadButton.clicked.connect(lambda: ProgramRunStatusUpload.ShowWindow(fileName, choose))
msgWidgetLayout.addWidget(QtWidgets.QLabel(QtCore.QCoreApplication.translate("U", "综合评价:")), 0, 0, 2, 1)
msgWidgetLayout.addLayout(starLayout, 0, 1, 2, 1)
msgWidgetLayout.addWidget(QtWidgets.QLabel(tipsInfo), 0, 2)
#msgWidgetLayout.addWidget(QtWidgets.QLabel("" if dateVersion == "" else f"数据版本:{dateVersion}"), 2, 0, 1, 2)
msgWidgetLayout.addWidget(uploadButton, 1, 2)
end = 5
if maxHead > 5:
for i in range(end):
starLayout.addWidget(QtWidgets.QLabel(f"<img src='{programPath}/Icon/BadStar.svg' width=50>"))
else:
for i in range(maxHead):
starLayout.addWidget(QtWidgets.QLabel(f"<img src='{programPath}/Icon/Star.svg' width=50>"))
head = maxHead
for i in range(head, end):
starLayout.addWidget(QtWidgets.QLabel(f"<img src='{programPath}/Icon/UnStar.svg' width=50>"))
pingLun = QtWidgets.QWidget()
msgWidgetLayout.addWidget(pingLun, 4, 0, 1, 3)
pingLunLayout = QtWidgets.QGridLayout()
pingLunInfo = QtWidgets.QTextEdit()
#pingLunInfo.document().setMaximumBlockCount(5)
uploadButton = QtWidgets.QPushButton("评论")
pingLunLayout.addWidget(pingLunInfo, 0, 0, 1, 3)
pingLunLayout.addWidget(uploadButton, 1, 2)
pingLunInfo.setPlaceholderText("""在此输入评论,须知:
※1、不得含有色情、暴力、侮辱等违法内容以及不得有广告推广等内容
※2、字数至少 15 字,但不得超过 250 字,评论内容最多 5 行,且评论内容将会进行审核,意味着评论不会实时生效显示
※3、如果审核不通过将会被屏蔽并拉入黑名单以及公开发布 IP 地址,评论前请三思!""")
leftButton = QtWidgets.QPushButton("上一页")
rightButton = QtWidgets.QPushButton("下一页")
if maxHead == 0:
#pingLun.setDisabled(True)
pass
else:
# 显示最新的3条评论
try:
all = int(requests.get(f"http://bashpinlun.gfdgdxi.top/{urllib.request.quote(fileName)}/data.txt").text)
now = all - 3
print(all)
if all < 3:
start = 0
rightButton.setDisabled(True)
else:
start = all - 3
uploadList = []
for i in range(all - 1, start - 1, -1):
print(f"{i + 1} 条评论:")
info = requests.get(f"http://bashpinlun.gfdgdxi.top/{urllib.request.quote(fileName)}/pf-{i}.txt").text.strip()
print(info)
uploadList.append([f"用户{i + 1}", i + 1, info])
Add(uploadList)
except:
traceback.print_exc()
try:
ProgramRunStatusShow.pingLunLayout = pingLunLayout
pingLunLayout.addWidget(pinLunLayout, 2, 0, 1, 3)
except:
leftButton.setDisabled(True)
rightButton.setDisabled(True)
leftButton.clicked.connect(Left)
rightButton.clicked.connect(Right)
pingLunLayout.addWidget(leftButton, 3, 0)
pingLunLayout.addWidget(rightButton, 3, 2)
leftButton.setDisabled(True)
pingLun.setLayout(pingLunLayout)
msgWidget.setLayout(msgWidgetLayout)
uploadButton.clicked.connect(lambda: ProgramRunStatusShow.Upload(pingLunInfo.toPlainText(), fileName))
ProgramRunStatusShow.msgWindow.setCentralWidget(msgWidget)
ProgramRunStatusShow.msgWindow.setWindowIcon(QtGui.QIcon(iconPath))
ProgramRunStatusShow.msgWindow.setWindowTitle(f"脚本“{choose}”运行情况")
ProgramRunStatusShow.msgWindow.show()
def Upload(info, name):
print(f"脚本:{name}")
print(f"评论:{info}")
try:
res = requests.post(base64.b64decode("aHR0cDovLzEyMC4yNS4xNTMuMTQ0OjMwMjUwL1BpbmdMdW4=").decode("utf-8"), {"PinLun": info, "Version": name}).json()
print(res)
if res["ExitCode"]:
QtWidgets.QMessageBox.critical(ProgramRunStatusShow.msgWindow, "错误", res["Error"])
return
QtWidgets.QMessageBox.information(ProgramRunStatusShow.msgWindow, "提示", res["Error"])
except:
traceback.print_exc()
QtWidgets.QMessageBox.critical(ProgramRunStatusShow.msgWindow, "错误", "提交失败")
def UpdateFen():
global now
fileName = ""
# 获取选中项
try:
choose = ui.searchList.selectionModel().selectedIndexes()[0].data()
except:
QtWidgets.QMessageBox.critical(window, "错误", "您未选择任何配置文件")
return
for i in lists:
print(i)
if i[0] == choose:
fileName = i[1]
break
uploadList = []
for i in range(now + 2, now - 1, -1):
print(f"{i + 1} 条评论:")
info = requests.get(f"http://bashpinlun.gfdgdxi.top/{urllib.request.quote(fileName)}/pf-{i}.txt").text.strip()
print(info)
uploadList.append([f"用户{i + 1}", i + 1, info])
#ProgramRunStatusShow.pingLunLayout.removeItem(ProgramRunStatusShow.pingLunLayout.itemAt(2))
ProgramRunStatusShow.pingLunLayout.removeWidget(pinLunLayout)
pinLunLayout.hide()
#pinLunLayout.
Add(uploadList)
#l = QtWidgets.QGridLayout()
#l.removeWidget(pinLunLayout)
ProgramRunStatusShow.pingLunLayout.addWidget(pinLunLayout, 2, 0, 1, 3)
def Left():
global now
global all
if now + 6 >= all:
now = all - 3
leftButton.setDisabled(True)
rightButton.setEnabled(True)
else:
now += 3
leftButton.setEnabled(True)
rightButton.setEnabled(True)
UpdateFen()
print(all)
print(now)
def Right():
global now
if now - 3 < 0:
now = 0
rightButton.setDisabled(True)
leftButton.setEnabled(True)
else:
now -= 3
leftButton.setEnabled(True)
rightButton.setEnabled(True)
UpdateFen()
def UploadFen():
global lists
# 获取选中项
try:
choose = ui.searchList.selectionModel().selectedIndexes()[0].data()
except:
QtWidgets.QMessageBox.critical(window, "错误", "您未选择任何配置文件")
return
fileName = ""
for i in lists:
print(i)
if i[0] == choose:
fileName = i[1]
break
ProgramRunStatusUpload.ShowWindow(fileName, choose)
class Connect:
def SearchBotton_Clicked():
@@ -573,11 +184,9 @@ if __name__ == "__main__":
# 连接信号和槽
ui.saerchBotton.clicked.connect(Connect.SearchBotton_Clicked)
#ui.uploadFen.clicked.connect(UploadFen)
ui.getInfoButton.clicked.connect(InformationWindow.ShowWindow)
ui.runBotton.clicked.connect(Connect.RunBotton_Clicked)
ui.openFile.triggered.connect(Connect.OpenFile_Triggered)
ui.exitProgram.triggered.connect(window.close)
ui.getFen.clicked.connect(ProgramRunStatusShow.ShowWindow)
# 解析云列表
try:
# 获取列表

View File

@@ -15,6 +15,10 @@ import PyQt5.QtGui as QtGui
import PyQt5.QtCore as QtCore
import PyQt5.QtWidgets as QtWidgets
TMPDIR = os.getenv("TMPDIR")
if (TMPDIR == None):
TMPDIR = ""
# 获取用户主目录
def get_home():
return os.path.expanduser('~')
@@ -26,6 +30,11 @@ def readtxt(path):
f.close() # 关闭文本对象
return str # 返回结果
fontSize = 1
'''tempSys = QtWidgets.QApplication(sys.argv)
if tempSys.primaryScreen().availableGeometry().size().width() < 1366 or tempSys.primaryScreen().availableGeometry().size().height() < 768:
fontSize = 1.1'''
defultProgramList = {
"Architecture": "Auto",
"Debug": True,
@@ -44,7 +53,7 @@ defultProgramList = {
"AutoPath": False,
"QemuUnMountHome": False,
"Chinese": True,
"FontSize": 1
"FontSize": fontSize
}
programPath = os.path.split(os.path.realpath(__file__))[0] # 返回 string
@@ -203,9 +212,9 @@ class SaveLogReport():
traceback.print_exc()
os.system(f"'{programPath}/wrestool' '{binPath}' -x -t 14 > '/tmp/wine-runner-log-icon.png'")
# 如果提取成功
if os.path.exists("/tmp/wine-runner-log-icon.png"):
if os.path.exists(TMPDIR + "/tmp/wine-runner-log-icon.png"):
# 转换成 base64 编码
self.binIcon = "data:image/jpg;base64," + FileToBase64("/tmp/wine-runner-log-icon.png")
self.binIcon = "data:image/jpg;base64," + FileToBase64(TMPDIR + "/tmp/wine-runner-log-icon.png")
self.binIconPath = "/tmp/wine-runner-log-icon.png"
else:
self.binIcon = "Not Found"
@@ -312,9 +321,9 @@ class SaveLogReport():
messagebox.exec_()
def To7z(self, savePath):
os.system("rm -rfv /tmp/wine-runner-log")
os.system("mkdir -v /tmp/wine-runner-log")
self.ToHtml("/tmp/wine-runner-log/index.html", toZip=True)
os.system("rm -rfv $TMPDIR/tmp/wine-runner-log")
os.system("mkdir -v $TMPDIR/tmp/wine-runner-log")
self.ToHtml(TMPDIR + "/tmp/wine-runner-log/index.html", toZip=True)
if os.path.exists(self.binIconPath):
shutil.copy(self.binIconPath, f"/tmp/wine-runner-log/{os.path.basename(self.binIconPath)}")
lists = ["wine-runner-log-icon.png", "index.html"]
@@ -327,7 +336,7 @@ class SaveLogReport():
else:
lists.append(name)
shutil.copy(i, f"/tmp/wine-runner-log/{name}")
os.system(f"7z a '{savePath}' /tmp/wine-runner-log")
os.system(f"7z a '{savePath}' $TMPDIR/tmp/wine-runner-log")
def ToHtml(self, savePath, toZip=False):

74
ExePreview/.gitignore vendored Normal file
View File

@@ -0,0 +1,74 @@
# This file is used to ignore files which are generated
# ----------------------------------------------------------------------------
*~
*.autosave
*.a
*.core
*.moc
*.o
*.obj
*.orig
*.rej
*.so
*.so.*
*_pch.h.cpp
*_resource.rc
*.qm
.#*
*.*#
core
!core/
tags
.DS_Store
.directory
*.debug
Makefile*
*.prl
*.app
moc_*.cpp
ui_*.h
qrc_*.cpp
Thumbs.db
*.res
*.rc
/.qmake.cache
/.qmake.stash
# qtcreator generated files
*.pro.user*
CMakeLists.txt.user*
# xemacs temporary files
*.flc
# Vim temporary files
.*.swp
# Visual Studio generated files
*.ib_pdb_index
*.idb
*.ilk
*.pdb
*.sln
*.suo
*.vcproj
*vcproj.*.*.user
*.ncb
*.sdf
*.opensdf
*.vcxproj
*vcxproj.*
# MinGW generated files
*.Debug
*.Release
# Python byte code
*.pyc
# Binaries
# --------
*.dll
*.exe

View File

@@ -0,0 +1,3 @@
{
"Keys": ["application/x-ms-dos-executable", "application/x-msi", "application/x-ms-shortcut"]
}

31
ExePreview/ExePreview.pro Normal file
View File

@@ -0,0 +1,31 @@
QT += gui
TEMPLATE = lib
CONFIG += plugin core gui
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
INCLUDEPATH += /usr/include/dde-file-manager/
DISTFILES += dfmpreview-wine-runner-plugin.json
CONFIG += c++17
# You can make your code fail to compile if it uses deprecated APIs.
# In order to do so, uncomment the following line.
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
SOURCES += \
dfmexepreview.cpp \
main.cpp
HEADERS += \
dfmexepreview.h \
main.h
DISTFILES += ExePreview.json
# Default rules for deployment.
unix {
target.path = $$[QT_INSTALL_PLUGINS]/generic
}
!isEmpty(target.path): INSTALLS += target

View File

@@ -0,0 +1,59 @@
#include "dfmexepreview.h"
#include <dfileservices.h>
DFMExePreview::DFMExePreview(QObject *parent) : DFMFilePreview(parent)
{
}
DFMExePreview::~DFMExePreview()
{
if (m_view) {
m_view->deleteLater();
m_view = NULL;
}
if (m_statusBar) {
m_statusBar->deleteLater();
m_statusBar = NULL;
}
}
void DFMExePreview::initialize(QWidget *window, QWidget *statusBar)
{
Q_UNUSED(window)
Q_UNUSED(statusBar)
if (!m_view) {
m_view = new QLabel();
}
if (!m_statusBar) {
m_statusBar = new QLabel();
}
}
bool DFMExePreview::setFileUrl(const DUrl &url)
{
m_url = url;
m_view->setText("114514");
return 1;
}
DUrl DFMExePreview::fileUrl() const
{
return m_url;
}
QWidget *DFMExePreview::contentWidget() const
{
return m_view;
}
QWidget *DFMExePreview::statusBarWidget() const
{
return m_statusBar;
}
QString DFMExePreview::title() const
{
return m_title;
}

View File

@@ -0,0 +1,28 @@
#ifndef DFMEXEPREVIEW_H
#define DFMEXEPREVIEW_H
#include <QObject>
#include <dfmfilepreview.h>
#include <QLabel>
class DFMExePreview : public DFM_NAMESPACE::DFMFilePreview
{
Q_OBJECT
public:
explicit DFMExePreview(QObject *parent = NULL);
~DFMExePreview();
virtual void initialize(QWidget *window, QWidget *statusBar) Q_DECL_OVERRIDE;
virtual bool setFileUrl(const DUrl &url) Q_DECL_OVERRIDE;
virtual DUrl fileUrl() const Q_DECL_OVERRIDE;
virtual QWidget *contentWidget() const Q_DECL_OVERRIDE;
virtual QWidget *statusBarWidget() const Q_DECL_OVERRIDE;
virtual QString title() const Q_DECL_OVERRIDE;
protected:
DUrl m_url;
QLabel *m_view = NULL;
QLabel *m_statusBar = NULL;
QString m_title;
};
#endif // DFMEXEPREVIEW_H

17
ExePreview/main.cpp Normal file
View File

@@ -0,0 +1,17 @@
#include "main.h"
#include "dfmexepreview.h"
GenericPlugin::GenericPlugin(QObject *parent)
: DFM_NAMESPACE::DFMFilePreviewPlugin(parent)
{
}
/*QObject *GenericPlugin::create(const QString &name, const QString &spec)
{
}*/
DFM_NAMESPACE::DFMFilePreview *GenericPlugin::create(const QString &key)
{
Q_UNUSED(key);
return new DFMExePreview;
}

22
ExePreview/main.h Normal file
View File

@@ -0,0 +1,22 @@
#define DFMFilePreviewFactoryInterface_ood "com.deepin.filemanager.DFMFilePreviewFactoryInterface_WineRunner"
#ifndef MAIN_H
#define MAIN_H
#include <QGenericPlugin>
#include <dfmfilepreviewplugin.h>
class GenericPlugin : public DFM_NAMESPACE::DFMFilePreviewPlugin
{
Q_OBJECT
Q_PLUGIN_METADATA(IID QGenericPluginFactoryInterface_iid FILE "ExePreview.json")
public:
explicit GenericPlugin(QObject *parent = nullptr);
virtual DFM_NAMESPACE::DFMFilePreview *create(const QString &key);
};
#endif // MAIN_H

BIN
Icon/Function/360.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

BIN
Icon/Function/bilibili.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

37
Icon/Function/deb.svg Normal file

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 46 KiB

View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 41.2 (35397) - http://www.bohemiancoding.com/sketch -->
<title>dialog-error</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="dialog-error">
<image id="Bitmap" x="1" y="2" width="62" height="62" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAD4AAAA+CAYAAABzwahEAAAABGdBTUEAA1teXP8meAAABQhJREFUaAXlmol2ozAMANu973v//yv3ProammEVAwWT5hVcvacaHFvWSLKhaS8vziuXhfnyvvj44qroKO+Lj9ffzjlSaznb47pU7DnGVrjccp2VeYhjru9O+OniJ5jopmqHVn0Q1ygixN+4RhEhnOt45zPG8c53ji1jVomLrpock5yvszj/8GDsT7S/Q9c6ic1HodkegTAIcbnadu84RmqkBMY5FMd+Hdpobk0I6ONQWgKKnhQAAcLOYnGOpWlGfoYFy3ixscqBrPnkMAd4twJdVZWl0wdbsw3QKPMsQzKMVi0c49cIa7h9qACTUG2rBjxDsyhOfD+01QufOMEAEHwUqQr8EnCBzTTQlBmlfdeCH+5/wIWfrYQacCILNMCU9lbEg869L/yN/s2Bm21LitJmoa0Jhxx+LYa/CVxoxmCQTG8ROtzqxFLHV68PHw2bKfAMTXlzkm6pvIck1z1kHt89fCfLfgyciQifaeBH17OPH1QlvqNmXqaegBNxTOhnIi37em+Cz5lh4D9wWXKJs1fI9LnfxvL6t3lNtp8e/B+U/FjGgecUZzB7e6/iGx4sN5Z6zjaD91jiZZJggIXKlq8bU2acDxnEAbHlR1fn/IIfcgjeTxHcaDCglWwLOZp1wRkEvPd7PdCEza0ssMHYiaDc0Em29/Cigr81AhNsA3CzTalv4beuGqglY2GCrc+6F4LzCLM0lhjcyxiZel5LXXAH7AWoxk9OeMH7w+w+gJPUSfAWnt1TVTDIONlGiMZ9AIf1Mu9xAjB4mWdUIwIbjF2iBYeNjpYPN9g6aGAF7zvobFwGGYfXQLTIfsTmjXu75czL1rEKTobp4LWuVYHNBPelTQfKl4util+cdvBk3Chw6rWecZ9aV5Y68HTyq1urAhuMfcYBFZxAGAz6WxG5JsF5ZX3eCm3igAm2I3Cybcb58FloawJTBh/scT7kgGvpkJMngx/tZ7LOl/Do69BWBBa5YOwkH2SWO1/MURotnPAwwAJTv7/jerSkebWjPJjwLXTP8j6cB5i/AfonpS7rOeMA0sle4FtJ3nT8D4O43J3gOwz+Q0Nf5pBMHWJknaDwGPgaukf5EE6TZcCPsg1MmXH6iIwTCMA7Oncm+IzvGfoIYSrjDmLyi1CCsZe/sLwMX1+F8jezXOazpQ7s0aCDIY3E7WaFfwTgQAPaA43DbSBTGQdeIQjc8zzklB81FP13LTy6PocCDDjbVV/LRE4ebjGnEyaonAdvQreYeTINNL4Bzbbk6aTvcXksUxnPo4wWLZl/G0okWWQLwn7+GGqmZ6Fxegk444ycpUPZM5fo3qWwn6lCtqCZHjy6xhxcAu5+z/AEgGc8J6gRHrN/rj5Lm5cU3jOEtrxn110Cno2U8Myn9Hm9pfStiLg8i/Am9imUNcksmfb0FhofZ6UWHIMlPLCcqLw00BKARYvHuKWCXcqatzHWI8Moa3l661d0zYtlPD/y/wjncMqjOIVSdvn9+EvcU4ZkYo2QFF6e2E7YZUsBKqzAVllVsIUIe1XiPFoUJ1ECQDmq9OEgzuo49wRDhwmecw0cLbYYxzzVuWVZV0GHvc5p2rVSBiBD5GBwbYUYLOdaorQEAwUsQ3rNZ46Py/VbysUxcopoJ0MJWraOyesJI3jZ+jktYnt9t+KnDq+YOjol2xMwt0xyjK0QueU6q4s5xvvVrYuvNjAzsbRf3pfTS7Dyvhy/+v4fra1pWYxQ1MYAAAAASUVORK5CYII="></image>
<ellipse id="Oval" fill="#C51818" cx="32" cy="32" rx="28" ry="28"></ellipse>
<path d="M40.7494771,20.5594658 C41.4928588,19.8160841 42.6929596,19.8109252 43.4415538,20.5595194 C44.1849651,21.3029306 44.1873135,22.50589 43.4416074,23.2515961 L23.2505229,43.4426806 C22.5071412,44.1860623 21.3070404,44.1912212 20.5584462,43.442627 C19.8150349,42.6992158 19.8126865,41.4962564 20.5583926,40.7505503 L40.7494771,20.5594658 Z" id="Rectangle" fill="#FFFFFF"></path>
<path d="M43.4405842,40.7476216 C44.1838994,41.4909368 44.1890579,42.6909303 43.4405307,43.4394576 C42.6971859,44.1828023 41.4943341,44.1851506 40.7486947,43.4395111 L20.5594158,23.2502322 C19.8161006,22.506917 19.8109421,21.3069235 20.5594693,20.5583962 C21.3028141,19.8150515 22.5056659,19.8127032 23.2513053,20.5583427 L43.4405842,40.7476216 Z" id="Rectangle" fill="#FFFFFF"></path>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 3.2 KiB

View File

@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 41.2 (35397) - http://www.bohemiancoding.com/sketch -->
<title>dialog-ok</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="dialog-ok">
<image id="Bitmap" x="1" y="2" width="62" height="62" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAD4AAAA+CAYAAABzwahEAAAABGdBTUEAA1teXP8meAAABQhJREFUaAXlmol2ozAMANu973v//yv3ProammEVAwWT5hVcvacaHFvWSLKhaS8vziuXhfnyvvj44qroKO+Lj9ffzjlSaznb47pU7DnGVrjccp2VeYhjru9O+OniJ5jopmqHVn0Q1ygixN+4RhEhnOt45zPG8c53ji1jVomLrpock5yvszj/8GDsT7S/Q9c6ic1HodkegTAIcbnadu84RmqkBMY5FMd+Hdpobk0I6ONQWgKKnhQAAcLOYnGOpWlGfoYFy3ixscqBrPnkMAd4twJdVZWl0wdbsw3QKPMsQzKMVi0c49cIa7h9qACTUG2rBjxDsyhOfD+01QufOMEAEHwUqQr8EnCBzTTQlBmlfdeCH+5/wIWfrYQacCILNMCU9lbEg869L/yN/s2Bm21LitJmoa0Jhxx+LYa/CVxoxmCQTG8ROtzqxFLHV68PHw2bKfAMTXlzkm6pvIck1z1kHt89fCfLfgyciQifaeBH17OPH1QlvqNmXqaegBNxTOhnIi37em+Cz5lh4D9wWXKJs1fI9LnfxvL6t3lNtp8e/B+U/FjGgecUZzB7e6/iGx4sN5Z6zjaD91jiZZJggIXKlq8bU2acDxnEAbHlR1fn/IIfcgjeTxHcaDCglWwLOZp1wRkEvPd7PdCEza0ssMHYiaDc0Em29/Cigr81AhNsA3CzTalv4beuGqglY2GCrc+6F4LzCLM0lhjcyxiZel5LXXAH7AWoxk9OeMH7w+w+gJPUSfAWnt1TVTDIONlGiMZ9AIf1Mu9xAjB4mWdUIwIbjF2iBYeNjpYPN9g6aGAF7zvobFwGGYfXQLTIfsTmjXu75czL1rEKTobp4LWuVYHNBPelTQfKl4util+cdvBk3Chw6rWecZ9aV5Y68HTyq1urAhuMfcYBFZxAGAz6WxG5JsF5ZX3eCm3igAm2I3Cybcb58FloawJTBh/scT7kgGvpkJMngx/tZ7LOl/Do69BWBBa5YOwkH2SWO1/MURotnPAwwAJTv7/jerSkebWjPJjwLXTP8j6cB5i/AfonpS7rOeMA0sle4FtJ3nT8D4O43J3gOwz+Q0Nf5pBMHWJknaDwGPgaukf5EE6TZcCPsg1MmXH6iIwTCMA7Oncm+IzvGfoIYSrjDmLyi1CCsZe/sLwMX1+F8jezXOazpQ7s0aCDIY3E7WaFfwTgQAPaA43DbSBTGQdeIQjc8zzklB81FP13LTy6PocCDDjbVV/LRE4ebjGnEyaonAdvQreYeTINNL4Bzbbk6aTvcXksUxnPo4wWLZl/G0okWWQLwn7+GGqmZ6Fxegk444ycpUPZM5fo3qWwn6lCtqCZHjy6xhxcAu5+z/AEgGc8J6gRHrN/rj5Lm5cU3jOEtrxn110Cno2U8Myn9Hm9pfStiLg8i/Am9imUNcksmfb0FhofZ6UWHIMlPLCcqLw00BKARYvHuKWCXcqatzHWI8Moa3l661d0zYtlPD/y/wjncMqjOIVSdvn9+EvcU4ZkYo2QFF6e2E7YZUsBKqzAVllVsIUIe1XiPFoUJ1ECQDmq9OEgzuo49wRDhwmecw0cLbYYxzzVuWVZV0GHvc5p2rVSBiBD5GBwbYUYLOdaorQEAwUsQ3rNZ46Py/VbysUxcopoJ0MJWraOyesJI3jZ+jktYnt9t+KnDq+YOjol2xMwt0xyjK0QueU6q4s5xvvVrYuvNjAzsbRf3pfTS7Dyvhy/+v4fra1pWYxQ1MYAAAAASUVORK5CYII="></image>
<ellipse id="Oval" fill="#7ED321" cx="32" cy="32" rx="28" ry="28"></ellipse>
<polyline id="Path-4" stroke="#FFFFFF" stroke-width="4" stroke-linecap="round" stroke-linejoin="round" points="18 32 27.5104121 42.0104121 46 23"></polyline>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 41.2 (35397) - http://www.bohemiancoding.com/sketch -->
<title>dialog-question</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="dialog-question">
<image id="Bitmap" x="1" y="2" width="62" height="62" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAD4AAAA+CAYAAABzwahEAAAABGdBTUEAA1teXP8meAAABQhJREFUaAXlmol2ozAMANu973v//yv3ProammEVAwWT5hVcvacaHFvWSLKhaS8vziuXhfnyvvj44qroKO+Lj9ffzjlSaznb47pU7DnGVrjccp2VeYhjru9O+OniJ5jopmqHVn0Q1ygixN+4RhEhnOt45zPG8c53ji1jVomLrpock5yvszj/8GDsT7S/Q9c6ic1HodkegTAIcbnadu84RmqkBMY5FMd+Hdpobk0I6ONQWgKKnhQAAcLOYnGOpWlGfoYFy3ixscqBrPnkMAd4twJdVZWl0wdbsw3QKPMsQzKMVi0c49cIa7h9qACTUG2rBjxDsyhOfD+01QufOMEAEHwUqQr8EnCBzTTQlBmlfdeCH+5/wIWfrYQacCILNMCU9lbEg869L/yN/s2Bm21LitJmoa0Jhxx+LYa/CVxoxmCQTG8ROtzqxFLHV68PHw2bKfAMTXlzkm6pvIck1z1kHt89fCfLfgyciQifaeBH17OPH1QlvqNmXqaegBNxTOhnIi37em+Cz5lh4D9wWXKJs1fI9LnfxvL6t3lNtp8e/B+U/FjGgecUZzB7e6/iGx4sN5Z6zjaD91jiZZJggIXKlq8bU2acDxnEAbHlR1fn/IIfcgjeTxHcaDCglWwLOZp1wRkEvPd7PdCEza0ssMHYiaDc0Em29/Cigr81AhNsA3CzTalv4beuGqglY2GCrc+6F4LzCLM0lhjcyxiZel5LXXAH7AWoxk9OeMH7w+w+gJPUSfAWnt1TVTDIONlGiMZ9AIf1Mu9xAjB4mWdUIwIbjF2iBYeNjpYPN9g6aGAF7zvobFwGGYfXQLTIfsTmjXu75czL1rEKTobp4LWuVYHNBPelTQfKl4util+cdvBk3Chw6rWecZ9aV5Y68HTyq1urAhuMfcYBFZxAGAz6WxG5JsF5ZX3eCm3igAm2I3Cybcb58FloawJTBh/scT7kgGvpkJMngx/tZ7LOl/Do69BWBBa5YOwkH2SWO1/MURotnPAwwAJTv7/jerSkebWjPJjwLXTP8j6cB5i/AfonpS7rOeMA0sle4FtJ3nT8D4O43J3gOwz+Q0Nf5pBMHWJknaDwGPgaukf5EE6TZcCPsg1MmXH6iIwTCMA7Oncm+IzvGfoIYSrjDmLyi1CCsZe/sLwMX1+F8jezXOazpQ7s0aCDIY3E7WaFfwTgQAPaA43DbSBTGQdeIQjc8zzklB81FP13LTy6PocCDDjbVV/LRE4ebjGnEyaonAdvQreYeTINNL4Bzbbk6aTvcXksUxnPo4wWLZl/G0okWWQLwn7+GGqmZ6Fxegk444ycpUPZM5fo3qWwn6lCtqCZHjy6xhxcAu5+z/AEgGc8J6gRHrN/rj5Lm5cU3jOEtrxn110Cno2U8Myn9Hm9pfStiLg8i/Am9imUNcksmfb0FhofZ6UWHIMlPLCcqLw00BKARYvHuKWCXcqatzHWI8Moa3l661d0zYtlPD/y/wjncMqjOIVSdvn9+EvcU4ZkYo2QFF6e2E7YZUsBKqzAVllVsIUIe1XiPFoUJ1ECQDmq9OEgzuo49wRDhwmecw0cLbYYxzzVuWVZV0GHvc5p2rVSBiBD5GBwbYUYLOdaorQEAwUsQ3rNZ46Py/VbysUxcopoJ0MJWraOyesJI3jZ+jktYnt9t+KnDq+YOjol2xMwt0xyjK0QueU6q4s5xvvVrYuvNjAzsbRf3pfTS7Dyvhy/+v4fra1pWYxQ1MYAAAAASUVORK5CYII="></image>
<ellipse id="Oval" fill="#11B5FF" cx="32" cy="32" rx="28" ry="28"></ellipse>
<path d="M32,40 C30.3153053,40 29,41.3153053 29,43 C29,44.6605881 30.3264079,46 32,46 C33.6735921,46 35,44.6605881 35,43 C35,41.3153053 33.6846947,40 32,40 Z" id="Path" fill="#FFFFFF"></path>
<path d="M32.468,16.96 C27.4238833,16.96 23.58,20.0244775 23.58,24.1702907 C23.58,26.1861804 25.003148,27.77337 27.032,27.77337 C28.9057249,27.77337 30.124,26.4889526 30.124,24.7281068 C30.124,23.0803988 29.3642533,22.3265653 27.8296148,21.9566688 C27.4706135,21.8638914 27.316,21.7167857 27.316,21.4183975 C27.316,20.1849102 29.1314221,18.7367478 31.64,18.7367478 C34.4418576,18.7367478 36.072,20.4206734 36.072,23.4265357 C36.072,25.5483621 35.3753311,26.8992916 33.4522353,29.2779172 C33.2518819,29.5253283 30,32.5 30,35 C30,35.916658 30,37 31,37.5 C32,38 32.1923697,36.5680604 32.6329793,35.0204247 C33.0706287,34.087734 34.2408493,32.7804809 37.3328167,31.0068188 C40.882884,28.675952 41.968,26.858853 41.968,23.9843519 C41.968,19.7046154 38.1785728,16.96 32.468,16.96 Z" id="Path" fill="#FFFFFF"></path>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 3.5 KiB

View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 41.2 (35397) - http://www.bohemiancoding.com/sketch -->
<title>dialog-warning</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="dialog-warning">
<image id="Bitmap" x="1" y="2" width="62" height="62" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAD4AAAA+CAYAAABzwahEAAAABGdBTUEAA1teXP8meAAABQhJREFUaAXlmol2ozAMANu973v//yv3ProammEVAwWT5hVcvacaHFvWSLKhaS8vziuXhfnyvvj44qroKO+Lj9ffzjlSaznb47pU7DnGVrjccp2VeYhjru9O+OniJ5jopmqHVn0Q1ygixN+4RhEhnOt45zPG8c53ji1jVomLrpock5yvszj/8GDsT7S/Q9c6ic1HodkegTAIcbnadu84RmqkBMY5FMd+Hdpobk0I6ONQWgKKnhQAAcLOYnGOpWlGfoYFy3ixscqBrPnkMAd4twJdVZWl0wdbsw3QKPMsQzKMVi0c49cIa7h9qACTUG2rBjxDsyhOfD+01QufOMEAEHwUqQr8EnCBzTTQlBmlfdeCH+5/wIWfrYQacCILNMCU9lbEg869L/yN/s2Bm21LitJmoa0Jhxx+LYa/CVxoxmCQTG8ROtzqxFLHV68PHw2bKfAMTXlzkm6pvIck1z1kHt89fCfLfgyciQifaeBH17OPH1QlvqNmXqaegBNxTOhnIi37em+Cz5lh4D9wWXKJs1fI9LnfxvL6t3lNtp8e/B+U/FjGgecUZzB7e6/iGx4sN5Z6zjaD91jiZZJggIXKlq8bU2acDxnEAbHlR1fn/IIfcgjeTxHcaDCglWwLOZp1wRkEvPd7PdCEza0ssMHYiaDc0Em29/Cigr81AhNsA3CzTalv4beuGqglY2GCrc+6F4LzCLM0lhjcyxiZel5LXXAH7AWoxk9OeMH7w+w+gJPUSfAWnt1TVTDIONlGiMZ9AIf1Mu9xAjB4mWdUIwIbjF2iBYeNjpYPN9g6aGAF7zvobFwGGYfXQLTIfsTmjXu75czL1rEKTobp4LWuVYHNBPelTQfKl4util+cdvBk3Chw6rWecZ9aV5Y68HTyq1urAhuMfcYBFZxAGAz6WxG5JsF5ZX3eCm3igAm2I3Cybcb58FloawJTBh/scT7kgGvpkJMngx/tZ7LOl/Do69BWBBa5YOwkH2SWO1/MURotnPAwwAJTv7/jerSkebWjPJjwLXTP8j6cB5i/AfonpS7rOeMA0sle4FtJ3nT8D4O43J3gOwz+Q0Nf5pBMHWJknaDwGPgaukf5EE6TZcCPsg1MmXH6iIwTCMA7Oncm+IzvGfoIYSrjDmLyi1CCsZe/sLwMX1+F8jezXOazpQ7s0aCDIY3E7WaFfwTgQAPaA43DbSBTGQdeIQjc8zzklB81FP13LTy6PocCDDjbVV/LRE4ebjGnEyaonAdvQreYeTINNL4Bzbbk6aTvcXksUxnPo4wWLZl/G0okWWQLwn7+GGqmZ6Fxegk444ycpUPZM5fo3qWwn6lCtqCZHjy6xhxcAu5+z/AEgGc8J6gRHrN/rj5Lm5cU3jOEtrxn110Cno2U8Myn9Hm9pfStiLg8i/Am9imUNcksmfb0FhofZ6UWHIMlPLCcqLw00BKARYvHuKWCXcqatzHWI8Moa3l661d0zYtlPD/y/wjncMqjOIVSdvn9+EvcU4ZkYo2QFF6e2E7YZUsBKqzAVllVsIUIe1XiPFoUJ1ECQDmq9OEgzuo49wRDhwmecw0cLbYYxzzVuWVZV0GHvc5p2rVSBiBD5GBwbYUYLOdaorQEAwUsQ3rNZ46Py/VbysUxcopoJ0MJWraOyesJI3jZ+jktYnt9t+KnDq+YOjol2xMwt0xyjK0QueU6q4s5xvvVrYuvNjAzsbRf3pfTS7Dyvhy/+v4fra1pWYxQ1MYAAAAASUVORK5CYII="></image>
<ellipse id="Oval" fill="#F39800" cx="32" cy="32" rx="28" ry="28"></ellipse>
<path d="M32.041368,39 L32.041368,39 C30.7366037,39 29.6679395,38.0426848 29.6260007,36.8352603 L29.0015777,18.8661959 C28.9472125,17.2994188 30.3047888,16 31.9994292,16 L31.9994292,16 C33.6894097,16 35.0454327,17.2907943 34.998834,18.8532592 L34.4567354,36.823761 C34.4210097,38.0369352 33.3507923,39 32.041368,39 L32.041368,39 Z" id="Shape" fill="#FFFFFF"></path>
<ellipse id="Oval" fill="#FFFFFF" cx="32" cy="46" rx="3" ry="3"></ellipse>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.9 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 9.5 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 33 KiB

BIN
Icon/Function/gitee.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

BIN
Icon/Function/gitlab.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

View File

@@ -0,0 +1,227 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="&#x56FE;&#x5C42;_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
y="0px" viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
<g style="display:none;opacity:0.5;">
<rect x="-0.018" y="-0.005" style="display:inline;" width="48" height="48"/>
</g>
<g>
<image style="overflow:visible;opacity:0.3;" width="201" height="201" xlink:href="data:image/png;base64,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
QmCC" transform="matrix(0.24 0 0 0.24 -0.0125 0.9876)">
</image>
<g>
<g>
<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="24.0024" y1="9.1404" x2="24.0024" y2="38.851">
<stop offset="0" style="stop-color:#FF78A7"/>
<stop offset="1" style="stop-color:#FF6166"/>
</linearGradient>
<path style="fill:url(#SVGID_1_);" d="M24.003,9.14c-8.192,0-14.856,6.665-14.856,14.855s6.664,14.855,14.856,14.855
c8.191,0,14.855-6.665,14.855-14.855S32.193,9.14,24.003,9.14z M24.003,32.238c-4.545,0-8.243-3.698-8.243-8.243
c0-4.545,3.698-8.242,8.243-8.242c4.545,0,8.243,3.698,8.243,8.242C32.245,28.54,28.547,32.238,24.003,32.238z"/>
<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="24" y1="2.9959" x2="24" y2="44.994">
<stop offset="0" style="stop-color:#EEFFFF"/>
<stop offset="1" style="stop-color:#C0D7F8"/>
</linearGradient>
<path style="fill:url(#SVGID_2_);" d="M44.986,18.905c-0.533-2.199-1.404-4.266-2.554-6.145c-0.133-0.217-0.406-0.287-0.641-0.19
c-1.773,0.725-3.876,0.386-5.316-1.053c-1.439-1.439-1.778-3.541-1.054-5.314c0.096-0.235,0.026-0.508-0.19-0.641
c-1.88-1.15-3.948-2.02-6.147-2.552c-0.248-0.06-0.492,0.084-0.59,0.319c-0.739,1.77-2.468,3.021-4.507,3.021
c-2.035,0-3.762-1.247-4.503-3.014c-0.099-0.235-0.343-0.379-0.591-0.319c-2.2,0.537-4.269,1.41-6.148,2.563
c-0.215,0.132-0.283,0.401-0.188,0.634c0.724,1.772,0.384,3.874-1.055,5.313c-1.436,1.437-3.534,1.778-5.305,1.059
c-0.233-0.095-0.502-0.026-0.634,0.189c-1.149,1.881-2.019,3.95-2.55,6.149c-0.06,0.247,0.084,0.491,0.318,0.59
c1.762,0.742,3.005,2.467,3.005,4.501c0,2.03-1.24,3.753-2.997,4.498c-0.234,0.099-0.377,0.343-0.317,0.59
c0.535,2.2,1.409,4.268,2.562,6.147c0.131,0.214,0.4,0.283,0.633,0.189c1.769-0.716,3.863-0.373,5.298,1.061
c1.433,1.432,1.776,3.524,1.062,5.293c-0.094,0.233-0.025,0.501,0.189,0.632c1.881,1.152,3.95,2.023,6.15,2.556
c0.247,0.06,0.491-0.083,0.59-0.317c0.744-1.758,2.468-2.998,4.497-2.998c2.03,0,3.753,1.24,4.497,2.998
c0.099,0.234,0.343,0.377,0.59,0.317c2.2-0.533,4.268-1.404,6.149-2.555c0.215-0.131,0.283-0.4,0.189-0.633
c-0.719-1.77-0.378-3.868,1.058-5.304c1.437-1.436,3.536-1.776,5.306-1.056c0.233,0.095,0.502,0.026,0.633-0.188
c1.153-1.88,2.026-3.949,2.56-6.149c0.06-0.248-0.084-0.492-0.319-0.59C42.9,27.762,41.653,26.035,41.653,24
c0-2.037,1.248-3.764,3.015-4.504C44.902,19.397,45.046,19.153,44.986,18.905z M24.003,37.495c-7.444,0-13.5-6.056-13.5-13.5
c0-7.443,6.056-13.5,13.5-13.5c7.443,0,13.5,6.056,13.5,13.5C37.502,31.439,31.446,37.495,24.003,37.495z"/>
<path style="fill:#DCEDFF;" d="M24.003,13.954c-5.537,0-10.041,4.506-10.041,10.042c0,5.536,4.504,10.042,10.041,10.042
c5.537,0,10.042-4.506,10.042-10.042C34.044,18.459,29.539,13.954,24.003,13.954z M27.343,20.25
c1.031,0.92,1.68,2.259,1.68,3.746c0,2.769-2.253,5.021-5.021,5.021c-2.769,0-5.021-2.253-5.021-5.021
c0-2.769,2.252-5.021,5.021-5.021C25.284,18.974,26.455,19.457,27.343,20.25"/>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 17 KiB

129
Icon/Function/qtcreator.svg Normal file
View File

@@ -0,0 +1,129 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="&#x56FE;&#x5C42;_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
y="0px" viewBox="0 0 48 48" enable-background="new 0 0 48 48" xml:space="preserve">
<g>
<image overflow="visible" opacity="0.3" width="200" height="192" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMwAAADECAYAAADTcc6fAAAACXBIWXMAAC4jAAAuIwF4pT92AAAA
GXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAE5BJREFUeNrsnYdy40gSRAuGRpTb
vf//xtvZ0YxGogHuGNEVTBarG6CFy4zoIORmRBJPWdlWhKKo1sr4+1I3Uk1g+vk7EZrhwFITmMf8
DtkZX6f6BUvd4prAXPH/etfZGfBQ/YKmdh7rsUBTdgRK6jGLfExw+g1LDa2KfH7wblN2CApCkIfr
3IEki4BDaPoHisKCTT83itKs7BAUhCTVMgcmAtMPYGzbQdtDsg3XMhZwyo5A2bcCHrHlzrXnPoSm
P7BUAQwFZBOu8/C4dcq0bIjQlHeGxYJiQSgjrYDHIuI4BKYfwCAse1DWpul7tIXvHyQs9wAmi4CS
Gwhm4XoW2hw+njvwFBGnITTdAVM5sHyH9hVaDnBUANnkgbGukhtXKR1AsC3MxzNoheM0BKYf7rKD
EkxB+QzvW+7AhTkmG2KWKW8MiwdKYUBYBkAWcL2E6zlANYuUZswy3feMVZBP9qXXn9Dm4b0SgGoL
+SabssOkyi+92ecGkH1bhccnaAjS/ExgCE032QVLsb2z/ILSuQL30abvXzXUF6C8MSxYfmG5pVCs
oD2HRwQGoZkRmN6XY1soxZbhvVJYFKQ5vIe5qQom00vmjacUJqMswE0UEG0vcL1ygJlHMowX+glL
98BoblFY1gGiRQSYwb5f5Q1gQWdRV1EAEJB9e4VHDxgsx0oAJm9wF0Lz+PyCYV9h2QVYPqFSKM0f
PO99q8cKjNcbhs6ygNLrGeDYtze4RmC0JGMpNhyHqQCOEmD5Njk0Bstgy7JrHEZv4tJklRU4yVto
73D9CiXZCmDxgr6dJiN0l94AszWZ5dv80bN/8LyezVFnmFhPGJZhz+Ag79D+AmC0PFuZ3DKT48HK
1Og+18h0X5IVJuDPnfdwFLnlEmC8HjEcmUdneQuAYEOHsbkl1X2cS3wpANUdODqhspLTuYCpMjqb
AjB2YNK6iwfL39AUmFdwlicTClP2TWD66TTSEpBsTO/ZuQ5jYVmYUgyB+U94fIdS7Nlklhn0sI3+
xR6RdPBxcuuVypag2JB/jrtoKYZlGPaEsct4mO4i0m517KSAEaccw16xlRy6jt8g4P8Fgf8NnAVh
4WDksDXJ96q8wF3mxl1eDCzYO/YKId8OZOHiMIJCjcZhsGTSUkynvDwbd3l3MgvCMhNO06dGCExT
N7IF5lX8gcknBxZvEh5FDaa3o427FADMwpRjOP0FJ1Vib1hJWKixAhObtj8zYX+VgGVJWKipOYw3
UKlT9p/keLr+cwQW2xtGWKhRAoMOUzj5xQPGmxtGZ6FGDYx1AS+/LOV4Cr+3pqVppipFjc5hYrOS
cS0+LjH25oblBIWaUkkWcxjbmtZBsBSjRguMt1MlArOIwOKtsCMo1GiByRocBneBsS21wo7QUKMP
/bGtk2YGmtj+YQz51KQyjIg/ym+3eW2zJJXQUJPIMLEcY9to129TVJuSzGYYC01sZ/2mRWAUNXqH
ySS+yUHRwlkIDTWJDBM7tiK1O0hq3zCKGhUwWYuyLJf0Vjp0FGpSDpM1lGbeYa2xnV4oanKhPwZO
03HgFDW5DGOzCEGhKGleouyFeIJCEZgLwJFE/qGoyQMjkXxDaCgCc4bbEBqKwFAURWAoisBQFIGh
KAJDUQSGoggMRVEEhqIIDEURGIoiMBRFYChqMir5ElAjV2xCcE1gKCoOSWYgyS4Bh8BQYwUltfyk
hsezwCEw1NhgySLXthyrzcdZG2gIDDU2UM4BpjZuQ4ehJgdL7lyjKgClMrA0ugyBocYCi93W2G6O
j7DsAJbqnBxDYKihw5La/9sDRgHZRZwn6TIEhhoiLN4Wxngci17jJvlagu2cMo0lGTUpWPBISXvQ
V25g2ZrgX7WFhcBQQ4VFS63UcZIWmD0sGwCjSjgOgaFGBYs9e9UeVKwnexfgJhsoz3bha1s5c+tj
AkMNJdxbWNRV9nAsw+NTuNYDi9FdCoClBIDO2nySwFBDgAV7wrAEW4b2FNrKACOh7NJSTK8LuXCm
PoGhhhbuERaFBNtTAKYAd/mCsqyIlGAc6adGUYJlTl5RZ3n+f3sJj9o0x6ijrA0suZz2iLWesUxg
qD6B4pVgFhYtvxSQ19Ceg8Ms4L7WUmwrh3EZBKQWTu+nRlCG2XBfQrhfgbO8ATAvASQN+1UoxfQR
A36daASG6r2jSKQEKyGvLMBVFJY3gEbLsRmUYHUoyQoHlCoCCUf6qV7nFJtZ0FV0TOUJnOXVwKLA
aNjPIehvHFgqA0trdyEwVBcllwVEwFUwrywAlucILO/hUbuTS3CVnQPLTg4zlauEyxAYqnfg6KAi
jq+gq2C38YuB5R1geTbuonPFviOwIDQ1gaH6GuRtoFcVUIbZEiwGiz6+yKFnrAB3sXPGttA8hxGG
fqpvWcX2ftmesEUkr7wYUDC36EBlKYfu410CFgsNHYbqbfmFgGTgLjgYia6CzvJuQHmFUgznjNVy
PJ1/G9xG29bJMRyHoXpThuWOk0i4UXMHlmeAxesJe4MybCWHKTAihx4xBceDZevAQmCoXpRhCIv2
fO0gvxRyPHKPrvLqwPIKsDzJYUQ/AwAkAou2mLuwW5nqTfmFYV7dJYPPobPEQMGpLzqIiaUYrqLc
RYC5Or8QGOoePWGxxV26DqUOX8cxFgvLq+MqFhZc37JN5BYLTHVpfiEw1C2hsSXYHPLJVg4j8CKH
6S4rpwx7hc89Qwm2hDIsVYohMGs5dDPbwF8TGKrrgI8lmOaTdfjeebhR9XvUXaybxFzFwoLySrF1
i8Avwm5l6sHh3lvgpbB8h5uzhJxRRLKLhn7PVWZQhuUGErsjDMJiobkqvxAY6lJYcNd7L+ArLNor
tpTDgGIpx93IzwYU6yp2y6TMwBIL+l45dlV+ITDUrUqyAnLLMtyouiPLLNy0WI7hPDF0lJUc7/5S
OrCIyS1VpBzz3GV3DSwEhrrUXbygPzMhX3vDllCO5XI8XwzbEkCxJRjOP6tM9kBgtgaUpgFLditT
nYR9u96+BjjUXTL4HM5I9sqvUvwNxXHvYw+Wc3rHWJJRnZVjWJLV8PkFuE0mp/uJ2Z0qPVfxesTq
RDnmjb9cNR2GwFC3DP52npiA6+BfdW/pMeaU0oASgwWzi+cw1l3QYXAvZQJDdQKLyGHUXeDjGdyk
IqezAIoGUFKw2N6xptH9m+QXAkNdC46Ac6C7FE75480zw94vz1WyBCwVOMe2oRy7eDo/gaHu1Vum
11ULYDLn0a75j8kuOU6VY/roje4TGKozl9EyDHuzCnNjZg2tCRSR051fmgJ/bA0/HYbqNMvotbcN
q0SgkUj51QTLOeVYbDoMHYbq1GEsOG1dqS0oMZfxSrK20/k5DkP1Bhw5ExppAU2sHPPmkHkrLK92
FwJD3TPT1FcA0ibDpEoyr3fs6h4yAkM9Cp5bwuL1kG2dUswOWNa3+CVyvq/UAJQqyc4Zf7m6LCMw
VN9B8cqxVEkW6x27iQgMNRR3EQBgFwn9TVvC1gSGmho4nrtszfXNBywJDDX0DNMm8N+sd4zAUEOF
ZSd+L1kKlpsEfgJDDSXwN5VkXuC/aXcygaGG5i6xUX7PXe4S+AkMNSRwKvG7lLcSXyzGbmWKGSYB
izcGc1MRGGoIOaZpWkzMXW426ZLAUENzGIRg2yLwe+UYBy6pUTtLzF12LQL/TZ2FwFBDcRYb+lM9
ZKkd+gkMNbmSLDal/+Y7XBIYagz5pe0M5ZtPiSEw1FBgSa3hT5VkN50SQ2CoIQX+StKrLGNnwNxc
BIbqe+CvpHmVZSq/MMNQkw/8qT3I7rLSksBQQ8kvbdzlJkeKExhq6PklNvaS2hb2boGfwFB9d5fU
oUmxc2DoMNRkwWna5TJ1ypgww1BTdJjYkRZNpyTTYajJ5pdzdum/27QYAkMNwV12kezinZR8lyn9
BIYaAjSpA1+/IyXZXZYlExiqr+VYauxlHWkPyy+3AuZu9kexHDPZ5RuadZjqEcCUN3hikvglCdCp
Mr4EZ5VjMVhsfrEbX9wFnPKCJ+RBc7eR1RGCUhOgxnvKhn2E5ctA87D80haY+sxW8SY4C6Ka4CRh
WQMoXwaeph6yhwLTBgzbT57Dz2a8EVwnycQ/GHWK4HjuYneFQVi+jMOkesjqRwMj0n7X9H0r5PT4
aQJzDAW23IEnk/YHq47RXWx2QVj+hKYftxmDuTswsYzS1Ceu/04VwMkjf0mn7CgISW6aPbt+CtDU
DUEfSzELCzrM3SdcxoCpTWnQ9onMws9V4DR0mMPztpAUTsvluIt/Kq+Z3UbJ9or9cRoCk1rHf1dg
7F80b/KbwqK/+G+AZRe+NoPSLCMsR7AoHDN4nIU3uoTvn4LL1A33mVeKITCdlGOxDJN6EvpLf4Sf
VVj2X1uEzxGY0zKsCK+NQrKAN3rmdAZMpSSLnfeC99onNM9hHgZLU4bBUmwNT+KXgWUdboA5gXGB
KQGW/Wu0DDfFkxx2NrH5ph6xy8RK/k0Clt/wuVR+6aRb2Xsia8grhYHlMwAzC//e1PMLlmMFALMI
sKzCa6pvss04U3AZrxt5Y7KxgvLbcZjYHLKHOwy6CzrMN9TgAgH/i+4S7RnLAZZ5cJRVeLN38H0F
fG9lHGbMoDQF/d+mfQIs6y7yi9dLhoFTn0xuer4qk1vm4Dz2r+SU3SWHUmwRYHkJr2kNr6vmGiwv
xgiNV4ptndyCzvIrtE9TjsVg6TT02wwj0BGwCU/Ag4XAHAOj7vIVXjeFZW4yjZYXhZzOAM9GCEss
5CMov8BdYsBUj3wiTcBk4ZcT81dhDZmlkNPBSgJzcA8FRmEpAJSnyF/MMcMS60K2sHwYYLzesYeF
/VQvWSankyi9mrNwyjCO7h/3jmk5Zp1lD8qznI4n2Bp/7M6ybglLL9wl5TAC4d6GtDw82TwS8jkd
5ji/bOB1w/IsdgOMZXnEJbB8mGbzSyddyU3A2N6yzPk4Ngdq6vIcRl+zGZRgdgHU3bc47UEZViVg
UUB+hmYdJjb28nCVDU8YnQbBqMwNQmBOgcFxlpn4a9EfcmpWzzILwoKu8i8A8zPSO9b5a1We8eQt
GFmkHCE0h25hCWVrm93mH95F+sAyzA6AIyw/Ayz79gMcxrrLQ7aCvRYYD5qawDQCg7DsJH36bxM0
2cBAEfGXhNi5iArLD2j/GmBS7tLJH5VL1/SLAw7X8ftlWZWAZifpY+aGnFcsLLYMU0f5J7QfUI7Z
kf1ORvVvAUybvEMd/5XFZl1la0BKlWZZj0ER8bdHSsHyj4EF3UWzCwb9XR9K1pL39d1vqtpxGe9Q
U3tT9HUsxjuDUsSfpq8B/xN6w9BZ/usA0ya7DNphqGZYUufMD6G3rE5cWwfVWey6s4uFRYHxYPll
SrFN314TAnN/YGKLpNqc0dhl8K8bSrDKlGCVHO/1gHPDsDfsR6QUi8HS6bgLgXncjZbJ+cc2pEqP
R4BTtyi/rKt4O1Ri17EN+bZX7MPJLd58sV7kZQLzuLLMTmdPnXVSPSjLNG3v661fqQHs2IZ7nw4s
/4o/3vIhh2n9Ckun018ITPe9SHYAzzunMXW46aUuU18ITJ1wFJvFMK98QWj/MKUYPuL0lz+Os/R2
bh2B6c5hvIOBvM21c6fMkxtBE+sariKOshX/CIovJ7PY+WHePDGEZSMDmIhKYO7vLrHQbw8Hsk4z
F39B2S3De9ttgL38Zfc81t4wLcV+yuns4w853tTiC/4tbxJq78b4CMz95XUrb5xS5suBppTDAr6m
3UTrhusmUGzJFTu9eC3+rpR2WTFO0celxp/ws975Lr1e4kBgHuM0laR3ELUNNxbJzgSmbglKJfHZ
CDgLwTtb0ttkzwLzCz5WULw/DDhg2/v1QATmsTnG7r8V291RN0XMAbgiAYwHhZdJmsquWE8euqH9
vXGjPbvLC+aUL4kf5DqYpQ0E5nG9ZHZTERuW9aZbBndRQHQr2XOBsaDYksebrpPqlPhOQG53p8Q9
xLzjKbYRV+n9vEQC83iH2Ym/+cMqwKK78Iic7lltd+Q5J5c0ZRTPVTxn+TYwoIPg7pT6vRjqPVep
WvTmEZgJQhNb066ly9LkFp1qskgAI4lcUjuApFylyVkQAnu40bf4p4OtTSaqnN9xULPdCczjyzJv
47p5BJYvA4zdcMT++7UDiHUUD5hNJNx70ODBrPZE4285HU+K9YANcik2geku+KvD/JbDlrL6vQrL
Uwtg2nQNxxrOmI7NQLBjRd5g68b8W7YjwTqgyEDXURGYx8kL/gUEeh3R30GphmVaLMPEer4qc9N6
sMRcZuMAgSWW5yJb5/8c3QnbBOZxZZmYsmwtp1vr4ja86C54KkKWcK/aASYFzlb8BW0b8Re5bZyf
80rAGCSDX51LYLoL/xsDgYL0HWDRXOMF/kzia+lTPWJtSrStA4X3vVULSEYDCoHpxmXs/m6ZnO7d
pZ0BWIpdA0x1IUje9zRBImMFhcB06zBafokBRnua2m703gRN3eJ6l+gwqCM/OylICEx3sGRyOlhn
gUFQ2pyK0GauWNP0GO/rVeJ3nRQkBKY/HQB4rXBs5fhksqbteNvORm7KGFULICYJCYq7VXb3unvN
Ozqkzd7Vsa2PmmCSCABNM58n/cZR3b72MTia9rJOAdMEgjR8jYAQmMGAE3tv2gJzzufqFj9DEZhB
vB/3AIZQEBi+R4SBoiiKoiiKoiiKoijqSv1PgAEAXGnb7GO+U78AAAAASUVORK5CYII=" transform="matrix(0.24 0 0 0.24 1.0127 3.0308)">
</image>
<g>
<g>
<g>
<path fill="#5AA72D" d="M36.909,38.27H4.013v-25.24c0-4.418,3.582-8,8-8h24.897V38.27z"/>
</g>
<g>
<g>
<path fill="#E3E3E3" d="M25.028,45.016c0,0-5.631-11.527,6.174-16.348c4.399-1.485,11.365-5.256,14.749-9.218
c0,0-1.29,4.308-2.463,10.356S41.759,45.914,25.028,45.016z"/>
</g>
<g>
<path fill="#959595" d="M25.331,44.598c3.581-3.054,19.385-23.054,19.385-23.054s-12.35,18.264-18.092,23.054H25.331z"/>
</g>
</g>
<g>
<g>
<path fill="#FFFFFF" d="M21.075,32.142c-2.143,0-4.355-0.798-5.309-3.42c-1.988,0.014-3.622-0.751-4.904-2.294
c-1.281-1.543-1.922-3.484-1.922-5.823c0-2.609,0.649-4.677,1.946-6.207s3.071-2.294,5.321-2.294
c2.026,0,3.67,0.751,4.932,2.252c1.262,1.501,1.893,3.456,1.893,5.864c0,2.138-0.444,3.934-1.333,5.387
c-0.754,1.234-2.135,2.237-3.428,2.727c0,0,0,1.69,2.813,1.69L21.075,32.142z M12.602,20.44c0,2.066,0.308,3.723,0.925,4.969
c0.616,1.246,1.421,1.87,2.413,1.87c1.065,0,1.902-0.597,2.51-1.792c0.608-1.195,0.912-2.866,0.912-5.013
c0-2.206-0.297-3.908-0.892-5.107c-0.595-1.199-1.41-1.798-2.445-1.798c-1.018,0-1.843,0.632-2.474,1.897
S12.602,18.389,12.602,20.44z"/>
<path fill="#FFFFFF" d="M31,28.344c-1,0.24-1.113,0.236-1.861,0.236c-2.04,0-3.139-1.13-3.139-3.39V19h-2v-2h2v-0.605
l0.601-2.841L28,13.558V17h3v2h-3v5.829c0,0.749,0.093,1.317,0.383,1.607c0.707,0.707,2.106,0.288,2.617,0.095V28.344z"/>
</g>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
<title>user-trash-full</title>
<desc>Created with Sketch.</desc>
<defs>
<linearGradient x1="50%" y1="0%" x2="50%" y2="97.8595344%" id="linearGradient-1">
<stop stop-color="#FFFFFF" offset="0%"></stop>
<stop stop-color="#D3D3D3" offset="100%"></stop>
</linearGradient>
</defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="user-trash-full">
<image id="Bitmap" x="2" y="7" width="60" height="56" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA4CAYAAAChbZtkAAAABGdBTUEAA1teXP8meAAAA2pJREFUaAXlmluP1DAMRne4CiQuD7zz/38eT9xZfKo53bR12jJih3qwFCV1nMx34mxaaXO6e7DTQ/OubTfucs37RvHQFsz6SQTQttbfjCvRBI7yq6kRfg+QUEA+wxnlRxSCK5s88I08T+MBh50AfosypJ+HwgbDzygkET6e72lgQNPBStyawQTbsJMBpkEh27dq7uSTGRb0tY0bqmUaMmxWeQD+VZSXUdj71Q+t58Hw9szDuTQcXGOqw6EB/SHKpyhVDy+S9/Gs/2vUAA+vKIGHEyycGhn/HKVqljmk2KkwADzu2HZLt9lkhdgCVU/tF6Edti9RvkcBGBtfS8KSUTop8wMtXGUM7XK4SwfGFkpoaoLavjKkZ6Foh6FlGrrmUG3AvO88V4kK7S3LKDqDIpCS9Y0DD94QWOhRbgYl8PCiHiNrNdAux0R5BkwAwbcAPIHlIQN2ZW4BGJaJZcAE/FcZFhhoP0zwVTE0u0sXmucZbgOrAwPb8gzwc2BXxMBev3FHrNGs/oW+HpADev2LiQ7kuAgY/UBX/htOc5Bl0OxSV3w1tR8dMEwsAzaA4LV+445Wu6VTXT0gs9zrTyc7iFPgRXbRtwbEgMpbOl3/HrAZrgx8UYZZpUrQak1hgdnKMAN7MYw/mqHV3ZlCZzAGOrDSu3j+HS3LmJgMeOw8r1ZF4JZh0l4DNsNrMZPJDvCAVnWncrZgGLwVk078j5wCd3++B+MqVQVW/wK8B2xgVWD1L+o1YFfJd9ti8AEdaFV3Km8NmAEMrgicwuJcA3alKgKjPbU1YAY4sAK0GtX8R8Bm17rCx0f7laXuBfSeDDO4GvACVMcWMHHVgGVL6y1gt8ZWXDr5lZ1oVG/3p/eAVPnnOCz+t/8iYFeL2hOwO9EBOtDYak4lbWXYCbbi0smv7ESjers/vQeESSqd0l1YOraAgeU2DDUX1o5qaGu1dnXuAeYg4K4T1/i4znc084ohGtubO6nOPVvVA4vFeRfFL5rNEzH9xb/jRBM37d5EeR+Fq4XtjTuynZowaWc46acAyUryI9xyo43P/mhezYBx+5JVYb1xZ38qiDuJa+ZK8XeMub0ZR8a3Fowxj2ECo4vrkd66W4VFyF7BZpJaUH3Mc20TjNq/W32rWvYCM0kb27ZXf+CRO4HU2ra+Rf0bOvj0yL4i8b8AAAAASUVORK5CYII="></image>
<path d="M11.7194173,54.8547905 C11.9328622,57.1478665 14.0117111,59 16.3634338,59 L47.6365662,59 C49.9756078,59 52.0674859,57.1441265 52.2805827,54.8547905 L56,15 C57.6897144,15 59,13.5330037 59,12 C59,10.4563085 57.5718954,9 56,9 L8,9 C6.43540907,9 5,10.4669963 5,12 C5,13.5436915 6.42810462,15 8,15 L11.7194173,54.8547905 Z" id="Combined-Shape" fill="url(#linearGradient-1)"></path>
<path d="M11.7194173,53.8547905 C11.9328622,56.1478665 14.0117111,58 16.3634338,58 L47.6365662,58 C49.9756078,58 52.0674859,56.1441265 52.2805827,53.8547905 L56,15 C57.6897144,15 59,13.5330037 59,12 C59,10.4563085 57.5718954,10 56,10 L8,10 C6.43540907,10 5,10.4669963 5,12 C5,13.5436915 6.42810462,15 8,15 L11.7194173,53.8547905 Z" id="Combined-Shape" fill="#F6F6F6"></path>
<path d="M13.698557,44.3787127 L14.1854636,49.9422602 L14.1881559,49.9431845 L14.4561404,53.1891895 C14.4561404,53.1891895 14.4561403,55.9721203 17.2631581,55.9721203 C17.8901613,55.9721203 20.001368,55.9721203 22.6098431,55.9721203 L23.5374037,55.9820829 L23.5437055,55.9721203 C27.0107364,55.9721203 31.1021885,55.9721203 33.7543862,55.9721203 C33.754386,55.9721207 43.2280702,55.9721202 46.0350877,55.9721202 C48.8421053,55.9721202 49.1228242,53.1891887 49.1228242,53.1891887 L51.257332,32.5400978 L49.6138251,32.2485287 L51.3407739,30.8471197 L45.223672,22.2023112 L34.3676082,29.9783265 L36.023599,25.9717216 L21.5238095,20.0504494 L17.534517,29.2674839 L14.7969924,27.8223201 L12.5343657,32.0071735 L13.2070325,39.1812079 L13.2453773,39.2005394 L13.4527573,41.5701282 L13.4516589,41.5725528 L13.6688273,44.3628846 L13.698557,44.3787127 L13.698557,44.3787127 L13.698557,44.3787127 Z" id="Combined-Shape" fill="#90A72F" opacity="0.4"></path>
<path d="M31.4852624,29.1551521 C28.6873677,23.5229359 25.7442098,28.0582872 25.7442098,28.0582872 L23.5126308,31.9178548 L28.106315,34.5367737 L31.4852624,29.1551521 Z M41.4199992,27.4297467 L38.9442098,28.7977467 L38.0368413,27.2346116 C38.0368413,27.2346116 37.3357887,25.6078008 33.8768413,25.7782872 C33.8768413,25.7782872 29.5905256,25.8953683 29.1442098,25.8152602 C29.1442098,25.8152602 30.3589466,26.0494224 30.9631571,26.9675845 L33.6999992,31.6919089 L31.6999992,32.7928818 L38.4115782,32.9346116 L41.4199992,27.4297467 Z M24.9694729,41.0522332 C21.497894,46.3085575 27.0010519,46.4092062 27.0010519,46.4092062 L31.5336834,46.2633683 L31.4431571,41.0727737 L24.9694729,41.0522332 Z M18.2999992,33.6699629 L20.7842098,35.0215305 L19.8831571,36.5887737 C19.8831571,36.5887737 18.826315,38.0225035 20.7736834,40.8119089 C20.7736834,40.8119089 23.1084203,44.3284494 23.2642098,44.7413143 C23.2642098,44.7413143 22.8368413,43.6074764 23.3273677,42.6256386 L26.0431571,37.8889899 L28.0494729,38.9796926 L24.6831571,33.3146116 L18.2999992,33.6699629 Z M39.2410519,40.2655305 C45.6389466,40.6599089 43.0431571,35.9273683 43.0431571,35.9273683 L40.6999992,32.1335305 L36.1021045,34.7462872 L39.2410519,40.2655305 Z M32.4557887,44.2853143 L35.8873677,38.6551521 L35.8873677,40.9002332 L41.4473677,40.9002332 C42.5652624,40.8386116 43.3715782,39.9204494 43.3715782,39.9204494 C43.0789466,40.2532062 41.0705256,43.9587197 41.0705256,43.9587197 C39.5252624,46.9781791 37.7273677,46.7768818 37.7273677,46.7768818 L35.8873677,46.7768818 L35.8873677,49.5498548 L32.4557887,44.2853143 Z" id="Fill-1" fill="#869D29"></path>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 5.4 KiB

View File

@@ -0,0 +1,57 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="&#x56FE;&#x5C42;_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
y="0px" viewBox="0 0 48 48" enable-background="new 0 0 48 48" xml:space="preserve">
<g>
<image overflow="visible" opacity="0.3" width="184" height="184" xlink:href="data:image/png;base64,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
AEOMwqS8OgSgAAAAAElFTkSuQmCC" transform="matrix(0.24 0 0 0.24 1.9977 3.0225)">
</image>
<g>
<g>
<path fill="#45B0D7" d="M42.998,42.023c0,0.552-0.448,1-1,1h-36c-0.552,0-1-0.448-1-1v-36c0-0.552,0.448-1,1-1h36
c0.552,0,1,0.448,1,1V42.023z"/>
<rect x="6.998" y="7.023" fill="#FFFFFF" width="34" height="34"/>
<rect x="8.998" y="9.023" fill="#45B0D7" width="30" height="30"/>
<g>
<path fill="#FFFFFF" d="M16.048,35c-0.449,0-0.845-0.273-0.964-0.708L12.238,24H8v-2h5c0.45,0,0.845,0.301,0.964,0.734
l2.031,7.365l4.038-16.343c0.108-0.438,0.498-0.75,0.95-0.76c0.456,0,0.854,0.287,0.98,0.721l3.127,10.732l3.008-10.722
C28.22,13.296,28.613,13,29.062,13c0.002,0,0.003,0,0.005,0c0.449,0,0.843,0.303,0.96,0.737L33.891,28H40v2h-6.875
c-0.451,0-0.847-0.303-0.965-0.738L29.045,17.76l-2.974,10.555C25.95,28.744,25.56,29,25.113,29c-0.002,0-0.003,0-0.005,0
c-0.444,0-0.836-0.249-0.96-0.677l-3.065-10.5l-4.064,16.433C16.909,34.698,16.516,35,16.062,35C16.057,35,16.052,35,16.048,35z
"/>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 3.9 KiB

View File

@@ -0,0 +1,3 @@
<svg width="1em" height="1em" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 89">
<path fill="#0b4dda" fill-rule="evenodd" d="M45.292 44.5 0 89h100V0H0l45.292 44.5zM90 80H22l35.987-35.2L22 9h68v71z"/>
</svg>

After

Width:  |  Height:  |  Size: 214 B

View File

@@ -0,0 +1,10 @@
<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" version="1.1">
<circle style="opacity:0.2" cx="32" cy="33" r="28"/>
<circle style="fill:#992b2b" cx="32" cy="32" r="28"/>
<path style="opacity:0.2" d="m 33.58182,13.000023 c -1.115388,-0.0026 -1.97382,0.183308 -2.328264,0.580371 -0.562336,0.629947 -1.857402,5.326822 -3.473084,12.505882 -1.165672,5.166004 -0.355128,8.17861 0.44138,9.790972 1.018314,2.061364 1.810928,3.300018 0.201376,7.413682 -1.165698,2.979282 -2.354688,2.978996 -3.459288,3.120756 -2.662046,-0.647484 -4.672772,-0.66966 -4.935144,0.0586 -0.358912,0.996212 2.679032,3.585172 6.78065,5.079778 4.101618,1.494602 7.7238,1.900248 8.082712,0.904038 0.263232,-0.730638 -1.303218,-2.009794 -3.773772,-3.231104 -1.084566,-1.130306 -2.058868,-1.917706 -1.199992,-5.418658 1.680206,-6.848874 4.242608,-4.496448 7.263404,-8.753 2.562426,-3.610672 3.241818,-6.381924 4.72549,-10.614098 1.571992,-4.4841 2.2614,-6.560101 2.057918,-6.970024 -1.37051,-2.760946 -7.037222,-4.459387 -10.383386,-4.467183 z m -3.831702,9.121313 c 1.6194,1.79231 3.097928,2.825452 4.431494,2.878664 3.290768,0.1313 5.698856,-3.651028 7.162918,-1.731872 -0.704562,2.340602 -4.95059,16.51333 -10.609592,13.98192 -4.687802,-2.066842 -1.974364,-12.607284 -0.98482,-15.128712 z"/>
<path style="fill:#ffffff" d="m 33.58182,12.000023 c -1.115388,-0.0026 -1.97382,0.183308 -2.328264,0.580371 -0.562336,0.629947 -1.857402,5.326822 -3.473084,12.505882 -1.165672,5.166004 -0.355128,8.17861 0.44138,9.790972 1.018314,2.061364 1.810928,3.300018 0.201376,7.413682 -1.165698,2.979282 -2.354688,2.978996 -3.459288,3.120756 -2.662046,-0.647484 -4.672772,-0.66966 -4.935144,0.0586 -0.358912,0.996212 2.679032,3.585172 6.78065,5.079778 4.101618,1.494602 7.7238,1.900248 8.082712,0.904038 0.263232,-0.730638 -1.303218,-2.009794 -3.773772,-3.231104 -1.084566,-1.130306 -2.058868,-1.917706 -1.199992,-5.418658 1.680206,-6.848874 4.242608,-4.496448 7.263404,-8.753 2.562426,-3.610672 3.241818,-6.381924 4.72549,-10.614098 1.571992,-4.484099 2.2614,-6.560101 2.057918,-6.970024 -1.37051,-2.760946 -7.037222,-4.459387 -10.383386,-4.467183 z m -3.831702,9.121313 c 1.6194,1.79231 3.097928,2.825452 4.431494,2.878664 3.290768,0.1313 5.698856,-3.651028 7.162918,-1.731872 -0.704562,2.340602 -4.95059,16.51333 -10.609592,13.98192 -4.687802,-2.066842 -1.974364,-12.607284 -0.98482,-15.128712 z"/>
<path style="opacity:0.1;fill:#ffffff" d="M 32 4 A 28 28 0 0 0 4 32 A 28 28 0 0 0 4.0058594 32.490234 A 28 28 0 0 1 32 5 A 28 28 0 0 1 59.994141 32.488281 A 28 28 0 0 0 60 32 A 28 28 0 0 0 32 4 z"/>
<circle style="opacity:0.2" cx="47" cy="48" r="15"/>
<circle style="fill:#ffa407" cx="47" cy="47" r="15"/>
<path style="fill:#ffffff" d="M 47,52.925858 41.438,56 42.5,49.487858 38,44.876 44.219,43.925858 47,38 49.781,43.925858 56,44.876 51.5,49.487858 52.562,56 Z"/>
</svg>

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
Icon/Program/AboutIcon2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

View File

@@ -17,7 +17,7 @@ import traceback
try:
import pyquery
except:
os.system("python3 -m pip install --upgrade pyquery --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple")
os.system("python3 -m pip install --upgrade pyquery --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple --break-system-packages")
if "--help" in sys.argv:
print("作者gfdgd xi")
@@ -127,4 +127,4 @@ except:
file.write(programVersion)
file.close()
if exitInputShow:
input("安装结束,按回车键退出")
input("安装结束,按回车键退出")

View File

@@ -34,7 +34,7 @@ package-pkg:
sudo debtap -Q spark-deepin-wine-runner.deb
sudo debtap -Q spark-deepin-wine-runner-ace.deb
package-deb:
copy-files:
#cd VM-source && qmake
#cd VM-source && make
#cd wine && make
@@ -49,6 +49,7 @@ package-deb:
cp -rv VM-source/*.fd VM
cp -rv wine/ deb/opt/apps/deepin-wine-runner/
cp -rv Test/ deb/opt/apps/deepin-wine-runner/
cp -rv dxvk/ deb/opt/apps/deepin-wine-runner
cp -rv information.json package-script
zip -v -q -r package-script.zip package-script
cp -rv InstallBox86-cn.sh deb/opt/apps/deepin-wine-runner/
@@ -62,7 +63,6 @@ package-deb:
cp -rv QemuRun.py deb/opt/apps/deepin-wine-runner
cp -rv kill.sh deb/opt/apps/deepin-wine-runner
cp -rv updatekiller.py deb/opt/apps/deepin-wine-runner
cp -rv AddWineDebMirrorForDeepin20.sh deb/opt/apps/deepin-wine-runner
cp -rv InstallNewWineHQOrg.sh deb/opt/apps/deepin-wine-runner
cp -rv InstallWineOnDeepin23Alpha.py deb/opt/apps/deepin-wine-runner
cp -rv wrestool deb/opt/apps/deepin-wine-runner
@@ -100,7 +100,6 @@ package-deb:
cp -rv geek.exe deb/opt/apps/deepin-wine-runner
#cp -rv uengineapi deb/opt/apps/deepin-wine-runner
cp -rv getxmlimg.py deb/opt/apps/deepin-wine-runner
cp -rv ProgramFen.py deb/opt/apps/deepin-wine-runner
cp -rv information.json deb/opt/apps/deepin-wine-runner
cp -rv InstallMono.py deb/opt/apps/deepin-wine-runner
cp -rv InstallMsxml.py deb/opt/apps/deepin-wine-runner
@@ -118,7 +117,6 @@ package-deb:
cp -rv UpdateGeek.sh deb/opt/apps/deepin-wine-runner
cp -rv AppStore.py deb/opt/apps/deepin-wine-runner
cp -rv InstallWineOnDeepin23.py deb/opt/apps/deepin-wine-runner
cp -rv dxvk.7z deb/opt/apps/deepin-wine-runner
cp -rv InstallFont.py deb/opt/apps/deepin-wine-runner
cp -rv CheckDLL deb/opt/apps/deepin-wine-runner
cp -rv InstallLat.sh deb/opt/apps/deepin-wine-runner
@@ -128,7 +126,6 @@ package-deb:
cp -rv sparkstore.list deb/opt/apps/deepin-wine-runner
cp -rv arm-package.7z deb/opt/apps/deepin-wine-runner
#cp -rv exa.7z deb/opt/apps/deepin-wine-runner
cp -rv clean-unuse-program.py deb/opt/apps/deepin-wine-runner
cp -rv InstallNewWineHQ.sh deb/opt/apps/deepin-wine-runner
cp -rv cleanbottle.sh deb/opt/apps/deepin-wine-runner
cp -rv StartVM.sh deb/opt/apps/deepin-wine-runner
@@ -149,6 +146,8 @@ package-deb:
cp -rv RemoveQemuUser.sh deb/opt/apps/deepin-wine-runner
cp -rv InstallBox86.sh deb/opt/apps/deepin-wine-runner
cp -rv InstallRuntime deb/opt/apps/deepin-wine-runner
if [[ ! -d novnc/utils/websockify ]]; then git submodule update --init --recursive ; fi
cp -rv novnc deb/opt/apps/deepin-wine-runner
mkdir -pv deb/opt/apps/deepin-wine-runner/entries/
cp -rv deb/usr/share/applications deb/opt/apps/deepin-wine-runner/entries/applications
python3 UpdateTime.py
@@ -180,16 +179,45 @@ package-deb:
bash builddeb/ChangeDebVersion.sh
chmod -Rv 777 /tmp/spark-deepin-wine-runner-builder/opt
chmod -Rv 777 /tmp/spark-deepin-wine-runner-builder/usr
dpkg-deb -Z xz -z 9 -b /tmp/spark-deepin-wine-runner-builder spark-deepin-wine-runner.deb
remove-copy-files:
sudo rm -rfv /tmp/spark-deepin-wine-runner-builder
package-deb:
make copy-files -j$(nproc)
dpkg-deb -Z xz -z 9 -b /tmp/spark-deepin-wine-runner-builder spark-deepin-wine-runner.deb
make remove-copy-files -j$(nproc)
# 构建 ace 包
cp -rv deb-ace /tmp/spark-deepin-wine-runner-builder
cp -rv spark-deepin-wine-runner.deb /tmp/spark-deepin-wine-runner-builder/opt/apps/spark-deepin-wine-runner-ace
bash builddeb/ChangeDebVersion.sh
sudo chown -R root:root /tmp/spark-deepin-wine-runner-builder
dpkg-deb -Z xz -z 9 -b /tmp/spark-deepin-wine-runner-builder spark-deepin-wine-runner-ace.deb
sudo rm -rfv /tmp/spark-deepin-wine-runner-builder
dpkg-deb -Z xz -z 0 -b /tmp/spark-deepin-wine-runner-builder spark-deepin-wine-runner-ace.deb
make remove-copy-files -j$(nproc)
package-termux-deb:
make copy-files -j$(nproc)
# 替换 DEBIAN
sudo rm -rf /tmp/spark-deepin-wine-runner-builder/DEBIAN
sudo rm -rf /tmp/spark-deepin-wine-runner-builder/usr/bin/*
sudo rm -rf /tmp/spark-deepin-wine-runner-builder/usr/share/applications/*
sudo rm -rf /tmp/spark-deepin-wine-runner-builder/opt/apps/deepin-wine-runner/entries/applications/*
sudo mkdir -pv /tmp/spark-deepin-wine-runner-builder/data/data/com.termux/files/
sudo mv /tmp/spark-deepin-wine-runner-builder/usr/ /tmp/spark-deepin-wine-runner-builder/data/data/com.termux/files/ -v
sudo mv /tmp/spark-deepin-wine-runner-builder/opt /tmp/spark-deepin-wine-runner-builder/data/data/com.termux/files/usr/opt -v
sudo ln -s /data/data/com.termux/files/usr/opt/apps/deepin-wine-runner/deepin-wine-runner /tmp/spark-deepin-wine-runner-builder/data/data/com.termux/files/usr/bin/deepin-wine-runner
sudo ln -s /data/data/com.termux/files/usr/opt/apps/deepin-wine-runner/deepin-wine-packager.py /tmp/spark-deepin-wine-runner-builder/data/data/com.termux/files/usr/bin/deepin-wine-package-builder
sudo ln -s /data/data/com.termux/files/usr/opt/apps/deepin-wine-runner/deepin-wine-packager-with-script.py /tmp/spark-deepin-wine-runner-builder/data/data/com.termux/files/usr/bin/deepin-wine-packager-with-script
sudo ln -s /data/data/com.termux/files/usr/opt/apps/deepin-wine-runner/deepin-wine-easy-packager.py /tmp/spark-deepin-wine-runner-builder/data/data/com.termux/files/usr/bin/deepin-wine-packager-easy-builder
sudo cp deb-termux/DEBIAN /tmp/spark-deepin-wine-runner-builder/DEBIAN -rv
sudo cp -rv deb-termux/usr/share/applications /tmp/spark-deepin-wine-runner-builder/data/data/com.termux/files/usr/opt/apps/deepin-wine-runner/entries/applications
sudo cp -rv deb-termux/usr/share/applications /tmp/spark-deepin-wine-runner-builder/data/data/com.termux/files/usr/share/applications
# 加入 termux loader
sudo cp -rv mainwindow-termux-loader.sh /tmp/spark-deepin-wine-runner-builder/data/data/com.termux/files/usr/opt/apps/deepin-wine-runner/deepin-wine-runner
sudo cp -rv mainwindow.py /tmp/spark-deepin-wine-runner-builder/data/data/com.termux/files/usr/opt/apps/deepin-wine-runner/mainwindow.py
sudo bash builddeb/ChangeDebVersion.sh
dpkg-deb -Z xz -z 9 -b /tmp/spark-deepin-wine-runner-builder spark-deepin-wine-runner-termux.deb
make remove-copy-files -j$(nproc)
install:
make build -j$(nproc)

View File

@@ -14,12 +14,14 @@ programPath = os.path.split(os.path.realpath(__file__))[0] # 返回 string
terminal = ""
terminalList = [
"deepin-terminal",
"deepin-terminal-gtk",
"mate-terminal",
"gnome-terminal",
"xfce4-terminal"
]
terminalEnd = {
f"{programPath}/../launch.sh\" \"deepin-terminal": ["-e", 0],
f"{programPath}/../launch.sh\" \"deepin-terminal-gtk": ["-e", 0],
"mate-terminal": ["-e", 1],
"gnome-terminal": ["--", 0],
"xfce4-terminal": ["-e", 1]
@@ -28,6 +30,8 @@ for i in terminalList:
if not os.system(f"which {i}"):
if i == "deepin-terminal":
i = f"{programPath}/../launch.sh\" \"deepin-terminal"
if i == "deepin-terminal-gtk":
i = f"{programPath}/../launch.sh\" \"deepin-terminal-gtk"
terminal = i
break
if terminal == "":

View File

@@ -1,122 +0,0 @@
#!/usr/bin/env python3
import os
import sys
import base64
import traceback
import updatekiller
import req as requests
import PyQt5.QtGui as QtGui
import PyQt5.QtCore as QtCore
import PyQt5.QtWidgets as QtWidgets
class ProgramRunStatusShow():
msgWindow = None
def ShowWindow():
try:
fenlists = []
for i in range(6):
fenlists.append(int(requests.get("http://data.download.gfdgdxi.top/Fen/Fen" + f"{i}.txt").text))
tipsInfo = ""
except:
traceback.print_exc()
fenlists = [0, 0, 0, 0, 0]
tipsInfo = "暂时无人提交此脚本运行情况,是否立即提交?"
maxHead = fenlists.index(max(fenlists))
allNumber = 0
for i in fenlists:
allNumber += i
try:
tipsInfo = ""
for i in range(len(fenlists)):
tipsInfo += f"{fenlists[i] / allNumber * 100}% 的用户选择了 {i} 分({fenlists[i]}/{allNumber}\n"
maxNumber = max(fenlists) / allNumber * 100
#if tipsInfo == "":
# tipsInfo = f"有{maxNumber}%的用户选择了这个评分"
except:
pass
ProgramRunStatusShow.msgWindow = QtWidgets.QMainWindow()
msgWidget = QtWidgets.QWidget()
msgWidgetLayout = QtWidgets.QGridLayout()
starLayout = QtWidgets.QHBoxLayout()
uploadButton = QtWidgets.QPushButton(QtCore.QCoreApplication.translate("U", "点此上传运行情况"))
uploadButton.clicked.connect(ProgramRunStatusUpload.ShowWindow)
msgWidgetLayout.addWidget(QtWidgets.QLabel(QtCore.QCoreApplication.translate("U", "综合评价:")), 0, 0)
msgWidgetLayout.addLayout(starLayout, 0, 1)
msgWidgetLayout.addWidget(QtWidgets.QLabel(tipsInfo), 1, 0, 1, 2)
msgWidgetLayout.addWidget(uploadButton, 3, 0, 1, 2)
end = 5
if maxHead > 5:
for i in range(end):
starLayout.addWidget(QtWidgets.QLabel(f"<img src='{programPath}/Icon/BadStar.svg' width=50>"))
else:
for i in range(maxHead):
starLayout.addWidget(QtWidgets.QLabel(f"<img src='{programPath}/Icon/Star.svg' width=50>"))
head = maxHead
for i in range(head, end):
starLayout.addWidget(QtWidgets.QLabel(f"<img src='{programPath}/Icon/UnStar.svg' width=50>"))
msgWidget.setLayout(msgWidgetLayout)
ProgramRunStatusShow.msgWindow.setCentralWidget(msgWidget)
ProgramRunStatusShow.msgWindow.setWindowIcon(QtGui.QIcon(iconPath))
ProgramRunStatusShow.msgWindow.setWindowTitle(f"程序运行情况")
ProgramRunStatusShow.msgWindow.show()
class ProgramRunStatusUpload():
msgWindow = None
starLayout = None
fen = None
starList = []
sha1Value = ""
programName = None
def ChangeStar():
if ProgramRunStatusUpload.fen.currentIndex() > 5:
for i in ProgramRunStatusUpload.starList:
i.setText(f"<img src='{programPath}/Icon/BadStar.svg' width=25>")
return
for i in range(ProgramRunStatusUpload.fen.currentIndex()):
ProgramRunStatusUpload.starList[i].setText(f"<img src='{programPath}/Icon/Star.svg' width=25>")
head = ProgramRunStatusUpload.fen.currentIndex()
end = len(ProgramRunStatusUpload.starList)
for i in range(head, end):
ProgramRunStatusUpload.starList[i].setText(f"<img src='{programPath}/Icon/UnStar.svg' width=25>")
def ShowWindow():
ProgramRunStatusUpload.starList = []
ProgramRunStatusUpload.msgWindow = QtWidgets.QMainWindow(ProgramRunStatusShow.msgWindow)
msgWidget = QtWidgets.QWidget()
msgWidgetLayout = QtWidgets.QGridLayout()
ProgramRunStatusUpload.fen = QtWidgets.QComboBox()
ProgramRunStatusUpload.starLayout = QtWidgets.QHBoxLayout()
upload = QtWidgets.QPushButton(QtCore.QCoreApplication.translate("U", "上传"))
upload.clicked.connect(ProgramRunStatusUpload.Upload)
# 生成星星列表
for i in [1, 1, 1, 1, 1]:
ProgramRunStatusUpload.starList.append(QtWidgets.QLabel(f"<img src='{programPath}/Icon/{['Un', ''][i]}Star.svg' width=25>"))
ProgramRunStatusUpload.starLayout.addWidget(ProgramRunStatusUpload.starList[-1])
ProgramRunStatusUpload.starLayout.addItem(QtWidgets.QSpacerItem(20, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum))
ProgramRunStatusUpload.fen.addItems(["0分", "1分", "2分", "3分", "4分", "5分"])
ProgramRunStatusUpload.fen.setCurrentIndex(5)
ProgramRunStatusUpload.fen.currentIndexChanged.connect(ProgramRunStatusUpload.ChangeStar)
msgWidgetLayout.addWidget(QtWidgets.QLabel(QtCore.QCoreApplication.translate("U", "评分:")), 1, 0)
msgWidgetLayout.addWidget(ProgramRunStatusUpload.fen, 1, 1)
msgWidgetLayout.addLayout(ProgramRunStatusUpload.starLayout, 2, 1)
msgWidgetLayout.addWidget(upload, 3, 1)
msgWidget.setLayout(msgWidgetLayout)
ProgramRunStatusUpload.msgWindow.setCentralWidget(msgWidget)
ProgramRunStatusUpload.msgWindow.setWindowTitle(QtCore.QCoreApplication.translate("U", "上传程序运行情况"))
ProgramRunStatusUpload.msgWindow.setWindowIcon(QtGui.QIcon(iconPath))
ProgramRunStatusUpload.msgWindow.show()
def Upload():
try:
QtWidgets.QMessageBox.information(ProgramRunStatusUpload.msgWindow, QtCore.QCoreApplication.translate("U", "提示"), requests.get(f"http://120.25.153.144/spark-deepin-wine-runner/Install.php?Version=Fen{ProgramRunStatusUpload.fen.currentIndex()}").json()["Error"])
except:
traceback.print_exc()
QtWidgets.QMessageBox.critical(ProgramRunStatusUpload.msgWindow, QtCore.QCoreApplication.translate("U", "错误"), QtCore.QCoreApplication.translate("U", "数据上传失败!"))
if __name__ == "__main__":
programPath = os.path.split(os.path.realpath(__file__))[0] # 返回 string
iconPath = "{}/deepin-wine-runner.svg".format(programPath)
app = QtWidgets.QApplication(sys.argv)
ProgramRunStatusShow.ShowWindow()
app.exec_()

View File

@@ -1,18 +1,24 @@
<p width=100px align="center"><img src="https://storage.deepin.org/thread/202208031419283599_deepin-wine-runner.png"></p>
<h1 align="center">Wine 运行器 3.8.1</h1>
<h1 align="center">Wine 运行器 4.0.0</h1>
<hr>
<a href='https://gitee.com/gfdgd-xi/deep-wine-runner/stargazers'><img src='https://gitee.com/gfdgd-xi/deep-wine-runner/badge/star.svg?theme=dark' alt='star'></img></a>
<a href='https://gitee.com/gfdgd-xi/deep-wine-runner/members'><img src='https://gitee.com/gfdgd-xi/deep-wine-runner/badge/fork.svg?theme=dark' alt='fork'></img></a>
## 介绍
Wine运行器是一个能让Linux用户更加方便地运行Windows应用的程序。原版的 Wine 只能使用命令操作且安装过程较为繁琐对小白不友好。于是该运行器为了解决该痛点内置了对Wine图形化的支持、Wine 安装器、微型应用商店、各种Wine工具、自制的Wine程序打包器、运行库安装工具等。
它同时还内置了基于Qemu/VirtualBox制作的、专供小白使用的Windows虚拟机安装工具可以做到只需下载系统镜像并点击安装即可无需考虑虚拟机的安装、创建、分区等操作也能在非 X86 架构安装 X86 架构的 Windows 操作系统(但是效率较低,可以运行些老系统)。
它同时还内置了基于Qemu/VirtualBox制作的、专供小白使用的Windows虚拟机安装工具可以做到只需下载系统镜像并点击安装即可无需考虑虚拟机的安装、创建、分区等操作也能在非 X86 架构安装 X86 架构的 Windows 操作系统(但是效率较低,可以运行些老系统)。
而且对于部分 Wine 应用适配者来说,提供了图形化的打包工具,以及提供了一些常用工具以及运行库的安装方式,以及能安装多种不同的 Wine 以测试效果,能极大提升适配效率。
且对于 Deepin23 用户做了特别优化,以便能在缺少 i386 运行库的情况下运行 Wine32。同时也为非 X86 架构用户提供了 Box86/64、Qemu User 的安装方式
当前支持 amd64、arm64、mips64el、loong64新世界、loongarch64旧世界、riscv64
注:
**在使用运行器时不要随便动 .deepinwine 下的容器,否则会导致安装的 wine 应用无法正常打开**
**除非你有把握不会损坏容器**
Wine Runner is a program that allows Linux users to run Windows applications more conveniently. It has built-in support for Wine graphics, various Wine tools, self-made Wine program packager and runtime installation tools. It also has a built-in Windows virtual machine installation tool based on VirtualBox, which is specially used by Xiaobai. You can download the system image and click Install without considering the installation, creation and partitioning of virtual machines.
![截图_选择区域_20221002221112.png](https://storage.deepin.org/thread/202210022215217037_截图_选择区域_20221002221112.png)
@@ -23,6 +29,20 @@ Wine运行器是一个能让Linux用户更加方便地运行Windows应用的程
Wine 运行器 QQ 交流群762985460
Wine 运行器离线包下载地址https://www.123pan.com/s/pDSKVv-pAJWv.html
### Wine 运行器 For Termux 安装方法以及注意事项
见 https://gitee.com/gfdgd-xi/deep-wine-runner-termux
https://github.com/gfdgd-xi/deep-wine-runner-termux
### 如何手动下载 Wine
下载链接: http://ctfile.gfdgdxi.top/d/31540479-61624693-080e74?p=2061 (访问密码: 2061)
### 如果使用更新版本的 Qemu
后续版本将支持调用以下链接 deb 包安装的 Qemu
Wine运行器Qemu: http://ctfile.gfdgdxi.top/d/31540479-61635610-54327c?p=2061 (访问密码: 2061)
https://sourceforge.net/projects/deep-wine-runner/files/Wine%20Runner%20Qemu%20Extra/
### Debian sid 依赖
https://gfdgdxi.lanzouw.com/b0plly5cj
密码:b346
@@ -143,6 +163,40 @@ desktop文件中StartupWMClass字段。用于让桌面组件将窗口类名与de
![image.png](https://storage.deepin.org/thread/202207190822204627_image.png)
## 更新日志
### 4.0.02024/07/22
**※1、优化运行器窗口大小机制**
**※2、Wine 安装器支持根据机器实际情况自动推荐适合的 Wine**
**※3、Wine 安装器支持手动导入 Wine 7z 包并提供相应 7z 包的网盘下载地址**
**※4、兼容 Deepin 终端deepin 15 经典版本deepin-terminal-gtk**
**※5、跟进 dxvk 2.4**
**※6、修复 deepin 23 无法使用 Mono/Gecko 安装器的问题**
**※7、修复 debian testing 打包时会把 / 打入 .7z 包内导致系统死机的问题**
**※8、支持 AOSC安同、小小电脑、proot 容器**
**※9、支持在 Termux 直接运行(单独提供安装包)**
10、修复虚拟机启动器入口不会调用安装的 Qemu Extra 的问题
11、优化高级打包器容器名称生成机制
12、修复部分机器无法正常打开高级打包器的问题
13、修复高级打包器选择Wine封装入deb模式时helper只能使用spark dwine helper的问题
![](https://t.tutu.to/img/8NAdd)
![](https://t.tutu.to/img/8NWtw)
![](https://t.tutu.to/img/8NZho)
### 3.9.22024/06/29
**※1、移除冗余组件**
**※2、修复 Wine 安装器在文件下载失败后无法自动关闭进度条和解除控件禁用的问题**
**※3、Wine 打包器不允许版本号开头输入首字母以及版本号不允许出现空格**
**※4、Wine 打包器生成的 deb 同时支持使用 spark-dwine-helper 和 deepin-wine-helper**
**※5、支持调用拓展 Qemu**
**※6、新增滚动条优化小屏幕使用体验**
![image.png](https://storage.deepin.org/thread/202406290742035395_image.png)
### 3.9.12024/06/07
**※1、修复 Windows 虚拟机安装工具安装程序在 Mips 架构无法正确启动虚拟机的问题**
**※2、优化打包器依赖**
### 3.9.02024年06月01日
**※1、UOS Mips64如 3a4000用户无需手动降级 Qemu 即可正常开启使用虚拟机**
**※2、修复开启部分 exe 提示参数有误的问题**
@@ -173,6 +227,16 @@ desktop文件中StartupWMClass字段。用于让桌面组件将窗口类名与de
8、修复问题 https://gitee.com/gfdgd-xi/deep-wine-runner/issues/I9B4L0
9、针对 Loongarch ACE 做特别优化
**※1. Repair system/application library download failed problem**
**※2. Support building loong64, loongarch64, armhf and amd64 architecture deb with packager**
**※3. Update Geek Uninstaller version**
**※4. Enable English translation by default**
**※5. Update dxvk version**
**※6. Repair virtual machine running problem with newer Qemu**
**※7. Support adding space with Qemu virtual disk**
8. Fixed an issue related to https://gitee.com/gfdgd-xi/deep-wine-runner/issues/I9B4L0
9. Added support for Loongarch ACE
![image.png](https://storage.deepin.org/thread/202404271014409954_image.png)
@@ -718,8 +782,8 @@ Sourceforgehttps://sourceforge.com/projects/deep-wine-runner
屏蔽微信在Wine中运行时产生的水印/黑块可以参考https://12101111.github.io/block-wine-wechat-black-window/ 和 https://blog.csdn.net/ericden/article/details/122118443
### 拉取
***(需要先安装 Docker 后再输入以下命令)***
Docker 镜像下载链接:
```bash
wget https://code.gitlink.org.cn/gfdgd_xi/wine-building-docker/raw/branch/master/wine-latest-debian10.tar.gz
sudo docker load -i wine-latest-debian10.tar.gz
```
### 启用

View File

@@ -0,0 +1,30 @@
#!/bin/bash
import os
import sys
import binascii
def Replace(fileName: str):
with open(f"{fileName}", "rb") as file:
data = file.read()
if (sys.argv[2] == "x86_64"):
data = data.replace(bytes("/lib64/ld-linux-x86-64.so.2".encode()),
bytes("/data/data/com.termux/gfdgd".encode())) # 替换与被替换需要保证字符数量相同
if (sys.argv[2] == "aarch64"):
data = data.replace(bytes("/lib/ld-linux-aarch64.so.1".encode()),
bytes("/data/data/com.termux/gfdg".encode())) # 替换与被替换需要保证字符数量相同
with open(f"{fileName}", "wb") as file:
file.write(data)
longest = 0
def Find(path: str):
global longest
for i in os.listdir(path):
newpath = f"{path}/{i}"
if (len(newpath) > longest):
longest = len(newpath)
print(f"\r{newpath}" + " " * (longest - len(newpath)), end="")
if (os.path.isfile(newpath)):
Replace(newpath)
if (os.path.isdir(newpath)):
Find(newpath)
Find(sys.argv[1])

View File

@@ -0,0 +1,50 @@
#!/usr/bin/env python3
import os
import sys
def Replace(path):
"spark-dwine-helper | store.spark-app.spark-dwine-helper"
"deepin-wine-helper (>= 5.1.30-1)"
"com.wine-helper.deepin"
with open(f"{path}/DEBIAN/control", "r") as file:
data = file.read()
isReplace = False
isSparkHelper = False
# 替换 Wine 包名
data = data.replace("deepin-wine6-stable,", "deepin-wine6-stable | com.deepin-wine6-stable.deepin,")
data = data.replace("deepin-wine6-stable | deepin-wine6-stable-bcm | deepin-wine6-stable-dcm,", "deepin-wine6-stable | deepin-wine6-stable-bcm | deepin-wine6-stable-dcm | com.deepin-wine6-stable.deepin,")
if "spark-dwine-helper | store.spark-app.spark-dwine-helper" in data and not isReplace:
isReplace = True
isSparkHelper = True
data = data.replace("spark-dwine-helper | store.spark-app.spark-dwine-helper", "deepin-wine-helper | com.wine-helper.deepin")
if "deepin-wine-helper (>= 5.1.30-1)" in data and not isReplace:
isReplace = True
data = data.replace("deepin-wine-helper (>= 5.1.30-1)", "deepin-wine-helper | com.wine-helper.deepin")
with open(f"{path}/DEBIAN/control", "w") as file:
file.write(data)
if isSparkHelper:
ReplaceSparkHelper(path)
def ReplaceSparkHelper(path):
name = os.listdir(f"{path}/opt/apps/")[0]
with open(f"{path}/opt/apps/{name}/files/run.sh", "r") as file:
data = file.read().replace("/opt/deepinwine/tools/spark_run_v4.sh", "/opt/deepinwine/tools/run_v4.sh")
with open(f"{path}/opt/apps/{name}/files/run.sh", "w") as file:
file.write(data)
if len(sys.argv) <= 1:
print(f"请加参数,命令示例: {sys.argv[0]} xxx.deb")
exit(1)
tempPath = "/tmp/turn-deb"
for i in sys.argv[1:]:
os.system(f"rm -rf '{tempPath}'")
os.system(f"dpkg -x '{i}' '{tempPath}'")
os.system(f"dpkg -e '{i}' '{tempPath}/DEBIAN'")
fileName = os.path.splitext(i)[0]
# 修改 control 文件
Replace(tempPath)
os.system(f"dpkg-deb -Z xz -z 0 -b '{tempPath}' '{fileName}-new.deb'")

View File

@@ -12,10 +12,11 @@ CURRENT_DIR=$(cd $(dirname $0); pwd)
VBoxManage showvminfo Windows
if [[ 0 == $? ]]; then
# 检测到虚拟机存在,启动虚拟机
VBoxManage startvm Windows > /tmp/windows-virtual-machine-installer-for-wine-runner-run.log 2>&1
VBoxManage startvm Windows > $TMPDIR/tmp/windows-virtual-machine-installer-for-wine-runner-run.log 2>&1
exit
fi
# 检查是否有 QEMU
export PATH=/opt/apps/deepin-wine-runner-qemu-system-extra/files/usr/local/bin:$PATH
which qemu-system-x86_64
if [[ $? == 0 ]] && [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
if [[ -f "$HOME/.config/deepin-wine-runner/QemuSetting.json" ]]; then
@@ -24,6 +25,10 @@ if [[ $? == 0 ]] && [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
python3 ./VM/StartQemu.py
exit
fi
# 判断是否有安装增强 Qemu
if [[ -f /opt/apps/deepin-wine-runner-qemu-system-extra/files/run.sh ]]; then
qemuMore=/opt/apps/deepin-wine-runner-qemu-system-extra/files/run.sh
fi
# 查看CPU个数
CpuSocketNum=`cat /proc/cpuinfo | grep "cpu cores" | uniq | wc -l`
# 查看CPU核心数
@@ -63,12 +68,12 @@ if [[ $? == 0 ]] && [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
./VM/kvm-ok
if [[ $? == 0 ]] && [[ `arch` == "x86_64" ]]; then
echo X86 架构,使用 kvm 加速
qemu-system-x86_64 --enable-kvm -cpu host --hda "$HOME/Qemu/Windows/Windows.qcow2" \
$qemuMore qemu-system-x86_64 --enable-kvm -cpu host --hda "$HOME/Qemu/Windows/Windows.qcow2" \
-smp $CpuCount,sockets=$CpuSocketNum,cores=$(($CpuCoreNum / $CpuSocketNum)),threads=$(($CpuCount / $CpuCoreNum / $CpuSocketNum)) \
-m ${use}G -display vnc=:5 -display gtk -usb -nic model=rtl8139 $qemuUEFI \
-device AC97 -device ES1370 -device intel-hda -device hda-duplex \
--boot 'splash=VM/boot.jpg,menu=on,splash-time=2000' \
> /tmp/windows-virtual-machine-installer-for-wine-runner-run.log 2>&1 # 最新的 qemu 已经移除参数 -soundhw all
> $TMPDIR/tmp/windows-virtual-machine-installer-for-wine-runner-run.log 2>&1 # 最新的 qemu 已经移除参数 -soundhw all
exit
fi
# 判断系统版本以选择 Qemu
@@ -88,13 +93,16 @@ if [[ $? == 0 ]] && [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
qemuPath="bwrap --dev-bind / / --bind ./VM/MipsQemu/usr/lib/mips64el-linux-gnuabi64/qemu/ui-gtk.so /usr/lib/mips64el-linux-gnuabi64/qemu/ui-gtk.so ./VM/MipsQemu/usr/bin/qemu-system-x86_64"
fi
fi
if [[ $qemuMore != "" ]]; then
qemuPath=$qemuMore
fi
echo 不使用 kvm 加速
$qemuPath --hda "$HOME/Qemu/Windows/Windows.qcow2" \
-smp $CpuCount,sockets=$CpuSocketNum,cores=$(($CpuCoreNum / $CpuSocketNum)),threads=$(($CpuCount / $CpuCoreNum / $CpuSocketNum)) \
-m ${use}G -display vnc=:5 -display gtk -usb -nic model=rtl8139 $qemuUEFI \
-device AC97 -device ES1370 -device intel-hda -device hda-duplex \
--boot 'splash=VM/boot.jpg,menu=on,splash-time=2000' \
> /tmp/windows-virtual-machine-installer-for-wine-runner-run.log 2>&1 # 最新的 qemu 已经移除参数 -soundhw all
> $TMPDIR/tmp/windows-virtual-machine-installer-for-wine-runner-run.log 2>&1 # 最新的 qemu 已经移除参数 -soundhw all
exit
fi
cat ~/.config/deepin-wine-runner/QEMU-ARCH | grep armhf
@@ -111,7 +119,7 @@ if [[ $? == 0 ]] && [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
echo $qemuUEFI
./VM/kvm-ok
if [[ $? == 0 ]] && [[ `arch` == "aarch64" ]]; then
qemu-system-arm --enable-kvm --hda "$HOME/Qemu/Windows/Windows.qcow2" \
$qemuMore qemu-system-arm --enable-kvm --hda "$HOME/Qemu/Windows/Windows.qcow2" \
-smp $CpuCount,sockets=$CpuSocketNum,cores=$(($CpuCoreNum / $CpuSocketNum)),threads=$(($CpuCount / $CpuCoreNum / $CpuSocketNum)) \
-m ${use}G -display vnc=:5 -display gtk -usb -nic model=rtl8139 $qemuUEFI \
-cpu max -M virt -device virtio-gpu-pci \
@@ -120,10 +128,10 @@ if [[ $? == 0 ]] && [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
-device usb-kbd,id=keyboard,bus=xhci.0,port=2 \
-device AC97 -device ES1370 -device intel-hda -device hda-duplex \
--boot 'splash=VM/boot.jpg,menu=on,splash-time=2000' \
> /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 # 最新的 qemu 已经移除参数 -soundhw all
> $TMPDIR/tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 # 最新的 qemu 已经移除参数 -soundhw all
exit
fi
qemu-system-arm --hda "$HOME/Qemu/Windows/Windows.qcow2" \
$qemuMore qemu-system-arm --hda "$HOME/Qemu/Windows/Windows.qcow2" \
-smp $CpuCount,sockets=$CpuSocketNum,cores=$(($CpuCoreNum / $CpuSocketNum)),threads=$(($CpuCount / $CpuCoreNum / $CpuSocketNum)) \
-m ${use}G -display vnc=:5 -display gtk -usb -nic model=rtl8139 $qemuUEFI \
-cpu max -M virt -device virtio-gpu-pci \
@@ -132,7 +140,7 @@ if [[ $? == 0 ]] && [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
-device usb-kbd,id=keyboard,bus=xhci.0,port=2 \
-device AC97 -device ES1370 -device intel-hda -device hda-duplex \
--boot 'splash=VM/boot.jpg,menu=on,splash-time=2000' \
> /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 # 最新的 qemu 已经移除参数 -soundhw all
> $TMPDIR/tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 # 最新的 qemu 已经移除参数 -soundhw all
exit
fi
cat ~/.config/deepin-wine-runner/QEMU-ARCH | grep aarch64
@@ -149,7 +157,7 @@ if [[ $? == 0 ]] && [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
echo $qemuUEFI
./VM/kvm-ok
if [[ $? == 0 ]] && [[ `arch` == "aarch64" ]]; then
qemu-system-aarch64 --enable-kvm --hda "$HOME/Qemu/Windows/Windows.qcow2" \
$qemuMore qemu-system-aarch64 --enable-kvm --hda "$HOME/Qemu/Windows/Windows.qcow2" \
-smp $CpuCount,sockets=$CpuSocketNum,cores=$(($CpuCoreNum / $CpuSocketNum)),threads=$(($CpuCount / $CpuCoreNum / $CpuSocketNum)) \
-m ${use}G -display vnc=:5 -display gtk -usb -nic model=rtl8139 $qemuUEFI \
-cpu max -M virt \
@@ -159,10 +167,10 @@ if [[ $? == 0 ]] && [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
-device usb-kbd,id=keyboard,bus=xhci.0,port=2 \
-device AC97 -device ES1370 -device intel-hda -device hda-duplex \
--boot 'splash=VM/boot.jpg,menu=on,splash-time=2000' \
> /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 # 最新的 qemu 已经移除参数 -soundhw all
> $TMPDIR/tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 # 最新的 qemu 已经移除参数 -soundhw all
exit
fi
qemu-system-aarch64 --hda "$HOME/Qemu/Windows/Windows.qcow2" \
$qemuMore qemu-system-aarch64 --hda "$HOME/Qemu/Windows/Windows.qcow2" \
-smp $CpuCount,sockets=$CpuSocketNum,cores=$(($CpuCoreNum / $CpuSocketNum)),threads=$(($CpuCount / $CpuCoreNum / $CpuSocketNum)) \
-m ${use}G -display vnc=:5 -display gtk -usb -nic model=rtl8139 $qemuUEFI \
-cpu max -M virt \
@@ -172,7 +180,7 @@ if [[ $? == 0 ]] && [[ -f "$HOME/Qemu/Windows/Windows.qcow2" ]]; then
-device usb-kbd,id=keyboard,bus=xhci.0,port=2 \
-device AC97 -device ES1370 -device intel-hda -device hda-duplex \
--boot 'splash=VM/boot.jpg,menu=on,splash-time=2000' \
> /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 # 最新的 qemu 已经移除参数 -soundhw all
> $TMPDIR/tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 # 最新的 qemu 已经移除参数 -soundhw all
exit
fi

View File

@@ -35,12 +35,6 @@ class Ui_MainWindow(object):
self.horizontalLayout_2.setObjectName("horizontalLayout_2")
spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_2.addItem(spacerItem)
self.getInfoButton = QtWidgets.QPushButton(self.centralwidget)
self.getInfoButton.setObjectName("getInfoButton")
self.horizontalLayout_2.addWidget(self.getInfoButton)
self.getFen = QtWidgets.QPushButton(self.centralwidget)
self.getFen.setObjectName("getFen")
self.horizontalLayout_2.addWidget(self.getFen)
self.runBotton = QtWidgets.QPushButton(self.centralwidget)
self.runBotton.setObjectName("runBotton")
self.horizontalLayout_2.addWidget(self.runBotton)
@@ -109,8 +103,6 @@ class Ui_MainWindow(object):
MainWindow.setWindowTitle(_translate("MainWindow", "自动部署脚本"))
self.searchTips.setText(_translate("MainWindow", "搜索内容(为空代表显示所有内容):"))
self.saerchBotton.setText(_translate("MainWindow", "搜索"))
self.getInfoButton.setText(_translate("MainWindow", "获取选中项介绍"))
self.getFen.setText(_translate("MainWindow", "获取/提交选中项的评分和评论"))
self.runBotton.setText(_translate("MainWindow", "部署此方案"))
self.menu.setTitle(_translate("MainWindow", "程序"))
self.menu_2.setTitle(_translate("MainWindow", "切换源"))

View File

@@ -6,15 +6,15 @@ echo ' # # #"""" #"""" #"# '
echo ' "mmm" "#mm" "#mm" # "m '
echo
echo
cd /tmp
cd $TMPDIR/tmp
echo 提示:
echo Geek Uninstaller 官网访问较慢,所以请耐心等待
aria2c -x 16 -s 16 https://geekuninstaller.com/geek.zip
unzip geek.zip
cd `dirname $0`
cp -rv /tmp/geek.exe ./
cp -rv $TMPDIR/tmp/geek.exe ./
if [[ $? == 0 ]];then
exit
fi
echo "拷贝失败,申请使用 sudo 拷贝"
sudo cp -rv /tmp/geek.exe ./
sudo cp -rv $TMPDIR/tmp/geek.exe ./

View File

@@ -154,6 +154,9 @@ buildvbox::buildvbox(QString isoPath, int id, int vm){
//vm.MountDisk(QDir::homePath() + "/Qemu/Windows/Windows.qcow2");
vm.MountMainDisk(QDir::homePath() + "/Qemu/Windows/Windows.qcow2");
if(QFile::exists("/opt/apps/deepin-wine-runner-qemu-system-extra/files/resources/virtio-win.iso")) {
vm.MountISO("/opt/apps/deepin-wine-runner-qemu-system-extra/files/resources/virtio-win.iso", "storage_controller_2", 1, 3);
}
if(!setISOAlready){
vm.MountISO(isoPath, "storage_controller_1", 0, 1);
switch (id) {

View File

@@ -22,8 +22,12 @@ qemu::qemu(QString name, QString managerPath)
}
this->managerPath = managerPath;
//Command command = Command();
this->vboxVersion = Command().GetCommand("'" + managerPath + "qemu-system-i386' --version");
QString qemuPath = "qemu-system-i386";
if(QFile::exists("/opt/apps/deepin-wine-runner-qemu-system-extra/files/run.sh")) {
// 如果存在拓展 Qemu则调用此
qemuPath = "/opt/apps/deepin-wine-runner-qemu-system-extra/files/run.sh qemu-system-i386";
}
this->vboxVersion = Command().GetCommand(qemuPath + " --version");
}
int qemu::Create(QString type)
@@ -108,15 +112,21 @@ int qemu::MountMainDisk(QString diskPath)
int qemu::StartArmhf()
{
qDebug() << commandOption;
if(Command().GetCommand("arch").replace("\n", "").replace(" ", "") == "aarch64" && !system((QCoreApplication::applicationDirPath() + "/kvm-ok").toUtf8())){
return system(("qemu-system-arm --boot 'splash=" + GetBootLogoPath() + ",order=d,menu=on,splash-time=2000' -display vnc=:5 -display gtk --enable-kvm -cpu host -M virt " + commandOption + " -device virtio-gpu-pci -device nec-usb-xhci,id=xhci,addr=0x1b -device usb-tablet,id=tablet,bus=xhci.0,port=1 -device usb-kbd,id=keyboard,bus=xhci.0,port=2 > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &").toLatin1());
QString qemuPath = "qemu-system-arm";
if(QFile::exists("/opt/apps/deepin-wine-runner-qemu-system-extra/files/run.sh")) {
// 如果存在拓展 Qemu则调用此
qemuPath = "/opt/apps/deepin-wine-runner-qemu-system-extra/files/run.sh qemu-system-arm";
}
return system(("qemu-system-arm --boot 'splash=" + GetBootLogoPath() + ",order=d,menu=on,splash-time=2000' -display vnc=:5 -display gtk -cpu max -M virt " + commandOption + " -device virtio-gpu-pci -device nec-usb-xhci,id=xhci,addr=0x1b -device usb-tablet,id=tablet,bus=xhci.0,port=1 -device usb-kbd,id=keyboard,bus=xhci.0,port=2 > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &").toLatin1());
if(Command().GetCommand("arch").replace("\n", "").replace(" ", "") == "aarch64" && !system((QCoreApplication::applicationDirPath() + "/kvm-ok").toUtf8())){
return system((qemuPath + " --boot 'splash=" + GetBootLogoPath() + ",order=d,menu=on,splash-time=2000' -display vnc=:5 -display gtk --enable-kvm -cpu host -M virt " + commandOption + " -device virtio-gpu-pci -device nec-usb-xhci,id=xhci,addr=0x1b -device usb-tablet,id=tablet,bus=xhci.0,port=1 -device usb-kbd,id=keyboard,bus=xhci.0,port=2 > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &").toLatin1());
}
return system((qemuPath + " --boot 'splash=" + GetBootLogoPath() + ",order=d,menu=on,splash-time=2000' -display vnc=:5 -display gtk -cpu max -M virt " + commandOption + " -device virtio-gpu-pci -device nec-usb-xhci,id=xhci,addr=0x1b -device usb-tablet,id=tablet,bus=xhci.0,port=1 -device usb-kbd,id=keyboard,bus=xhci.0,port=2 > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &").toLatin1());
}
int qemu::StartAarch64()
{
QString bootScreenLogo = "";
QString qemuPath = "qemu-system-aarch64";
// 判断 boot 文件是否存在
if(QFile::exists(QCoreApplication::applicationDirPath() + "/boot.jpg")) {
bootScreenLogo = QCoreApplication::applicationDirPath() + "/boot.jpg";
@@ -126,11 +136,15 @@ int qemu::StartAarch64()
QFile::copy(":/boot.jpg", "/tmp/deep-wine-runner-boot.jpg");
bootScreenLogo = "/tmp/deep-wine-runner-boot.jpg";
}
if(QFile::exists("/opt/apps/deepin-wine-runner-qemu-system-extra/files/run.sh")) {
// 如果存在拓展 Qemu则调用此
qemuPath = "/opt/apps/deepin-wine-runner-qemu-system-extra/files/run.sh qemu-system-aarch64";
}
qDebug() << commandOption;
if(Command().GetCommand("arch").replace("\n", "").replace(" ", "") == "aarch64" && !system((QCoreApplication::applicationDirPath() + "/kvm-ok").toUtf8())){
return system(("qemu-system-aarch64 --boot 'splash=" + GetBootLogoPath() + ",order=d,menu=on,splash-time=2000' -display vnc=:5 -display gtk --enable-kvm -cpu host -M virt " + commandOption + " -device virtio-gpu-pci -device nec-usb-xhci,id=xhci,addr=0x1b -device usb-tablet,id=tablet,bus=xhci.0,port=1 -device usb-kbd,id=keyboard,bus=xhci.0,port=2 > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &").toLatin1());
return system((qemuPath + " --boot 'splash=" + GetBootLogoPath() + ",order=d,menu=on,splash-time=2000' -display vnc=:5 -display gtk --enable-kvm -cpu host -M virt " + commandOption + " -device virtio-gpu-pci -device nec-usb-xhci,id=xhci,addr=0x1b -device usb-tablet,id=tablet,bus=xhci.0,port=1 -device usb-kbd,id=keyboard,bus=xhci.0,port=2 > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &").toLatin1());
}
return system(("qemu-system-aarch64 --boot 'splash=" + GetBootLogoPath() + ",order=d,menu=on,splash-time=2000' -display vnc=:5 -display gtk -cpu max -M virt " + commandOption + " -device virtio-gpu-pci -device nec-usb-xhci,id=xhci,addr=0x1b -device usb-tablet,id=tablet,bus=xhci.0,port=1 -device usb-kbd,id=keyboard,bus=xhci.0,port=2 > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &").toLatin1());
return system((qemuPath + " --boot 'splash=" + GetBootLogoPath() + ",order=d,menu=on,splash-time=2000' -display vnc=:5 -display gtk -cpu max -M virt " + commandOption + " -device virtio-gpu-pci -device nec-usb-xhci,id=xhci,addr=0x1b -device usb-tablet,id=tablet,bus=xhci.0,port=1 -device usb-kbd,id=keyboard,bus=xhci.0,port=2 > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &").toLatin1());
}
int qemu::StartLoong64()
@@ -158,6 +172,10 @@ int qemu::Start(bool unShown)
qemuPath = "bwrap --dev-bind / / --bind '" + QCoreApplication::applicationDirPath() + "/MipsQemu/usr/lib/mips64el-linux-gnuabi64/qemu/ui-gtk.so' /usr/lib/mips64el-linux-gnuabi64/qemu/ui-gtk.so '" + QCoreApplication::applicationDirPath() + "/MipsQemu/usr/bin/qemu-system-x86_64' ";
}
}
if(QFile::exists("/opt/apps/deepin-wine-runner-qemu-system-extra/files/run.sh")) {
// 如果存在拓展 Qemu则调用此
qemuPath = "/opt/apps/deepin-wine-runner-qemu-system-extra/files/run.sh qemu-system-x86_64";
}
qDebug() << commandOption;
if(Command().GetCommand("arch").replace("\n", "").replace(" ", "") == "x86_64" && !system((QCoreApplication::applicationDirPath() + "/kvm-ok").toUtf8())){
return system((qemuPath + " --boot 'splash=" + GetBootLogoPath() + ",order=d,menu=on,splash-time=2000' -display vnc=:5 -display gtk --enable-kvm -cpu host " + newCommandOption + " > /tmp/windows-virtual-machine-installer-for-wine-runner-install.log 2>&1 &").toLatin1());
@@ -331,7 +349,7 @@ QString qemu::GetArch()
process.start("uname", QStringList() << "-m");
process.waitForStarted();
process.waitForFinished();
QString data = process.readAllStandardError();
QString data = process.readAllStandardOutput();
process.close();
return data.replace("\n", "").replace(" ", "");
}

0
VM/AAVMF32_CODE.fd Normal file → Executable file
View File

0
VM/OVMF.fd Normal file → Executable file
View File

0
VM/QEMU_AARCH64_EFI.fd Normal file → Executable file
View File

0
VM/QEMU_EFI_LOONG64_7.1.fd Normal file → Executable file
View File

0
VM/StartQemu.py Normal file → Executable file
View File

View File

@@ -1,6 +1,8 @@
#!/usr/bin/env python3
import os
import sys
import subprocess
import PyQt5.QtWidgets as QtWidgets
programPath = os.path.split(os.path.realpath(__file__))[0] # 返回 string
arch = subprocess.getoutput("dpkg --print-architecture").replace(" ", "").replace("\n", "")
if os.path.exists(f"{programPath}/VirtualMachine-{arch}"):
@@ -13,6 +15,10 @@ if not os.path.exists(f"{programPath}/VirtualMachine-amd64"):
if os.path.exists(f"{programPath}/VirtualMachine-{arch}"):
os.system(f"{programPath}/VirtualMachine-{arch}")
exit()
app = QtWidgets.QApplication(sys.argv)
QtWidgets.QMessageBox.information(None, "提示", "虚拟机安装器暂不支持此系统")
exit(1)
# 后面已废弃
# 只能使用 Qemu User 运行程序
if os.path.exists("/usr/lib/x86_64-linux-gnu/") and not os.system("which qemu-x86_64"):
os.system(f"qemu-x86_64 '{programPath}/VirtualMachine-x86_64'")

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

0
VM/Windows7X64Auto.iso Normal file → Executable file
View File

0
VM/Windows7X86Auto.iso Normal file → Executable file
View File

0
VM/boot.jpg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 44 KiB

0
VM/test.qcow2 Normal file → Executable file
View File

View File

@@ -1,117 +0,0 @@
#!/usr/bin/env python3
import os
import updatekiller
if __name__ == "__main__":
print('''
mmm ""#
m" " # mmm mmm m mm
# # #" # " # #" #
# # #"""" m"""# # #
"mmm" "mm "#mm" "mm"# # #
''')
programPath = os.path.split(os.path.realpath(__file__))[0] # 返回 string
print("此程序可以帮助您删除程序无需的组件以节约空间")
print("如果全部删除,将只会有核心功能")
print("如果删除后想要恢复这样组件需要重新安装该软件包")
delProgramList = []
delProramCommand = "#!/bin/bash\n"
for i in [
[
"含有商业软件的内容",
[
f"{programPath}/StartVM.sh",
f"{programPath}/RunVM.sh",
f"{programPath}/VM",
"/usr/share/applications/spark-deepin-wine-runner-control-vm.desktop",
"/usr/share/applications/spark-deepin-wine-runner-start-vm.desktop",
f"{programPath}/BeCyIconGrabber.exe",
f"{programPath}/geek.exe",
f"{programPath}/窗体透明度设置工具.exe",
f"{programPath}/UpdateGeek.sh",
f"{programPath}/AppStore.py",
f"{programPath}/InstallFont.py",
f"{programPath}/InstallMsxml.py",
f"{programPath}/InstallNetFramework.py",
f"{programPath}/InstallOther.py",
f"{programPath}/InstallVisualCPlusPlus.py"
]
],
[
"Wine 打包器(不基于生态打包脚本)",
[
f"{programPath}/deepin-wine-packager.py",
f"{programPath}/exagear",
f"{programPath}/exagear.7z",
f"{programPath}/exagear",
f"{programPath}/wined3d.dll.so.7z",
f"{programPath}/wined3d.dll.so",
"/usr/bin/deepin-wine-package-builder",
"/usr/share/applications/spark-deepin-wine-package-builder.desktop"
]
],
[
"Wine 打包器(基于生态打包脚本)",
[
f"{programPath}/deepin-wine-packager-with-script.py",
f"{programPath}/package-script.zip",
f"{programPath}/package-script",
"/usr/bin/deepin-wine-packager-with-script",
"/usr/share/applications/spark-deepin-wine-packager-with-script.desktop"
]
],
[
"Arm 64 box86 wine 运行 DLL",
[
f"{programPath}/dlls-arm.7z",
f"{programPath}/dlls-arm",
f"{programPath}/wined3d.dll.so.7z",
f"{programPath}/wined3d.dll.so"
]
],
[
"Windows 虚拟机简易安装组件",
[
f"{programPath}/StartVM.sh",
f"{programPath}/RunVM.sh",
f"{programPath}/VM",
"/usr/share/applications/spark-deepin-wine-runner-control-vm.desktop",
"/usr/share/applications/spark-deepin-wine-runner-start-vm.desktop"
]
],
[
"Wine 安装组件",
[
f"{programPath}/AllInstall.py",
f"{programPath}/wine install",
f"{programPath}/InstallWineOnDeepin23.py",
f"{programPath}/sparkstore.list",
f"{programPath}/InstallNewWineHQ.sh",
f"{programPath}/wine",
"/usr/bin/deepin-wine-runner-wine-installer",
"/usr/bin/deepin-wine-runner-wine-install-deepin23",
"/usr/bin/deepin-wine-runner-wine-install",
"/usr/bin/deepin-wine-runner-winehq-install"
]
]
]:
if not os.path.exists(i[1][0]):
continue
if input(f"是否删除组件“{i[0]}”?[Y/n]").upper() == "Y":
delProgramList.append(i)
for x in i[1]:
if x == "/*" or x == "/": # 为了防止个人疏忽,出现危险命令,所以如果有最危险的 /* 会直接跳过该命令的写入
continue
delProramCommand += f"rm -rfv \"{x}\"\n"
if len(delProgramList) == 0:
print("您已经删除了所有可删除的组件,如果需要使用被删除的组件,请重新安装该软件安装包")
input("按回车退出")
exit()
print("开始删除")
file = open("/tmp/deepin-wine-clean.sh", "w")
file.write(delProramCommand)
file.close()
os.system("pkexec bash /tmp/deepin-wine-clean.sh")
input("按回车键退出程序")

59
deb-termux/DEBIAN/control Executable file
View File

@@ -0,0 +1,59 @@
Package: spark-deepin-wine-runner-termux
Version: @@VERSION@@
Maintainer: gfdgd xi <3025613752@qq.com>
Homepage: https://gitee.com/gfdgd-xi/deep-wine-runner
Architecture: all
Severity: serious
Certainty: possible
Check: binaries
Type: binary, udeb
Priority: optional
Depends: python3,
python3-pil | pillow | python-pillow,
python3-pil.imagetk | pillow | python-tkinter,
aria2,
curl,
unrar | unrar-free ,
unzip,
python3-pyqt5 | pyqt5,
xfce4-terminal | deepin-terminal-gtk | deepin-terminal | mate-terminal | gnome-terminal,
p7zip-full | p7zip-legacy | p7zip,
zenity,
tree,
dpkg,
fakeroot,
which,
git,
xfwm4,
tigervnc,
proot,
bash
Recommends: winbind,
wimtools | wimlib,
python3-pyquery,
python3-pyqt5.qtwebengine | pyqtwebengine,
binfmt-support,
libc6:i386,
libc6:armhf,
libwine,
qemu-system,
qemu-full,
qemu,
qemu-system-x86-64,
qemu-system-i386,
qemu-system-arm,
qemu-system-aarch64,
qemu-utils,
alien,
spark-deepin-wine-runner-qemu-system-extra,
deepin-wine8-stable | spark-wine | spark-wine9 | spark-wine9-wow | spark-wine8 | spark-wine8-wow | spark-wine7-devel | deepin-wine6-stable | deepin-wine5-stable | deepin-wine5 | deepin-wine | wine | wine-stable,
spark-dwine-helper | store.spark-app.spark-dwine-helper | deepin-wine-helper | com.wine-helper.deepin
Section: utils
Conflicts: spark.deepin-venturi-setter, spark-deepin-wine5-application-packer, spark-deepin-wine-runner-52
Replaces: spark.deepin-venturi-setter, spark-deepin-wine5-application-packer, spark-deepin-wine-runner-52
Provides: spark.deepin-venturi-setter, spark-deepin-wine5-application-packer, spark-deepin-wine-runner-52
Installed-Size: @@SIZE@@
Description: Wine运行器是一个能让Linux用户更加方便地运行Windows应用的程序。原版的 Wine 只能使用命令操作且安装过程较为繁琐对小白不友好。于是该运行器为了解决该痛点内置了对Wine图形化的支持、Wine 安装器、微型应用商店、各种Wine工具、自制的Wine程序打包器、运行库安装工具等。
它同时还内置了基于Qemu/VirtualBox制作的、专供小白使用的Windows虚拟机安装工具可以做到只需下载系统镜像并点击安装即可无需考虑虚拟机的安装、创建、分区等操作也能在非 X86 架构安装 X86 架构的 Windows 操作系统(但是效率较低,可以运行些老系统)。
而且对于部分 Wine 应用适配者来说,提供了图形化的打包工具,以及提供了一些常用工具以及运行库的安装方式,以及能安装多种不同的 Wine 以测试效果,能极大提升适配效率。
且对于 Deepin23 用户做了特别优化,以便能在缺少 i386 运行库的情况下运行 Wine32。同时也为非 X86 架构用户提供了 Box86/64、Qemu User 的安装方式

131
deb-termux/DEBIAN/postinst Executable file
View File

@@ -0,0 +1,131 @@
#!/bin/bash
# 使用系统默认的 sh 运行
#################################################################################################################
# 作者gfdgd xi
# 版本3.0.0
# 更新时间2022年10月02日
# 感谢:感谢 wine、deepin-wine 以及星火团队,提供了 wine、deepin-wine、spark-wine-devel 给大家使用,让我能做这个程序
# 基于 sh
#################################################################################################################
# 非强制性的必应组件,所以成功不成功都行
# 程序版本号
version=3.4.1
echo 安装组件
#python3 -m pip install --upgrade pyqt5 --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple > /dev/null 2>&1 | true
#python3 -m pip install --upgrade PyQtWebEngine --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple > /dev/null 2>&1 | true
python3 -m pip install --upgrade requests --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 psutil --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple --break-system-packages > /dev/null 2>&1 | true
# termux 在使用 pip 安装 dbus-python 时会卡住
# python3 -m pip install --upgrade dbus-python --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 pyperclip --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 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
# 用于解决老版本 pip 没 --break-system-packages 参数的问题
python3 -m pip install --upgrade pynput --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple > /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 > /dev/null 2>&1 | true
python3 -m pip install --upgrade requests --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple > /dev/null 2>&1 | true
python3 -m pip install --upgrade psutil --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple > /dev/null 2>&1 | true
# termux 在使用 pip 安装 dbus-python 时会卡住
# python3 -m pip install --upgrade dbus-python --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple > /dev/null 2>&1 | true
python3 -m pip install --upgrade pyperclip --trusted-host https://repo.huaweicloud.com -i https://repo.huaweicloud.com/repository/pypi/simple > /dev/null 2>&1 | true
# 修改 box86/64 国内源错误数据
if [ -f /etc/apt/sources.list.d/box64.list ]; then
sed -i 's/http:\/\/seafile.jyx2048.com:2345/http:\/\/gfdgdxi.v5.idcfengye.com/g' /etc/apt/sources.list.d/box64.list
fi
if [ -f /etc/apt/sources.list.d/box86.list ]; then
sed -i 's/http:\/\/seafile.jyx2048.com:2345/http:\/\/gfdgdxi.v5.idcfengye.com/g' /etc/apt/sources.list.d/box86.list
fi
echo 执行完成
echo 移除旧组件
if [ -d /opt/apps/deepin-wine-runner/arm-package ]; then
rm -rf /opt/apps/deepin-wine-runner/arm-package
fi
if [ -d /opt/apps/deepin-wine-runner/dlls-arm ]; then
rm -rf /opt/apps/deepin-wine-runner/dlls-arm
fi
if [ -d /opt/apps/deepin-wine-runner/exa ]; then
rm -rf /opt/apps/deepin-wine-runner/exa
fi
if [ -d /opt/apps/deepin-wine-runner/dxvk ]; then
rm -rf /opt/apps/deepin-wine-runner/dxvk
fi
echo 移除完成
# 如果为非 X86 PC可以删除掉一些无用组件主要是用不了
if [[ `arch` != "x86_64" ]]; then
echo 非X86架构删除对非X86架构无用的组件
# 删除虚拟机功能
#rm -rf /opt/apps/deepin-wine-runner/StartVM.sh
#rm -rf /opt/apps/deepin-wine-runner/RunVM.sh
#rm -rf /opt/apps/deepin-wine-runner/VM
#rm -rf /usr/share/applications/spark-deepin-wine-runner-control-vm.desktop
#rm -rf /usr/share/applications/spark-deepin-wine-runner-start-vm.desktop
# 删除安装 wine 功能
rm -rf "/opt/apps/deepin-wine-runner/wine install"
# 这个注释掉的理论可用,不移除
#rm -rf "/opt/apps/deepin-wine-runner/wine"
rm -rf /usr/bin/deepin-wine-runner-wine-installer
rm -rf /usr/bin/deepin-wine-runner-wine-install-deepin23
rm -rf /usr/bin/deepin-wine-runner-wine-install
rm -rf /usr/bin/deepin-wine-runner-winehq-install
rm -rf /opt/apps/deepin-wine-runner/InstallWineOnDeepin23.py
rm -rf /opt/apps/deepin-wine-runner/sparkstore.list
rm -rf /opt/apps/deepin-wine-runner/AllInstall.py
rm -rf /opt/apps/deepin-wine-runner/InstallNewWineHQ.sh
fi
# 处理 VM 工具
vmPath=/opt/apps/deepin-wine-runner/VM/VirtualMachine-`dpkg --print-architecture`
echo 当前架构为:`dpkg --print-architecture`
if [ -f $vmPath ]; then
echo 虚拟机工具有该架构的预编译文件
# 移除辅助文件
rm -f /opt/apps/deepin-wine-runner/VM/VirtualMachine
# 移动
mv $vmPath /opt/apps/deepin-wine-runner/VM/VirtualMachine
rm -f /opt/apps/deepin-wine-runner/VM/VirtualMachine-*
else
echo 虚拟机工具无该架构的预编译文件
rm -f /opt/apps/deepin-wine-runner/VM/VirtualMachine-*
fi
echo 处理完成!
# 修复 3.3.0.1 Box86 源挂了的问题
if [ -f /etc/apt/sources.list.d/box86.list ]; then
bash -c "echo deb http://seafile.jyx2048.com:2345/spark-deepin-wine-runner/data/box86-debs/debian ./ > /etc/apt/sources.list.d/box86.list"
fi
# Gitlink 源挂了
# 到时候切换 gpg 源会方便很多
#if [ -r /etc/apt/sources.list.d/better-dde.list ]; then
# if [ -d /usr/share/deepin-installer ]; then
# # 用于修复 Deepin Community Live CD Install 版签名过期的问题
# wget -P /tmp/gfdgd-xi-sources https://code.gitlink.org.cn/gfdgd_xi/gfdgd-xi-apt-mirrors/raw/branch/master/gpg.asc
# rm -rfv /etc/apt/trusted.gpg.d/gfdgdxi-list.gpg | true
# cp -v /tmp/gfdgd-xi-sources/gpg.asc.gpg /etc/apt/trusted.gpg.d/gfdgdxi-list.gpg
# # 用于修复 2022.11.25 Better DDE 导致的 Deepin Community Live CD Install 版问题
# # 移除 Better DDE 源
# rm -rfv /etc/apt/sources.list.d/better-dde.list
# apt update > /dev/null 2>&1 | true
# fi
#fi
# 设置目录权限,让用户可读可写,方便后续删除组件
chmod 777 -R /opt/apps/deepin-wine-runner > /dev/null 2>&1 | true
if [[ ! -f /data/data/com.termux/files/home/.vnc/passwd ]]; then
echo 开始配置 VNCServer
echo 接下来需要设置 VNCServer 的密码
set +e
while [[ 1 ]];
do
vncpasswd
if [[ $? == 0 ]]; then
break
fi
echo 设置有误,需重新设置
sleep 1
done
fi
# 向服务器返回安装数加1不显示内容且忽略错误
python3 /opt/apps/deepin-wine-runner/Download.py $version > /dev/null 2>&1 | true
echo 'Wine 运行器安装完成,如果没有设置 $DISPLAY 变量的情况下打开 Wine 运行器'
echo '可以在浏览器输入网址 http://localhost:6080/vnc.html 远程访问'
echo '或者用 VNC 远程工具输入 localhost:5 远程访问'

54
deb-termux/DEBIAN/postrm Executable file
View File

@@ -0,0 +1,54 @@
#!/bin/bash
# 使用系统默认的 sh 运行
#################################################################################################################
# 作者gfdgd xi
# 版本2.2.0
# 更新时间2022年09月24日
# 感谢:感谢 wine、deepin-wine 以及星火团队,提供了 wine、deepin-wine、spark-wine-devel 给大家使用,让我能做这个程序
# 基于 sh
#################################################################################################################
# 删除软件残留,简单粗暴一点直接全部删掉,防止出现警告
# 加判断是为了怕 reinstall 后程序就再也打不开了(除非卸载后重新安装)
if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
rm -rf /opt/apps/deepin-wine-runner/
fi
# 删除软件缓存(留着也没什么用了)
# 缓存目录:~/.cache/deepin-wine-runner
if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
echo "清理程序缓存"
for username in $(ls /home); do
echo /home/$username
if [ -d "/home/$username/.cache/deepin-wine-runner/" ]; then
rm -rf "/home/$username/.cache/deepin-wine-runner/"
fi
done
# 清理 root 用户的缓存文件
echo /root
if [ -d "/root/.cache/deepin-wine-runner/" ]; then
rm -rf "/root/.cache/deepin-wine-runner/"
fi
else
echo "非卸载,跳过清理"
fi
# 删除软件配置文件只限“purge”
# 配置目录:~/.config/deepin-wine-runner
if [ "$1" = "purge" ]; then
echo "清理程序配置文件"
for username in $(ls /home); do
echo /home/$username
if [ -d "/home/$username/.config/deepin-wine-runner/" ]; then
rm -rf "/home/$username/.config/deepin-wine-runner/"
fi
done
# 清理 root 用户的配置文件
echo /root
if [ -d "/root/.config/deepin-wine-runner/" ]; then
rm -rf "/root/.config/deepin-wine-runner/"
fi
else
echo "非 purge跳过清理"
fi

View File

@@ -0,0 +1 @@
/opt/apps/deepin-wine-runner/API/Python/

View File

@@ -0,0 +1,12 @@
[Desktop Entry]
Type=Application
X-Categories=System;Wine;
Exec=/data/data/com.termux/files/usr/bin/deepin-wine-package-builder "~/.wine" %F
Icon=/data/data/com.termux/files/usr/opt/apps/deepin-wine-runner/deepin-wine-runner.svg
Name=Wine Package Builder
Name[zh]=Wine 打包器
Terminal=false
StartupNotify=true
NoDisplay=true
Keywords=exe;scr;
MimeType=application/x-ms-dos-executable;application/x-msi;application/x-ms-shortcut;

View File

@@ -0,0 +1,12 @@
[Desktop Entry]
Type=Application
X-Categories=System;Wine;
Exec=/data/data/com.termux/files/usr/bin/deepin-wine-packager-easy-builder %F
Icon=/data/data/com.termux/files/usr/opt/apps/deepin-wine-runner/deepin-wine-runner.svg
Name=Wine Package Builder
Name[zh]=Wine 简易打包器
Terminal=false
StartupNotify=true
NoDisplay=true
Keywords=exe;scr;
MimeType=application/x-ms-dos-executable;application/x-msi;application/x-ms-shortcut;

View File

@@ -0,0 +1,10 @@
[Desktop Entry]
Type=Application
X-Categories=System;Wine;
Exec=/data/data/com.termux/files/usr/bin/deepin-wine-packager-with-script
Icon=/data/data/com.termux/files/usr/opt/apps/deepin-wine-runner/deepin-wine-runner.svg
Name=Wine Package Builder For UOS
NoDisplay=true
Name[zh]=Wine 打包器(基于活动脚本)
Terminal=false
StartupNotify=true

View File

@@ -0,0 +1,10 @@
[Desktop Entry]
Type=Application
X-Categories=System;Wine;
Exec=/data/data/com.termux/files/usr/opt/apps/deepin-wine-runner/RunVM.sh %F
Icon=/data/data/com.termux/files/usr/opt/apps/deepin-wine-runner/deepin-wine-runner.svg
Name=Setting VirtualMachine
Name[zh]=设置 Windows 虚拟机
NoDisplay=true
Terminal=false
StartupNotify=true

View File

@@ -0,0 +1,9 @@
[Desktop Entry]
Type=Application
X-Categories=System;
Exec=/data/data/com.termux/files/usr/opt/apps/deepin-wine-runner/StartVM.sh %F
Icon=/data/data/com.termux/files/usr/opt/apps/deepin-wine-runner/deepin-wine-runner.svg
Name=Start Windows VirtualMachine
Name[zh]=开启 Windows 虚拟机
Terminal=false
StartupNotify=true

View File

@@ -0,0 +1,11 @@
[Desktop Entry]
Type=Application
X-Categories=System;Wine;
Exec=/data/data/com.termux/files/usr/bin/deepin-wine-runner %F
Icon=/data/data/com.termux/files/usr/opt/apps/deepin-wine-runner/deepin-wine-runner.svg
Name=Wine Runner
Name[zh]=Wine 运行器
Terminal=false
StartupNotify=true
Keywords=exe;scr;
MimeType=application/x-ms-dos-executable;application/x-msi;application/x-ms-shortcut;

View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE policyconfig PUBLIC
"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
"http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
<policyconfig>
<vendor>gfdgd xi</vendor>
<vendor_url>https://gitee.com/gfdgd-xi/deep-wine-runner/</vendor_url>
<action id="com.deepin.pkexec.deepin-wine-venturi-setter">
<message>Authentication is required to change run_v3 file manager</message>
<message xml:lang="zh_CN">修改 run_v3 文管需要输入密码</message>
<icon_name>preferences-system</icon_name>
<defaults>
<allow_any>no</allow_any>
<allow_inactive>no</allow_inactive>
<allow_active>auth_admin_keep</allow_active>
</defaults>
<annotate key="org.freedesktop.policykit.exec.path">/opt/apps/deepin-wine-runner/deepin-wine-venturi-setter.py</annotate>
<annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
</action>
</policyconfig>

View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE policyconfig PUBLIC
"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
"http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
<policyconfig>
<vendor>gfdgd xi</vendor>
<vendor_url>https://gitee.com/gfdgd-xi/deep-wine-runner/</vendor_url>
<action id="com.deepin.pkexec.mount">
<message>Authentication is required to mount file</message>
<message xml:lang="zh_CN">挂载文件需要输入密码</message>
<icon_name>preferences-system</icon_name>
<defaults>
<allow_any>no</allow_any>
<allow_inactive>no</allow_inactive>
<allow_active>auth_admin_keep</allow_active>
</defaults>
<annotate key="org.freedesktop.policykit.exec.path">/usr/bin/mount</annotate>
<annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
</action>
</policyconfig>

View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE policyconfig PUBLIC
"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
"http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
<policyconfig>
<vendor>gfdgd xi</vendor>
<vendor_url>https://gitee.com/gfdgd-xi/deep-wine-runner/</vendor_url>
<action id="com.deepin.pkexec.umount">
<message>Authentication is required to unmount file</message>
<message xml:lang="zh_CN">卸载文件需要输入密码</message>
<icon_name>preferences-system</icon_name>
<defaults>
<allow_any>no</allow_any>
<allow_inactive>no</allow_inactive>
<allow_active>auth_admin_keep</allow_active>
</defaults>
<annotate key="org.freedesktop.policykit.exec.path">/usr/bin/umount</annotate>
<annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
</action>
</policyconfig>

View File

@@ -8,12 +8,46 @@ Certainty: possible
Check: binaries
Type: binary, udeb
Priority: optional
Depends: python3, python3-pil, python3-pil.imagetk, python3-pyquery, aria2, curl, unrar | unrar-free , unzip, python3-requests, python3-pyqt5, python3-psutil, xfce4-terminal | deepin-terminal | mate-terminal | gnome-terminal, python3-dbus, python3-pip, p7zip-full (<< 16.02+transitional.1) | p7zip-legacy (>= 16.02+dfsg-8+Mejituu-2024022216), sudo, python3-pyperclip, bubblewrap, zenity, tree, dpkg, fakeroot
Recommends: winbind, wimtools, python3-pyqt5.qtwebengine, binfmt-support, libc6:i386, libc6:armhf, libwine, qemu-system, qemu-full, alien
Depends: python3,
python3-pil | pillow,
python3-pil.imagetk | pillow,
aria2,
curl,
unrar | unrar-free ,
unzip,
python3-requests,
python3-pyqt5 | pyqt5,
python3-psutil | pypsutil,
xfce4-terminal | deepin-terminal-gtk | deepin-terminal | mate-terminal | gnome-terminal,
python3-dbus,
python3-pip | pip, p7zip-full | p7zip-legacy | p7zip,
sudo,
python3-pyperclip | pyperclip,
bubblewrap,
zenity,
tree,
dpkg,
fakeroot,
bash
Recommends: winbind,
wimtools | wimlib,
python3-pyquery,
python3-pyqt5.qtwebengine | pyqtwebengine,
binfmt-support,
libc6:i386,
libc6:armhf,
libwine,
qemu-system,
qemu-full,
qemu,
alien,
spark-deepin-wine-runner-qemu-system-extra,
deepin-wine8-stable | spark-wine | spark-wine9 | spark-wine9-wow | spark-wine8 | spark-wine8-wow | spark-wine7-devel | deepin-wine6-stable | deepin-wine5-stable | deepin-wine5 | deepin-wine | wine,
spark-dwine-helper | store.spark-app.spark-dwine-helper | deepin-wine-helper | com.wine-helper.deepin
Section: utils
Conflicts: spark.deepin-venturi-setter, spark-deepin-wine5-application-packer, spark-deepin-wine-runner-52
Replaces: spark.deepin-venturi-setter, spark-deepin-wine5-application-packer, spark-deepin-wine-runner-52
Provides: spark.deepin-venturi-setter, spark-deepin-wine5-application-packer, spark-deepin-wine-runner-52
Conflicts: spark.deepin-venturi-setter, spark-deepin-wine5-application-packer, spark-deepin-wine-runner-52, spark-deepin-wine-runner-termux, termux-exec
Replaces: spark.deepin-venturi-setter, spark-deepin-wine5-application-packer, spark-deepin-wine-runner-52, spark-deepin-wine-runner-termux
Provides: spark.deepin-venturi-setter, spark-deepin-wine5-application-packer, spark-deepin-wine-runner-52, spark-deepin-wine-runner-termux
Installed-Size: @@SIZE@@
Description: Wine运行器是一个能让Linux用户更加方便地运行Windows应用的程序。原版的 Wine 只能使用命令操作且安装过程较为繁琐对小白不友好。于是该运行器为了解决该痛点内置了对Wine图形化的支持、Wine 安装器、微型应用商店、各种Wine工具、自制的Wine程序打包器、运行库安装工具等。
它同时还内置了基于Qemu/VirtualBox制作的、专供小白使用的Windows虚拟机安装工具可以做到只需下载系统镜像并点击安装即可无需考虑虚拟机的安装、创建、分区等操作也能在非 X86 架构安装 X86 架构的 Windows 操作系统(但是效率较低,可以运行些老系统)。

View File

@@ -210,7 +210,6 @@ Get_Dist_Name()
}}
####获得发行版名称
#########################预设值段
@@ -221,9 +220,23 @@ BOTTLENAME="@@@Package@@@"
APPVER="@@@Version@@@"
EXEC_PATH="@@@EXEC_PATH@@@"
##### 软件在wine中的启动路径
START_SHELL_PATH="/opt/deepinwine/tools/spark_run_v4.sh"
##### 软件在wine中的启动路径
SHELL_DIR=$(dirname $(realpath $0))
START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh"
if [ -e "$SHELL_DIR/deepinwine/tools/spark_run_v4.sh" ] ;then
# 如果 helper 在 run.sh 相同目录的 deepinwine/tools/spark_run_v4.sh 则可以调用
START_SHELL_PATH="$SHELL_DIR/deepinwine/tools/spark_run_v4.sh"
fi
if [ -e "/opt/deepinwine/tools/run_v4.sh" ] ;then
START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh"
fi
if [ -e "/opt/deepinwine/tools/spark_run_v4.sh" ] ;then
START_SHELL_PATH="/opt/deepinwine/tools/spark_run_v4.sh"
fi
ENABLE_DOT_NET=""
####若使用spark-wine时需要用到.net则请把ENABLE_DOT_NET设为true同时在依赖中写spark-wine7-mono
#export BOX86_EMU_CMD="/opt/spark-box86/box86"
####仅在Arm且不可使用exagear时可用作用是强制使用box86而不是deepin-box86.如果你想要这样做,请取消注释
export MIME_TYPE=""
export DEB_PACKAGE_NAME="@@@Package@@@"
@@ -264,7 +277,7 @@ fi
##默认屏蔽mono和gecko安装器
if [ "$APPRUN_CMD" = "spark-wine7-devel" ] || [ "$APPRUN_CMD" = "spark-wine" ]|| [ "$APPRUN_CMD" = "spark-wine8" ] && [ -z "$ENABLE_DOT_NET" ];then
export WINEDLLOVERRIDES="mscoree=d,mshtml=d"
#export WINEDLLOVERRIDES="mscoree=d,mshtml=d,control.exe=d"
export WINEDLLOVERRIDES="control.exe=d"
#### "为了降低打包体积默认关闭gecko和momo如有需要注释此行仅对spark-wine7-devel有效"
@@ -293,6 +306,9 @@ if [ -n "$EXEC_PATH" ];then
else
$START_SHELL_PATH $BOTTLENAME $APPVER "uninstaller.exe" "$@"
fi
'''
desktopFile = f'''#!/usr/bin/env xdg-open
@@ -549,7 +565,7 @@ class RunThread(QtCore.QThread):
self.RunCommand(f"cp -rv '{folderExePath}' '{bottlePath}/drive_c/Program Files'")
debPackageVersion = self.GetEXEVersion(exePath.text(), bottlePath)
debDescription = f"{exeName} By Build By Wine Runner Easy Packager"
debDepends = f"{chooseWine} | {chooseWine}-bcm | {chooseWine}-dcm, spark-dwine-helper | store.spark-app.spark-dwine-helper, fonts-wqy-microhei, fonts-wqy-zenhei"
debDepends = f"{chooseWine} | {chooseWine}-bcm | {chooseWine}-dcm | com.{chooseWine}.deepin, spark-dwine-helper | store.spark-app.spark-dwine-helper | deepin-wine-helper | com.wine-helper.deepinwinerunner, fonts-wqy-microhei, fonts-wqy-zenhei"
self.RunCommand(f"mkdir -pv '{debBuildPath}/DEBIAN'")
self.RunCommand(f"mkdir -pv '{debBuildPath}/opt/apps/{debPackageName}/files'")
self.RunCommand(f"mkdir -pv '{debBuildPath}/opt/apps/{debPackageName}/entries/applications'")
@@ -573,7 +589,7 @@ class RunThread(QtCore.QThread):
self.RunCommand(f"rm -fv '{bottlePath}/drive_c/users/@current_user@/Downloads'")
self.RunCommand(f"rm -fv '{bottlePath}/drive_c/users/@current_user@/Templates'")
########### 打包容器
self.RunCommand(f"7z a '{bottlePackagePath}' '{bottlePath}/'*")
self.RunCommand(f"7z a -snh -snl '{bottlePackagePath}' '{bottlePath}/'*")
########### 生成文件内容
buildProgramSize = getFileFolderSize(debBuildPath) / 1000
replaceMap = [

View File

@@ -28,6 +28,10 @@ from trans import *
from DefaultSetting import *
from Model import *
TMPDIR = os.getenv("TMPDIR")
if (TMPDIR == None):
TMPDIR = ""
#################
# 程序所需事件
#################
@@ -215,9 +219,9 @@ def Build7z(b, self, debInformation, debPackagePath):
os.system(f"cp -rv '{b}' '{debPackagePath}/opt/cxoffice/support/{e5_text.text()}'")
return
if debPackagePath[-3: ] == ".7z":
self.run_command("7z a '{}' '{}/'*".format(debPackagePath, b))
self.run_command("7z a -snh -snl '{}' '{}/'*".format(debPackagePath, b))
else:
self.run_command("7z a {}/opt/apps/{}/files/files.7z '{}/'*".format(debPackagePath, e1_text.text(), b))
self.run_command("7z a -snh -snl {}/opt/apps/{}/files/files.7z '{}/'*".format(debPackagePath, e1_text.text(), b))
def Build7zButton_Clicked():
@@ -409,8 +413,8 @@ class make_deb_threading(QtCore.QThread):
"Wine": wine[wineVersion.currentText()],
"Architecture": debFirstArch.currentText(),
"Depends": [
f"{wine[wineVersion.currentText()]}, deepin-wine-helper (>= 5.1.30-1), fonts-wqy-microhei, fonts-wqy-zenhei",
f"{wine[wineVersion.currentText()]}, spark-dwine-helper | store.spark-app.spark-dwine-helper, fonts-wqy-microhei, fonts-wqy-zenhei"
f"{wine[wineVersion.currentText()]}, deepin-wine-helper | com.wine-helper.deepin, fonts-wqy-microhei, fonts-wqy-zenhei",
f"{wine[wineVersion.currentText()]}, spark-dwine-helper | store.spark-app.spark-dwine-helper | deepin-wine-helper | com.wine-helper.deepinwinerunner, fonts-wqy-microhei, fonts-wqy-zenhei"
][int(chooseWineHelperValue.isChecked())],
"postinst": ['', f'''#!/bin/bash
PACKAGE_NAME="{e1_text.text()}"
@@ -527,7 +531,6 @@ Get_Dist_Name()
}}
####获得发行版名称
#########################预设值段
@@ -538,12 +541,24 @@ BOTTLENAME="@@@BOTTLENAME@@@"
APPVER="@@@APPVER@@@"
EXEC_PATH="@@@EXEC_PATH@@@"
##### 软件在wine中的启动路径
START_SHELL_PATH="/opt/deepinwine/tools/spark_run_v4.sh"
{['''ENABLE_DOT_NET=true''', 'ENABLE_DOT_NET=""'][int(disabledMono.isChecked())]}
SHELL_DIR=$(dirname $(realpath $0))
START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh"
if [ -e "$SHELL_DIR/deepinwine/tools/spark_run_v4.sh" ] ;then
# 如果 helper 在 run.sh 相同目录的 deepinwine/tools/spark_run_v4.sh 则可以调用
START_SHELL_PATH="$SHELL_DIR/deepinwine/tools/spark_run_v4.sh"
fi
if [ -e "/opt/deepinwine/tools/run_v4.sh" ] ;then
START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh"
fi
if [ -e "/opt/deepinwine/tools/spark_run_v4.sh" ] ;then
START_SHELL_PATH="/opt/deepinwine/tools/spark_run_v4.sh"
fi
ENABLE_DOT_NET=""
####若使用spark-wine时需要用到.net则请把ENABLE_DOT_NET设为true同时在依赖中写spark-wine7-mono
#export BOX86_EMU_CMD="/opt/spark-box86/box86"
####仅在Arm且不可使用exagear时可用作用是强制使用box86而不是deepin-box86.如果你想要这样做,请取消注释
export MIME_TYPE=""
export DEB_PACKAGE_NAME="@@@DEB_PACKAGE_NAME@@@"
####这里写包名才能在启动的时候正确找到files.7z,似乎也和杀残留进程有关
export APPRUN_CMD="@@@APPRUN_CMD@@@"
@@ -582,7 +597,7 @@ fi
##默认屏蔽mono和gecko安装器
if [ "$APPRUN_CMD" = "spark-wine7-devel" ] || [ "$APPRUN_CMD" = "spark-wine" ]|| [ "$APPRUN_CMD" = "spark-wine8" ] && [ -z "$ENABLE_DOT_NET" ];then
export WINEDLLOVERRIDES="mscoree=d,mshtml=d"
#export WINEDLLOVERRIDES="mscoree=d,mshtml=d,control.exe=d"
export WINEDLLOVERRIDES="control.exe=d"
#### "为了降低打包体积默认关闭gecko和momo如有需要注释此行仅对spark-wine7-devel有效"
@@ -611,6 +626,9 @@ if [ -n "$EXEC_PATH" ];then
else
$START_SHELL_PATH $BOTTLENAME $APPVER "uninstaller.exe" "$@"
fi
"""
][chooseWineHelperValue.isChecked()],
"info": f'''{{
@@ -1003,52 +1021,118 @@ echo "非卸载,跳过清理"
fi
"""][int(rmBash.isChecked())],
# 又又又改
"run.sh": f"""#!/bin/bash
"run.sh": f"""
#!/bin/sh
# Copyright (C) 2016 Deepin, Inc.
#
# Author: Li LongYu <lilongyu@linuxdeepin.com>
# Peng Hao <penghao@linuxdeepin.com>
#
#
# Copyright (C) 2022 The Spark Project
#
#
# Modifier shenmo <shenmo@spark-app.store>
#
#
#
#######################函数段。下文调用的额外功能会在此处声明
Get_Dist_Name()
{{
if grep -Eqii "Deepin" /etc/issue || grep -Eq "Deepin" /etc/*-release; then
DISTRO='Deepin'
elif grep -Eqi "UnionTech" /etc/issue || grep -Eq "UnionTech" /etc/*-release; then
DISTRO='UniontechOS'
elif grep -Eqi "UOS" /etc/issue || grep -Eq "UOS" /etc/*-release; then
DISTRO='UniontechOS'
else
DISTRO='OtherOS'
fi
}}
####获得发行版名称
#########################预设值段
version_gt() {{ test "$(echo "$@" | tr " " "\n" | sort -V | head -n 1)" != "$1"; }}
ACTIVEX_NAME=""
####用于比较版本?未实装
BOTTLENAME="@@@BOTTLENAME@@@"
APPVER="@@@APPVER@@@"
EXEC_PATH="@@@EXEC_PATH@@@"
START_SHELL_PATH="{['/opt/deepinwine/tools/run_v4.sh', '/opt/deepinwine/tools/spark_run_v4.sh'][chooseWineHelperValue.isChecked()]}"
##### 软件在wine中的启动路径
##### 软件在wine中的启动路径
SHELL_DIR=$(dirname $(realpath $0))
START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh"
if [ -e "$SHELL_DIR/deepinwine/tools/spark_run_v4.sh" ] ;then
# 如果 helper 在 run.sh 相同目录的 deepinwine/tools/spark_run_v4.sh 则可以调用
START_SHELL_PATH="$SHELL_DIR/deepinwine/tools/spark_run_v4.sh"
fi
if [ -e "/opt/deepinwine/tools/run_v4.sh" ] ;then
START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh"
fi
if [ -e "/opt/deepinwine/tools/spark_run_v4.sh" ] ;then
START_SHELL_PATH="/opt/deepinwine/tools/spark_run_v4.sh"
fi
ENABLE_DOT_NET=""
####若使用spark-wine时需要用到.net则请把ENABLE_DOT_NET设为true同时在依赖中写spark-wine7-mono
#export BOX86_EMU_CMD="/opt/spark-box86/box86"
####仅在Arm且不可使用exagear时可用作用是强制使用box86而不是deepin-box86.如果你想要这样做,请取消注释
export MIME_TYPE=""
export MIME_EXEC=""
export DEB_PACKAGE_NAME="{e1_text.text()}"
export APPRUN_CMD="deepin-wine6-stable"
DISABLE_ATTACH_FILE_DIALOG=""
EXPORT_ENVS=""
EXEC_NAME="@@@EXEC_NAME@@@"
INSTALL_SETUP=""
export BOX86_EMU_CMD="/opt/deepin-box86/stable/box86"
####这里写包名才能在启动的时候正确找到files.7z,似乎也和杀残留进程有关
export APPRUN_CMD="@@@APPRUN_CMD@@@"
#####wine启动指令建议
#EXPORT_ENVS="wine的动态链接库路径"
##例如我的wine应用是使用的dwine6的32位容器那么我要填LD_LIBRARY_PATH=$LD_LIBRARY;/opt/deepin-wine6-stable/lib
## 如果用不到就不填,不要删除前面的注释用的#
export SPECIFY_SHELL_DIR=`dirname $START_SHELL_PATH`
ARCHIVE_FILE_DIR="/opt/apps/$DEB_PACKAGE_NAME/files"
if [ -z "$APPRUN_CMD" ];then
export APPRUN_CMD="/opt/deepin-wine6-stable/bin/wine"
fi
if [ -f "$APPRUN_CMD" ];then
wine_path=$(dirname $APPRUN_CMD)
wine_path=$(realpath "$wine_path/../")
export WINEDLLPATH=$wine_path/lib:$wine_path/lib64
else
export WINEDLLPATH=/opt/$APPRUN_CMD/lib:/opt/$APPRUN_CMD/lib64
fi
export WINEDLLPATH=/opt/$APPRUN_CMD/lib:/opt/$APPRUN_CMD/lib64
export WINEPREDLL="$ARCHIVE_FILE_DIR/dlls"
_SetRegistryValue()
{{
env WINEPREFIX="$BOTTLEPATH" $APPRUN_CMD reg ADD "$1" /v "$2" /t "$3" /d "$4" /f
}}
DISABLE_ATTACH_FILE_DIALOG=""
##默认为空。若为1则不使用系统自带的文件选择而是使用wine的
##对于deepin/UOS大部分的应用都不需要使用wine的如果有需求比如wine应用选择的限定种类文件系统的文管不支持
##请填1。
##注意因为非DDE的环境不确定所以默认会在非Deepin/UOS发行版上禁用这个功能。如果你确认在适配的发行版上可以正常启动请注释或者删除下面这段
##############<<<<<<<<<禁用文件选择工具开始
Get_Dist_Name
#此功能实现参见开头函数段
if [ "$DISTRO" != "Deepin" ] && [ "$DISTRO" != "UniontechOS" ];then
DISABLE_ATTACH_FILE_DIALOG="1"
echo "非deepin/UOS默认关闭系统自带的文件选择工具使用Wine的"
echo "如果你想改变这个行为,请到/opt/apps/$DEB_PACKAGE_NAME/files/$0处修改"
echo "To打包者如果你要打开自带请注意在适配的发行版上进行测试"
echo "To用户打包者没有打开这个功能这证明启用这个功能可能造成运行问题。如果你要修改这个行为请确保你有一定的动手能力"
fi
##############>>>>>>>>>禁用文件选择工具结束
##############<<<<<<<<<屏蔽mono和gecko安装器开始
##默认屏蔽mono和gecko安装器
if [ "$APPRUN_CMD" = "spark-wine7-devel" ] || [ "$APPRUN_CMD" = "spark-wine" ]|| [ "$APPRUN_CMD" = "spark-wine8" ] && [ -z "$ENABLE_DOT_NET" ];then
#export WINEDLLOVERRIDES="mscoree=d,mshtml=d,control.exe=d"
export WINEDLLOVERRIDES="control.exe=d"
#### "为了降低打包体积默认关闭gecko和momo如有需要注释此行仅对spark-wine7-devel有效"
fi
##############>>>>>>>>>屏蔽mono和gecko安装器结束
#########################执行段
if [ -z "$DISABLE_ATTACH_FILE_DIALOG" ];then
export ATTACH_FILE_DIALOG=1
@@ -1058,38 +1142,18 @@ if [ -n "$EXPORT_ENVS" ];then
export $EXPORT_ENVS
fi
# 打包安装程序的情况
if [[ -z "$EXEC_PATH" ]] && [[ -n "$INSTALL_SETUP" ]];then
$START_SHELL_PATH $BOTTLENAME $APPVER "$EXEC_PATH" -c
BOTTLEPATH="$HOME/.deepinwine/$BOTTLENAME"
EXEC_PATH=$(find "$BOTTLEPATH" -name $EXEC_NAME | head -1)
if [ -z "$EXEC_PATH" ];then
_SetRegistryValue "HKCU\\Software\\Wine\\DllOverrides" winemenubuilder.exe REG_SZ
WINEPREFIX="$BOTTLEPATH" $APPRUN_CMD "$ARCHIVE_FILE_DIR/$INSTALL_SETUP"
EXEC_PATH=$(find "$BOTTLEPATH" -name $EXEC_NAME | head -1)
cp "$ARCHIVE_FILE_DIR/setup.md5sum" "$BOTTLEPATH"
fi
if [ -z "$EXEC_PATH" ];then
echo "安装失败退出"
exit
fi
fi
if [ -n "$EXEC_PATH" ];then
if [ -z "${{EXEC_PATH##*.lnk*}}" ];then
$START_SHELL_PATH $BOTTLENAME $APPVER "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
elif [ -z "${{EXEC_PATH##*.bat}}" ];then
$START_SHELL_PATH $BOTTLENAME $APPVER "cmd" -f /c "$EXEC_PATH" "${{@:2}}"
else
$START_SHELL_PATH $BOTTLENAME $APPVER "$EXEC_PATH" "$@"
$START_SHELL_PATH $BOTTLENAME $APPVER "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
fi
elif [ -n "$ACTIVEX_NAME" ] && [ $# -gt 1 ];then
$START_SHELL_PATH $BOTTLENAME $APPVER "$1" -f "${{@:2}}"
else
$START_SHELL_PATH $BOTTLENAME $APPVER "uninstaller.exe" "$@"
fi
""",
"info": f'''{{
"appid": "{e1_text.text()}",
@@ -1295,8 +1359,8 @@ true
]
print("c")
if os.path.exists(wine[wineVersion.currentText()]):
debInformation[0]["Depends"] = ["deepin-wine-helper (>= 5.1.30-1)",
"spark-dwine-helper | store.spark-app.spark-dwine-helper"
debInformation[0]["Depends"] = ["deepin-wine-helper | com.wine-helper.deepin",
"spark-dwine-helper | store.spark-app.spark-dwine-helper | deepin-wine-helper | com.wine-helper.deepinwinerunner"
][int(chooseWineHelperValue.isChecked())] #+ ["", "libasound2 (>= 1.0.16), libc6 (>= 2.28), libglib2.0-0 (>= 2.12.0), libgphoto2-6 (>= 2.5.10), libgphoto2-port12 (>= 2.5.10), libgstreamer-plugins-base1.0-0 (>= 1.0.0), libgstreamer1.0-0 (>= 1.4.0), liblcms2-2 (>= 2.2+git20110628), libldap-2.4-2 (>= 2.4.7), libmpg123-0 (>= 1.13.7), libopenal1 (>= 1.14), libpcap0.8 (>= 0.9.8), libpulse0 (>= 0.99.1), libudev1 (>= 183), libvkd3d1 (>= 1.0), libx11-6, libxext6, libxml2 (>= 2.9.0), ocl-icd-libopencl1 | libopencl1, udis86, zlib1g (>= 1:1.1.4), libasound2-plugins, libncurses6 | libncurses5 | libncurses, deepin-wine-plugin-virtual\nRecommends: libcapi20-3, libcups2, libdbus-1-3, libfontconfig1, libfreetype6, libglu1-mesa | libglu1, libgnutls30 | libgnutls28 | libgnutls26, libgsm1, libgssapi-krb5-2, libjpeg62-turbo | libjpeg8, libkrb5-3, libodbc1, libosmesa6, libpng16-16 | libpng12-0, libsane | libsane1, libsdl2-2.0-0, libtiff5, libv4l-0, libxcomposite1, libxcursor1, libxfixes3, libxi6, libxinerama1, libxrandr2, libxrender1, libxslt1.1, libxxf86vm1"][]
print("d")
debInformation[0]["run.sh"] = f'''#!/bin/sh
@@ -1359,6 +1423,13 @@ export WINEDLLPATH=/opt/$APPRUN_CMD/lib:/opt/$APPRUN_CMD/lib64
export WINEPREDLL="$ARCHIVE_FILE_DIR/dlls"
##### 软件在wine中的启动路径
if [ -e "/opt/deepinwine/tools/spark_run_v4.sh"] ;then
START_SHELL_PATH="/opt/deepinwine/tools/spark_run_v4.sh"
else
START_SHELL_PATH="/opt/deepinwine/tools/run_v4.sh"
fi
if [ -n "$PATCH_LOADER_ENV" ] && [ -n "$EXEC_PATH" ];then
export $PATCH_LOADER_ENV
fi
@@ -1406,7 +1477,7 @@ fi
debPackagePath = savePath
print("g")
else:
debPackagePath = f"/tmp/{random.randint(0, 9999)}"
debPackagePath = f"{TMPDIR}/tmp/{random.randint(0, 9999)}"
#self.run_command(f"rm -rfv /tmp/{debPackagePath}")
print("f")
# 为了避免删库,必须保证是 deb 文件构建目录才进行清空
@@ -1454,7 +1525,7 @@ fi
# 都有了为什么要打包呢?
shutil.copy(wine[wineVersion.currentText()], f"{debPackagePath}/opt/apps/{e1_text.text()}/files/wine_archive.7z")
else:
self.run_command(f"7z a '{debPackagePath}/opt/apps/{e1_text.text()}/files/wine_archive.7z' '{wine[wineVersion.currentText()]}/*'")
self.run_command(f"7z a -snh -snl '{debPackagePath}/opt/apps/{e1_text.text()}/files/wine_archive.7z' '{wine[wineVersion.currentText()]}/*'")
###############
# 复制文件
###############
@@ -1846,15 +1917,15 @@ def BrowserHelperConfigPathText():
def ChangeWine():
useInstallWineArch.setEnabled(os.path.exists(wine[wineVersion.currentText()]))
debDepends.setText([f"{wine[wineVersion.currentText()]} | {wine[wineVersion.currentText()]}-bcm | {wine[wineVersion.currentText()]}-dcm, deepin-wine-helper (>= 5.1.30-1), fonts-wqy-microhei, fonts-wqy-zenhei",
f"{wine[wineVersion.currentText()]} | {wine[wineVersion.currentText()]}-bcm | {wine[wineVersion.currentText()]}-dcm, spark-dwine-helper | store.spark-app.spark-dwine-helper, fonts-wqy-microhei, fonts-wqy-zenhei"
debDepends.setText([f"{wine[wineVersion.currentText()]} | {wine[wineVersion.currentText()]}-bcm | {wine[wineVersion.currentText()]}-dcm | com.{wine[wineVersion.currentText()]}.deepin, deepin-wine-helper | com.wine-helper.deepin, fonts-wqy-microhei, fonts-wqy-zenhei",
f"{wine[wineVersion.currentText()]} | {wine[wineVersion.currentText()]}-bcm | {wine[wineVersion.currentText()]}-dcm | com.{wine[wineVersion.currentText()]}.deepin, spark-dwine-helper | store.spark-app.spark-dwine-helper | deepin-wine-helper | com.wine-helper.deepinwinerunner, fonts-wqy-microhei, fonts-wqy-zenhei"
][int(chooseWineHelperValue.isChecked())])
debRecommend.setText("")
helperConfigPathText.setEnabled(chooseWineHelperValue.isChecked())
helperConfigPathButton.setEnabled(chooseWineHelperValue.isChecked())
if os.path.exists(wine[wineVersion.currentText()]):
debDepends.setText(["deepin-wine-helper (>= 5.1.30-1)",
"spark-dwine-helper | store.spark-app.spark-dwine-helper"
debDepends.setText(["deepin-wine-helper | com.wine-helper.deepin",
"spark-dwine-helper | store.spark-app.spark-dwine-helper | deepin-wine-helper | com.wine-helper.deepinwinerunner"
][int(chooseWineHelperValue.isChecked())])
#if "deepin-wine5-stable" in wine[wineVersion.currentText()]:
# debDepends.setText("libasound2 (>= 1.0.16), libc6 (>= 2.28), libglib2.0-0 (>= 2.12.0), libgphoto2-6 (>= 2.5.10), libgphoto2-port12 (>= 2.5.10), libgstreamer-plugins-base1.0-0 (>= 1.0.0), libgstreamer1.0-0 (>= 1.4.0), liblcms2-2 (>= 2.2+git20110628), libldap-2.4-2 (>= 2.4.7), libmpg123-0 (>= 1.13.7), libopenal1 (>= 1.14), libpcap0.8 (>= 0.9.8), libpulse0 (>= 0.99.1), libudev1 (>= 183), libvkd3d1 (>= 1.0), libx11-6, libxext6, libxml2 (>= 2.9.0), ocl-icd-libopencl1 | libopencl1, udis86, zlib1g (>= 1:1.1.4), libasound2-plugins, libncurses6 | libncurses5 | libncurses, deepin-wine-plugin-virtual")
@@ -1862,12 +1933,14 @@ def ChangeWine():
# 获取用户桌面目录
def get_desktop_path():
if (not os.path.exists(get_home() + "/.config/user-dirs.dirs")):
return f"{get_home()}/Desktop"
for line in open(get_home() + "/.config/user-dirs.dirs"): # 以行来读取配置文件
desktop_index = line.find("XDG_DESKTOP_DIR=\"") # 寻找是否有对应项,有返回 0没有返回 -1
if desktop_index != -1: # 如果有对应项
break # 结束循环
if desktop_index == -1: # 如果是提前结束,值一定≠-1如果是没有提前结束值一定-1
return -1
return f"{get_home()}/Desktop"
else:
get = line[17:-2] # 截取桌面目录路径
get_index = get.find("$HOME") # 寻找是否有对应的项,需要替换内容
@@ -1899,7 +1972,7 @@ def ReadDeb(unzip = False):
if debPath == "":
return
# 分类讨论
path = f"/tmp/deb-unzip-{random.randint(0, 1000)}"
path = f"{TMPDIR}/tmp/deb-unzip-{random.randint(0, 1000)}"
# 新建文件夹
os.system(f"mkdir -p '{path}'")
# 解包 control 文件
@@ -2202,21 +2275,18 @@ def DelTab():
def ChangeBottleName():
global bottleNameLock
global bottleNameChangeLock
e1_text.setText(e1_text.text().replace(" ", ""))
if bottleNameLock:
return
if os.path.basename(e6_text.text()) == ".wine" or e6_text.text() == "":
bottleNameChangeLock = True
e5_text.setText(e1_text.text())
return
replaceForum = [e1_text, e2_text]
for i in replaceForum:
if " " in i.text():
i.setText(i.text().replace(" ", ""))
# 进行版本号限制
if len(e2_text.text()) > 0:
if ord(e2_text.text()[0]) < 48 or ord(e2_text.text()[0]) > 57:
e2_text.setText(e2_text.text()[1:])
# 调整逻辑,容器名默认与包名相同
bottleNameChangeLock = True
e5_text.setText(os.path.basename(e6_text.text().replace(" ", "")))
e5_text.setText(e1_text.text())
def LockBottleName():
global bottleNameLock
if bottleNameChangeLock:
return
bottleNameLock = True
# 获取当前语言
def get_now_lang()->"获取当前语言":
@@ -2248,9 +2318,12 @@ programPath = os.path.split(os.path.realpath(__file__))[0] # 返回 string
wine = {"deepin-wine": "deepin-wine", "deepin-wine5": "deepin-wine5", "wine": "wine", "wine64": "wine64", "deepin-wine5 stable": "deepin-wine5-stable", "deepin-wine6 stable": "deepin-wine6-stable", "spark-wine7-devel": "spark-wine7-devel", "ukylin-wine": "ukylin-wine", "okylin-wine": "okylin-wine", "spark-wine8": "spark-wine8", "spark-wine8-wow": "spark-wine8-wow", "deepin-wine6-vannila": "deepin-wine6-vannila", "deepin-wine8-stable": "deepin-wine8-stable", "spark-wine9": "spark-wine9", "spark-wine9-wow": "spark-wine9-wow", "spark-wine": "spark-wine"}
wineValue = {"deepin-wine": "deepin-wine", "deepin-wine5": "deepin-wine5", "wine": "wine", "wine64": "wine64", "deepin-wine5-stable": "deepin-wine5 stable", "deepin-wine6-stable": "deepin-wine6 stable", "spark-wine7-devel": "spark-wine7-devel", "ukylin-wine": "ukylin-wine", "okylin-wine": "okylin-wine", "spark-wine8": "spark-wine8", "spark-wine8-wow": "spark-wine8-wow", "deepin-wine6-vannila": "deepin-wine6-vannila", "deepin-wine8-stable": "deepin-wine8-stable", "spark-wine": "spark-wine"}
# 读取 wine 本地列表
for i in os.listdir("/opt"):
if os.path.exists(f"/opt/{i}/bin/wine"):
wine[f"/opt/{i}/bin/wine"] = f"/opt/{i}/bin/wine"
try:
for i in os.listdir("/opt"):
if os.path.exists(f"/opt/{i}/bin/wine"):
wine[f"/opt/{i}/bin/wine"] = f"/opt/{i}/bin/wine"
except:
pass
try:
for i in os.listdir(f"{get_home()}/.deepinwine"):
if os.path.exists(f"{get_home()}/.deepinwine/{i}/bin/wine"):
@@ -2296,6 +2369,7 @@ tips = transla.transe("U", """提示:
app = QtWidgets.QApplication(sys.argv)
window = QtWidgets.QMainWindow()
widget = QtWidgets.QWidget()
defaultFont = window.font()
#hScroll = QtWidgets.QScrollArea()
#hScroll.setWidget(widget)
@@ -2342,6 +2416,7 @@ option1_text.addItems(["Network", "Chat", "Audio", "Video", "Graphics", "Office"
option1_text.setCurrentText("Network")
wineFrame = QtWidgets.QHBoxLayout()
chooseWineHelperValue = QtWidgets.QCheckBox(transla.transe("U", "使用星火wine helper\n如不勾选默认为deepin-wine-helper"))
chooseWineHelperValue.setVisible(False)
helperConfigPathLayout = QtWidgets.QHBoxLayout()
helperConfigPathButton = QtWidgets.QPushButton("浏览")
helperConfigPathText = QtWidgets.QLabel("点击浏览按钮指定软件包适配脚本")
@@ -2364,14 +2439,14 @@ build7z.clicked.connect(Build7zButton_Clicked)
installDeb.clicked.connect(InstallDeb)
wineFrame.addWidget(wineVersion)
e1_text.textChanged.connect(ChangeBottleName)
e5_text.textChanged.connect(LockBottleName)
e2_text.textChanged.connect(ChangeBottleName)
e6_text.textChanged.connect(ChangeBottleName)
e7_text.textChanged.connect(ChangeTapTitle)
widgetLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "要打包的 deb 包的包名(※必填):")), 0, 0, 1, 1)
widgetLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "deb 包版本号(※必填):")), 1, 0, 1, 1)
widgetLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "deb 包说明(※必填):")), 2, 0, 1, 1)
widgetLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "deb 包维护者(※必填):")), 3, 0, 1, 1)
widgetLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "要解压 wine 容器名称(※必填):")), 4, 0, 1, 1)
widgetLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "Wine 容器名称(※必填,推荐默认")), 4, 0, 1, 1)
widgetLayout.addWidget(QtWidgets.QLabel(transla.transe("U", "要打包 wine 容器的路径(※必填):")), 5, 0, 1, 1)
desktopIconTab = QtWidgets.QTabWidget()
controlWidget = QtWidgets.QWidget()
@@ -2552,7 +2627,6 @@ cleanBottonByUOS.setChecked(True)
chooseWineHelperValue.setChecked(True)
e12_text.setText(f"{get_desktop_path()}/demo_1.0.0_all.deb")
widget.setLayout(widgetLayout)
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()))
@@ -2625,6 +2699,20 @@ allInfoList = {
# 设置字体
SetFont(app)
#window.setWindowFlag(QtGui.Qt)
window.setCentralWidget(widget)
# 判断是否为小屏幕,是则设置滚动条并全屏
if (window.frameGeometry().width() > app.primaryScreen().availableGeometry().size().width() * 0.8 or
window.frameGeometry().height() > app.primaryScreen().availableGeometry().size().height() * 0.9):
# 设置滚动条
areaScroll = QtWidgets.QScrollArea(window)
areaScroll.setWidgetResizable(True)
areaScroll.setWidget(widget)
areaScroll.setFrameShape(QtWidgets.QFrame.NoFrame)
window.setCentralWidget(areaScroll)
window.showMaximized() # 设置全屏
window.show()
window.show()
sys.exit(app.exec_())
# Flag解包只读control和解包全部读取

BIN
dxvk.7z

Binary file not shown.

219
dxvk/setup_dxvk.sh Executable file
View File

@@ -0,0 +1,219 @@
#!/usr/bin/env bash
function wait(){
echo Press Enter To Exit
read
}
# default directories
dxvk_lib32=${dxvk_lib32:-"x32"}
dxvk_lib64=${dxvk_lib64:-"x64"}
# figure out where we are
basedir="$(dirname "$(readlink -f "$0")")"
# figure out which action to perform
action="$1"
case "$action" in
install)
;;
uninstall)
;;
*)
echo "Unrecognized action: $action"
echo "Usage: $0 [install|uninstall] [--without-dxgi] [--symlink]"
exit 1
esac
# process arguments
shift
with_dxgi=true
file_cmd="cp -v --reflink=auto"
while (($# > 0)); do
case "$1" in
"--without-dxgi")
with_dxgi=false
;;
"--symlink")
file_cmd="ln -s -v"
;;
esac
shift
done
# check wine prefix before invoking wine, so that we
# don't accidentally create one if the user screws up
if [ -n "$WINEPREFIX" ] && ! [ -f "$WINEPREFIX/system.reg" ]; then
echo "$WINEPREFIX:"' Not a valid wine prefix.' >&2
exit 1
fi
# find wine executable
export WINEDEBUG=-all
# disable mscoree and mshtml to avoid downloading
# wine gecko and mono
export WINEDLLOVERRIDES="mscoree,mshtml="
# 专门添加,为了可以使用自定义的 wine
wine=$WINE
wine64=$WINE64
wineboot="$WINE wineboot"
if [[ $WINE == "" ]];then
wine="wine"
fi
if [[ $WINE64 == "" ]];then
wine64="wine64"
fi
# $PATH is the way for user to control where wine is located (including custom Wine versions).
# Pure 64-bit Wine (non Wow64) requries skipping 32-bit steps.
# In such case, wine64 and winebooot will be present, but wine binary will be missing,
# however it can be present in other PATHs, so it shouldn't be used, to avoid versions mixing.
wine_path=$(dirname "$(which $wineboot)")
wow64=true
if ! [ -f "$wine_path/$wine" ]; then
wine=$wine64
wow64=false
fi
# resolve 32-bit and 64-bit system32 path
winever=$($wine --version | grep wine)
if [ -z "$winever" ]; then
echo "$wine:"' Not a wine executable. Check your $wine.' >&2
exit 1
fi
# ensure wine placeholder dlls are recreated
# if they are missing
$wineboot -u
win64_sys_path=$($wine64 winepath -u 'C:\windows\system32' 2> /dev/null)
win64_sys_path="${win64_sys_path/$'\r'/}"
if $wow64; then
win32_sys_path=$($wine winepath -u 'C:\windows\system32' 2> /dev/null)
win32_sys_path="${win32_sys_path/$'\r'/}"
fi
if [ -z "$win32_sys_path" ] && [ -z "$win64_sys_path" ]; then
echo 'Failed to resolve C:\windows\system32.' >&2
wait
exit 1
fi
# create native dll override
overrideDll() {
$wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v $1 /d native /f >/dev/null 2>&1
if [ $? -ne 0 ]; then
echo -e "Failed to add override for $1"
wait
exit 1
fi
}
# remove dll override
restoreDll() {
$wine reg delete 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v $1 /f > /dev/null 2>&1
if [ $? -ne 0 ]; then
echo "Failed to remove override for $1"
fi
}
# copy or link dxvk dll, back up original file
installFile() {
dstfile="${1}/${3}.dll"
srcfile="${basedir}/${2}/${3}.dll"
if [ -f "${srcfile}.so" ]; then
srcfile="${srcfile}.so"
fi
if ! [ -f "${srcfile}" ]; then
echo "${srcfile}: File not found. Skipping." >&2
return 1
fi
if [ -n "$1" ]; then
if [ -f "${dstfile}" ] || [ -h "${dstfile}" ]; then
if ! [ -f "${dstfile}.old" ]; then
mv -v "${dstfile}" "${dstfile}.old"
else
rm -v "${dstfile}"
fi
$file_cmd "${srcfile}" "${dstfile}"
else
echo "${dstfile}: File not found in wine prefix" >&2
return 1
fi
fi
return 0
}
# remove dxvk dll, restore original file
uninstallFile() {
dstfile="${1}/${3}.dll"
srcfile="${basedir}/${2}/${3}.dll"
if [ -f "${srcfile}.so" ]; then
srcfile="${srcfile}.so"
fi
if ! [ -f "${srcfile}" ]; then
echo "${srcfile}: File not found. Skipping." >&2
return 1
fi
if ! [ -f "${dstfile}" ] && ! [ -h "${dstfile}" ]; then
echo "${dstfile}: File not found. Skipping." >&2
return 1
fi
if [ -f "${dstfile}.old" ]; then
rm -v "${dstfile}"
mv -v "${dstfile}.old" "${dstfile}"
return 0
else
return 1
fi
}
install() {
installFile "$win64_sys_path" "$dxvk_lib64" "$1"
inst64_ret="$?"
inst32_ret=-1
if $wow64; then
installFile "$win32_sys_path" "$dxvk_lib32" "$1"
inst32_ret="$?"
fi
if (( ($inst32_ret == 0) || ($inst64_ret == 0) )); then
overrideDll "$1"
fi
}
uninstall() {
uninstallFile "$win64_sys_path" "$dxvk_lib64" "$1"
uninst64_ret="$?"
uninst32_ret=-1
if $wow64; then
uninstallFile "$win32_sys_path" "$dxvk_lib32" "$1"
uninst32_ret="$?"
fi
if (( ($uninst32_ret == 0) || ($uninst64_ret == 0) )); then
restoreDll "$1"
fi
}
# skip dxgi during install if not explicitly
# enabled, but always try to uninstall it
if $with_dxgi || [ "$action" == "uninstall" ]; then
$action dxgi
fi
$action d3d9
$action d3d10core
$action d3d11
wait

BIN
dxvk/x32/d3d10core.dll Executable file

Binary file not shown.

BIN
dxvk/x32/d3d11.dll Executable file

Binary file not shown.

BIN
dxvk/x32/d3d8.dll Executable file

Binary file not shown.

BIN
dxvk/x32/d3d9.dll Executable file

Binary file not shown.

BIN
dxvk/x32/dxgi.dll Executable file

Binary file not shown.

BIN
dxvk/x64/d3d10core.dll Executable file

Binary file not shown.

BIN
dxvk/x64/d3d11.dll Executable file

Binary file not shown.

BIN
dxvk/x64/d3d8.dll Executable file

Binary file not shown.

BIN
dxvk/x64/d3d9.dll Executable file

Binary file not shown.

BIN
dxvk/x64/dxgi.dll Executable file

Binary file not shown.

View File

@@ -1,92 +0,0 @@
___
( )
| | .-. ___ ___ .--. .--.
| |/ \ ( )( ) / \ / \
| .-. . | | | | ; ,-. ' | .-. ;
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | |/ |
| | | | | | | | | | | | | ' _.'
| | | | | | ; ' | ' | | | .'.-.
| | | | ' `-' / ' `-' | ' `-' /
(___)(___) '.__.' `.__. | `.__.'
( `-' ;
`.__.
___
( )
| |.-. .---. ___ .-. .--. ___ .-.
| / \ / .-, \ ( ) \ / \ ( ) \
| .-. | (__) ; | | ' .-. ; | .-. ; | .-. .
| | | | .'` | | / (___) | | | | | | | |
| | | | / .'| | | | | | | | | | | |
| | | | | / | | | | | | | | | | | |
| ' | | ; | ; | | | | ' | | | | | |
' `-' ; ' `-' | | | ' `-' / | | | |
`.__. `.__.'_. (___) `.__.' (___)(___)
___
( )
| |.-. ___ ___ ___ .-. ___ .-. ___ ___
| / \ ( )( ) ( ) \ ( ) \ ( )( )
| .-. | | | | | | .-. . | .-. . | | | |
| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | ' | |
| | | | | | | | | | | | | | | | ' `-' |
| ' | | | | ; ' | | | | | | | | `.__. |
' `-' ; ' `-' / | | | | | | | | ___ | |
`.__. '.__.' (___)(___) (___)(___) ( )' |
; `-' '
.__.'
............ .....]OOOo]`....
... ........ ...=OOOOOOOOO\..
.../OOOOOOO`.... ..=OOO@/[\OOOOO.
..=OOOOOOOOO\... .,@OO^/....O@O@`
..OOOOOO[[OOO@`. .=OO@,...=.OOOO.
..OOOOO./O^,@OO` .=OO^....,.@OO^.
..\OOO@^...=OOOO.... .OOO^*..,`/OOO..
...\OOOOOOOooooO^... .=OO^...`=OO@`..
..=@O@OooOOOOO@`...........=@@O]].,@O@`...
.,@OoOO`...O@^......,]]]]/OOOOOOO@@... .
...\OO@]]]OOOO@@@@@@@@@@@@@@@@@@@OO.....
.....[@@OOO@@@@@@@@@@@@@@@@@@@@@@@@@@`..
..OOO@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@`....
.,@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\...
....=@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@^..
...=@@@@@@@@@@@@@@@@@@@@@@`,\@@@@@@@@@@@@@^.
..,@@@@@@@@@@@@@@@@@@@@@@@O,[].\@@@@@@@@@@@.
../@@@@@@@@@@@@O@@@@@@@@@@@......\@@@@@@@@@^
.,@@@@@@@@@@@O`.\@@@@@@@@@/........\@@@@@@@@...
.=@@@@@@@@@/.....\@@@@@@@@/`...[O`..\@@@@@@@`...
.=@@@@@@@^,O[..,`.,@@@@@/../@@O[`...,@@@@@@@....
....@@@@@@@O`,@@O[]..,@/[`..=oo@O`,^...@@@@@@@@`..
....O@@@@@@@@`,OOO@^*\.........\..../.../@`.=^..
.. ...,@^=@@@^.\`...,^...........[[......O]//...
..,\]@@@\...[`....................=@@/....
.=@@\............,]/`........../@@@\.. .
.....@@@@@\.....................,/@@@@@@\...
...=@@@@@@@@\]..............]@@@@@@@@@@@@`.
...,@@@@@@@@@@@@@@/[\O@@O/[*./@@@@@@@@@@@@@\.......
...@@@@@@@@@@@@@@@^.,O@@@@^../@@@@@@@@@@@@@@@\.....
..........@@@@@@@@@@@@@@@@@`..`\/`../@@@@@@@@@@@@@@@@@@@@]]
........,@@@@@@@@@@@@@@@@/*[\].,`]/[[@@@@@@@@@@@@@@,[[[[`..
..,O\/@@@@@@@@@@@@@@@@@@@`...........O@@O@@@@@@@@@@\....
.....\@@@@@@@@@@@@@@@@@@@OO\`,O.. .,@OOO@@@@@@@@@@. ..
..../@@@@@@@@@@@@@@OO@`.^,O. ..=@OOO@@@@@@@@@.. .
...=@@@@@@@@@@@@@@@@@O[[.... ...\@@@@@@@@@@@/.. .
...=@@@@@@@@@@@@@@,^ ....O...\@@@@@@`
....@@@@@@@@@@@@@/.. ...^/\]/[\@@@@`.
.@@@@/@@@@@@@^O..... ...,@@^]..]@/...
...\@`.[@@@@@@...... .=`@@@@@^..^....
....`....[@@@O\.[,..........OO@@@@@^.,[[....
............\@@@\`...,`**,]@@@@@@@^.........
.. .,@@@@@@@@@@@@@@@@@@/...
..O@@@@@@@@@@@@@@@@@^...
..O@@@@@@^...=@@@@@@@...
..@@@@@@@\...=@@@@@@@^..
.=@@@@@@@@...=@@@@@@@O..
.=@@@@@@@@`..=@@@@@@@@..
.=@@@O@@@@^..=@@OO@@@@^.
.O@OOOOO@O^..=@OOOOOOO^.
.Oo/[\O/\O@..=/[\O/\o*O.
.O^......=O...^......*/.
.=\.....]O^...\\...]//.. .. ........

Some files were not shown because too many files have changed in this diff Show More