Usability: ConfigurationDialog -> pictures

Replace checkbox for showing info items at all with a "do not show"
position in the combobox. While at it, remove unused SideBySide
position.

1 files changed, 3 insertions, 11 deletions

diff --git a/pictureviewer2.cpp b/pictureviewer2.cpp
index eee61ab..609c796 100644
--- a/pictureviewer2.cpp
+++ b/pictureviewer2.cpp
@@ -180,10 +180,8 @@ void PictureViewer2::readSettings(){
     mUseGradient = s.value("ui/pvgradient").toBool();
     QVariant t = s.value("ui/pvbgcolor");
     mBgColor = t.value<QColor>();
-    mShowInfoItem = s.value("ui/showinfoitem").toBool();
     mConfigInfoPos = s.value("ui/infoposition").toInt();
     mInfoPos = s.value("ui/pvinfopos", QPointF(20, 20)).toPointF();
-    mShowMapItem = s.value("ui/showmapitem").toBool();
     mConfigMapPos = s.value("ui/mappingposition").toInt();
     mMappingPos = s.value("ui/pvmappingpos", QPointF(20, 20)).toPointF();
 }
@@ -290,7 +288,7 @@ void PictureViewer2::showFile(const PicData &file){
     mScene->addItem(mCur);
     mCur->setPos(cX, cY);
     setWindowTitle(constructWindowTitle());
-    if(mShowInfoItem){
+    if(mConfigInfoPos != ConfigurationDialog::NoDisplay){
         constructInfoItem(file, pixmap.size());
     }else{
         if(mFnItem){
@@ -299,7 +297,7 @@ void PictureViewer2::showFile(const PicData &file){
             mFnItem = 0;
         }
     }
-    if(mShowMapItem){
+    if(mConfigMapPos != ConfigurationDialog::NoDisplay){
         constructMappingItem(file);
     }else{
         if(mMappingItem){
@@ -341,13 +339,7 @@ void PictureViewer2::constructMappingItem(const PicData &file){
         }
         QTextDocument *mapString = treeToString(mappingTree);
         mMappingItem = new PictureViewer2Item(mapString);
-        if(mConfigMapPos != ConfigurationDialog::SideBySide){
-            mMappingItem->setPos(getPos(mMappingItem, mConfigMapPos, mMappingPos));
-        }else{
-            if(!mShowInfoItem){
-                return;
-            }
-        }
+        mMappingItem->setPos(getPos(mMappingItem, mConfigMapPos, mMappingPos));
         mScene->addItem(mMappingItem);
     }
     delete mappingTree;