alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Now also cached images loading is async with threads.

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1099054
This commit is contained in:
Davide Bettio 2010-03-04 23:22:24 +00:00
parent 5ed6f6d546
commit 3c262b40ea
2 changed files with 55 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
private/wallpaper_p.h
View File

@ -22,6 +22,7 @@
#define PLASMA_WALLPAPERPRIVATE_H
#include <QtCore/QQueue>
#include <QtCore/QRunnable>
#include <QtCore/QWeakPointer>
#include "plasma/scripting/wallpaperscript.h"
@ -51,6 +52,8 @@ public:
int resizeMethod, const QColor &color) const;
void initScript();
bool findInCache(const QString &key, unsigned int lastModified = 0);
void renderCompleted(WallpaperRenderThread *renderer,int token, const QImage &image,
const QString &sourceImagePath, const QSize &size,
int resizeMethod, const QColor &color);
@ -75,6 +78,21 @@ public:
bool scriptInitialized : 1;
};
class LoadImageThread : public QObject, public QRunnable
{
Q_OBJECT
private:
QString m_filePath;
Q_SIGNALS:
void done(const QImage &pixmap);
public:
LoadImageThread(const QString &filePath);
void run();
};
} // namespace Plasma
#endif

40
wallpaper.cpp
View File

@ -67,6 +67,18 @@ class SaveImageThread : public QRunnable
m_image.save(m_filePath);
}
};
LoadImageThread::LoadImageThread(const QString &filePath)
{
m_filePath = filePath;
}
void LoadImageThread::run()
{
QImage image;
image.load(m_filePath);
emit done(image);
}
class WallpaperWithPaint : public Wallpaper
{
@ -400,9 +412,7 @@ void Wallpaper::render(const QString &sourceImagePath, const QSize &size,
if (d->cacheRendering) {
QFileInfo info(sourceImagePath);
QString cache = d->cacheKey(sourceImagePath, size, resizeMethod, color);
QImage img;
if (findInCache(cache, img, info.lastModified().toTime_t())) {
emit renderCompleted(img);
if (d->findInCache(cache, info.lastModified().toTime_t())) {
return;
}
}
@ -559,6 +569,29 @@ void WallpaperPrivate::initScript()
}
}
bool WallpaperPrivate::findInCache(const QString &key, unsigned int lastModified)
{
if (cacheRendering) {
QString cache = cachePath(key);
if (QFile::exists(cache)) {
if (lastModified > 0) {
QFileInfo info(cache);
if (info.lastModified().toTime_t() < lastModified) {
return false;
}
}
LoadImageThread *loadImageT = new LoadImageThread(cache);
q->connect(loadImageT, SIGNAL(done(const QImage&)), q, SIGNAL(renderCompleted(const QImage&)));
QThreadPool::globalInstance()->start(loadImageT);
return true;
}
}
return false;
}
bool Wallpaper::findInCache(const QString &key, QImage &image, unsigned int lastModified)
{
if (d->cacheRendering) {
@ -613,3 +646,4 @@ const Package *Wallpaper::package() const
} // Plasma namespace
#include "wallpaper.moc"
#include "private/wallpaper_p.moc"