diff options
author | Arno <arno@disconnect.de> | 2015-10-24 09:36:13 +0200 |
---|---|---|
committer | Arno <arno@disconnect.de> | 2015-10-24 09:36:13 +0200 |
commit | 25dfbed3a2deceb48ea2b1a6e36585d21de145cc (patch) | |
tree | fc92079da3f07304a7bda2906faac20f57f19258 /pictureviewer2.h | |
parent | 664a1a6e2ac8a90f3bf2ddf50a796138a3673bf2 (diff) | |
download | SheMov-25dfbed3a2deceb48ea2b1a6e36585d21de145cc.tar.gz SheMov-25dfbed3a2deceb48ea2b1a6e36585d21de145cc.tar.bz2 SheMov-25dfbed3a2deceb48ea2b1a6e36585d21de145cc.zip |
Fix convert to PNG mess
Automatically converting a damaged file to PNG and updating the archive
is fine as long as we're *in* the archive, but it totally messes things
up if we're browsing the file system.
So check if the image is in the archive path, and only then consider
auto-converting it. Also show a notice in the InfoItem if the file has
been converted.
Diffstat (limited to 'pictureviewer2.h')
-rw-r--r-- | pictureviewer2.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pictureviewer2.h b/pictureviewer2.h index 63b020d..f0c5e71 100644 --- a/pictureviewer2.h +++ b/pictureviewer2.h @@ -87,7 +87,7 @@ class PictureViewer2 : public QGraphicsView { private slots: void showFile(const PicData &data); - void constructInfoItem(const PicData &file, QSize picSize); + void constructInfoItem(const PicData &file, QSize picSize, bool converted = false); void constructMappingItem(const PicData &file); void docFromTree(SmTreeItem *start, QTextCursor *cur, int indent); void nextFromAll(); @@ -146,6 +146,7 @@ class PictureViewer2 : public QGraphicsView { bool mShowMarkItem; bool mShuffle; QString mCurrentDir; + QString mArchiveDir; }; class PictureViewer2Item : public QGraphicsItem { |