summaryrefslogtreecommitdiffstats
path: root/smglobals.cpp
diff options
context:
space:
mode:
authorArno <am@disconnect.de>2011-01-09 12:52:09 +0100
committerArno <am@disconnect.de>2011-01-09 12:52:09 +0100
commitf4a2553aa56939721bcd82d8ad9bffbaecd0647a (patch)
treefa8c2374d125c5b139a3977bbb3d450568076b21 /smglobals.cpp
parent9603ec4b1e8cb85770f2d6b69dbe31a0fcff44f7 (diff)
downloadSheMov-f4a2553aa56939721bcd82d8ad9bffbaecd0647a.tar.gz
SheMov-f4a2553aa56939721bcd82d8ad9bffbaecd0647a.tar.bz2
SheMov-f4a2553aa56939721bcd82d8ad9bffbaecd0647a.zip
Use pictureViewer in NewMovieWizard
Optionally show a frame or the picture in PictureViewer when clicking an item in the file list. Added a new function to SmGlobals::FrameCache: make it possible to retrieve the path of the frame, also.
Diffstat (limited to 'smglobals.cpp')
-rw-r--r--smglobals.cpp21
1 files changed, 15 insertions, 6 deletions
diff --git a/smglobals.cpp b/smglobals.cpp
index 52b3805..c21cea4 100644
--- a/smglobals.cpp
+++ b/smglobals.cpp
@@ -164,15 +164,24 @@ void SmGlobals::FrameCache::readConfig(){
}
const QPixmap SmGlobals::FrameCache::entry(const QString &sourcePath, const QString &when){
- QString realWhen = when;
- if(realWhen.isEmpty()){
- realWhen = mWhen;
+ const QPair<QString, QString> source = prepFrame(sourcePath, when);
+ return QPixmap(mFrameCache.value(source));
+}
+
+const QString SmGlobals::FrameCache::entryPath(const QString &sourcePath, const QString &when){
+ const QPair<QString, QString> source = prepFrame(sourcePath, when);
+ return mFrameCache.value(source);
+}
+
+const QPair<QString, QString> SmGlobals::FrameCache::prepFrame(const QString &sourceFile, QString when){
+ if(when.isEmpty()){
+ when = mWhen;
}
- const QPair<QString, QString> source(sourcePath, realWhen);
+ const QPair<QString, QString> source(sourceFile, when);
if(!mFrameCache.contains(source)){
- grabFrame(sourcePath, realWhen);
+ grabFrame(sourceFile, when);
}
- return QPixmap(mFrameCache.value(source));
+ return source;
}
void SmGlobals::FrameCache::grabFrame(const QString &sourceFile, QString when){