FreshRSS
/
rssguard
mirror of https://github.com/martinrotter/rssguard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Icons in download mgr.

This commit is contained in:
Martin Rotter 2020-11-11 13:40:43 +01:00
parent 72b7182752
commit 89ebcf7382
4 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/librssguard/definitions/definitions.h
View File

@ -81,6 +81,9 @@
#define EXTERNAL_TOOL_SEPARATOR "###"
#define EXTERNAL_TOOL_PARAM_SEPARATOR "|||"
#define CLI_LOG_SHORT "l"
#define CLI_LOG_LONG "log"
#define HTTP_HEADERS_ACCEPT "Accept"
#define HTTP_HEADERS_CONTENT_TYPE "Content-Type"
#define HTTP_HEADERS_CONTENT_LENGTH "Content-Length"

21
src/librssguard/miscellaneous/application.cpp
View File

@ -49,11 +49,17 @@ Application::Application(const QString& id, int& argc, char** argv)
m_feedReader(nullptr),
m_quitLogicDone(false),
m_updateFeedsLock(new Mutex()), m_mainForm(nullptr),
m_trayIcon(nullptr), m_settings(Settings::setupSettings(this)), m_webFactory(new WebFactory(this)),
m_system(new SystemFactory(this)), m_skins(new SkinFactory(this)),
m_localization(new Localization(this)), m_icons(new IconFactory(this)),
m_database(new DatabaseFactory(this)), m_downloadManager(nullptr), m_shouldRestart(false) {
m_updateFeedsLock(new Mutex()),
m_mainForm(nullptr),
m_trayIcon(nullptr),
m_settings(Settings::setupSettings(this)),
m_webFactory(new WebFactory(this)),
m_system(new SystemFactory(this)),
m_skins(new SkinFactory(this)),
m_localization(new Localization(this)),
m_icons(new IconFactory(this)),
m_database(new DatabaseFactory(this)),
m_downloadManager(nullptr), m_shouldRestart(false) {
parseCmdArguments();
@ -556,7 +562,8 @@ void Application::determineFirstRuns() {
}
void Application::parseCmdArguments() {
QCommandLineOption log_file(QStringList() << "l" << "log", "Write application debug log to file.", "log-file");
QCommandLineOption log_file(QStringList() << CLI_LOG_SHORT << CLI_LOG_LONG,
"Write application debug log to file.", "log-file");
m_cmdParser.addOption(log_file);
m_cmdParser.addHelpOption();
@ -565,5 +572,5 @@ void Application::parseCmdArguments() {
m_cmdParser.process(*this);
s_customLogFile = m_cmdParser.value(QSL("l"));
s_customLogFile = m_cmdParser.value(CLI_LOG_SHORT);
}

13
src/librssguard/network-web/downloaditem.ui
View File

@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>413</width>
<width>418</width>
<height>206</height>
</rect>
</property>
@ -19,9 +19,6 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Ico</string>
</property>
</widget>
</item>
<item>
@ -81,7 +78,7 @@
</layout>
</item>
<item>
<widget class="QToolButton" name="m_btnTryAgain">
<widget class="QPushButton" name="m_btnTryAgain">
<property name="enabled">
<bool>false</bool>
</property>
@ -91,21 +88,21 @@
</widget>
</item>
<item>
<widget class="QToolButton" name="m_btnStopDownload">
<widget class="QPushButton" name="m_btnStopDownload">
<property name="text">
<string>&amp;Stop</string>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="m_btnOpenFile">
<widget class="QPushButton" name="m_btnOpenFile">
<property name="text">
<string>&amp;Open file</string>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="m_btnOpenFolder">
<widget class="QPushButton" name="m_btnOpenFolder">
<property name="text">
<string>Open &amp;directory</string>
</property>

16
src/librssguard/network-web/downloadmanager.cpp
View File

@ -31,10 +31,15 @@ DownloadItem::DownloadItem(QNetworkReply* reply, QWidget* parent) : QWidget(pare
m_ui->m_btnTryAgain->hide();
m_requestFileName = qApp->settings()->value(GROUP(Downloads), SETTING(Downloads::AlwaysPromptForFilename)).toBool();
connect(m_ui->m_btnStopDownload, &QToolButton::clicked, this, &DownloadItem::stop);
connect(m_ui->m_btnOpenFile, &QToolButton::clicked, this, &DownloadItem::openFile);
connect(m_ui->m_btnTryAgain, &QToolButton::clicked, this, &DownloadItem::tryAgain);
connect(m_ui->m_btnOpenFolder, &QToolButton::clicked, this, &DownloadItem::openFolder);
m_ui->m_btnTryAgain->setIcon(qApp->icons()->fromTheme(QSL("view-refresh")));
m_ui->m_btnOpenFile->setIcon(qApp->icons()->fromTheme(QSL("document-open")));
m_ui->m_btnOpenFolder->setIcon(qApp->icons()->fromTheme(QSL("folder")));
m_ui->m_btnStopDownload->setIcon(qApp->icons()->fromTheme(QSL("process-stop")));
connect(m_ui->m_btnStopDownload, &QPushButton::clicked, this, &DownloadItem::stop);
connect(m_ui->m_btnOpenFile, &QPushButton::clicked, this, &DownloadItem::openFile);
connect(m_ui->m_btnTryAgain, &QPushButton::clicked, this, &DownloadItem::tryAgain);
connect(m_ui->m_btnOpenFolder, &QPushButton::clicked, this, &DownloadItem::openFolder);
init();
}
@ -432,6 +437,9 @@ DownloadManager::DownloadManager(QWidget* parent) : TabContent(parent), m_ui(new
m_ui->m_viewDownloads->setAlternatingRowColors(true);
m_ui->m_viewDownloads->horizontalHeader()->setStretchLastSection(true);
m_ui->m_viewDownloads->setModel(m_model);
m_ui->m_btnCleanup->setIcon(qApp->icons()->fromTheme(QSL("edit-clear")));
setDownloadDirectory(qApp->settings()->value(GROUP(Downloads), SETTING(Downloads::TargetDirectory)).toString());
connect(m_ui->m_btnCleanup, &QPushButton::clicked, this, &DownloadManager::cleanup);
load();