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

Fixed #106.

This commit is contained in:
Martin Rotter 2015-01-24 09:32:54 +01:00
parent 7fb7e4aad3
commit 6668c4280e
23 changed files with 424 additions and 265 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -281,6 +281,11 @@ elseif(OS2 AND ${ENABLE_OS2_RC})
) )
endif(WIN32) endif(WIN32)
# Set special linker flag for Windows XP & MSVC++ 2013 support.
if(WIN32 AND MSVC)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,5.01" )
endif(WIN32 AND MSVC)
# Compile application icon if compiling with MinGW on WIN32 or with OS2. # Compile application icon if compiling with MinGW on WIN32 or with OS2.
if(MINGW AND WIN32) if(MINGW AND WIN32)
enable_language(RC) enable_language(RC)

BIN
resources/graphics/icons/mini-kfaenza/download-manager.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

4
resources/misc/db_init_mysql.sql
View File

@ -12,7 +12,7 @@ CREATE TABLE IF NOT EXISTS Information (
inf_value TEXT NOT NULL inf_value TEXT NOT NULL
); );
-- ! -- !
INSERT INTO Information VALUES (1, 'schema_version', '0.0.2'); INSERT INTO Information VALUES (1, 'schema_version', '2');
-- ! -- !
DROP TABLE IF EXISTS Categories; DROP TABLE IF EXISTS Categories;
-- ! -- !
@ -68,7 +68,7 @@ CREATE TABLE IF NOT EXISTS Messages (
author TEXT NOT NULL, author TEXT NOT NULL,
date_created BIGINT NOT NULL CHECK (date_created != 0), date_created BIGINT NOT NULL CHECK (date_created != 0),
contents TEXT, contents TEXT,
is_pdeleted INTEGER(1) NOT NULL DEFAULT 0 CHECK (is_pdeleted >= 0 AND is_pdeleted <= 1), is_pdeleted INTEGER(1) NOT NULL DEFAULT 0 CHECK (is_pdeleted >= 0 AND is_pdeleted <= 1),
FOREIGN KEY (feed) REFERENCES Feeds (id) FOREIGN KEY (feed) REFERENCES Feeds (id)
); );

4
resources/misc/db_init_sqlite.sql
View File

@ -6,7 +6,7 @@ CREATE TABLE IF NOT EXISTS Information (
inf_value TEXT NOT NULL inf_value TEXT NOT NULL
); );
-- ! -- !
INSERT INTO Information VALUES (1, 'schema_version', '0.0.2'); INSERT INTO Information VALUES (1, 'schema_version', '2');
-- ! -- !
DROP TABLE IF EXISTS Categories; DROP TABLE IF EXISTS Categories;
-- ! -- !
@ -62,7 +62,7 @@ CREATE TABLE IF NOT EXISTS Messages (
author TEXT NOT NULL, author TEXT NOT NULL,
date_created INTEGER NOT NULL CHECK (date_created != 0), date_created INTEGER NOT NULL CHECK (date_created != 0),
contents TEXT, contents TEXT,
is_pdeleted INTEGER(1) NOT NULL DEFAULT 0 CHECK (is_pdeleted >= 0 AND is_pdeleted <= 1), is_pdeleted INTEGER(1) NOT NULL DEFAULT 0 CHECK (is_pdeleted >= 0 AND is_pdeleted <= 1),
FOREIGN KEY (feed) REFERENCES Feeds (id) FOREIGN KEY (feed) REFERENCES Feeds (id)
); );

4
resources/misc/db_init_sqlite_memory.sql
View File

@ -6,7 +6,7 @@ CREATE TABLE IF NOT EXISTS Information (
inf_value TEXT NOT NULL inf_value TEXT NOT NULL
); );
-- ! -- !
INSERT INTO Information VALUES (1, 'schema_version', '0.0.2'); INSERT INTO Information VALUES (1, 'schema_version', '2');
-- ! -- !
DROP TABLE IF EXISTS Categories; DROP TABLE IF EXISTS Categories;
-- ! -- !
@ -62,7 +62,7 @@ CREATE TABLE IF NOT EXISTS Messages (
author TEXT NOT NULL, author TEXT NOT NULL,
date_created INTEGER NOT NULL CHECK (date_created != 0), date_created INTEGER NOT NULL CHECK (date_created != 0),
contents TEXT, contents TEXT,
is_pdeleted INTEGER(1) NOT NULL DEFAULT 0 CHECK (is_pdeleted >= 0 AND is_pdeleted <= 1), is_pdeleted INTEGER(1) NOT NULL DEFAULT 0 CHECK (is_pdeleted >= 0 AND is_pdeleted <= 1),
FOREIGN KEY (feed) REFERENCES Feeds (id) FOREIGN KEY (feed) REFERENCES Feeds (id)
); );

1
resources/text/CHANGELOG
View File

@ -9,6 +9,7 @@ Fixed:
Added: Added:
<ul> <ul>
<li></li>
</ul> </ul>
<hr/> <hr/>

27
src/gui/formsettings.cpp
View File

