Redesign of ConfigurationDialog

Revamped ConfigurationDialog for more than one movie player or picture
viewers. Introduced a new widget ProgramConfigurator.

1 files changed, 37 insertions, 55 deletions

diff --git a/configurationdialog.cpp b/configurationdialog.cpp
index 6c31232..e6b4e46 100644
--- a/configurationdialog.cpp
+++ b/configurationdialog.cpp
@@ -20,6 +20,7 @@
 #include <QRegExp>
 
 #include "configurationdialog.h"
+#include "programconfigurator.h"
 
 ConfigurationDialog::ConfigurationDialog(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f){
 	//paths tab
@@ -30,52 +31,32 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent, Qt::WindowFlags f) : Q
 	QCompleter *fsCompleter = new QCompleter(this);
 	fsCompleter->setModel(model);
 	fsCompleter->setCompletionMode(QCompleter::PopupCompletion);
-	QLabel *l1 = new QLabel(tr("Path to &picture viewer"));
-	mPictureViewer = new QLineEdit;
-	mPictureViewer->setCompleter(fsCompleter);
-	l1->setBuddy(mPictureViewer);
-	pathGrid->addWidget(l1, 0, 0);
-	pathGrid->addWidget(mPictureViewer, 0, 1);
-	QLabel *l2 = new QLabel(tr("Arguments for picture viewer"));
-	mPictureViewerArgs = new QLineEdit;
-	pathGrid->addWidget(l2, 1, 0);
-	pathGrid->addWidget(mPictureViewerArgs, 1, 1);
-	QLabel *l3 = new QLabel(tr("Path to movie viewer"));
-	mMovieViewer = new QLineEdit;
-	mMovieViewer->setCompleter(fsCompleter);
-	l2->setBuddy(mMovieViewer);
-	pathGrid->addWidget(l3, 2, 0);
-	pathGrid->addWidget(mMovieViewer, 2, 1);
-	QLabel *l4 = new QLabel(tr("Arguments for movie viewer"));
-	mMovieViewerArgs = new QLineEdit;
-	pathGrid->addWidget(l4, 3, 0);
-	pathGrid->addWidget(mMovieViewerArgs, 3, 1);
-	QLabel *l5 = new QLabel(tr("Path to &archive program"));
+	QLabel *l1 = new QLabel(tr("Path to &archive program"));
 	mArchiver = new QLineEdit;
 	mArchiver->setCompleter(fsCompleter);
-	l5->setBuddy(mArchiver);
-	pathGrid->addWidget(l5, 4, 0);
-	pathGrid->addWidget(mArchiver, 4, 1);
-	QLabel *l6 = new QLabel(tr("Arguments for archive program"));
+	l1->setBuddy(mArchiver);
+	pathGrid->addWidget(l1, 0, 0);
+	pathGrid->addWidget(mArchiver, 0, 1);
+	QLabel *l2 = new QLabel(tr("Arguments for archive program"));
 	mArchiverArgs = new QLineEdit;
-	l6->setBuddy(mArchiverArgs);
-	pathGrid->addWidget(l6, 5, 0);
-	pathGrid->addWidget(mArchiverArgs, 5, 1);
-	QLabel *l9 = new QLabel(tr("Archive directory"));
+	l2->setBuddy(mArchiverArgs);
+	pathGrid->addWidget(l2, 1, 0);
+	pathGrid->addWidget(mArchiverArgs, 1, 1);
+	QLabel *l3 = new QLabel(tr("Archive directory"));
 	mArchiveDir = new QLineEdit;
 	mArchiveDir->setCompleter(fsCompleter);
-	pathGrid->addWidget(l9, 6, 0);
-	pathGrid->addWidget(mArchiveDir, 6, 1);
-	QLabel *l7 = new QLabel(tr("Extraction paths"));
+	pathGrid->addWidget(l3, 2, 0);
+	pathGrid->addWidget(mArchiveDir, 2, 1);
+	QLabel *l4 = new QLabel(tr("Extraction paths"));
 	mArchivePaths = new QComboBox;
-	pathGrid->addWidget(l7, 7, 0);
-	pathGrid->addWidget(mArchivePaths, 7, 1);
-	QLabel *l8 = new QLabel(tr("Enter new &extraction path"));
+	pathGrid->addWidget(l4, 3, 0);
+	pathGrid->addWidget(mArchivePaths, 3, 1);
+	QLabel *l5 = new QLabel(tr("Enter new &extraction path"));
 	mExtractPath = new QLineEdit;
 	mExtractPath->setCompleter(fsCompleter);
