From da2c019da092715093ebb3b941da676b38046888 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9F=9A=E5=AD=90?= <admin@yzzi.icu>
Date: Tue, 13 Dec 2022 12:34:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=82=B9=E5=87=BB=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=20=E4=BB=8D=E7=84=B6=E4=BC=9A=E6=9C=89?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E9=80=9A=E7=9F=A5=E6=8F=90=E7=A4=BA=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E5=AE=8C=E6=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/widgets/common/downloaditem.cpp |  1 +
 src/widgets/common/downloaditem.h   |  2 +-
 src/widgets/downloadlistwidget.cpp  |  1 -
 translations/spark-store_en.ts      | 32 ++++++++++++++---------------
 translations/spark-store_fr.ts      | 32 ++++++++++++++---------------
 translations/spark-store_zh_CN.ts   | 28 ++++++++++++++++---------
 6 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/src/widgets/common/downloaditem.cpp b/src/widgets/common/downloaditem.cpp
index 51878f6..905bb5b 100644
--- a/src/widgets/common/downloaditem.cpp
+++ b/src/widgets/common/downloaditem.cpp
@@ -59,6 +59,7 @@ void DownloadItem::readyInstall()
 {
     if(!close)
     {
+        Utils::sendNotification("spark-store",tr("Spark Store"),tr("The download is complete."));
         ui->progressBar->hide();
         ui->pushButton_install->setEnabled(true);
         ui->pushButton_install->show();
diff --git a/src/widgets/common/downloaditem.h b/src/widgets/common/downloaditem.h
index f5a7d86..33f9479 100644
--- a/src/widgets/common/downloaditem.h
+++ b/src/widgets/common/downloaditem.h
@@ -5,7 +5,7 @@
 #include <QTextBrowser>
 #include <QMenu>
 #include <QAction>
-
+#include "utils/utils.h"
 #include <DDialog>
 DWIDGET_USE_NAMESPACE
 
diff --git a/src/widgets/downloadlistwidget.cpp b/src/widgets/downloadlistwidget.cpp
index 9e0ca06..d4437a1 100644
--- a/src/widgets/downloadlistwidget.cpp
+++ b/src/widgets/downloadlistwidget.cpp
@@ -125,7 +125,6 @@ void DownloadListWidget::httpFinished() // 完成下载
     isBusy = false;
     downloaditemlist[nowDownload - 1]->readyInstall();
     downloaditemlist[nowDownload - 1]->free = true;
-    Utils::sendNotification("spark-store",tr("Spark Store"),tr("The download is complete. Please click the download button on the title Bar to open the download list for installation"));
     emit downloadFinished();
     if(nowDownload < allDownload)
     {
diff --git a/translations/spark-store_en.ts b/translations/spark-store_en.ts
index 7d60f78..77b155c 100644
--- a/translations/spark-store_en.ts
+++ b/translations/spark-store_en.ts
@@ -278,32 +278,42 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="98"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="62"/>
+        <source>Spark Store</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="62"/>
+        <source>The download is complete.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="99"/>
         <source>Installing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="141"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="142"/>
         <source>Finish</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="147"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="148"/>
         <source>Retry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="148"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="149"/>
         <source>Error happened in dpkg progress , you can try it again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="154"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="155"/>
         <source>dpkg progress had been aborted，you can retry installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="175"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="176"/>
         <source>Download canceled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -325,16 +335,6 @@
         <source>Open download directory</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/widgets/downloadlistwidget.cpp" line="128"/>
-        <source>Spark Store</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/widgets/downloadlistwidget.cpp" line="128"/>
-        <source>The download is complete. Please click the download button on the title Bar to open the download list for installation</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>MainWindow</name>
diff --git a/translations/spark-store_fr.ts b/translations/spark-store_fr.ts
index b3af1e6..8e05891 100644
--- a/translations/spark-store_fr.ts
+++ b/translations/spark-store_fr.ts
@@ -278,32 +278,42 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="98"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="62"/>
+        <source>Spark Store</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="62"/>
+        <source>The download is complete.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="99"/>
         <source>Installing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="141"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="142"/>
         <source>Finish</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="147"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="148"/>
         <source>Retry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="148"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="149"/>
         <source>Error happened in dpkg progress , you can try it again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="154"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="155"/>
         <source>dpkg progress had been aborted，you can retry installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="175"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="176"/>
         <source>Download canceled</source>
         <translation type="unfinished"></translation>
     </message>
@@ -325,16 +335,6 @@
         <source>Open download directory</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/widgets/downloadlistwidget.cpp" line="128"/>
-        <source>Spark Store</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/widgets/downloadlistwidget.cpp" line="128"/>
-        <source>The download is complete. Please click the download button on the title Bar to open the download list for installation</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>MainWindow</name>
diff --git a/translations/spark-store_zh_CN.ts b/translations/spark-store_zh_CN.ts
index 7d95f8c..3f1402c 100644
--- a/translations/spark-store_zh_CN.ts
+++ b/translations/spark-store_zh_CN.ts
@@ -310,32 +310,42 @@
         <translation>下载完成</translation>
     </message>
     <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="98"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="62"/>
+        <source>Spark Store</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="62"/>
+        <source>The download is complete.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="99"/>
         <source>Installing</source>
         <translation>正在安装</translation>
     </message>
     <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="141"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="142"/>
         <source>Finish</source>
         <translation>完成</translation>
     </message>
     <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="147"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="148"/>
         <source>Retry</source>
         <translation>重试</translation>
     </message>
     <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="148"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="149"/>
         <source>Error happened in dpkg progress , you can try it again</source>
         <translation>dpkg出现错误，可重新安装</translation>
     </message>
     <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="154"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="155"/>
         <source>dpkg progress had been aborted，you can retry installation</source>
         <translation>安装被中止，可重新安装</translation>
     </message>
     <message>
-        <location filename="../src/widgets/common/downloaditem.cpp" line="175"/>
+        <location filename="../src/widgets/common/downloaditem.cpp" line="176"/>
         <source>Download canceled</source>
         <translation>下载已取消</translation>
     </message>
@@ -358,14 +368,12 @@
         <translation>打开下载文件夹</translation>
     </message>
     <message>
-        <location filename="../src/widgets/downloadlistwidget.cpp" line="128"/>
         <source>Spark Store</source>
-        <translation>星火应用商店</translation>
+        <translation type="vanished">星火应用商店</translation>
     </message>
     <message>
-        <location filename="../src/widgets/downloadlistwidget.cpp" line="128"/>
         <source>The download is complete. Please click the download button on the title Bar to open the download list for installation</source>
-        <translation>下载已完成，请点击标题栏上的下载按钮打开下载列表进行安装</translation>
+        <translation type="vanished">下载已完成，请点击标题栏上的下载按钮打开下载列表进行安装</translation>
     </message>
 </context>
 <context>