From 72ce5602962f07d09c192cb79ef2fc5f67bbcaa9 Mon Sep 17 00:00:00 2001
From: Arno <am@disconnect.de>
Date: Sat, 14 Sep 2013 04:13:08 +0200
Subject: Preview fixes

* Don't show the mapping item in preview, because it has none.
* Use qApp->showOverrideCursor() instead of QWidget::cursor()
---
 pictureviewer2.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pictureviewer2.cpp')

diff --git a/pictureviewer2.cpp b/pictureviewer2.cpp
index 3f1669b..5939c6b 100644
--- a/pictureviewer2.cpp
+++ b/pictureviewer2.cpp
@@ -41,7 +41,7 @@
 
 const QString PictureViewer2::mDefaultFile = ":/picgone.png";
 
-PictureViewer2::PictureViewer2(QWidget *parent) : QGraphicsView(parent), mCur(0), mCurPos(0), mFnItem(0), mMappingItem(0) {
+PictureViewer2::PictureViewer2(QWidget *parent) : QGraphicsView(parent), mCur(0), mCurPos(0), mFnItem(0), mMappingItem(0), mShowInfoItem(true), mShowMappingItem(true) {
     //behave like QDialog, but don't be one...
     setWindowFlags(QFlags<Qt::WindowType>(0x1|0x2|0x1000|0x2000|0x10000|0x8000000));
     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
@@ -318,7 +318,7 @@ void PictureViewer2::showFile(const PicData &file){
     picRect.moveCenter(rect().center());
     mCur->setPos(picRect.topLeft());
     setWindowTitle(constructWindowTitle());
-    if(mConfigInfoPos != ConfigurationDialog::NoDisplay){
+    if(mConfigInfoPos != ConfigurationDialog::NoDisplay && mShowInfoItem){
         constructInfoItem(file, pixmap.size());
     }else{
         if(mFnItem){
@@ -327,7 +327,7 @@ void PictureViewer2::showFile(const PicData &file){
             mFnItem = 0;
         }
     }
-    if(mConfigMapPos != ConfigurationDialog::NoDisplay){
+    if(mConfigMapPos != ConfigurationDialog::NoDisplay && mShowMappingItem){
         constructMappingItem(file);
     }else{
         if(mMappingItem){
-- 
cgit v1.2.3-70-g09d2