@ -130,6 +130,7 @@ FormSettings::FormSettings(QWidget *parent) : QDialog(parent), m_ui(new Ui::Form
connect(m_ui->m_txtMysqlUsername->lineEdit(), SIGNAL(textEdited(QString)), this, SLOT(onMysqlDataStorageEdited())); connect(m_ui->m_txtMysqlUsername->lineEdit(), SIGNAL(textEdited(QString)), this, SLOT(onMysqlDataStorageEdited()));
connect(m_ui->m_cmbSelectToolBar, SIGNAL(currentIndexChanged(int)), m_ui->m_stackedToolbars, SLOT(setCurrentIndex(int))); connect(m_ui->m_cmbSelectToolBar, SIGNAL(currentIndexChanged(int)), m_ui->m_stackedToolbars, SLOT(setCurrentIndex(int)));
connect(m_ui->m_cmbDatabaseDriver, SIGNAL(currentIndexChanged(int)), this, SLOT(selectSqlBackend(int))); connect(m_ui->m_cmbDatabaseDriver, SIGNAL(currentIndexChanged(int)), this, SLOT(selectSqlBackend(int)));
connect(m_ui->m_btnDownloadsTargetDirectory, SIGNAL(clicked()), this, SLOT(selectDownloadsDirectory()));
// Load all settings. // Load all settings.
loadGeneral(); loadGeneral();
@ -140,6 +141,7 @@ FormSettings::FormSettings(QWidget *parent) : QDialog(parent), m_ui(new Ui::Form
loadBrowser(); loadBrowser();
loadLanguage(); loadLanguage();
loadFeedsMessages(); loadFeedsMessages();
loadDownloads();
} }
FormSettings::~FormSettings() { FormSettings::~FormSettings() {
@ -163,6 +165,30 @@ void FormSettings::onSkinSelected(QTreeWidgetItem *current,
} }
} }
void FormSettings::loadDownloads() {
m_ui->m_txtDownloadsTargetDirectory->setText(qApp->settings()->value(GROUP(Downloads),
SETTING(Downloads::TargetDirectory)).toString());
m_ui->m_rbDownloadsAskEachFile->setChecked(qApp->settings()->value(GROUP(Downloads),
SETTING(Downloads::AlwaysPromptForFilename)).toBool());
}
void FormSettings::saveDownloads() {
qApp->settings()->setValue(GROUP(Downloads), Downloads::TargetDirectory, m_ui->m_txtDownloadsTargetDirectory->text());
qApp->settings()->setValue(GROUP(Downloads), Downloads::AlwaysPromptForFilename,
m_ui->m_rbDownloadsAskEachFile->isChecked());
}
void FormSettings::selectDownloadsDirectory() {
QString target_directory = QFileDialog::getExistingDirectory(this,
tr("Select downloads target directory"),
m_ui->m_txtDownloadsTargetDirectory->text()
);
if (!target_directory.isEmpty()) {
m_ui->m_txtDownloadsTargetDirectory->setText(QDir::toNativeSeparators(target_directory));
}
}
void FormSettings::selectBrowserExecutable() { void FormSettings::selectBrowserExecutable() {
QString executable_file = QFileDialog::getOpenFileName(this, QString executable_file = QFileDialog::getOpenFileName(this,
tr("Select web browser executable"), tr("Select web browser executable"),
@ -312,6 +338,7 @@ void FormSettings::saveSettings() {
saveBrowser(); saveBrowser();
saveLanguage(); saveLanguage();
saveFeedsMessages(); saveFeedsMessages();
saveDownloads();
qApp->settings()->checkSettings(); qApp->settings()->checkSettings();
promptForRestart(); promptForRestart();

4
src/gui/formsettings.h
View File

@ -62,6 +62,10 @@ class FormSettings : public QDialog {
void saveInterface(); void saveInterface();
void onSkinSelected(QTreeWidgetItem *current, QTreeWidgetItem *previous); void onSkinSelected(QTreeWidgetItem *current, QTreeWidgetItem *previous);
void loadDownloads();
void saveDownloads();
void selectDownloadsDirectory();
void loadGeneral(); void loadGeneral();
void saveGeneral(); void saveGeneral();

129
src/gui/formsettings.ui
View File

@ -78,22 +78,17 @@
<string>Feeds &amp; messages</string> <string>Feeds &amp; messages</string>
</property> </property>
</item> </item>
</widget> <item>
</item> <property name="text">
<item row="1" column="0" colspan="2"> <string>Downloads</string>
<widget class="QDialogButtonBox" name="m_buttonBox"> </property>
<property name="orientation"> </item>
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QStackedWidget" name="m_stackedSettings"> <widget class="QStackedWidget" name="m_stackedSettings">
<property name="currentIndex"> <property name="currentIndex">
<number>6</number> <number>7</number>
</property> </property>
<widget class="QWidget" name="m_pageGeneral"> <widget class="QWidget" name="m_pageGeneral">
<layout class="QFormLayout" name="formLayout_5"> <layout class="QFormLayout" name="formLayout_5">
@ -475,8 +470,8 @@ Authors of this application are NOT responsible for lost data.</string>
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>167</width> <width>695</width>
<height>219</height> <height>425</height>
</rect> </rect>
</property> </property>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
@ -1315,6 +1310,82 @@ Authors of this application are NOT responsible for lost data.</string>
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="m_pageDownloads">
<layout class="QFormLayout" name="formLayout_19">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="1" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>Target directory for downloaded files</string>
</property>
<layout class="QFormLayout" name="formLayout_20">
<item row="1" column="0">
<widget class="QRadioButton" name="m_rbDownloadsAskEachFile">
<property name="text">
<string>Ask for each individual downloaded file</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_12">
<item>
<widget class="QRadioButton" name="m_rbDownloadsSaveAllIntoDirectory">
<property name="text">
<string>Save all downloaded files into</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="m_txtDownloadsTargetDirectory">
<property name="readOnly">
<bool>true</bool>
</property>
<property name="placeholderText">
<string>Target directory where all downloaded files are saved</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="m_btnDownloadsTargetDirectory">
<property name="text">
<string>&amp;Browse</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
<item row="1" column="0" colspan="3">
<widget class="QDialogButtonBox" name="m_buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
@ -1443,5 +1514,37 @@ Authors of this application are NOT responsible for lost data.</string>
</hint> </hint>
</hints> </hints>
</connection> </connection>
<connection>
<sender>m_rbDownloadsAskEachFile</sender>
<signal>toggled(bool)</signal>
<receiver>m_txtDownloadsTargetDirectory</receiver>
<slot>setDisabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>821</x>
<y>50</y>
</hint>
<hint type="destinationlabel">
<x>522</x>
<y>49</y>
</hint>
</hints>
</connection>
<connection>
<sender>m_rbDownloadsAskEachFile</sender>
<signal>toggled(bool)</signal>
<receiver>m_btnDownloadsTargetDirectory</receiver>
<slot>setDisabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>821</x>
<y>50</y>
</hint>
<hint type="destinationlabel">
<x>673</x>
<y>50</y>
</hint>
</hints>
</connection>
</connections> </connections>
</ui> </ui>

1
src/main.cpp
View File

@ -24,6 +24,7 @@
#include "gui/formmain.h" #include "gui/formmain.h"
#include "gui/feedmessageviewer.h" #include "gui/feedmessageviewer.h"
#include "gui/feedsview.h" #include "gui/feedsview.h"
#include "network-web/silentnetworkaccessmanager.h"
// Needed for setting ini file format on Mac OS. // Needed for setting ini file format on Mac OS.
#ifdef Q_OS_MAC #ifdef Q_OS_MAC

28
src/miscellaneous/application.h
View File

@ -26,18 +26,13 @@
#include "miscellaneous/skinfactory.h" #include "miscellaneous/skinfactory.h"
#include "miscellaneous/localization.h" #include "miscellaneous/localization.h"
#include "miscellaneous/databasefactory.h" #include "miscellaneous/databasefactory.h"
#include "miscellaneous/iofactory.h"
#include "gui/systemtrayicon.h" #include "gui/systemtrayicon.h"
#include "network-web/downloadmanager.h" #include "network-web/downloadmanager.h"
#include <QMutex> #include <QMutex>
#include <QList> #include <QList>
#if QT_VERSION >= 0x050000
#include <QStandardPaths>
#else
#include <QDesktopServices>
#endif
#if defined(qApp) #if defined(qApp)
#undef qApp #undef qApp
#endif #endif
@ -128,30 +123,15 @@ class Application : public QtSingleApplication {
} }
inline QString tempFolderPath() { inline QString tempFolderPath() {
#if QT_VERSION >= 0x050000 return IOFactory::getSystemFolder(SYSTEM_FOLDER_ENUM::TempLocation);
QString temp_directory = QStandardPaths::writableLocation(QStandardPaths::TempLocation);
#else
QString temp_directory = QDesktopServices::storageLocation(QDesktopServices::TempLocation);
#endif
return temp_directory;
} }
inline QString documentsFolderPath() { inline QString documentsFolderPath() {
#if QT_VERSION >= 0x050000 return IOFactory::getSystemFolder(SYSTEM_FOLDER_ENUM::DocumentsLocation);
QString doc_directory = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
#else
QString doc_directory = QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation);
#endif
return doc_directory;
} }
inline QString homeFolderPath() { inline QString homeFolderPath() {
#if QT_VERSION >= 0x050000 return IOFactory::getSystemFolder(SYSTEM_FOLDER_ENUM::HomeLocation);
QString home_path = QStandardPaths::writableLocation(QStandardPaths::HomeLocation);
#else
QString home_path = QDesktopServices::storageLocation(QDesktopServices::HomeLocation);
#endif
return home_path;
} }
bool backupDatabaseSettings(bool backup_database, bool backup_settings, const QString &target_path, const QString &backup_name); bool backupDatabaseSettings(bool backup_database, bool backup_settings, const QString &target_path, const QString &backup_name);

12
src/miscellaneous/iofactory.cpp
View File

@ -25,6 +25,14 @@
IOFactory::IOFactory() { IOFactory::IOFactory() {
} }
QString IOFactory::getSystemFolder(SYSTEM_FOLDER_ENUM::StandardLocation location) {
#if QT_VERSION >= 0x050000
return SYSTEM_FOLDER_ENUM::writableLocation(location);
#else
return SYSTEM_FOLDER_ENUM::storageLocation(location);
#endif
}
bool IOFactory::copyFile(const QString &source, const QString &destination) { bool IOFactory::copyFile(const QString &source, const QString &destination) {
if (QFile::exists(destination)) { if (QFile::exists(destination)) {
if (!QFile::remove(destination)) { if (!QFile::remove(destination)) {
@ -36,8 +44,8 @@ bool IOFactory::copyFile(const QString &source, const QString &destination) {
} }
bool IOFactory::removeFolder(const QString& directory_name, bool IOFactory::removeFolder(const QString& directory_name,
const QStringList& exception_file_list, const QStringList& exception_file_list,
const QStringList& exception_folder_list) { const QStringList& exception_folder_list) {
bool result = true; bool result = true;
QDir dir(directory_name); QDir dir(directory_name);

14
src/miscellaneous/iofactory.h
View File

@ -20,12 +20,24 @@
#include <QStringList> #include <QStringList>
#if QT_VERSION >= 0x050000
#include <QStandardPaths>
#define SYSTEM_FOLDER_ENUM QStandardPaths
#else
#include <QDesktopServices>
#define SYSTEM_FOLDER_ENUM QDesktopServices
#endif
class IOFactory { class IOFactory {
private: private:
IOFactory(); IOFactory();
public: public:
// Returns system-wide folder according to type.
static QString getSystemFolder(SYSTEM_FOLDER_ENUM::StandardLocation location);
// Copies file, overwrites destination.
static bool copyFile(const QString &source, const QString &destination); static bool copyFile(const QString &source, const QString &destination);
// Copy whole directory recursively. // Copy whole directory recursively.

9
src/miscellaneous/settings.cpp
View File

@ -150,6 +150,15 @@ DVALUE(bool) General::RemoveTrolltechJunkDef = false;
DKEY General::Language = "language"; DKEY General::Language = "language";
DVALUE(QString) General::LanguageDef = QLocale::system().name(); DVALUE(QString) General::LanguageDef = QLocale::system().name();
// Downloads.
DKEY Downloads::ID = "download_manager";
DKEY Downloads::AlwaysPromptForFilename = "prompt_for_filename";
DVALUE(bool) Downloads::AlwaysPromptForFilenameDef = false;
DKEY Downloads::TargetDirectory = "target_directory";
DVALUE(QString) Downloads::TargetDirectoryDef = IOFactory::getSystemFolder(SYSTEM_FOLDER_ENUM::DesktopLocation);
// Proxy. // Proxy.
DKEY Proxy::ID = "proxy"; DKEY Proxy::ID = "proxy";

11
src/miscellaneous/settings.h
View File

@ -164,6 +164,17 @@ namespace General {
VALUE(QString) LanguageDef; VALUE(QString) LanguageDef;
} }
// Downloads.
namespace Downloads {
KEY ID;
KEY AlwaysPromptForFilename;
VALUE(bool) AlwaysPromptForFilenameDef;
KEY TargetDirectory;
VALUE(QString) TargetDirectoryDef;
}
// Proxy. // Proxy.
namespace Proxy { namespace Proxy {
KEY ID; KEY ID;

7
src/network-web/downloader.cpp
View File

@ -31,7 +31,7 @@ Downloader::Downloader(QObject *parent)
m_timer->setSingleShot(true); m_timer->setSingleShot(true);
connect(m_timer, SIGNAL(timeout()), this, SLOT(timeout())); connect(m_timer, SIGNAL(timeout()), this, SLOT(timeout()));
connect(m_downloadManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(finished(QNetworkReply*))); //connect(m_downloadManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(finished(QNetworkReply*)));
} }
Downloader::~Downloader() { Downloader::~Downloader() {
@ -67,7 +67,9 @@ void Downloader::downloadFile(const QString &url, int timeout, bool protected_co
runGetRequest(request); runGetRequest(request);
} }
void Downloader::finished(QNetworkReply *reply) { void Downloader::finished() {
QNetworkReply *reply = static_cast<QNetworkReply*>(sender());
m_timer->stop(); m_timer->stop();
// In this phase, some part of downloading process is completed. // In this phase, some part of downloading process is completed.
@ -124,6 +126,7 @@ void Downloader::runGetRequest(const QNetworkRequest &request) {
m_activeReply = m_downloadManager->get(request); m_activeReply = m_downloadManager->get(request);
connect(m_activeReply, SIGNAL(downloadProgress(qint64,qint64)), this, SLOT(progressInternal(qint64,qint64))); connect(m_activeReply, SIGNAL(downloadProgress(qint64,qint64)), this, SLOT(progressInternal(qint64,qint64)));
connect(m_activeReply, SIGNAL(finished()), this, SLOT(finished()));
} }
QVariant Downloader::lastContentType() const { QVariant Downloader::lastContentType() const {

2
src/network-web/downloader.h
View File

@ -56,7 +56,7 @@ class Downloader : public QObject {
private slots: private slots:
// Called when current reply is processed. // Called when current reply is processed.
void finished(QNetworkReply *reply); void finished();
// Called when progress of downloaded file changes. // Called when progress of downloaded file changes.
void progressInternal(qint64 bytes_received, qint64 bytes_total); void progressInternal(qint64 bytes_received, qint64 bytes_total);

17
src/network-web/downloaditem.ui
View File

@ -46,7 +46,7 @@
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="SqueezeLabel" name="fileNameLabel" native="true"> <widget class="SqueezeLabel" name="m_fileNameLabel" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -59,7 +59,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="SqueezeLabel" name="downloadInfoLabel" native="true"> <widget class="SqueezeLabel" name="m_lblInfoDownload" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred"> <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -79,21 +79,28 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="text"> <property name="text">
<string>Try again</string> <string>&amp;Try again</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="stopButton"> <widget class="QToolButton" name="stopButton">
<property name="text"> <property name="text">
<string>Stop</string> <string>&amp;Stop</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QToolButton" name="openButton"> <widget class="QToolButton" name="openButton">
<property name="text"> <property name="text">
<string>Open file</string> <string>&amp;Open file</string>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="toolButton">
<property name="text">
<string>Open &amp;folder</string>
</property> </property>
</widget> </widget>
</item> </item>

364
src/network-web/downloadmanager.cpp
View File

@ -22,6 +22,7 @@
#include "gui/formmain.h" #include "gui/formmain.h"
#include "gui/tabwidget.h" #include "gui/tabwidget.h"
#include "network-web/silentnetworkaccessmanager.h" #include "network-web/silentnetworkaccessmanager.h"
#include "network-web/webbrowsernetworkaccessmanager.h"
#include <math.h> #include <math.h>
@ -39,58 +40,52 @@
#include <QWebSettings> #include <QWebSettings>
DownloadItem::DownloadItem(QNetworkReply *reply, bool request_file_name, QWidget *parent) : QWidget(parent), m_reply(reply), DownloadItem::DownloadItem(QNetworkReply *reply, bool request_file_name, QWidget *parent) : QWidget(parent),
m_ui(new Ui::DownloadItem), m_reply(reply),
m_bytesReceived(0), m_requestFileName(request_file_name), m_startedSaving(false), m_finishedDownloading(false), m_bytesReceived(0), m_requestFileName(request_file_name), m_startedSaving(false), m_finishedDownloading(false),
m_gettingFileName(false), m_canceledFileSelect(false) { m_gettingFileName(false), m_canceledFileSelect(false) {
setupUi(this); m_ui->setupUi(this);
m_ui->tryAgainButton->hide();
tryAgainButton->hide(); connect(m_ui->stopButton, SIGNAL(clicked()), this, SLOT(stop()));
connect(m_ui->openButton, SIGNAL(clicked()), this, SLOT(openFile()));
connect(stopButton, SIGNAL(clicked()), this, SLOT(stop())); connect(m_ui->tryAgainButton, SIGNAL(clicked()), this, SLOT(tryAgain()));
connect(openButton, SIGNAL(clicked()), this, SLOT(openFile()));
connect(tryAgainButton, SIGNAL(clicked()), this, SLOT(tryAgain()));
if (!request_file_name) { if (!request_file_name) {
QSettings settings; m_requestFileName = qApp->settings()->value(GROUP(Downloads), SETTING(Downloads::AlwaysPromptForFilename)).toBool();
settings.beginGroup(QLatin1String("downloadmanager"));
m_requestFileName = settings.value(QLatin1String("alwaysPromptForFileName"), false).toBool();
} }
/*if (reply != NULL) {
reply->deleteLater();
}*/
init(); init();
} }
DownloadItem::~DownloadItem() {
delete m_ui;
}
void DownloadItem::init() { void DownloadItem::init() {
if (!m_reply) if (m_reply == NULL) {
return; return;
}
m_startedSaving = false; m_startedSaving = false;
m_finishedDownloading = false; m_finishedDownloading = false;
m_ui->openButton->setEnabled(false);
openButton->setEnabled(false); m_ui->toolButton->setEnabled(false);
// attach to the m_reply
m_url = m_reply->url(); m_url = m_reply->url();
m_reply->setParent(this); m_reply->setParent(this);
connect(m_reply, SIGNAL(readyRead()), this, SLOT(downloadReadyRead()));
connect(m_reply, SIGNAL(error(QNetworkReply::NetworkError)),
this, SLOT(error(QNetworkReply::NetworkError)));
connect(m_reply, SIGNAL(downloadProgress(qint64, qint64)),
this, SLOT(downloadProgress(qint64, qint64)));
connect(m_reply, SIGNAL(metaDataChanged()),
this, SLOT(metaDataChanged()));
connect(m_reply, SIGNAL(finished()),
this, SLOT(finished()));
// reset info connect(m_reply, SIGNAL(readyRead()), this, SLOT(downloadReadyRead()));
downloadInfoLabel->clear(); connect(m_reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(error(QNetworkReply::NetworkError)));
progressBar->setValue(0); connect(m_reply, SIGNAL(downloadProgress(qint64, qint64)), this, SLOT(downloadProgress(qint64, qint64)));
connect(m_reply, SIGNAL(metaDataChanged()), this, SLOT(metaDataChanged()));
connect(m_reply, SIGNAL(finished()), this, SLOT(finished()));
// Reset info.
m_ui->m_lblInfoDownload->clear();
m_ui->progressBar->setValue(0);
getFileName(); getFileName();
// start timer for the download estimation // Start timer for the download estimation.
m_downloadTime.start(); m_downloadTime.start();
if (m_reply->error() != QNetworkReply::NoError) { if (m_reply->error() != QNetworkReply::NoError) {
@ -99,82 +94,95 @@ void DownloadItem::init() {
} }
} }
void DownloadItem::getFileName() void DownloadItem::getFileName() {
{ if (m_gettingFileName) {
if (m_gettingFileName)
return; return;
}
QString downloadDirectory = qApp->downloadManager()->downloadDirectory(); QString download_directory = qApp->downloadManager()->downloadDirectory();
QString default_filename = saveFileName(download_directory);
QString chosen_filename = default_filename;
QString defaultFileName = saveFileName(downloadDirectory);
QString fileName = defaultFileName;
if (m_requestFileName) { if (m_requestFileName) {
m_gettingFileName = true; m_gettingFileName = true;
fileName = QFileDialog::getSaveFileName(this, tr("Save File"), defaultFileName); chosen_filename = QFileDialog::getSaveFileName(this, tr("Select destination for downloaded file"), default_filename);
m_gettingFileName = false; m_gettingFileName = false;
if (fileName.isEmpty()) {
progressBar->setVisible(false); if (chosen_filename.isEmpty()) {
stop(); stop();
fileNameLabel->setText(tr("Download canceled: %1").arg(QFileInfo(defaultFileName).fileName()));
m_ui->progressBar->setVisible(false);
m_ui->m_fileNameLabel->setText(tr("Download for %1 cancelled").arg(QFileInfo(default_filename).fileName()));
m_canceledFileSelect = true; m_canceledFileSelect = true;
return; return;
} }
QFileInfo fileInfo = QFileInfo(fileName);
qApp->downloadManager()->setDownloadDirectory(fileInfo.absoluteDir().absolutePath()); QFileInfo file_info = QFileInfo(chosen_filename);
fileNameLabel->setText(fileInfo.fileName());
qApp->downloadManager()->setDownloadDirectory(file_info.absoluteDir().absolutePath());
m_ui->m_fileNameLabel->setText(file_info.fileName());
} }
m_output.setFileName(fileName);
m_output.setFileName(chosen_filename);
// Check file path for saving. // Check file path for saving.
QDir saveDirPath = QFileInfo(m_output.fileName()).dir(); QDir save_dir = QFileInfo(m_output.fileName()).dir();
if (!saveDirPath.exists()) {
if (!saveDirPath.mkpath(saveDirPath.absolutePath())) { if (!save_dir.exists() && !save_dir.mkpath(save_dir.absolutePath())) {
progressBar->setVisible(false); stop();
stop();
downloadInfoLabel->setText(tr("Download directory (%1) couldn't be created.").arg(saveDirPath.absolutePath())); m_ui->progressBar->setVisible(false);
return; m_ui->m_lblInfoDownload->setText(tr("Download directory %1 couldn't be created").arg(QDir::toNativeSeparators(save_dir.absolutePath())));
} return;
} }
fileNameLabel->setText(QFileInfo(m_output.fileName()).fileName()); m_ui->m_fileNameLabel->setText(QFileInfo(m_output.fileName()).fileName());
if (m_requestFileName)
if (m_requestFileName) {
downloadReadyRead(); downloadReadyRead();
}
} }
QString DownloadItem::saveFileName(const QString &directory) const QString DownloadItem::saveFileName(const QString &directory) const {
{
// Move this function into QNetworkReply to also get file name sent from the server
QString path; QString path;
if (m_reply->hasRawHeader("Content-Disposition")) { if (m_reply->hasRawHeader("Content-Disposition")) {
QString value = QLatin1String(m_reply->rawHeader("Content-Disposition")); QString value = QLatin1String(m_reply->rawHeader("Content-Disposition"));
int pos = value.indexOf(QLatin1String("filename=")); int pos = value.indexOf(QLatin1String("filename="));
if (pos != -1) { if (pos != -1) {
QString name = value.mid(pos + 9); QString name = value.mid(pos + 9);
if (name.startsWith(QLatin1Char('"')) && name.endsWith(QLatin1Char('"')))
if (name.startsWith(QLatin1Char('"')) && name.endsWith(QLatin1Char('"'))) {
name = name.mid(1, name.size() - 2); name = name.mid(1, name.size() - 2);
}
path = name; path = name;
} }
} }
if (path.isEmpty())
if (path.isEmpty()) {
path = m_url.path(); path = m_url.path();
QFileInfo info(path);
QString baseName = info.completeBaseName();
QString endName = info.suffix();
if (baseName.isEmpty()) {
baseName = QLatin1String("unnamed_download");
} }
if (!endName.isEmpty()) QFileInfo info(path);
endName = QLatin1Char('.') + endName; QString base_name = info.completeBaseName();
QString end_name = info.suffix();
QString name = directory + baseName + endName; if (base_name.isEmpty()) {
base_name = QLatin1String("unnamed_download");
}
if (!end_name.isEmpty()) {
end_name = QLatin1Char('.') + end_name;
}
QString name = directory + base_name + end_name;
if (!m_requestFileName && QFile::exists(name)) { if (!m_requestFileName && QFile::exists(name)) {
// already exists, don't overwrite // already exists, don't overwrite
int i = 1; int i = 1;
do { do {
name = directory + baseName + QLatin1Char('-') + QString::number(i++) + endName; name = directory + base_name + QLatin1Char('-') + QString::number(i++) + end_name;
} while (QFile::exists(name)); } while (QFile::exists(name));
} }
return name; return name;
@ -183,10 +191,10 @@ QString DownloadItem::saveFileName(const QString &directory) const
void DownloadItem::stop() void DownloadItem::stop()
{ {
setUpdatesEnabled(false); setUpdatesEnabled(false);
stopButton->setEnabled(false); m_ui->stopButton->setEnabled(false);
stopButton->hide(); m_ui->stopButton->hide();
tryAgainButton->setEnabled(true); m_ui->tryAgainButton->setEnabled(true);
tryAgainButton->show(); m_ui->tryAgainButton->show();
setUpdatesEnabled(true); setUpdatesEnabled(true);
m_reply->abort(); m_reply->abort();
emit downloadFinished(); emit downloadFinished();
@ -199,15 +207,19 @@ void DownloadItem::openFile() {
QDesktopServices::openUrl(url); QDesktopServices::openUrl(url);
} }
void DownloadItem::openFolder() {
// TODO: pouze na windows, otevrit explorer, jinde schovat tlacitko Open folder.
}
void DownloadItem::tryAgain() { void DownloadItem::tryAgain() {
if (!tryAgainButton->isEnabled()) if (!m_ui->tryAgainButton->isEnabled())
return; return;
tryAgainButton->setEnabled(false); m_ui->tryAgainButton->setEnabled(false);
tryAgainButton->setVisible(false); m_ui->tryAgainButton->setVisible(false);
stopButton->setEnabled(true); m_ui->stopButton->setEnabled(true);
stopButton->setVisible(true); m_ui->stopButton->setVisible(true);
progressBar->setVisible(true); m_ui->progressBar->setVisible(true);
QNetworkReply *r = qApp->downloadManager()->networkManager()->get(QNetworkRequest(m_url)); QNetworkReply *r = qApp->downloadManager()->networkManager()->get(QNetworkRequest(m_url));
if (m_reply) if (m_reply)
@ -228,8 +240,8 @@ void DownloadItem::downloadReadyRead()
if (!m_requestFileName) if (!m_requestFileName)
getFileName(); getFileName();
if (!m_output.open(QIODevice::WriteOnly)) { if (!m_output.open(QIODevice::WriteOnly)) {
downloadInfoLabel->setText(tr("Error opening output file: %1") m_ui->m_lblInfoDownload->setText(tr("Error opening output file: %1")
.arg(m_output.errorString())); .arg(m_output.errorString()));
stop(); stop();
emit statusChanged(); emit statusChanged();
return; return;
@ -237,9 +249,9 @@ void DownloadItem::downloadReadyRead()
emit statusChanged(); emit statusChanged();
} }
if (-1 == m_output.write(m_reply->readAll())) { if (-1 == m_output.write(m_reply->readAll())) {
downloadInfoLabel->setText(tr("Error saving: %1") m_ui->m_lblInfoDownload->setText(tr("Error saving: %1")
.arg(m_output.errorString())); .arg(m_output.errorString()));
stopButton->click(); m_ui->stopButton->click();
} else { } else {
m_startedSaving = true; m_startedSaving = true;
if (m_finishedDownloading) if (m_finishedDownloading)
@ -249,9 +261,10 @@ void DownloadItem::downloadReadyRead()
void DownloadItem::error(QNetworkReply::NetworkError) void DownloadItem::error(QNetworkReply::NetworkError)
{ {
downloadInfoLabel->setText(tr("Network Error: %1").arg(m_reply->errorString())); m_ui->m_lblInfoDownload->setText(tr("Error: %1").arg(m_reply->errorString()));
tryAgainButton->setEnabled(true); m_ui->tryAgainButton->setEnabled(true);
tryAgainButton->setVisible(true); m_ui->tryAgainButton->setVisible(true);
emit downloadFinished(); emit downloadFinished();
} }
@ -267,34 +280,33 @@ void DownloadItem::metaDataChanged()
} }
} }
void DownloadItem::downloadProgress(qint64 bytesReceived, qint64 bytesTotal) void DownloadItem::downloadProgress(qint64 bytes_received, qint64 bytes_total) {
{
QTime now = QTime::currentTime(); QTime now = QTime::currentTime();
if (m_lastProgressTime.msecsTo(now) < 200) if (m_lastProgressTime.msecsTo(now) < 25)
return; return;
m_lastProgressTime = now; m_lastProgressTime = now;
m_bytesReceived = bytesReceived; m_bytesReceived = bytes_received;
qint64 currentValue = 0; qint64 currentValue = 0;
qint64 totalValue = 0; qint64 totalValue = 0;
if (bytesTotal > 0) { if (bytes_total > 0) {
currentValue = bytesReceived * 100 / bytesTotal; currentValue = bytes_received * 100 / bytes_total;
totalValue = 100; totalValue = 100;
} }
progressBar->setValue(currentValue); m_ui->progressBar->setValue(currentValue);
progressBar->setMaximum(totalValue); m_ui->progressBar->setMaximum(totalValue);
emit progress(currentValue, totalValue); emit progress(currentValue, totalValue);
updateInfoLabel(); updateInfoLabel();
} }
qint64 DownloadItem::bytesTotal() const qint64 DownloadItem::bytes_total() const
{ {
return m_reply->header(QNetworkRequest::ContentLengthHeader).toULongLong(); return m_reply->header(QNetworkRequest::ContentLengthHeader).toULongLong();
} }
qint64 DownloadItem::bytesReceived() const qint64 DownloadItem::bytes_received() const
{ {
return m_bytesReceived; return m_bytesReceived;
} }
@ -304,7 +316,7 @@ double DownloadItem::remainingTime() const
if (!downloading()) if (!downloading())
return -1.0; return -1.0;
double timeRemaining = ((double)(bytesTotal() - bytesReceived())) / currentSpeed(); double timeRemaining = ((double)(bytes_total() - bytes_received())) / currentSpeed();
// When downloading the eta should never be 0 // When downloading the eta should never be 0
if (timeRemaining == 0) if (timeRemaining == 0)
@ -354,17 +366,17 @@ void DownloadItem::updateInfoLabel()
.arg(DownloadManager::dataString(m_bytesReceived)) .arg(DownloadManager::dataString(m_bytesReceived))
.arg(DownloadManager::dataString(bytesTotal)); .arg(DownloadManager::dataString(bytesTotal));
} }
downloadInfoLabel->setText(info); m_ui->m_lblInfoDownload->setText(info);
} }
bool DownloadItem::downloading() const bool DownloadItem::downloading() const
{ {
return (progressBar->isVisible()); return (m_ui->progressBar->isVisible());
} }
bool DownloadItem::downloadedSuccessfully() const bool DownloadItem::downloadedSuccessfully() const
{ {
return (stopButton->isHidden() && tryAgainButton->isHidden()); return (m_ui->stopButton->isHidden() && m_ui->tryAgainButton->isHidden());
} }
void DownloadItem::finished() void DownloadItem::finished()
@ -373,44 +385,30 @@ void DownloadItem::finished()
if (!m_startedSaving) { if (!m_startedSaving) {
return; return;
} }
progressBar->hide(); m_ui->progressBar->hide();
stopButton->setEnabled(false); m_ui->stopButton->setEnabled(false);
stopButton->hide(); m_ui->stopButton->hide();
openButton->setEnabled(true); m_ui->openButton->setEnabled(true);
m_ui->toolButton->setEnabled(true);
m_output.close(); m_output.close();
updateInfoLabel(); updateInfoLabel();
emit statusChanged(); emit statusChanged();
emit downloadFinished(); emit downloadFinished();
} }
/*! DownloadManager::DownloadManager(QWidget *parent) : TabContent(parent), m_ui(new Ui::DownloadManager),
DownloadManager is a Dialog that contains a list of DownloadItems m_autoSaver(new AutoSaver(this)), m_model(new DownloadModel(this)),
m_networkManager(WebBrowserNetworkAccessManager::instance()), m_iconProvider(0), m_removePolicy(Never) {
m_ui->setupUi(this);
m_ui->downloadsView->setShowGrid(false);
m_ui->downloadsView->verticalHeader()->hide();
m_ui->downloadsView->horizontalHeader()->hide();
m_ui->downloadsView->setAlternatingRowColors(true);
m_ui->downloadsView->horizontalHeader()->setStretchLastSection(true);
m_ui->downloadsView->setModel(m_model);
It is a basic download manager. It only downloads the file, doesn't do BitTorrent, setDownloadDirectory(qApp->settings()->value(GROUP(Downloads), SETTING(Downloads::TargetDirectory)).toString());
extract zipped files or anything fancy. connect(m_ui->cleanupButton, SIGNAL(clicked()), this, SLOT(cleanup()));
*/
DownloadManager::DownloadManager(QWidget *parent)
: TabContent(parent)
, m_autoSaver(new AutoSaver(this))
, m_model(new DownloadModel(this))
, m_networkManager(new SilentNetworkAccessManager(this))
, m_iconProvider(0)
, m_removePolicy(Never)
{
setupUi(this);
QSettings settings;
settings.beginGroup(QLatin1String("downloadmanager"));
QString defaultLocation = QDesktopServices::storageLocation(QDesktopServices::DesktopLocation);
setDownloadDirectory(settings.value(QLatin1String("downloadDirectory"), defaultLocation).toString());
downloadsView->setShowGrid(false);
downloadsView->verticalHeader()->hide();
downloadsView->horizontalHeader()->hide();
downloadsView->setAlternatingRowColors(true);
downloadsView->horizontalHeader()->setStretchLastSection(true);
downloadsView->setModel(m_model);
connect(cleanupButton, SIGNAL(clicked()), this, SLOT(cleanup()));
load(); load();
} }
@ -418,22 +416,25 @@ DownloadManager::~DownloadManager()
{ {
m_autoSaver->changeOccurred(); m_autoSaver->changeOccurred();
m_autoSaver->saveIfNeccessary(); m_autoSaver->saveIfNeccessary();
if (m_iconProvider)
if (m_iconProvider) {
delete m_iconProvider; delete m_iconProvider;
}
delete m_ui;
} }
int DownloadManager::activeDownloads() const int DownloadManager::activeDownloads() const
{ {
int count = 0; int count = 0;
for (int i = 0; i < m_downloads.count(); ++i) { for (int i = 0; i < m_downloads.count(); ++i) {
if (m_downloads.at(i)->stopButton->isEnabled()) if (m_downloads.at(i)->m_ui->stopButton->isEnabled())
++count; ++count;
} }
return count; return count;
} }
bool DownloadManager::allowQuit() bool DownloadManager::allowQuit() {
{
if (activeDownloads() >= 1) { if (activeDownloads() >= 1) {
int choice = QMessageBox::warning(this, QString(), int choice = QMessageBox::warning(this, QString(),
tr("There are %1 downloads in progress\n" tr("There are %1 downloads in progress\n"
@ -449,19 +450,19 @@ bool DownloadManager::allowQuit()
return true; return true;
} }
void DownloadManager::download(const QNetworkRequest &request, bool requestFileName) void DownloadManager::download(const QNetworkRequest &request, bool request_filename)
{ {
if (request.url().isEmpty()) if (request.url().isEmpty())
return; return;
handleUnsupportedContent(m_networkManager->get(request), requestFileName); handleUnsupportedContent(m_networkManager->get(request), request_filename);
} }
void DownloadManager::download(const QUrl &url, bool requestFileName) { void DownloadManager::download(const QUrl &url, bool request_filename) {
download(QNetworkRequest(url), requestFileName); download(QNetworkRequest(url), request_filename);
} }
void DownloadManager::handleUnsupportedContent(QNetworkReply *reply, bool requestFileName) void DownloadManager::handleUnsupportedContent(QNetworkReply *reply, bool request_filename)
{ {
if (reply == NULL || reply->url().isEmpty()) { if (reply == NULL || reply->url().isEmpty()) {
return; return;
@ -475,50 +476,37 @@ void DownloadManager::handleUnsupportedContent(QNetworkReply *reply, bool reques
return; return;
} }
DownloadItem *item = new DownloadItem(reply, requestFileName, this); DownloadItem *item = new DownloadItem(reply, request_filename, this);
addItem(item); addItem(item);
if (item->m_canceledFileSelect) { if (item->m_canceledFileSelect) {
return; return;
} }
// TODO: zobrazit ted.
qApp->mainForm()->tabWidget()->showDownloadManager(); qApp->mainForm()->tabWidget()->showDownloadManager();
} }
void DownloadManager::addItem(DownloadItem *item) void DownloadManager::addItem(DownloadItem *item) {
{
connect(item, SIGNAL(statusChanged()), this, SLOT(updateRow())); connect(item, SIGNAL(statusChanged()), this, SLOT(updateRow()));
connect(item, SIGNAL(downloadFinished()), this, SLOT(finished())); connect(item, SIGNAL(downloadFinished()), this, SLOT(finished()));
int row = m_downloads.count(); int row = m_downloads.count();
m_model->beginInsertRows(QModelIndex(), row, row); m_model->beginInsertRows(QModelIndex(), row, row);
m_downloads.append(item); m_downloads.append(item);
m_model->endInsertRows(); m_model->endInsertRows();
downloadsView->setIndexWidget(m_model->index(row, 0), item); m_ui->downloadsView->setIndexWidget(m_model->index(row, 0), item);
QIcon icon = style()->standardIcon(QStyle::SP_FileIcon); QIcon icon = style()->standardIcon(QStyle::SP_FileIcon);
item->fileIcon->setPixmap(icon.pixmap(48, 48)); item->m_ui->fileIcon->setPixmap(icon.pixmap(48, 48));
downloadsView->setRowHeight(row, item->sizeHint().height()); m_ui->downloadsView->setRowHeight(row, item->sizeHint().height());
updateRow(item); //incase download finishes before the constructor returns updateRow(item); //incase download finishes before the constructor returns
updateActiveItemCount();
} }
void DownloadManager::updateActiveItemCount() QNetworkAccessManager *DownloadManager::networkManager() const {
{
int acCount = activeDownloads();
if (acCount > 0) {
setWindowTitle(QApplication::translate("DownloadDialog", "Downloading %1", 0, QApplication::UnicodeUTF8).arg(acCount));
} else {
setWindowTitle(QApplication::translate("DownloadDialog", "Downloads", 0, QApplication::UnicodeUTF8));
}
}
QNetworkAccessManager *DownloadManager::networkManager() const
{
return m_networkManager; return m_networkManager;
} }
void DownloadManager::finished() void DownloadManager::finished()
{ {
updateActiveItemCount();
if (isVisible()) { if (isVisible()) {
QApplication::alert(this); QApplication::alert(this);
} }
@ -540,10 +528,10 @@ void DownloadManager::updateRow(DownloadItem *item)
QIcon icon = m_iconProvider->icon(item->m_output.fileName()); QIcon icon = m_iconProvider->icon(item->m_output.fileName());
if (icon.isNull()) if (icon.isNull())
icon = style()->standardIcon(QStyle::SP_FileIcon); icon = style()->standardIcon(QStyle::SP_FileIcon);
item->fileIcon->setPixmap(icon.pixmap(48, 48)); item->m_ui->fileIcon->setPixmap(icon.pixmap(48, 48));
int oldHeight = downloadsView->rowHeight(row); int oldHeight = m_ui->downloadsView->rowHeight(row);
downloadsView->setRowHeight(row, qMax(oldHeight, item->minimumSizeHint().height())); m_ui->downloadsView->setRowHeight(row, qMax(oldHeight, item->minimumSizeHint().height()));
bool remove = false; bool remove = false;
QWebSettings *globalSettings = QWebSettings::globalSettings(); QWebSettings *globalSettings = QWebSettings::globalSettings();
@ -558,7 +546,7 @@ void DownloadManager::updateRow(DownloadItem *item)
if (remove) if (remove)
m_model->removeRow(row); m_model->removeRow(row);
cleanupButton->setEnabled(m_downloads.count() - activeDownloads() > 0); m_ui->cleanupButton->setEnabled(m_downloads.count() - activeDownloads() > 0);
} }
DownloadManager::RemovePolicy DownloadManager::removePolicy() const DownloadManager::RemovePolicy DownloadManager::removePolicy() const
@ -620,21 +608,20 @@ void DownloadManager::load()
QString fileName = settings.value(key + QLatin1String("location")).toString(); QString fileName = settings.value(key + QLatin1String("location")).toString();
bool done = settings.value(key + QLatin1String("done"), true).toBool(); bool done = settings.value(key + QLatin1String("done"), true).toBool();
if (!url.isEmpty() && !fileName.isEmpty()) { if (!url.isEmpty() && !fileName.isEmpty()) {
DownloadItem *item = new DownloadItem(0, this); DownloadItem *item = new DownloadItem(0, false, this);
item->m_output.setFileName(fileName); item->m_output.setFileName(fileName);
item->fileNameLabel->setText(QFileInfo(item->m_output.fileName()).fileName()); item->m_ui->m_fileNameLabel->setText(QFileInfo(item->m_output.fileName()).fileName());
item->m_url = url; item->m_url = url;
item->stopButton->setVisible(false); item->m_ui->stopButton->setVisible(false);
item->stopButton->setEnabled(false); item->m_ui->stopButton->setEnabled(false);
item->tryAgainButton->setVisible(!done); item->m_ui->tryAgainButton->setVisible(!done);
item->tryAgainButton->setEnabled(!done); item->m_ui->tryAgainButton->setEnabled(!done);
item->progressBar->setVisible(false); item->m_ui->progressBar->setVisible(false);
addItem(item); addItem(item);
} }
key = QString(QLatin1String("download_%1_")).arg(++i); key = QString(QLatin1String("download_%1_")).arg(++i);
} }
cleanupButton->setEnabled(m_downloads.count() - activeDownloads() > 0); m_ui->cleanupButton->setEnabled(m_downloads.count() - activeDownloads() > 0);
updateActiveItemCount();
} }
void DownloadManager::cleanup() void DownloadManager::cleanup()
@ -642,7 +629,6 @@ void DownloadManager::cleanup()
if (m_downloads.isEmpty()) if (m_downloads.isEmpty())
return; return;
m_model->removeRows(0, m_downloads.count()); m_model->removeRows(0, m_downloads.count());
updateActiveItemCount();
if (m_downloads.isEmpty() && m_iconProvider) { if (m_downloads.isEmpty() && m_iconProvider) {
delete m_iconProvider; delete m_iconProvider;
m_iconProvider = 0; m_iconProvider = 0;
@ -662,18 +648,18 @@ QString DownloadManager::downloadDirectory()
return m_downloadDirectory; return m_downloadDirectory;
} }
QString DownloadManager::timeString(double timeRemaining) QString DownloadManager::timeString(double time_remaining)
{ {
QString remaining; QString remaining;
if (timeRemaining > 60) { if (time_remaining > 60) {
timeRemaining = timeRemaining / 60; time_remaining = time_remaining / 60;
timeRemaining = floor(timeRemaining); time_remaining = floor(time_remaining);
remaining = tr("%n minutes remaining", "", int(timeRemaining)); remaining = tr("%n minutes remaining", "", int(time_remaining));
} }
else { else {
timeRemaining = floor(timeRemaining); time_remaining = floor(time_remaining);
remaining = tr("%n seconds remaining", "", int(timeRemaining)); remaining = tr("%n seconds remaining", "", int(time_remaining));
} }
return remaining; return remaining;
@ -701,9 +687,9 @@ QString DownloadManager::dataString(qint64 size)
return QString(QLatin1String("%1 %2")).arg(newSize, 0, 'f', 1).arg(unit); return QString(QLatin1String("%1 %2")).arg(newSize, 0, 'f', 1).arg(unit);
} }
DownloadModel::DownloadModel(DownloadManager *downloadManager, QObject *parent) DownloadModel::DownloadModel(DownloadManager *download_manager, QObject *parent)
: QAbstractListModel(parent) : QAbstractListModel(parent)
, m_downloadManager(downloadManager) , m_downloadManager(download_manager)
{ {
} }
@ -713,7 +699,7 @@ QVariant DownloadModel::data(const QModelIndex &index, int role) const
return QVariant(); return QVariant();
if (role == Qt::ToolTipRole) if (role == Qt::ToolTipRole)
if (!m_downloadManager->m_downloads.at(index.row())->downloadedSuccessfully()) if (!m_downloadManager->m_downloads.at(index.row())->downloadedSuccessfully())
return m_downloadManager->m_downloads.at(index.row())->downloadInfoLabel->text(); return m_downloadManager->m_downloads.at(index.row())->m_ui->m_lblInfoDownload->text();
return QVariant(); return QVariant();
} }
@ -730,7 +716,7 @@ bool DownloadModel::removeRows(int row, int count, const QModelIndex &parent)
int lastRow = row + count - 1; int lastRow = row + count - 1;
for (int i = lastRow; i >= row; --i) { for (int i = lastRow; i >= row; --i) {
if (m_downloadManager->m_downloads.at(i)->downloadedSuccessfully() if (m_downloadManager->m_downloads.at(i)->downloadedSuccessfully()
|| m_downloadManager->m_downloads.at(i)->tryAgainButton->isEnabled()) { || m_downloadManager->m_downloads.at(i)->m_ui->tryAgainButton->isEnabled()) {
beginRemoveRows(parent, i, i); beginRemoveRows(parent, i, i);
m_downloadManager->m_downloads.takeAt(i)->deleteLater(); m_downloadManager->m_downloads.takeAt(i)->deleteLater();
endRemoveRows(); endRemoveRows();

32
src/network-web/downloadmanager.h
View File

@ -33,7 +33,7 @@ class DownloadModel;
class QFileIconProvider; class QFileIconProvider;
class QMimeData; class QMimeData;
class DownloadItem : public QWidget, public Ui_DownloadItem { class DownloadItem : public QWidget {
Q_OBJECT Q_OBJECT
friend class DownloadManager; friend class DownloadManager;
@ -41,12 +41,13 @@ class DownloadItem : public QWidget, public Ui_DownloadItem {
public: public:
explicit DownloadItem(QNetworkReply *reply = 0, bool request_file_name = false, QWidget *parent = 0); explicit DownloadItem(QNetworkReply *reply = 0, bool request_file_name = false, QWidget *parent = 0);
virtual ~DownloadItem();
bool downloading() const; bool downloading() const;
bool downloadedSuccessfully() const; bool downloadedSuccessfully() const;
qint64 bytesTotal() const; qint64 bytes_total() const;
qint64 bytesReceived() const; qint64 bytes_received() const;
double remainingTime() const; double remainingTime() const;
double currentSpeed() const; double currentSpeed() const;
@ -54,25 +55,26 @@ class DownloadItem : public QWidget, public Ui_DownloadItem {
void stop(); void stop();
void tryAgain(); void tryAgain();
void openFile(); void openFile();
void openFolder();
void downloadReadyRead(); void downloadReadyRead();
void error(QNetworkReply::NetworkError code); void error(QNetworkReply::NetworkError code);
void downloadProgress(qint64 bytesReceived, qint64 bytesTotal); void downloadProgress(qint64 bytes_received, qint64 bytes_total);
void metaDataChanged(); void metaDataChanged();
void finished(); void finished();
signals: signals:
void statusChanged(); void statusChanged();
void progress(qint64 bytesReceived = 0, qint64 bytesTotal = 0); void progress(qint64 bytes_received = 0, qint64 bytes_total = 0);
void downloadFinished(); void downloadFinished();
private: private:
void getFileName(); void getFileName();
void init(); void init();
void updateInfoLabel(); void updateInfoLabel();
QString saveFileName(const QString &directory) const; QString saveFileName(const QString &directory) const;
Ui::DownloadItem *m_ui;
QUrl m_url; QUrl m_url;
QFile m_output; QFile m_output;
QNetworkReply *m_reply; QNetworkReply *m_reply;
@ -86,7 +88,7 @@ class DownloadItem : public QWidget, public Ui_DownloadItem {
bool m_canceledFileSelect; bool m_canceledFileSelect;
}; };
class DownloadManager : public TabContent, public Ui_DownloadManager { class DownloadManager : public TabContent {
Q_OBJECT Q_OBJECT
Q_PROPERTY(RemovePolicy removePolicy READ removePolicy WRITE setRemovePolicy) Q_PROPERTY(RemovePolicy removePolicy READ removePolicy WRITE setRemovePolicy)
Q_ENUMS(RemovePolicy) Q_ENUMS(RemovePolicy)
@ -100,8 +102,8 @@ class DownloadManager : public TabContent, public Ui_DownloadManager {
SuccessFullDownload SuccessFullDownload
}; };
DownloadManager(QWidget *parent = 0); explicit DownloadManager(QWidget *parent = 0);
~DownloadManager(); virtual ~DownloadManager();
WebBrowser *webBrowser(); WebBrowser *webBrowser();
QNetworkAccessManager *networkManager() const; QNetworkAccessManager *networkManager() const;
@ -112,16 +114,16 @@ class DownloadManager : public TabContent, public Ui_DownloadManager {
RemovePolicy removePolicy() const; RemovePolicy removePolicy() const;
void setRemovePolicy(RemovePolicy policy); void setRemovePolicy(RemovePolicy policy);
static QString timeString(double timeRemaining); static QString timeString(double time_remaining);
static QString dataString(qint64 size); static QString dataString(qint64 size);
void setDownloadDirectory(const QString &directory); void setDownloadDirectory(const QString &directory);
QString downloadDirectory(); QString downloadDirectory();
public slots: public slots:
void download(const QNetworkRequest &request, bool requestFileName = false); void download(const QNetworkRequest &request, bool request_filename = false);
void download(const QUrl &url, bool requestFileName = false); void download(const QUrl &url, bool request_filename = false);
void handleUnsupportedContent(QNetworkReply *reply, bool requestFileName = false); void handleUnsupportedContent(QNetworkReply *reply, bool request_filename = false);
void cleanup(); void cleanup();
private slots: private slots:
@ -133,8 +135,8 @@ class DownloadManager : public TabContent, public Ui_DownloadManager {
private: private:
void addItem(DownloadItem *item); void addItem(DownloadItem *item);
void load(); void load();
void updateActiveItemCount();
Ui::DownloadManager *m_ui;
AutoSaver *m_autoSaver; AutoSaver *m_autoSaver;
DownloadModel *m_model; DownloadModel *m_model;
QNetworkAccessManager *m_networkManager; QNetworkAccessManager *m_networkManager;
@ -150,7 +152,7 @@ class DownloadModel : public QAbstractListModel {
friend class DownloadManager; friend class DownloadManager;
public: public:
DownloadModel(DownloadManager *downloadManager, QObject *parent = 0); explicit DownloadModel(DownloadManager *download_manager, QObject *parent = 0);
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
int rowCount(const QModelIndex &parent = QModelIndex()) const; int rowCount(const QModelIndex &parent = QModelIndex()) const;

9
src/network-web/silentnetworkaccessmanager.cpp
View File

@ -17,6 +17,8 @@
#include "network-web/silentnetworkaccessmanager.h" #include "network-web/silentnetworkaccessmanager.h"
#include "miscellaneous/application.h"
#include <QNetworkReply> #include <QNetworkReply>
#include <QAuthenticator> #include <QAuthenticator>
@ -38,15 +40,14 @@ void SilentNetworkAccessManager::onAuthenticationRequired(QNetworkReply *reply,
// This feed contains authentication information, it is good. // This feed contains authentication information, it is good.
authenticator->setUser(originating_object->property("username").toString()); authenticator->setUser(originating_object->property("username").toString());
authenticator->setPassword(originating_object->property("password").toString()); authenticator->setPassword(originating_object->property("password").toString());
reply->setProperty("authentication-given", true);
qDebug("Feed '%s' requested authentication and got it.", qPrintable(reply->url().toString())); qDebug("Feed '%s' requested authentication and got it.", qPrintable(reply->url().toString()));
reply->setProperty("authentication-given", true);
} }
else { else {
reply->setProperty("authentication-given", false);
// Authentication is required but this feed does not contain it. // Authentication is required but this feed does not contain it.
qDebug("Feed '%s' requested authentication but username/password is not available.", qPrintable(reply->url().toString())); qDebug("Feed '%s' requested authentication but username/password is not available.", qPrintable(reply->url().toString()));
reply->setProperty("authentication-given", false);
} }
} }

1
src/network-web/silentnetworkaccessmanager.h
View File

@ -31,6 +31,7 @@ class SilentNetworkAccessManager : public BaseNetworkAccessManager {
virtual ~SilentNetworkAccessManager(); virtual ~SilentNetworkAccessManager();
protected slots: protected slots:
// This cannot do any GUI stuff.
void onAuthenticationRequired(QNetworkReply * reply, QAuthenticator *authenticator); void onAuthenticationRequired(QNetworkReply * reply, QAuthenticator *authenticator);
}; };

4
src/network-web/webbrowsernetworkaccessmanager.h
View File

@ -33,9 +33,7 @@ class WebBrowserNetworkAccessManager : public BaseNetworkAccessManager {
virtual ~WebBrowserNetworkAccessManager(); virtual ~WebBrowserNetworkAccessManager();
// Returns pointer to global network access manager // Returns pointer to global network access manager
// used by ALL web browsers. // used by ALL web browsers and download manager.
// NOTE: All web browsers use shared network access manager,
// which makes setting of custom network settings easy.
static WebBrowserNetworkAccessManager *instance(); static WebBrowserNetworkAccessManager *instance();
protected slots: protected slots: