From 1e78584493ab860038110f48d9479a7846ce85a0 Mon Sep 17 00:00:00 2001
From: gfdgd_xi <3025613752@qq.com>
Date: Sat, 10 Sep 2022 22:07:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20QQ=E3=80=81TIM=20=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85=E5=90=8E=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=BF=AB=E6=8D=B7=E6=96=B9=E5=BC=8F=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Icon/QQ.svg                   |  4 +--
 Icon/TIM.svg                  |  2 +-
 Icon/{Wechat.svg => 微信.svg} |  2 +-
 mainwindow.py                 | 50 ++++++++++++++++++++++++++++++++---
 4 files changed, 51 insertions(+), 7 deletions(-)
 rename Icon/{Wechat.svg => 微信.svg} (99%)

diff --git a/Icon/QQ.svg b/Icon/QQ.svg
index 69ac0d2..2b858d4 100644
--- a/Icon/QQ.svg
+++ b/Icon/QQ.svg
@@ -23,7 +23,7 @@
    inkscape:version="0.92.4 (5da689c313, 2019-01-14)"><metadata
    id="metadata75"><rdf:RDF><cc:Work
        rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
    id="defs73"><clipPath
      id="clip0"><path
        id="path218"
@@ -287,7 +287,7 @@
 <g
    style="overflow:hidden"
    id="g352"
-   transform="matrix(0.59524695,0,0,0.59348352,310.21129,310.80909)"><g
+   transform="matrix(0.59524695,0,0,0.59348352,310.80653,311.40257)"><g
      id="g297"
      transform="translate(-858,-199)"
      clip-path="url(#clip0)"><g
diff --git a/Icon/TIM.svg b/Icon/TIM.svg
index 6e88489..df383e4 100644
--- a/Icon/TIM.svg
+++ b/Icon/TIM.svg
@@ -200,7 +200,7 @@
   <g
      style="overflow:hidden"
      id="g279"
-     transform="matrix(0.59524695,0,0,0.59524695,311.90659,311.27079)">
+     transform="matrix(0.59524695,0,0,0.59348352,310.80653,311.40257)">
     <g
        id="g224"
        transform="translate(-858,-199)"
diff --git a/Icon/Wechat.svg b/Icon/微信.svg
similarity index 99%
rename from Icon/Wechat.svg
rename to Icon/微信.svg
index 720e333..bab296b 100644
--- a/Icon/Wechat.svg
+++ b/Icon/微信.svg
@@ -249,7 +249,7 @@
   <g
      style="overflow:hidden"
      id="g294"
-     transform="matrix(0.59524695,0,0,0.59524695,311.48343,313.84891)">
+     transform="matrix(0.59524695,0,0,0.59348352,310.80653,311.40257)">
     <g
        id="g239"
        transform="translate(-858,-199)"
diff --git a/mainwindow.py b/mainwindow.py
index a3f4798..5322dfe 100755
--- a/mainwindow.py
+++ b/mainwindow.py
@@ -203,6 +203,24 @@ class Runexebutton_threading(QtCore.QThread):
             wineBottonHistory.append(e2.currentText())  # 将记录写进数组        
             write_txt(get_home() + "/.config/deepin-wine-runner/WineBottonHistory.json", str(json.dumps(ListToDictionary(wineBottonHistory))))  # 将历史记录的数组转换为字典并写入
         self.showHistory.emit("")
+        # 针对 QQ、TIM 安装后不会生成 lnk 的问题，由程序读取以及自动创建
+        # 判断是否安装了 QQ/TIM
+        for i in iconListUnBuild:
+            if os.path.exists(i[1].replace("wineBottonPath", wineBottonPath)):
+                if not os.path.exists(f"{get_home()}/.local/share/applications/{i[0]}-{os.path.basename(wineBottonPath)}.desktop"):
+                    print("图标不存在，创建图标")
+                    # 图标不存在
+                    # 写入 .desktop 文件
+                    try:
+                        write_txt(f"{get_home()}/.local/share/applications/{i[0]}-{os.path.basename(wineBottonPath)}.desktop", f'''[Desktop Entry]
+Name={i[0]}
+Exec=env WINEPREFIX='{wineBottonPath}' {option} {wine[o1.currentText()]} '{i[1].replace("wineBottonPath", wineBottonPath)}' {setting["WineOption"]} {wineUsingOption}
+Icon={programPath}/Icon/{i[0]}.svg
+Type=Application
+StartupNotify=true''')
+                    except:
+                        # 写入不进去就别写入了，当什么事情都没发生就行
+                        traceback.print_exc()
         DisableButton(False)
   
 