-	l8->setBuddy(mExtractPath);
-	pathGrid->addWidget(l8, 8, 0);
-	pathGrid->addWidget(mExtractPath, 8, 1);
+	l5->setBuddy(mExtractPath);
+	pathGrid->addWidget(l5, 4, 0);
+	pathGrid->addWidget(mExtractPath, 4, 1);
 	mAddPath = new QPushButton(tr("Add path"));
 	connect(mAddPath, SIGNAL(clicked()), this, SLOT(addPath()));
 	mRemovePath = new QPushButton(tr("Remove path"));
@@ -84,14 +65,13 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent, Qt::WindowFlags f) : Q
 	pathButtonLayout->addStretch();
 	pathButtonLayout->addWidget(mAddPath);
 	pathButtonLayout->addWidget(mRemovePath);
-	pathGrid->addLayout(pathButtonLayout, 9, 1);
-	QLabel *l10 = new QLabel(tr("Burn Directory"));
+	pathGrid->addLayout(pathButtonLayout, 5, 1);
+	QLabel *l6 = new QLabel(tr("Burn Directory"));
 	mBurnDir = new QLineEdit;
 	mBurnDir->setCompleter(fsCompleter);
-	pathGrid->addWidget(l10, 10, 0);
-	pathGrid->addWidget(mBurnDir, 10, 1);
+	pathGrid->addWidget(l6, 6, 0);
+	pathGrid->addWidget(mBurnDir, 6, 1);
 	pathWidget->setLayout(pathGrid);
-	mTab->addTab(pathWidget, tr("Paths"));
 
 	//ui tab
 	QWidget *uiWidget = new QWidget;
@@ -128,6 +108,14 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent, Qt::WindowFlags f) : Q
 	uiWidget->setLayout(uiGrid);
 	mTab->addTab(uiWidget, tr("User interface"));
 
+	// movie viewer
+	mMovieConfig = new ProgramConfigurator("movieviewer", "Movie viewer");
+	mTab->addTab(mMovieConfig, tr("Movies"));
+
+	// picture viewer
+	mPicConfig = new ProgramConfigurator("pictureviewer", "Picture viewer");
+	mTab->addTab(mPicConfig, tr("Pictures"));
+
 	//database tab
 	QWidget *databaseWidget = new QWidget;
 	QGridLayout *dbGrid = new QGridLayout;
@@ -228,12 +216,6 @@ void ConfigurationDialog::readSettings(){
 	QSettings s;
 
 	//read paths
-	mPictureViewer->setText(s.value("paths/pictureviewer", "/usr/bin/gwenview").toString());
-	QStringList pvArgs = s.value("paths/pictureviewerargs").toStringList();
-	mPictureViewerArgs->setText(pvArgs.join(" "));
-	mMovieViewer->setText(s.value("paths/movieviewer", "/usr/bin/mplayer").toString());
-	QStringList mvArgs = s.value("paths/movieviewerargs").toStringList();
-	mMovieViewerArgs->setText(mvArgs.join(" "));
 	mArchiver->setText(s.value("paths/archiver", "/usr/bin/7z").toString());
 	QStringList arArgs = s.value("paths/archiverargs").toStringList();
 	mArchiverArgs->setText(arArgs.join(" "));
@@ -266,12 +248,6 @@ void ConfigurationDialog::writeSettings(){
 
 	//write paths
 	QRegExp splitAt("\\s+");
-	s.setValue("paths/pictureviewer", mPictureViewer->text());
-	QStringList pvArgs = mPictureViewerArgs->text().split(splitAt, QString::SkipEmptyParts);
-	s.setValue("paths/pictureviewerargs", pvArgs);
-	s.setValue("paths/movieviewer", mMovieViewer->text());
-	QStringList mvArgs = mMovieViewerArgs->text().split(splitAt, QString::SkipEmptyParts);
-	s.setValue("paths/movieviewerargs", mvArgs);
 	s.setValue("paths/archiver", mArchiver->text());
 	QStringList aArgs = mArchiverArgs->text().split(splitAt, QString::SkipEmptyParts);
 	s.setValue("paths/archiverargs", aArgs);
@@ -289,5 +265,11 @@ void ConfigurationDialog::writeSettings(){
 	s.setValue("database/dbname", mDatabaseName->text());
 	s.setValue("database/dbuser", mDatabaseUsername->text());
 	s.setValue("database/dbpass", mDatabasePassword->text());
+
+	//write movies
+	mMovieConfig->writeSettings();
+
+	//write pics
+	mPicConfig->writeSettings();
 }