From 4334c424ac3b0706efd986e8fd511d2b9ba6bda6 Mon Sep 17 00:00:00 2001
From: gfdgd_xi <3025613752@qq.com>
Date: Sat, 10 Sep 2022 22:36:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A5=E7=9D=A1=E8=A7=89=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Model/__init__.py                         |  10 ++++++++--
 Model/__pycache__/__init__.cpython-37.pyc | Bin 867 -> 948 bytes
 mainwindow.py                             |   1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Model/__init__.py b/Model/__init__.py
index 7f043be..eee72d3 100644
--- a/Model/__init__.py
+++ b/Model/__init__.py
@@ -1,4 +1,6 @@
 import os
+import sys
+import PyQt5.QtWidgets as QtWidgets
 def OpenTerminal(command):
     if terminalEnd[terminal][1]:
         os.system(f"\"{terminal}\" \"{terminalEnd[terminal][0]}\" \"{command}\"")
@@ -12,12 +14,14 @@ terminal = ""
 terminalList = [
     "deepin-terminal",
     "mate-terminal",
-    "gnome-terminal"
+    "gnome-terminal",
+    "xfce4-terminal"
 ]
 terminalEnd = {
     f"{programPath}/../launch.sh\" \"deepin-terminal": ["-e", 0],
     "mate-terminal": ["-e", 1],
-    "gnome-terminal": ["--", 0]
+    "gnome-terminal": ["--", 0],
+    "xfce4-terminal": ["-e", 1]
 }
 for i in terminalList:
     if not os.system(f"which {i}"):
@@ -28,4 +32,6 @@ for i in terminalList:
 if terminal == "":
     print("无法识别到以下的任意一个终端")
     print(" ".join(terminalList))
+    app = QtWidgets.QApplication(sys.argv)
+    QtWidgets.QMessageBox.critical(None, "错误", "无法识别到以下的任意一个终端\n" + " ".join(terminalList))
     exit()
diff --git a/Model/__pycache__/__init__.cpython-37.pyc b/Model/__pycache__/__init__.cpython-37.pyc
index 3a4bb90eccd05b8f6f1d922067501a59c43cd283..d22512e8a0b6adfe3651fe63e0d407b4c6d6bf2c 100644
GIT binary patch
delta 376
zcmaFNwuN2YiI<m)0SJ^A$RsncFfcp@abSQG$Z!DS;sX=aP3u!Q(pjQ7QrTuRq;Sq<
zO5sXjNM}mn2GTr0nm2_H%;$jcGg+cID@;;3To__?qPS8S7I3HVr*h3^n9H<~u{a}@
zD@7oisi+TT7ElFO6ng+eVMaJZDtihGP;O5uPl{kOBO?Ql7FxiY%CS(85zOUlW?*DU
zVGL%_6yEsAfYDMQB{j7mGf%f9wJ0|;FEPikiZ3^@Bo&FzpPrYWi!8ubk(QilGTDMj
z&#{UZMR5@m(6?25s2Zx6bakuP$}=*PGZd=$(X5+X&U8pm3#f~Ok%Lu&g@uWU5d_(o
Z`51vBj66(Si~>NKi;;zq4J^XP2mq~4S~CCu

delta 276
zcmdnO{+LbOiI<m)0SNB2izXjqW?*;>;=lkqkl_Ht#oH#To7Sf@M{%UG&1Oj9n9G#H
znZl6Hl)?t2xqvi#3O9(K$sEO5VUo(>!Vs$y#g)pifIEdJm1{P`T&9JL#c`=zDXiH{
zMJ+HhfGW76*aH{}<H8wI*;816a+^|lQh1vg85w{y-vZuLj)jb19$zy9BRfM1V=#jz
z|Hd~4jB5NTsi_5-dAcR3MY)-Ii8)ogxrrsI2rgfGUVd)s<WMF(!6GK052~1Sb*tFQ
lGcuDi6eb^GIwY(H6y#v!V3lBDVPaxrVq|0Hn>?3U9024tK=}Xw

diff --git a/mainwindow.py b/mainwindow.py
index a8e56d6..eebd719 100755
--- a/mainwindow.py
+++ b/mainwindow.py
@@ -1633,6 +1633,7 @@ updateThingsString = '''※1、Dll 提取工具支持 NT 6.X 及以上版本的
 ※5、修复无法正常评分的问题
 ※6、修复 QQ、TIM 安装后无法正常生成快捷方式的问题
 7、更新组件安装的离线列表
+8、不再强制依赖深度终端，只做推荐安装
 '''
 for i in information["Thank"]:
     thankText += f"{i}\n"