Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 09:32:12 +01:00
Code Releases Activity

DownloadItem: Show file icon only on Linux

Browse Source
This commit is contained in:
David Rosca 2017-01-20 12:03:27 +01:00
parent 67452c1bf4
commit f791f81972
2 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/lib/downloads/downloaditem.cpp
View File

@ -1,6 +1,6 @@
/* ============================================================ /* ============================================================
* QupZilla - WebKit based browser * QupZilla - Qt web browser
* Copyright (C) 2010-2014 David Rosca <nowrep@gmail.com> * Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -52,7 +52,6 @@ DownloadItem::DownloadItem(QListWidgetItem *item, QWebEngineDownloadItem* downlo
, m_fileName(fileName) , m_fileName(fileName)
, m_downUrl(downloadItem->url()) , m_downUrl(downloadItem->url())
, m_openFile(openFile) , m_openFile(openFile)
, m_validIcon(false)
, m_downloading(false) , m_downloading(false)
, m_downloadStopped(false) , m_downloadStopped(false)
, m_currSpeed(0) , m_currSpeed(0)
@ -85,29 +84,21 @@ void DownloadItem::startDownloading()
m_downloading = true; m_downloading = true;
m_downTimer.start(); m_downTimer.start();
updateDownloadInfo(0, m_download->receivedBytes(), m_download->totalBytes()); updateDownloadInfo(0, m_download->receivedBytes(), m_download->totalBytes());
}
void DownloadItem::updateIcon() #ifdef Q_OS_LINUX
{ // QFileIconProvider uses only suffix on Linux
if (m_validIcon)
return;
// Copy the downloaded file to temp dir and get its icon
QString tempFile = DataPaths::path(DataPaths::Temp) + QL1S("/download_") + m_fileName;
QFile::copy(m_download->path() + QL1S(".download"), tempFile);
QFileIconProvider iconProvider; QFileIconProvider iconProvider;
QFileInfo info(tempFile); QIcon fileIcon = iconProvider.icon(QFileInfo(m_fileName));
QIcon fileIcon = iconProvider.icon(info);
QFile::remove(tempFile);
if (!fileIcon.isNull()) { if (!fileIcon.isNull()) {
ui->fileIcon->setPixmap(fileIcon.pixmap(30)); ui->fileIcon->setPixmap(fileIcon.pixmap(30));
m_validIcon = true; } else {
}
else {
ui->fileIcon->setPixmap(style()->standardIcon(QStyle::SP_FileIcon).pixmap(30)); ui->fileIcon->setPixmap(style()->standardIcon(QStyle::SP_FileIcon).pixmap(30));
} }
#else
ui->fileIcon->hide();
#endif
} }
void DownloadItem::parentResized(const QSize &size) void DownloadItem::parentResized(const QSize &size)
@ -251,8 +242,6 @@ void DownloadItem::updateDownloadInfo(double currSpeed, qint64 received, qint64
else { else {
ui->downloadInfo->setText(tr("Remaining %1 - %2 of %3 (%4)").arg(remTime, currSize, fileSize, speed)); ui->downloadInfo->setText(tr("Remaining %1 - %2 of %3 (%4)").arg(remTime, currSize, fileSize, speed));
} }
updateIcon();
} }
void DownloadItem::stop() void DownloadItem::stop()

6
src/lib/downloads/downloaditem.h
View File

@ -1,6 +1,6 @@
/* ============================================================ /* ============================================================
* QupZilla - WebKit based browser * QupZilla - Qt web browser
* Copyright (C) 2010-2014 David Rosca <nowrep@gmail.com> * Copyright (C) 2010-2017 David Rosca <nowrep@gmail.com>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -72,7 +72,6 @@ private slots:
private: private:
void startDownloading(); void startDownloading();
void updateIcon();
void updateDownloadInfo(double currSpeed, qint64 received, qint64 total); void updateDownloadInfo(double currSpeed, qint64 received, qint64 total);
void mouseDoubleClickEvent(QMouseEvent* e); void mouseDoubleClickEvent(QMouseEvent* e);
@ -87,7 +86,6 @@ private:
QBasicTimer m_timer; QBasicTimer m_timer;
QUrl m_downUrl; QUrl m_downUrl;
bool m_openFile; bool m_openFile;
bool m_validIcon;
bool m_downloading; bool m_downloading;
bool m_downloadStopped; bool m_downloadStopped;