@@ -274,6 +292,12 @@ def make_desktop_on_launcher():
                     os.remove(f"{programPath}/dlls-arm.7z")
             if o1.currentText() == "基于 exagear 的 deepin-wine6-stable" or o1.currentText() == "基于 box86 的 deepin-wine6-stable":
                 wineUsingOption = "--disable-gpu"
+            for i in iconList:
+                if i[1].replace("wineBottonPath", wineBottonPath) == e2.currentText():
+                    # 如果路径相同，即可以用程序对应的图标
+                    iconPath = f"{programPath}/Icon/{i[0]}.svg"
+                    # 读到了就不需要再读取了
+                    break
             write_txt(get_home() + "/.local/share/applications/" + combobox1.currentText() + ".desktop", f'''[Desktop Entry]
 Name={combobox1.currentText()}
 Exec=env WINEPREFIX='{wineBottonPath}' {option} {wine[o1.currentText()]} '{e2.currentText()}' {setting["WineOption"]} {wineUsingOption}
@@ -329,6 +353,12 @@ def make_desktop_on_desktop():
                 option += f"WINEARCH={setting['Architecture']} "
             if not setting["Debug"]:
                 option += "WINEDEBUG=-all "
+            for i in iconList:
+                if i[1].replace("wineBottonPath", wineBottonPath) == e2.currentText():
+                    # 如果路径相同，即可以用程序对应的图标
+                    iconPath = f"{programPath}/Icon/{i[0]}.svg"
+                    # 读到了就不需要再读取了
+                    break
             write_txt(get_desktop_path() + "/" + combobox1.currentText() + ".desktop", f'''[Desktop Entry]
 Name={combobox1.currentText()}
 Exec=env WINEPREFIX='{wineBottonPath}' {option} {wine[o1.currentText()]} '{e2.currentText()}' {setting["WineOption"]} {wineUsingOption}
@@ -514,6 +544,8 @@ class RunWinetricksThread(QtCore.QThread):
                 text = ""
             self.signal.emit(text)
             print(text, end="")
+        
+        
         DisableButton(False)
 
 runWinetricks = None
@@ -1586,7 +1618,8 @@ updateThingsString = '''※1、Dll 提取工具支持 NT 6.X 及以上版本的
 ※3、DEBUG 模式输出更多信息以方便调试（原本只输出 pid、Err）
 ※4、支持安装 msi 文件
 ※5、修复无法正常评分的问题
-6、更新组件安装的离线列表
+※6、修复 QQ、TIM 安装后无法正常生成快捷方式的问题
+7、更新组件安装的离线列表
 '''
 for i in information["Thank"]:
     thankText += f"{i}\n"
@@ -1624,8 +1657,19 @@ try:
     threading.Thread(target=requests.get, args=[parse.unquote(base64.b64decode("aHR0cHM6Ly8zMDQ2MjZwOTI3LmdvaG8uY28vc3BhcmstZGVlcGluLXdpbmUtcnVubmVyL29wZW4vSW5zdGFsbC5waHA=").decode("utf-8")) + "?Version=" + version]).start()
 except:
     pass
-
-
+iconListUnBuild = [
+    ["QQ", "wineBottonPath/drive_c/Program Files/Tencent/QQ/Bin/QQ.exe"],
+    ["QQ", "wineBottonPath/drive_c/Program Files (x86)/Tencent/QQ/Bin/QQ.exe"],
+    ["TIM", "wineBottonPath/drive_c/Program Files/Tencent/TIM/Bin/TIM.exe"],
+    ["TIM", "wineBottonPath/drive_c/Program Files (x86)/Tencent/TIM/Bin/TIM.exe"]
+]
+iconList = [
+    ["微信", "wineBottonPath/drive_c/Program Files/Tencent/WeChat/WeChat.exe"],
+    ["微信", "wineBottonPath/drive_c/Program Files (x86)/Tencent/WeChat/WeChat.exe"]
+]
+for i in iconListUnBuild:
+    iconList.append(i)
+print(iconList)
 
 ###########################
 # 窗口创建