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, 14 insertions, 33 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){