1 files changed, 51 insertions, 14 deletions

diff --git a/shemov.cpp b/shemov.cpp
index c8f61d3..c7ba5db 100644
--- a/shemov.cpp
+++ b/shemov.cpp
@@ -100,9 +100,6 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla
     mNewMovieWizard->setMinimumWidth(1024);
     ArchiveController *c = SmGlobals::instance()->archiveController();
     connect(mNewMovieWizard, SIGNAL(accepted()), c->archiveTreeModel(), SLOT(refresh()));
-    mDbAnalyzerDialog = new DbAnalyzerDialog(this);
-    connect(mDbAnalyzerDialog, SIGNAL(partClicked(int, int)), mATree, SLOT(selectMoviePart(int, int)));
-    connect(mDbAnalyzerDialog, SIGNAL(delItems(int,QList<int>&)), this, SLOT(analyzeDelete(int,QList<int>&)));
     mNewPicsDialog = new NewPicsDialog(this);
 
 	QVBoxLayout *mainLayout = new QVBoxLayout;
@@ -392,8 +389,6 @@ void SheMov::createActions(){
     connect(mArchiveSelectedPicsA, SIGNAL(triggered()), this, SLOT(newPicsDialogWithFiles()));
 	mConsistencyA = new QAction(tr("Check consisteny..."), this);
 	connect(mConsistencyA, SIGNAL(triggered()), this, SLOT(checkConsistency()));
-    mAnalyzerA = new QAction(QIcon(":/higheels.png"), tr("Analyze Db..."), this);
-    connect(mAnalyzerA, SIGNAL(triggered()), this, SLOT(analyzeDb()));
     mNewPicsA = new QAction(tr("Archive pics...."), this);
     connect(mNewPicsA, SIGNAL(triggered()), this, SLOT(newPicsDialog()));
 
@@ -768,18 +763,36 @@ void SheMov::createActions(){
     mArchiveViewMetadataA->setData(ArchiveModel::SeriesPartNode);
     connect(mArchiveViewMetadataA, SIGNAL(triggered()), c->archiveTree(), SLOT(editMetadata()));
 
-    // ArchiveFiles actions
+    // ArchiveFiles actions <- ArchiveView!
+    // play selected
     mArchiveFilesPlayA = new QAction(tr("Play selected..."), this);
     connect(mArchiveFilesPlayA, SIGNAL(triggered()), c, SLOT(playSelectedFiles()));
+    // set quality
     mArchiveFilesQualityA = new QAction(tr("Set Quality..."), this);
     connect(mArchiveFilesQualityA, SIGNAL(triggered()), c, SLOT(editQuality()));
+    // set dvd
     mArchiveFilesDvdNoA = new QAction(tr("Set Dvd No. ..."), this);
     connect(mArchiveFilesDvdNoA, SIGNAL(triggered()), c, SLOT(editDvdNo()));
+    // set file type
     mArchiveFilesTypeA = new QAction(tr("Set file type..."), this);
     connect(mArchiveFilesTypeA, SIGNAL(triggered()), c, SLOT(editFileType()));
+    // set file no
     mArchiveFilesFileNoA = new QAction(tr("Set File No. ..."), this);
     connect(mArchiveFilesFileNoA, SIGNAL(triggered()), c, SLOT(editFileNo()));
 
+    // db analyzer dialogs
+    // analyze actors
+    mAnalyzeActorsA = new QAction(tr("Actors..."), this);
+    connect(mAnalyzeActorsA, SIGNAL(triggered()), this, SLOT(analyzeActors()));
+    // analyze genres
+    mAnalyzeGenresA = new QAction(tr("Genres..."), this);
+    connect(mAnalyzeGenresA, SIGNAL(triggered()), this, SLOT(analyzeGenres()));
+    // analyze series
+    mAnalyzeSeriesA = new QAction(tr("Series..."), this);
+    connect(mAnalyzeSeriesA, SIGNAL(triggered()), this, SLOT(analyzeSeries()));
+    // anaylze series parts
+    mAnalyzePartsA = new QAction(tr("Series Parts..."), this);
+    connect(mAnalyzePartsA, SIGNAL(triggered()), this, SLOT(analyzeParts()));
 
     //don't add actions with checkable(true) unless you know what you're doing!
     mPicActionGroup = new QActionGroup(this);
@@ -804,7 +817,12 @@ void SheMov::createMenus(){
     fileMenu->addAction(mNewPicsA);
     fileMenu->addSeparator();
 	fileMenu->addAction(mConsistencyA);
-    fileMenu->addAction(mAnalyzerA);
+    QMenu *analyzeMenu = new QMenu(tr("Analyze"), this);
+    analyzeMenu->addAction(mAnalyzeActorsA);
+    analyzeMenu->addAction(mAnalyzeGenresA);
+    analyzeMenu->addAction(mAnalyzeSeriesA);
+    analyzeMenu->addAction(mAnalyzePartsA);
+    fileMenu->addMenu(analyzeMenu);
     fileMenu->addAction(mRebuildFrameCacheA);
 	fileMenu->addSeparator();
 	fileMenu->addAction(mQuitA);
@@ -1095,7 +1113,6 @@ void SheMov::createToolBar(){
 	toolBar->addAction(mCdupA);
 	toolBar->addSeparator();
 	toolBar->addAction(mConfigA);
-    toolBar->addAction(mAnalyzerA);
 	toolBar->addSeparator();
 	toolBar->addAction(mShowNormalA);
 	toolBar->addAction(mShowArchivedA);
@@ -1197,16 +1214,36 @@ void SheMov::rebuildFrameCache(){
     }
 }
 
+void SheMov::analyzeActors(){
+    EmptyActorsDialog d(tr("Actors"), this);
+    d.populate();
+    d.exec();
+}
+
+void SheMov::analyzeGenres(){
+    EmptyGenresDialog d(tr("Genres"), this);
+    d.populate();
+    d.exec();
+}
+
+void SheMov::analyzeSeries(){
+    EmptySeriesDialog d(tr("Series"), this);
+    d.populate();
+    d.exec();
+}
+
+void SheMov::analyzeParts(){
+    EmptyPartsDialog d(tr("Series Parts"), this);
+    d.populate();
+    d.exec();
+}
+
 void SheMov::checkConsistency(){
 	ConsistencyCheck c;
 	c.exec();
 }
 
-void SheMov::analyzeDb(){
-    mDbAnalyzerDialog->show();
-}
-
-void SheMov::analyzeDelete(int mode, QList<int> &ids){
+/*void SheMov::analyzeDelete(int mode, QList<int> &ids){
     QString message = QString(tr("Really delete %1 items?")).arg(QString::number(ids.count()));
     int res = QMessageBox::question(this, tr("Delete items"), message, QMessageBox::Yes | QMessageBox::No);
     if(res != QMessageBox::Yes){
@@ -1226,7 +1263,7 @@ void SheMov::analyzeDelete(int mode, QList<int> &ids){
     Q_ASSERT(model);
     model->deleteItems(ids);
     mDbAnalyzerDialog->refresh();
-}
+}*/
 
 void SheMov::toggleHover(QObject *object){
 	QAction *action = qobject_cast<QAction*>(object);