Again huge changes (should go on vacation more often :))

-turned archive tab into a QDialog
-fixed duplicate handling in ListModel
-fixed html output in archive dialog
-actually made archiving work
-changed covertype to text in database
-fixed bug with covertype in coveritem


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

1 files changed, 12 insertions, 5 deletions

diff --git a/configurationdialog.cpp b/configurationdialog.cpp
index 065e105..021d40b 100644
--- a/configurationdialog.cpp
+++ b/configurationdialog.cpp
@@ -62,16 +62,21 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent, Qt::WindowFlags f) : Q
 	l6->setBuddy(mArchiverArgs);
 	pathGrid->addWidget(l6, 5, 0);
 	pathGrid->addWidget(mArchiverArgs, 5, 1);
+	QLabel *l9 = 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"));
 	mArchivePaths = new QComboBox;
-	pathGrid->addWidget(l7, 6, 0);
-	pathGrid->addWidget(mArchivePaths);
+	pathGrid->addWidget(l7, 7, 0);
+	pathGrid->addWidget(mArchivePaths, 7, 1);
 	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);
+	pathGrid->addWidget(l8, 8, 0);
+	pathGrid->addWidget(mExtractPath, 8, 1);
 	mAddPath = new QPushButton(tr("Add path"));
 	connect(mAddPath, SIGNAL(clicked()), this, SLOT(addPath()));
 	mRemovePath = new QPushButton(tr("Remove path"));
@@ -80,7 +85,7 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent, Qt::WindowFlags f) : Q
 	pathButtonLayout->addStretch();
 	pathButtonLayout->addWidget(mAddPath);
 	pathButtonLayout->addWidget(mRemovePath);
-	pathGrid->addLayout(pathButtonLayout, 8, 1);
+	pathGrid->addLayout(pathButtonLayout, 9, 1);
 	pathWidget->setLayout(pathGrid);
 	mTab->addTab(pathWidget, tr("Paths"));
 
@@ -231,6 +236,7 @@ void ConfigurationDialog::readSettings(){
 	QStringList extractPaths = s.value("paths/extractpaths").toStringList();
 	mArchivePaths->addItems(extractPaths);
 	mPaths = extractPaths;
+	mArchiveDir->setText(s.value("paths/archivedir").toString());
 
 	//read ui
 	QStringList expandPaths = s.value("ui/expandpaths").toStringList();
@@ -265,6 +271,7 @@ void ConfigurationDialog::writeSettings(){
 	QStringList aArgs = mArchiverArgs->text().split(splitAt, QString::SkipEmptyParts);
 	s.setValue("paths/archiverargs", aArgs);
 	s.setValue("paths/extractpaths", mPaths);
+	s.setValue("paths/archivedir", mArchiveDir->text());
 
 	//write ui
 	s.setValue("ui/expandpaths", mEPaths);