From 25dfbed3a2deceb48ea2b1a6e36585d21de145cc Mon Sep 17 00:00:00 2001
From: Arno <arno@disconnect.de>
Date: Sat, 24 Oct 2015 09:36:13 +0200
Subject: 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.
---
 pictureviewer2.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'pictureviewer2.h')

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 {
-- 
cgit v1.2.3-70-g09d2