Make Mapping widget configurable

Make mappingwidget behave according to settings. SideBySide doesn't work
yet, maybe it should be canned.

1 files changed, 31 insertions, 10 deletions

diff --git a/configurationdialog.cpp b/configurationdialog.cpp
index d05bc91..95e0f89 100644
--- a/configurationdialog.cpp
+++ b/configurationdialog.cpp
@@ -172,22 +172,37 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent, Qt::WindowFlags f) : S
     movieWidget->setLayout(movieWidgetLayout);
     mTab->addTab(movieWidget, tr("Movies"));
 
-    //picture viewer
+    //picture viewer - info item
     QGroupBox *picInfoBox = new QGroupBox(tr("Picture info item"));
-    mPositionBox = new QComboBox;
+    mInfoPositionBox = new QComboBox;
     createPositionMap();
-    fillPositions(mPositionBox);
-    mPositionBox->removeItem(mPositionBox->findData(SideBySide));
+    fillPositions(mInfoPositionBox);
+    mInfoPositionBox->removeItem(mInfoPositionBox->findData(SideBySide));
     QFormLayout *pvInfoL = new QFormLayout;
-    pvInfoL->addRow(tr("Picture info position"), mPositionBox);
+    pvInfoL->addRow(tr("Picture info position"), mInfoPositionBox);
     mShowInfoItem = new QCheckBox(tr("Show info item"));
-    connect(mShowInfoItem, SIGNAL(toggled(bool)), mPositionBox, SLOT(setEnabled(bool)));
-    pvInfoL->addRow(tr("Show info item"), mShowInfoItem);
+    connect(mShowInfoItem, SIGNAL(toggled(bool)), mInfoPositionBox, SLOT(setEnabled(bool)));
+    pvInfoL->addRow(QString(), mShowInfoItem);
     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"));
 
 	//database tab
@@ -384,8 +399,11 @@ void ConfigurationDialog::readSettings(){
 
     //read pictures
     mShowInfoItem->setChecked(s.value("ui/showinfoitem", true).toBool());
-    mPositionBox->setCurrentIndex(mPositionBox->findData(s.value("ui/infoposition", TopLeft).toInt()));
-    mPositionBox->setEnabled(mShowInfoItem->checkState());
+    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());
 
 	//read database
 	mDatabaseHost->setText(s.value("database/hostname").toString());
@@ -459,8 +477,11 @@ void ConfigurationDialog::writeSettings(){
 
     //write pictures
     s.setValue("ui/showinfoitem", (mShowInfoItem->checkState() == Qt::Checked));
-    QString curPos = mPositionBox->currentText();
+    QString curPos = mInfoPositionBox->currentText();
     s.setValue("ui/infoposition", mPositionMap.value(curPos));
+    s.setValue("ui/showmapitem", (mShowMapItem->checkState() == Qt::Checked));
+    curPos = mMapPositionBox->currentText();
+    s.setValue("ui/mappingposition", mPositionMap.value(curPos));
 
 	//write database
 	s.setValue("database/hostname", mDatabaseHost->text());