-Made CoverItem behave consistent

-get QModelIndex from MovieModel by movieId
-ArchiveView: added delegates for dvd and size, MovieItem now returns size as int
-Finished EditArchiveItemDialog
-Reverted covereditor, it became too convoluted


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

1 files changed, 43 insertions, 22 deletions

diff --git a/shemov.cpp b/shemov.cpp
index 4b54d78..6525dd5 100644
--- a/shemov.cpp
+++ b/shemov.cpp
@@ -29,6 +29,7 @@
 #include "moviemodel.h"
 #include "listmodel.h"
 #include "archiveviewwidget.h"
+#include "editarchiveitemdialog.h"
 
 SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, flags) {
 	qApp->setWindowIcon(QIcon(":/shemov.png"));
@@ -64,6 +65,9 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla
 	mAEdit->setMovieModel(mMovieModel);
 	mFSWidget->setArchiveDialog(mAEdit);
 
+	mAItemEdit = new EditArchiveItemDialog(mGenreModel, mActorModel, mMovieModel, this);
+	mAVWidget->setEditDialog(mAItemEdit);
+
 	QVBoxLayout *mainLayout = new QVBoxLayout;
 	mainLayout->addWidget(mTab);
 
@@ -78,6 +82,7 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla
 	connect(mFSWidget->fileView(), SIGNAL(statusbarMessage(const QString &)), this, SLOT(statusbarMessage(const QString &)));
 	connect(mFSWidget, SIGNAL(statusbarMessage(const QString &)), this, SLOT(statusbarMessage(const QString &)));
 	connect(mFSWidget, SIGNAL(newTemplate(const QString &)), this, SLOT(setTemplate(const QString &)));
+	connect(mTab, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int)));
 
 	QWidget *centralWidget = new QWidget;
 	centralWidget->setLayout(mainLayout);
@@ -108,6 +113,11 @@ void SheMov::configure(){
 	createExtractMenu();
 }
 
+void SheMov::tabChanged(int newTab){
+	mEditFSMenuA->setVisible(newTab == 0);
+	mEditArchiveMenuA->setVisible(newTab == 1);
+}
+
 void SheMov::createStatusbar(){
 	QLabel *selCountL = new QLabel(tr("Sel. Items"));
 	mSelectedItems = new QLabel("0");
@@ -126,7 +136,7 @@ void SheMov::createActions(){
 	mQuitA = new QAction(tr("Quit"), this);
 	mQuitA->setShortcut(tr("CTRL+q"));
 
-	//Edit menu
+	//Edit menu (FS)
 	mCdupA = new QAction(tr("Go up"), this);
 	connect(mCdupA, SIGNAL(triggered()), mFSWidget, SLOT(parentDir()));
 	mFSWidget->fileView()->addAction(mCdupA);
@@ -204,39 +214,50 @@ void SheMov::createActions(){
 	connect(mExtractMapper, SIGNAL(mapped(const QString &)), mFSWidget, SLOT(extract(const QString &)));
 	mExtractMenu = new QMenu(tr("E&xtract to..."), this);
 	createExtractMenu();
+
+	//Edit menu (archive)
+	mEditArchiveFileA = new QAction(tr("Edit file..."), this);
+	mEditArchiveFileA->setShortcut(tr("CTRL+e"));
+	mAVWidget->fileView()->addAction(mEditArchiveFileA);
+	connect(mEditArchiveFileA, SIGNAL(triggered()), mAVWidget, SLOT(editFile()));
 }
 
 void SheMov::createMenus(){
 	QMenu *fileMenu = new QMenu(tr("&File"), this);
 	fileMenu->addAction(mQuitA);
-	QMenu *editMenu = new QMenu(tr("&Edit"), this);
-	editMenu->addAction(mCdupA);
-	editMenu->addSeparator();
-	editMenu->addAction(mMarkFilesA);
-	editMenu->addAction(mUnmarkFilesA);
-	editMenu->addSeparator();
-	editMenu->addAction(mCreateFolderA);
-	editMenu->addAction(mDeleteFilesA);
-	editMenu->addSeparator();
-	editMenu->addAction(mCopyA);
-	editMenu->addAction(mMoveA);
-	editMenu->addAction(mRenameA);
-	editMenu->addAction(mArchiveA);
+	mEditFSMenu = new QMenu(tr("&Edit"), this);
+	mEditFSMenu->addAction(mCdupA);
+	mEditFSMenu->addSeparator();
+	mEditFSMenu->addAction(mMarkFilesA);
+	mEditFSMenu->addAction(mUnmarkFilesA);
+	mEditFSMenu->addSeparator();
+	mEditFSMenu->addAction(mCreateFolderA);
+	mEditFSMenu->addAction(mDeleteFilesA);
+	mEditFSMenu->addSeparator();
+	mEditFSMenu->addAction(mCopyA);
+	mEditFSMenu->addAction(mMoveA);
+	mEditFSMenu->addAction(mRenameA);
+	mEditFSMenu->addAction(mArchiveA);
 	QMenu *renameMenu = new QMenu(tr("&Rename..."), this);
 	renameMenu->addAction(mTemplateA);
 	renameMenu->addAction(mRenameCoverFA);
 	renameMenu->addAction(mRenameCoverBA);
 	renameMenu->addAction(mRenameCoverCA);
-	editMenu->addMenu(renameMenu);
-	editMenu->addSeparator();
-	editMenu->addMenu(mExtractMenu);
-	editMenu->addSeparator();
-	editMenu->addAction(mRefreshA);
-	editMenu->addSeparator();
-	editMenu->addAction(mConfigA);
+	mEditFSMenu->addMenu(renameMenu);
+	mEditFSMenu->addSeparator();
+	mEditFSMenu->addMenu(mExtractMenu);
+	mEditFSMenu->addSeparator();
+	mEditFSMenu->addAction(mRefreshA);
+	mEditFSMenu->addSeparator();
+	mEditFSMenu->addAction(mConfigA);
+
+	mEditArchiveMenu = new QMenu(tr("&Edit archive"), this);
+	mEditArchiveMenu->addAction(mEditArchiveFileA);
 
 	menuBar()->addMenu(fileMenu);
-	menuBar()->addMenu(editMenu);
+	mEditFSMenuA = menuBar()->addMenu(mEditFSMenu);
+	mEditArchiveMenuA = menuBar()->addMenu(mEditArchiveMenu);
+	mEditArchiveMenuA->setVisible(false);
 }
 
 void SheMov::createExtractMenu(){