diff options
author | Arno <am@disconnect.de> | 2013-09-14 04:13:08 +0200 |
---|---|---|
committer | Arno <am@disconnect.de> | 2013-09-14 04:13:08 +0200 |
commit | 72ce5602962f07d09c192cb79ef2fc5f67bbcaa9 (patch) | |
tree | 45af0febf1891379cd88668e39fe1dded023c595 /pictureviewer2.cpp | |
parent | 666db6b8c2d7704415946c0a8d69adb3cf5ae7f5 (diff) | |
download | SheMov-72ce5602962f07d09c192cb79ef2fc5f67bbcaa9.tar.gz SheMov-72ce5602962f07d09c192cb79ef2fc5f67bbcaa9.tar.bz2 SheMov-72ce5602962f07d09c192cb79ef2fc5f67bbcaa9.zip |
Preview fixes
* Don't show the mapping item in preview, because it has none.
* Use qApp->showOverrideCursor() instead of QWidget::cursor()
Diffstat (limited to 'pictureviewer2.cpp')
-rw-r--r-- | pictureviewer2.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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){ |