Improve Features

Using DDesktopServices::showFileItem() instead of calling
dde-file-manager directly in QProcess;
Delete useless QDebug info and headers include.
This commit is contained in:
忘记、过去 2020-12-16 18:57:09 +08:00
parent 0f256ff27b
commit 8da4f87164
7 changed files with 23 additions and 43 deletions

@ -164,8 +164,7 @@ int main(int argc, char *argv[])
szCfgFile = parser.value(optCfgFile); szCfgFile = parser.value(optCfgFile);
if (!szCfgFile.isEmpty()) if (!szCfgFile.isEmpty())
{ {
QFileInfo fi(szCfgFile); if (QFileInfo(szCfgFile).exists())
if (fi.exists())
{ {
QSettings settings(szCfgFile, QSettings::IniFormat); QSettings settings(szCfgFile, QSettings::IniFormat);
szTitle = settings.value("SparkWebAppRuntime/Title", DEFAULT_TITLE).toString(); szTitle = settings.value("SparkWebAppRuntime/Title", DEFAULT_TITLE).toString();

@ -1,15 +1,14 @@
#include "mainwindow.h" #include "mainwindow.h"
#include <DMainWindow>
#include <DWidgetUtil> #include <DWidgetUtil>
#include <DTitlebar> #include <DTitlebar>
#include <DMessageManager> #include <DMessageManager>
#include <DDesktopServices>
#include <QFileInfo> #include <QFileInfo>
#include <QFileDialog> #include <QFileDialog>
#include <QDir> #include <QDir>
#include <QCloseEvent> #include <QCloseEvent>
#include <QDebug>
#include "webenginepage.h" #include "webenginepage.h"
@ -45,7 +44,6 @@ MainWindow::MainWindow(QString szTitle,
, cancel(new DPushButton(tr("Cancel"))) , cancel(new DPushButton(tr("Cancel")))
, progress(new QHBoxLayout) , progress(new QHBoxLayout)
, message(new DFloatingMessage(DFloatingMessage::ResidentType)) , message(new DFloatingMessage(DFloatingMessage::ResidentType))
, process(new QProcess)
, isCanceled(false) , isCanceled(false)
, mtray(tray) , mtray(tray)
, mFixSize(nFixSize) , mFixSize(nFixSize)
@ -181,17 +179,11 @@ MainWindow::~MainWindow()
void MainWindow::setIcon(QString szIconPath) void MainWindow::setIcon(QString szIconPath)
{ {
QFileInfo fi(szIconPath); if (QFileInfo(szIconPath).exists())
if (fi.exists())
{ {
titlebar()->setIcon(QIcon(szIconPath)); titlebar()->setIcon(QIcon(szIconPath));
setWindowIcon(QIcon(szIconPath)); setWindowIcon(QIcon(szIconPath));
m_tray->setIcon(QIcon(szIconPath)); m_tray->setIcon(QIcon(szIconPath));
qDebug() << szIconPath << "is Set!";
}
else
{
qDebug() << szIconPath << "is Not Exists!";
} }
} }
@ -386,7 +378,7 @@ void MainWindow::on_downloadFinish(QString filePath)
connect(button, &DPushButton::clicked, this, [=]() connect(button, &DPushButton::clicked, this, [=]()
{ {
process->start("dde-file-manager --show-item " + filePath); DDesktopServices::showFileItem(filePath);
message->hide(); message->hide();
}); });
} }

@ -9,7 +9,6 @@
#include <DFloatingMessage> #include <DFloatingMessage>
#include <QSystemTrayIcon> #include <QSystemTrayIcon>
#include <QLayout>
#include <QProcess> #include <QProcess>
#include <QMutex> #include <QMutex>
@ -64,8 +63,6 @@ private:
QHBoxLayout *progress; QHBoxLayout *progress;
DFloatingMessage *message; DFloatingMessage *message;
QProcess *process;
QMutex mutex; // 通过 Mutex 互斥量禁止同时下载多个文件(使用简单的 bool 变量应该也可以实现该功能?) QMutex mutex; // 通过 Mutex 互斥量禁止同时下载多个文件(使用简单的 bool 变量应该也可以实现该功能?)
bool isCanceled; // 判断是否为取消下载 bool isCanceled; // 判断是否为取消下载

@ -4,92 +4,92 @@
<context> <context>
<name>MainWindow</name> <name>MainWindow</name>
<message> <message>
<location filename="../mainwindow.cpp" line="34"/> <location filename="../mainwindow.cpp" line="33"/>
<source>Full Screen</source> <source>Full Screen</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="35"/> <location filename="../mainwindow.cpp" line="34"/>
<source>Fix Size</source> <source>Fix Size</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="36"/> <location filename="../mainwindow.cpp" line="35"/>
<source>Hide Buttons</source> <source>Hide Buttons</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="38"/> <location filename="../mainwindow.cpp" line="37"/>
<source>Show MainWindow</source> <source>Show MainWindow</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="39"/> <location filename="../mainwindow.cpp" line="38"/>
<source>About</source> <source>About</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="40"/> <location filename="../mainwindow.cpp" line="39"/>
<source>Exit</source> <source>Exit</source>
<translation>退</translation> <translation>退</translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="43"/> <location filename="../mainwindow.cpp" line="42"/>
<source>Pause</source> <source>Pause</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="44"/> <location filename="../mainwindow.cpp" line="43"/>
<source>Resume</source> <source>Resume</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="45"/> <location filename="../mainwindow.cpp" line="44"/>
<source>Cancel</source> <source>Cancel</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="206"/> <location filename="../mainwindow.cpp" line="198"/>
<source>%1Fullscreen Mode</source> <source>%1Fullscreen Mode</source>
<translation>%1</translation> <translation>%1</translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="216"/> <location filename="../mainwindow.cpp" line="208"/>
<source>%1Windowed Mode</source> <source>%1Windowed Mode</source>
<translation>%1</translation> <translation>%1</translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="258"/> <location filename="../mainwindow.cpp" line="250"/>
<source>Save As</source> <source>Save As</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="344"/> <location filename="../mainwindow.cpp" line="336"/>
<source>%1Start downloading %2</source> <source>%1Start downloading %2</source>
<translation>%1 %2</translation> <translation>%1 %2</translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="357"/> <location filename="../mainwindow.cpp" line="349"/>
<source>%1Wait for previous download to complete!</source> <source>%1Wait for previous download to complete!</source>
<translation>%1</translation> <translation>%1</translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="379"/> <location filename="../mainwindow.cpp" line="371"/>
<source>Open</source> <source>Open</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="383"/> <location filename="../mainwindow.cpp" line="375"/>
<source>download finished.</source> <source>download finished.</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="383"/> <location filename="../mainwindow.cpp" line="375"/>
<source>Show in file manager?</source> <source>Show in file manager?</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../mainwindow.cpp" line="421"/> <location filename="../mainwindow.cpp" line="413"/>
<source>%1Download canceled!</source> <source>%1Download canceled!</source>
<translation>%1</translation> <translation>%1</translation>
</message> </message>

@ -1,12 +1,5 @@
#include "webenginepage.h" #include "webenginepage.h"
#include <QDir>
#include <QDebug>
#include <DMessageManager>
DWIDGET_USE_NAMESPACE
WebEnginePage::WebEnginePage(QObject *parent) WebEnginePage::WebEnginePage(QObject *parent)
: QWebEnginePage(parent) : QWebEnginePage(parent)
{ {

@ -2,6 +2,7 @@
#define WEBENGINEPAGE_H #define WEBENGINEPAGE_H
#include <QWebEnginePage> #include <QWebEnginePage>
#include <QWebEngineProfile>
#include <QObject> #include <QObject>
class WebEnginePage : public QWebEnginePage class WebEnginePage : public QWebEnginePage

@ -3,8 +3,6 @@
#include <QWidget> #include <QWidget>
#include <QWebEngineView> #include <QWebEngineView>
#include <QWebEnginePage>
#include <QWebEngineProfile>
#include <QLayout> #include <QLayout>
#include <DSpinner> #include <DSpinner>