fix:点击取消下载 仍然会有系统通知提示下载完毕

This commit is contained in:
柚子 2022-12-13 12:34:48 +08:00
parent ce8c058265
commit da2c019da0
6 changed files with 52 additions and 44 deletions

View File

@ -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();

View File

@ -5,7 +5,7 @@
#include <QTextBrowser>
#include <QMenu>
#include <QAction>
#include "utils/utils.h"
#include <DDialog>
DWIDGET_USE_NAMESPACE

View File

@ -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)
{

View File

@ -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 abortedyou 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>

View File

@ -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 abortedyou 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>

View File

@ -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 abortedyou 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>