5 files changed, 14 insertions, 5 deletions

diff --git a/archivecontroller.cpp b/archivecontroller.cpp
index 234eab4..0d89b96 100644
--- a/archivecontroller.cpp
+++ b/archivecontroller.cpp
@@ -13,6 +13,7 @@
 #include <QTextEdit>
 #include <QStandardItemModel>
 #include <QAction>
+#include <QApplication>
 
 #include "archivecontroller.h"
 #include "archivemodel.h"
@@ -183,19 +184,20 @@ void ArchiveController::showPreview(){
     }
     QString first = sel.first().data().toString();
     PictureViewer2 *pv = SmGlobals::instance()->pictureViewer();
+    pv->setShowMappingItem(false);
     QFileInfo fi(first);
     if(!fi.exists()){
         pv->setFile();
     }else if(sel.first().data(ArchiveFilesModel::FileTypeRole).toInt() == ArchiveFilesModel::Movie){
-        mArchiveFiles->setCursor(Qt::BusyCursor);
+        qApp->setOverrideCursor(Qt::BusyCursor);
         QPixmap preview = Helper::preview(first);
-        mArchiveFiles->setCursor(Qt::ArrowCursor);
         if(!preview.isNull()){
             pv->setPixmap(preview);
             pv->show();
         }else{
             pv->setFile();
         }
+        qApp->restoreOverrideCursor();
     }else{
         pv->setFile(first);
     }
diff --git a/filesystemwidget.cpp b/filesystemwidget.cpp
index da8acb2..ea129ad 100644
--- a/filesystemwidget.cpp
+++ b/filesystemwidget.cpp
@@ -200,6 +200,7 @@ void FilesystemWidget::fileViewActivated(const QModelIndex &idx){
         if(!mPicViewer->isVisible()){
             mPicViewer->setVisible(true);
         }
+        mPicViewer->setShowMappingItem(false);
         mPicViewer->setFile(path);
 		return;
 	}
diff --git a/pictureswidget.cpp b/pictureswidget.cpp
index 9c9d393..c93f72e 100644
--- a/pictureswidget.cpp
+++ b/pictureswidget.cpp
@@ -122,6 +122,8 @@ void PicturesWidget::showInPicViewer(const QModelIndex &idx){
     }
 
     PicData pData = mPictureView->filesModel()->dataList(real);
+    mPicViewer->setShowInfoItem(true);
+    mPicViewer->setShowMappingItem(true);
     mPicViewer->setFile(pData);
     mPictureView->setPVAll();
     if(mPicViewerA){
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){
diff --git a/pictureviewer2.h b/pictureviewer2.h
index c6b7322..c03b9d3 100644
--- a/pictureviewer2.h
+++ b/pictureviewer2.h
@@ -41,6 +41,8 @@ class PictureViewer2 : public QGraphicsView {
         void setFile(const PicData &file);
         void setFile(QString fullPath = mDefaultFile);
         void setPixmap(const QPixmap &pm);
+        void setShowInfoItem(bool show) { mShowInfoItem = show; }
+        void setShowMappingItem(bool show) { mShowMappingItem = show; }
         PicData picData(const QString &fullPath);
         virtual QSize sizeHint() const;
 
@@ -95,6 +97,8 @@ class PictureViewer2 : public QGraphicsView {
         PicFilesModel *mPicFilesModel;
         PicData mCurPicData;
         NewPicsDialog *mNewPicsDlg;
+        bool mShowInfoItem;
+        bool mShowMappingItem;
 };
 
 class PictureViewer2Item : public QGraphicsItem {