-Finished ConfigurationDialog->paths

-Implemented ExtractorDialog (untested)
-started work on extractor menus


git-svn-id: file:///var/svn/repos2/shemov/trunk@386 f440f766-f032-0410-8965-dc7d17de2ca0

1 files changed, 29 insertions, 2 deletions

diff --git a/configurationdialog.cpp b/configurationdialog.cpp
index d10050a..0a94134 100644
--- a/configurationdialog.cpp
+++ b/configurationdialog.cpp
@@ -18,6 +18,7 @@
 #include <QApplication>
 #include <QSettings>
 #include <QRegExp>
+#include <QDebug>
 
 #include "configurationdialog.h"
 
@@ -25,6 +26,7 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent, Qt::WindowFlags f) : Q
 	//paths tab
 	QWidget *pathWidget = new QWidget;
 	QGridLayout *pathGrid = new QGridLayout;
+	mTab = new QTabWidget;
 	QDirModel *model = new QDirModel(this);
 	QCompleter *fsCompleter = new QCompleter(this);
 	fsCompleter->setModel(model);
@@ -66,6 +68,7 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent, Qt::WindowFlags f) : Q
 	pathGrid->addWidget(mArchivePaths);
 	QLabel *l8 = new QLabel(tr("Enter new &extraction path"));
 	mExtractPath = new QLineEdit;
+	mExtractPath->setCompleter(fsCompleter);
 	l8->setBuddy(mExtractPath);
 	pathGrid->addWidget(l8, 7, 0);
 	pathGrid->addWidget(mExtractPath, 7, 1);
@@ -83,7 +86,7 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent, Qt::WindowFlags f) : Q
 
 	//main layout
 	mOk = new QPushButton(tr("Ok"));
-	connect(mOk, SIGNAL(clicked()), this, SLOT(accpet()));
+	connect(mOk, SIGNAL(clicked()), this, SLOT(accept()));
 	mCancel = new QPushButton(tr("Cancel"));
 	connect(mCancel, SIGNAL(clicked()), this, SLOT(reject()));
 	QHBoxLayout *mainButtonLayout = new QHBoxLayout;
@@ -99,6 +102,30 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent, Qt::WindowFlags f) : Q
 	readSettings();
 }
 
+void ConfigurationDialog::accept(){
+	writeSettings();
+	QDialog::accept();
+}
+
+void ConfigurationDialog::addPath(){
+	QString newPath = mExtractPath->text();
+	if(!newPath.isEmpty() && !mPaths.contains(newPath)){
+		mArchivePaths->addItem(newPath);
+		mPaths.append(newPath);
+	}
+}
+
+void ConfigurationDialog::removePath(){
+	QString removePath = mArchivePaths->currentText();
+	int current = mArchivePaths->currentIndex();
+	if(!removePath.isEmpty()){
+		if(mPaths.contains(removePath)){
+			mPaths.removeOne(removePath);
+			mArchivePaths->removeItem(current);
+		}
+	}
+}
+
 void ConfigurationDialog::readSettings(){
 	QSettings s;
 	mPictureViewer->setText(s.value("paths/pictureviewer", "/usr/bin/gwenview").toString());
@@ -123,7 +150,7 @@ void ConfigurationDialog::writeSettings(){
 	s.setValue("paths/pictureviewerargs", pvArgs);
 	s.setValue("paths/movieviewer", mMovieViewer->text());
 	QStringList mvArgs = mMovieViewerArgs->text().split(splitAt, QString::SkipEmptyParts);
-	s.setValue("paths/movievieverargs", mvArgs);
+	s.setValue("paths/movieviewerargs", mvArgs);
 	s.setValue("paths/archiver", mArchiver->text());
 	QStringList aArgs = mArchiverArgs->text().split(splitAt, QString::SkipEmptyParts);
 	s.setValue("paths/archiverargs", aArgs);