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.

4 files changed, 20 insertions, 49 deletions

diff --git a/configurationdialog.cpp b/configurationdialog.cpp
index 95e0f89..3f654e1 100644
--- a/configurationdialog.cpp
+++ b/configurationdialog.cpp
@@ -172,35 +172,22 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent, Qt::WindowFlags f) : S
     movieWidget->setLayout(movieWidgetLayout);
     mTab->addTab(movieWidget, tr("Movies"));
 
-    //picture viewer - info item
-    QGroupBox *picInfoBox = new QGroupBox(tr("Picture info item"));
-    mInfoPositionBox = new QComboBox;
+    //picture viewer - information
     createPositionMap();
-    fillPositions(mInfoPositionBox);
-    mInfoPositionBox->removeItem(mInfoPositionBox->findData(SideBySide));
     QFormLayout *pvInfoL = new QFormLayout;
-    pvInfoL->addRow(tr("Picture info position"), mInfoPositionBox);
-    mShowInfoItem = new QCheckBox(tr("Show info item"));
-    connect(mShowInfoItem, SIGNAL(toggled(bool)), mInfoPositionBox, SLOT(setEnabled(bool)));
-    pvInfoL->addRow(QString(), mShowInfoItem);
+    QGroupBox *picInfoBox = new QGroupBox(tr("Show additional info"));
+    mInfoBox = new QComboBox;
+    fillPositions(mInfoBox);
+    pvInfoL->addRow(tr("Picture information position"), mInfoBox);
+    mMapBox = new QComboBox;
+    fillPositions(mMapBox);
+    pvInfoL->addRow(tr("Picture mapping information"), mMapBox);
     picInfoBox->setLayout(pvInfoL);
 
-    //picture viewer - mapping item
-    QGroupBox *picMapBox = new QGroupBox(tr("Picture mappings"));
-    mMapPositionBox = new QComboBox;
-    fillPositions(mMapPositionBox);
-    QFormLayout *pvMapL = new QFormLayout;
-    pvMapL->addRow(tr("Picture mapping position"), mMapPositionBox);
-    mShowMapItem = new QCheckBox(tr("Show mapping item"));
-    connect(mShowMapItem, SIGNAL(toggled(bool)), mMapPositionBox, SLOT(setEnabled(bool)));
-    pvMapL->addRow(QString(), mShowMapItem);
-    picMapBox->setLayout(pvMapL);
-
     //picture viewer - layout
     QWidget *picWidget = new QWidget;
     QVBoxLayout *picLayout = new QVBoxLayout;
     picLayout->addWidget(picInfoBox);
-    picLayout->addWidget(picMapBox);
     picWidget->setLayout(picLayout);
     picLayout->addStretch();
     mTab->addTab(picWidget, tr("Pictures"));
@@ -398,12 +385,8 @@ void ConfigurationDialog::readSettings(){
 	mStripPath->setText(s.value("paths/strippath").toString());
 
     //read pictures
-    mShowInfoItem->setChecked(s.value("ui/showinfoitem", true).toBool());
-    mInfoPositionBox->setCurrentIndex(mInfoPositionBox->findData(s.value("ui/infoposition", TopLeft).toInt()));
-    mInfoPositionBox->setEnabled(mShowInfoItem->checkState());
-    mShowMapItem->setChecked(s.value("ui/showmapitem", true).toBool());
-    mMapPositionBox->setCurrentIndex(mMapPositionBox->findData(s.value("ui/mappingposition", TopRight).toInt()));
-    mMapPositionBox->setEnabled(mShowMapItem->checkState());
+    mInfoBox->setCurrentIndex(mInfoBox->findData(s.value("ui/infoposition", TopLeft).toInt()));
+    mMapBox->setCurrentIndex(mMapBox->findData(s.value("ui/mappingposition", TopRight).toInt()));
 
 	//read database
 	mDatabaseHost->setText(s.value("database/hostname").toString());
@@ -476,11 +459,9 @@ void ConfigurationDialog::writeSettings(){
 	s.setValue("ui/cursoroffset", mCursorOffset->value());
 
     //write pictures
-    s.setValue("ui/showinfoitem", (mShowInfoItem->checkState() == Qt::Checked));
-    QString curPos = mInfoPositionBox->currentText();
+    QString curPos = mInfoBox->currentText();
     s.setValue("ui/infoposition", mPositionMap.value(curPos));
-    s.setValue("ui/showmapitem", (mShowMapItem->checkState() == Qt::Checked));
-    curPos = mMapPositionBox->currentText();
+    curPos = mMapBox->currentText();
     s.setValue("ui/mappingposition", mPositionMap.value(curPos));
 
 	//write database
@@ -593,8 +574,8 @@ void ConfigurationDialog::createPositionMap(){
     mPositionMap.insert(tr("Top right"), TopRight);
     mPositionMap.insert(tr("Bottom left"), BottomLeft);
     mPositionMap.insert(tr("Bottom right"), BottomRigth);
-    mPositionMap.insert(tr("Side by side"), SideBySide);
-    mPositionMap.insert(tr("Freely moveable"), Moveable);;
+    mPositionMap.insert(tr("Freely moveable"), Moveable);
+    mPositionMap.insert(tr("Do not show"), NoDisplay);
 }
 
 void ConfigurationDialog::fillPositions(QComboBox *cb){
diff --git a/configurationdialog.h b/configurationdialog.h
index 751cfb5..bbe477f 100644
--- a/configurationdialog.h
+++ b/configurationdialog.h
@@ -27,7 +27,7 @@ class ProgramConfigurator;
 class ConfigurationDialog : public SmDialog {
 	Q_OBJECT
 	public:
-        enum Position { TopLeft = 0, TopRight = 1, BottomLeft = 2, BottomRigth = 3, SideBySide = 4, Moveable = 5 };
+        enum Position { TopLeft = 0, TopRight = 1, BottomLeft = 2, BottomRigth = 3, Moveable = 4, NoDisplay = 5 };
 		ConfigurationDialog(QWidget *parent = 0, Qt::WindowFlags f = 0);
 		~ConfigurationDialog() {}
 
@@ -66,8 +66,8 @@ class ConfigurationDialog : public SmDialog {
 		QLineEdit *mStripPath;
 		QLineEdit *mGrabFrameFrom;
 		QComboBox *mIconForFolder;
-        QComboBox *mInfoPositionBox;
-        QComboBox *mMapPositionBox;
+        QComboBox *mInfoBox;
+        QComboBox *mMapBox;
 		QCheckBox *mHoverPics;
 		QCheckBox *mHoverArchive;
 		QCheckBox *mHoverMovies;
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;
diff --git a/pictureviewer2.h b/pictureviewer2.h
index e245224..743cd58 100644
--- a/pictureviewer2.h
+++ b/pictureviewer2.h
@@ -82,8 +82,6 @@ class PictureViewer2 : public QGraphicsView {
         PictureViewer2Item *mFnItem;
         PictureViewer2Item *mMappingItem;
         bool mUseGradient;
-        bool mShowInfoItem;
-        bool mShowMapItem;
         QColor mBgColor;
         QPointF mInfoPos;
         QPointF mMappingPos;