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, 11 insertions, 3 deletions

diff --git a/shemov.cpp b/shemov.cpp
index 0844cce..28e4924 100644
--- a/shemov.cpp
+++ b/shemov.cpp
@@ -26,6 +26,7 @@
 #include "fileview.h"
 #include "configurationdialog.h"
 #include "archiveeditwidget.h"
+#include "moviemodel.h"
 
 SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, flags) {
 	qApp->setWindowIcon(QIcon(":/shemov.png"));
@@ -44,15 +45,17 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla
 		QMessageBox::critical(this, tr("Error"), tr("Could not open database. Please configure the database and restart the program"));
 	}
 
+	mMovieModel = new MovieModel(this);
+
 	mFSWidget = new FilesystemWidget;
 	setWindowTitle(mFSWidget->windowTitle());
-	mAEWidget = new ArchiveEditWidget;
 	
 	mTab = new QTabWidget;
 	mTab->addTab(mFSWidget, tr("Filemanager"));
-	mTab->addTab(mAEWidget, tr("Archive editor"));
-
 
+	mAEdit = new ArchiveEditDialog(this);
+	mAEdit->setMovieModel(mMovieModel);
+	mFSWidget->setArchiveDialog(mAEdit);
 
 	QVBoxLayout *mainLayout = new QVBoxLayout;
 	mainLayout->addWidget(mTab);
@@ -157,6 +160,10 @@ void SheMov::createActions(){
 	mFSWidget->fileView()->addAction(mRenameA);
 	mConfigA = new QAction(tr("Configure..."), this);
 	connect(mConfigA, SIGNAL(triggered()), this, SLOT(configure()));
+	mArchiveA = new QAction(tr("Archive files..."), this);
+	mArchiveA->setShortcut(tr("CTRL+a"));
+	connect(mArchiveA, SIGNAL(triggered()), mFSWidget, SLOT(archiveFiles()));
+	mFSWidget->fileView()->addAction(mArchiveA);
 
 	//Edit menu rename submenu
 	mTemplateA = new QAction(tr("Set as template"), this);
@@ -207,6 +214,7 @@ void SheMov::createMenus(){
 	editMenu->addAction(mCopyA);
 	editMenu->addAction(mMoveA);
 	editMenu->addAction(mRenameA);
+	editMenu->addAction(mArchiveA);
 	QMenu *renameMenu = new QMenu(tr("&Rename..."), this);
 	renameMenu->addAction(mTemplateA);
 	renameMenu->addAction(mRenameCoverFA);