diff --git a/Makefile b/Makefile index e70b00f..cd3bbad 100755 --- a/Makefile +++ b/Makefile @@ -39,6 +39,7 @@ build: cp -rv ConfigLanguareRunner-help.json new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/ cp -rv ConfigLanguareRunner.py new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/ cp -rv run-program-without-wayland.sh new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/ + cp -rv ProgramFen.py new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/ python3 RemovePycacheFile.py new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/ cp -rv new-deb-build /tmp/uengine-runner-builder sudo chown -R root:root /tmp/uengine-runner-builder diff --git a/ProgramFen.py b/ProgramFen.py index f583d3f..33d95b0 100755 --- a/ProgramFen.py +++ b/ProgramFen.py @@ -14,7 +14,7 @@ class ProgramRunStatusShow(): try: fenlists = [] for i in range(6): - fenlists.append(int(requests.get(base64.b64decode("aHR0cHM6Ly9jb2RlLmdpdGxpbmsub3JnLmNuL2dmZGdkLXhpLW9yZy93aW5lLXJ1bm5lci1kb3dubG9hZHMtb2YtcnVubmVyL3Jhdy9icmFuY2gvbWFzdGVyL0Zlbi1VRW5naW5lL0Zlbg==").decode("utf-8") + f"{i}-UEngine.txt").text)) + fenlists.append(int(requests.get(base64.b64decode("aHR0cHM6Ly9jb2RlLmdpdGxpbmsub3JnLmNuL2dmZGdkLXhpLW9yZy93aW5lLXJ1bm5lci1kb3dubG9hZHMtb2YtcnVubmVyL3Jhdy9icmFuY2gvbWFzdGVyL0Zlbi1VRW5naW5lL0Zlbg==").decode("utf-8") + f"{i}.txt").text)) tipsInfo = "" except: traceback.print_exc() @@ -28,8 +28,9 @@ class ProgramRunStatusShow(): try: #tipsInfo = "" for i in range(len(fenlists)): - tipsInfo += f"有 {fenlists[i] / allNumber * 100}% 的用户选择了 {i} 分({fenlists[i]}/{allNumber})\n" - maxNumber = max(fenlists) / allNumber * 100 + # 显示整数 + tipsInfo += f"有 {int(fenlists[i] / allNumber * 100)}% 的用户选择了 {i} 分({fenlists[i]}/{allNumber})\n" + maxNumber = int(max(fenlists) / allNumber * 100) #if tipsInfo == "": # tipsInfo = f"有{maxNumber}%的用户选择了这个评分" except: diff --git a/mainwindow.py b/mainwindow.py index 124f4a9..1dfcf44 100755 --- a/mainwindow.py +++ b/mainwindow.py @@ -1940,17 +1940,23 @@ uengineRunnerSearch = QtWidgets.QAction("查询指定程序在 UEngine 的运行 helpUengineRunnerBugUpload = QtWidgets.QAction(langFile[lang]["Main"]["MainWindow"]["Menu"][3]["Menu"][2]) helpShowHelp = QtWidgets.QAction(langFile[lang]["Main"]["MainWindow"]["Menu"][3]["Menu"][4]) helpRunnerUpdate = QtWidgets.QAction(langFile[lang]["Main"]["MainWindow"]["Menu"][3]["Menu"][3]) +helpFen = QtWidgets.QAction("程序评分") helpAbout = QtWidgets.QAction(langFile[lang]["Main"]["MainWindow"]["Menu"][3]["Menu"][1]) helpAboutQt = QtWidgets.QAction(langFile[lang]["Main"]["MainWindow"]["Menu"][3]["Menu"][5]) help.addAction(helpOpenProgramUrl) help.addAction(uengineRunnerSearch) help.addAction(makerWebsize) help.addAction(helpForum) +help.addSeparator() help.addAction(helpUengineRunnerBugUpload) +help.addSeparator() help.addAction(helpShowHelp) help.addAction(helpRunnerUpdate) +help.addAction(helpFen) +help.addSeparator() help.addAction(helpAbout) help.addAction(helpAboutQt) +help.addSeparator() hm1 = help.addMenu("更多生态适配应用") hm1_1 = QtWidgets.QAction("运行 Windows 应用:Wine 运行器") hm1.addAction(hm1_1) @@ -1963,6 +1969,7 @@ helpForum.triggered.connect(lambda: webbrowser.open_new_tab("https://bbs.racoong helpUengineRunnerBugUpload.triggered.connect(UengineRunnerBugUpload) helpShowHelp.triggered.connect(ShowHelp) helpRunnerUpdate.triggered.connect(UpdateWindow.ShowWindow) +helpFen.triggered.connect(lambda: threading.Thread(target=os.system, args=[f"'{programPath}/ProgramFen.py'"]).start()) helpAbout.triggered.connect(showhelp) helpAboutQt.triggered.connect(lambda: QtWidgets.QMessageBox.aboutQt(widget)) # 设置窗口