From 18ce8a080f6beb57de3603b54bcc17f541898a7a Mon Sep 17 00:00:00 2001
From: gfdgd_xi <3025613752@qq.com>
Date: Mon, 15 Jul 2024 12:52:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=B0=83=E7=94=A8GXDE?=
=?UTF-8?q?=E7=9A=84deepin-terminal-gtk?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Model/__init__.py | 4 ++++
deb/DEBIAN/control | 2 +-
mainwindow.py | 7 +++++++
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/Model/__init__.py b/Model/__init__.py
index e217e0c..2e1ea3d 100755
--- a/Model/__init__.py
+++ b/Model/__init__.py
@@ -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 == "":
diff --git a/deb/DEBIAN/control b/deb/DEBIAN/control
index 8396806..0b0c02a 100755
--- a/deb/DEBIAN/control
+++ b/deb/DEBIAN/control
@@ -8,7 +8,7 @@ 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 | p7zip-legacy, sudo, python3-pyperclip, bubblewrap, zenity, tree, dpkg, fakeroot
+Depends: python3, python3-pil, python3-pil.imagetk, python3-pyquery, aria2, curl, unrar | unrar-free , unzip, python3-requests, python3-pyqt5, python3-psutil, deepin-terminal-gtk | xfce4-terminal | deepin-terminal | mate-terminal | gnome-terminal, python3-dbus, python3-pip, p7zip-full | p7zip-legacy, 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, 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
Section: utils
Conflicts: spark.deepin-venturi-setter, spark-deepin-wine5-application-packer, spark-deepin-wine-runner-52
diff --git a/mainwindow.py b/mainwindow.py
index a32d2a0..7cccf19 100755
--- a/mainwindow.py
+++ b/mainwindow.py
@@ -142,6 +142,10 @@ def runexebutton(self):
class QT:
message = None
def ShowWineReturn(things):
+ global unUseLnk
+ unUseLnk = True
+ # 不显示超链接
+ #returnText.setStyleSheet(returnText.styleSheet() + "a {color: white; text-decoration: none;}")
returnText.insertPlainText(things)
def ShowHistory(temp):
@@ -2718,8 +2722,11 @@ returnText = QtWidgets.QTextBrowser()
getUpdate = GetUpdateToShow()
getUpdate.signal.connect(returnText.setHtml)
getUpdate.start()
+unUseLnk = False
def ReturnTextOpenUrl(url):
print(url)
+ if unUseLnk:
+ return
if url.url() == "http://update.gfdgdxi.top/update-wine-runner":
UpdateWindow.ShowWindow()
elif url.url() == "http://update.gfdgdxi.top/information-wine-runner":