暂无此程序的介绍
" try: import requests as r - fenlists = requests.get(base64.b64decode("aHR0cDovLzEyMC4yNS4xNTMuMTQ0L3NwYXJrLWRlZXBpbi13aW5lLXJ1bm5lci9iYXNoYXBwLw==").decode("utf-8") + fileName + base64.b64decode("L2FsbC5qc29u").decode("utf-8"), timeout=1000).json() + fenlists = requests.get(base64.b64decode("aHR0cHM6Ly9jb2RlLmdpdGxpbmsub3JnLmNuL2dmZGdkLXhpLW9yZy93aW5lLXJ1bm5lci1kb3dubG9hZHMtb2YtcnVubmVyL3Jhdy9icmFuY2gvbWFzdGVyL0Jhc2hBcHBGZW4v").decode("utf-8") + fileName + base64.b64decode("L2FsbC5qc29u").decode("utf-8"), timeout=1000).json() tipsInfo = "" except: fenlists = [0, 0, 0, 0, 0] @@ -207,10 +210,36 @@ class InformationWindow(): 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("第{i[1]}层
"), 1, 2) + inLayout.addWidget(QtWidgets.QLabel(i[2]), 2, 0, 1, 3) + widget.setLayout(inLayout) + pinLunLayout1.addWidget(widget) + #pinLunLayout.addWidget(QtWidgets.QLabel("
"))
+ 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、不得有广告推广等内容
+※3、字数至少 15 字，但不得超过 250 字
+※4、评论内容最多 5 行，且评论内容将会进行审核，意味着评论不会实时生效显示""")
+ leftButton = QtWidgets.QPushButton("上一页")
+ rightButton = QtWidgets.QPushButton("下一页")
+ if maxHead == 0:
+ #pingLun.setDisabled(True)
+ pass
+ else:
+ # 显示最新的3条评论
+ try:
+ all = int(requests.get(f"https://code.gitlink.org.cn/gfdgd-xi-org/bashpinlun/raw/branch/master/{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"https://code.gitlink.org.cn/gfdgd-xi-org/bashpinlun/raw/branch/master/{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"https://code.gitlink.org.cn/gfdgd-xi-org/bashpinlun/raw/branch/master/{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
# 获取选中项
@@ -401,6 +551,7 @@ if __name__ == "__main__":
app = QtWidgets.QApplication(sys.argv)
window = QtWidgets.QMainWindow()
ui = Ui_MainWindow()
+ pinLunLayout = QtWidgets.QHBoxLayout()
ui.setupUi(window)
window.setWindowTitle(f"Wine 运行器 {version}——容器自动配置部署脚本")
window.setWindowIcon(QtGui.QIcon(f"{programPath}/deepin-wine-runner.svg"))
diff --git a/ConfigLanguareRunner.py b/ConfigLanguareRunner.py
index de201a2..c505a74 100755
--- a/ConfigLanguareRunner.py
+++ b/ConfigLanguareRunner.py
@@ -2,7 +2,7 @@
# 使用系统默认的 python3 运行
###########################################################################################
# 作者：gfdgd xi、为什么您不喜欢熊出没和阿布呢
-# 版本：2.1.0
+# 版本：3.0.1
# 更新时间：2022年10月05日
# 感谢：感谢 wine 以及 deepin-wine 团队，提供了 wine 和 deepin-wine 给大家使用，让我能做这个程序
# 基于 Python3 构建
@@ -14,6 +14,7 @@ import json
import random
import platform
import traceback
+import webbrowser
import subprocess
import PyQt5.QtWidgets as QtWidgets
# 读取文本文档
@@ -39,8 +40,8 @@ programEnv = [
["($PROGRAMPATH)", programPath],
["($VERSION)", version],
["($THANK)", thankText],
- ["($MAKER)", "gfdgd xi、为什么您不喜欢熊出没和阿布呢"],
- ["($COPYRIGHT)", f"©2020~{time.strftime('%Y')} gfdgd xi、为什么您不喜欢熊出没和阿布呢"],
+ ["($MAKER)", "RacoonGX 团队，By gfdgd xi、为什么您不喜欢熊出没和阿布呢"],
+ ["($COPYRIGHT)", f"©2020~{time.strftime('%Y')} RacoonGX 团队，By gfdgd xi、为什么您不喜欢熊出没和阿布呢"],
["($?)", "0"],
["($PLATFORM)", platform.system()],
["($DEBUG)", "1"]
@@ -126,7 +127,8 @@ class Command():
"enabledWinebottlecreatelink",
"installvb",
"installother",
- "decompressionbottle"
+ "decompressionbottle",
+ "programforum"
]
def __init__(self, commandString: str) -> None:
@@ -294,7 +296,7 @@ class Command():
def Version(self):
print(f"版本：{version}")
- print(f"©2020~{time.strftime('%Y')} gfdgd xi、为什么您不喜欢熊出没和阿布呢")
+ print(f"©2020~{time.strftime('%Y')} RacoonGX 团队，By gfdgd xi、为什么您不喜欢熊出没和阿布呢")
return 0
def Pause(self) -> int:
@@ -430,6 +432,9 @@ class Command():
import InstallOther
return InstallOther.Download(self.wineBottonPath, int(self.command[1]), self.wine)
+ def ProgramForum(self):
+ webbrowser.open_new_tab("https://gfdgdxi.flarum.cloud/")
+
# 可以运行的命令的映射关系
# 可以被使用的命令的映射
commandList = {
@@ -473,7 +478,8 @@ class Command():
"enabledWinebottlecreatelink": EnabledWineBottleCreateLink,
"installvb": InstallVB,
"installother": InstallOther,
- "decompressionbottle": DecompressionBottle
+ "decompressionbottle": DecompressionBottle,
+ "programforum": ProgramForum
}
# 参数数列表
@@ -519,7 +525,8 @@ class Command():
"enabledWinebottlecreatelink": [0],
"installvb": [1],
"installother": [1],
- "decompressionbottle": [2]
+ "decompressionbottle": [2],
+ "programforum": [0]
}
windowsUnrun = [
"createbotton",
@@ -606,7 +613,7 @@ if __name__ == "__main__":
if len(sys.argv) - optionAll < 2:
print("Wine 运行器自动配置文件解析器交互环境")
print(f"版本：{version}")
- print(f"©2020~{time.strftime('%Y')} gfdgd xi、为什么您不喜欢熊出没和阿布呢")
+ print(f"©2020~{time.strftime('%Y')} RacoonGX 团队，By gfdgd xi、为什么您不喜欢熊出没和阿布呢")
print("--------------------------------------------------------------")
while True:
commandLine = input(">")
diff --git a/__pycache__/ConfigLanguareRunner.cpython-37.pyc b/__pycache__/ConfigLanguareRunner.cpython-37.pyc
index 17d0b46..0990daf 100644
Binary files a/__pycache__/ConfigLanguareRunner.cpython-37.pyc and b/__pycache__/ConfigLanguareRunner.cpython-37.pyc differ
diff --git a/deb/DEBIAN/control b/deb/DEBIAN/control
index f506662..5257407 100755
--- a/deb/DEBIAN/control
+++ b/deb/DEBIAN/control
@@ -1,7 +1,7 @@
Package: wine-runner-linux
Version: 3.0.0.2
Maintainer: gfdgd xi <3025613752@qq.com>
-Homepage: https://gitee.com/gfdgd-xi/deep-wine-runner
+Homepage: https://gitee.com/gfdgd-xi-org/deep-wine-runner
Architecture: all
Severity: serious
Certainty: possible
diff --git a/deepin-wine-easy-packager.py b/deepin-wine-easy-packager.py
index b9cfd20..342691d 100755
--- a/deepin-wine-easy-packager.py
+++ b/deepin-wine-easy-packager.py
@@ -433,6 +433,8 @@ class RunThread(QtCore.QThread):
self.RunCommand(f"chmod 777 -Rv '{bottlePath}'")
# 禁止生成 .desktop 文件
self.RunCommand(f"WINEPREFIX='{bottlePath}' deepin-wine6-stable 'reg' 'add' 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v winemenubuilder.exe '/f'")
+ # 写入字体
+ self.RunCommand(f"WINEPREFIX='{bottlePath}' '{programPath}/AutoShell/command/installfont' 1")
# 安装包
self.info.emit("请在运行完安装程序后按下打包器主界面的“安装程序执行完成按钮”以进行下一步操作")
global pressCompleteDownload
diff --git a/mainwindow.py b/mainwindow.py
index b14dcce..576fd9f 100755
--- a/mainwindow.py
+++ b/mainwindow.py
@@ -2378,7 +2378,7 @@ Qt 版本：{QtCore.qVersion()}
是由 @gfdgd xi 带头的团队。
+是由 @gfdgd xi 带头的团队，gfdgd xi开发了UEngine运行器等好用的开源软件。
星火应用商店：https://spark-app.store/ @@ -2386,9 +2386,9 @@ Deepin 官网：https://www.deepin.org Deepin 论坛：https://bbs.deepin.org 论坛：https://gfdgdxi.flarum.cloud/