From 26dfde02bd98a3a78ddacdb16681c640dfc1ad5e Mon Sep 17 00:00:00 2001 From: Arno Date: Thu, 5 Apr 2018 19:52:50 +0200 Subject: Weed out old archive view and archivecontroller Unfortunately, it is so convoluted code that there's most likely a lot of cruft left, so call it work in progress... --- shemov.cpp | 176 ------------------------------------------------------------- 1 file changed, 176 deletions(-) (limited to 'shemov.cpp') diff --git a/shemov.cpp b/shemov.cpp index 78f8216..576611f 100644 --- a/shemov.cpp +++ b/shemov.cpp @@ -30,7 +30,6 @@ #include "newpicsdialog.h" #include "pictureswidget.h" #include "archiveview.h" -#include "archivecontroller.h" #include "archivebrowser.h" #include "searchdialog.h" #include "randomtab.h" @@ -122,13 +121,6 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla mMovieWidget = new MovieWidget; mTab->addTab(mMovieWidget, "MW"); - //experimental - splash.showMessage(tr("Creating Movie archive..."), Qt::AlignHCenter, Qt::yellow); - qApp->processEvents(); - mArchive = new ArchiveView; - mTab->addTab(mArchive, "Movies"); - connect(mArchive->archiveModel(), &ArchiveModel::message, this, &SheMov::statusbarMessage); - //pictures splash.showMessage(tr("Creating Picture Archive..."), Qt::AlignHCenter, Qt::yellow); qApp->processEvents(); @@ -159,14 +151,6 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla //misc dialogs splash.showMessage(tr("Creating misc. Dialogs..."), Qt::AlignHCenter, Qt::yellow); qApp->processEvents(); - ArchiveController *c = SmGlobals::instance()->archiveController(); - mSearchDialog = new SearchDialog(this); - connect(mSearchDialog, &SearchDialog::searchResultClicked, this, &SheMov::searchResult); - - //experimental archive - connect(c, &ArchiveController::sizeChanged, this, &SheMov::setSize); - connect(c, &ArchiveController::durationChanged, this, &SheMov::setDuration); - connect(c->archiveTreeModel(), &ArchiveModel::windowTitle, this, &SheMov::setWindowTitle); QVBoxLayout *mainLayout = new QVBoxLayout; mainLayout->addWidget(mTab); @@ -183,7 +167,6 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla qApp->processEvents(); connect(mTab, &QTabWidget::currentChanged, this, &SheMov::tabChanged); connect(this, &SheMov::configChanged, picViewer, &PictureViewer2::readSettings); - connect(this, &SheMov::configChanged, c->archiveTreeModel(), &ArchiveModel::readConfig); connect(this, &SheMov::configChanged, mFileWidget, &FSWidget::readSettings); QWidget *centralWidget = new QWidget; @@ -193,7 +176,6 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla show(); splash.finish(this); mPicWidget->readSettings(); - mArchive->readSettings(); mArchiveBrowser->readConfig(); readSettings(); setWindowState(Qt::WindowMaximized); @@ -202,7 +184,6 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla void SheMov::closeEvent(QCloseEvent *event){ mPicWidget->picViewer2()->writeSettings(); mPicWidget->writeSettings(); - mArchive->writeSettings(); mArchiveBrowser->writeSettings(); writeSettings(); SmGlobals *globals = SmGlobals::instance(); @@ -234,7 +215,6 @@ void SheMov::tabChanged(int newTab){ } mEditPicMenuA->setVisible(newTab == Pictures); mViewPicMenuA->setVisible(newTab == Pictures); - mArchiveViewMenuA->setVisible(newTab == Movies); mArchiveMenuA->setVisible(newTab == Movies); mPicActionGroup->setEnabled(newTab == Pictures); mPVSelectAllA->disconnect(); @@ -243,13 +223,10 @@ void SheMov::tabChanged(int newTab){ mArchiveBrowserViewMenuA->setVisible(newTab == ArchiveBrowserTab); mRandomEditMenuA->setVisible(newTab == RandomDisp); statusbarMessage(QString()); - ArchiveController *c = SmGlobals::instance()->archiveController(); switch(newTab){ case FileManager: break; case Movies: - c->fileSelectionChanged(QItemSelection(), QItemSelection()); - c->archiveTreeModel()->setWindowTitle(); break; case Pictures: connect(mPVSelectAllA, &QAction::triggered, mPicWidget->picView(), &PictureView::setPVAll); @@ -384,17 +361,11 @@ void SheMov::createStatusbar(){ } void SheMov::createActions(){ - //headers mPicsTreeHeaderGroup = new QActionGroup(this); SmTreeModel *picFilesModel = static_cast(SmGlobals::instance()->model("PicFiles")); createHeaderMapper(picFilesModel, mPicWidget->picView(), mPicsTreeHeaderGroup); mPicWidget->picView()->setHeaderGroup(mPicsTreeHeaderGroup); - mArchiveFilesAG = new QActionGroup(this); - ArchiveController *controller = SmGlobals::instance()->archiveController(); - SmTreeModel *afilesmodel = controller->archiveFilesModel(); - createHeaderMapper(afilesmodel, controller->archiveFiles(), mArchiveFilesAG); - controller->archiveFiles()->setHeaderGroup(mArchiveFilesAG); SmTreeModel *abrowsermodel = static_cast(SmGlobals::instance()->model("BrowserModel")); mArchiveBrowserAG = new QActionGroup(this); createHeaderMapper(abrowsermodel, mArchiveBrowser->archiveTree(), mArchiveBrowserAG); @@ -496,85 +467,6 @@ void SheMov::createActions(){ /* picView(er) END Actions! */ - // ArchiveView actions - ArchiveController *c = SmGlobals::instance()->archiveController(); - // edit - mArchiveViewRenameA = new QAction(tr("Edit..."), this); - mArchiveViewRenameA->setData(ArchiveModel::AllNodes); - connect(mArchiveViewRenameA, &QAction::triggered, c->archiveTree(), &ArchiveTree::edit); - // edit actors - mArchiveViewActorsA = new QAction(tr("Edit actors..."), this); - mArchiveViewActorsA->setData(ArchiveModel::SeriesPartNode); - connect(mArchiveViewActorsA, &QAction::triggered, c->archiveTree(), &ArchiveTree::editActors); - // edit genres - mArchiveViewGenresA = new QAction(tr("Edit genres..."), this); - mArchiveViewGenresA->setData(ArchiveModel::SeriesPartNode); - connect(mArchiveViewGenresA, &QAction::triggered, c->archiveTree(), &ArchiveTree::editGenres); - // edit part no and subtitle - mArchiveViewPartnoA = new QAction(tr("Edit Part No..."), this); - mArchiveViewPartnoA->setData(ArchiveModel::SeriesPartNode); - connect(mArchiveViewPartnoA, &QAction::triggered, c->archiveTree(), &ArchiveTree::editSeriesPart); - // edit metadata - mArchiveViewMetadataA = new QAction(tr("Edit metadata..."), this); - mArchiveViewMetadataA->setData(ArchiveModel::SeriesPartNode); - // add Covers - connect(mArchiveViewMetadataA, &QAction::triggered, c->archiveTree(), &ArchiveTree::editMetadata); - mArchiveViewAddCoversA = new QAction(QIcon(":/huge_bra.png"), tr("Add Files..."), this); - mArchiveViewAddCoversA->setData(ArchiveModel::SeriesPartNode); - connect(mArchiveViewAddCoversA, &QAction::triggered, c, &ArchiveController::addFiles); - //collapse and expand... - mArchiveViewExpandAllA = new QAction(tr("Expand all"), this); - mArchiveViewExpandAllA->setData(ArchiveModel::AllNodes); - connect(mArchiveViewExpandAllA, &QAction::triggered, c->archiveTree(), &ArchiveTree::expandAll); - mArchiveViewCollapseAllA = new QAction(tr("Collapse all"), this); - mArchiveViewCollapseAllA->setData(ArchiveModel::AllNodes); - connect(mArchiveViewCollapseAllA, &QAction::triggered, c->archiveTree(), &ArchiveTree::collapseAll); - // refresh all - mArchiveViewRefreshA = new QAction(tr("Refresh"), this); - mArchiveViewRefreshA->setData(ArchiveModel::AllNodes); - connect(mArchiveViewRefreshA, &QAction::triggered, c->archiveView(), &ArchiveView::refreshArchive); - // mark as favorite - mArchiveViewMarkFavA = new QAction(tr("Mark as favorite"), this); - mArchiveViewMarkFavA->setData(ArchiveModel::SeriesPartNode); - connect(mArchiveViewMarkFavA, &QAction::triggered, c->archiveTree(), &ArchiveTree::markAsFavorite); - //delete from Tree - mArchiveViewDeleteA = new QAction(QIcon(":/delete.png"), tr("Delete..."), this); - int deleteMask = 0; - deleteMask |= ArchiveModel::SeriesNode; - deleteMask |= ArchiveModel::SeriesPartNode; - mArchiveViewDeleteA->setData(deleteMask); - connect(mArchiveViewDeleteA, &QAction::triggered, c->archiveTree(), &ArchiveTree::deleteFromTree); - //add new series part - mArchiveViewNewPartA = new QAction(QIcon(":/french_maid_dress.png"), tr("New..."), this); - mArchiveViewNewPartA->setData(ArchiveModel::SeriesNode); - connect(mArchiveViewNewPartA, &QAction::triggered, c->archiveTree(), &ArchiveTree::newPart); - - // ArchiveFiles actions <- ArchiveView! - // play selected - mArchiveFilesPlayA = new QAction(tr("Play selected..."), this); - connect(mArchiveFilesPlayA, &QAction::triggered, c, &ArchiveController::playSelectedFiles); - // set quality - mArchiveFilesQualityA = new QAction(QIcon(":/letter_q.png"), tr("Set Quality..."), this); - connect(mArchiveFilesQualityA, &QAction::triggered, c, &ArchiveController::editQuality); - // set dvd - mArchiveFilesDvdNoA = new QAction(QIcon(":/letter_d.png"), tr("Set Dvd No. ..."), this); - connect(mArchiveFilesDvdNoA, &QAction::triggered, c, &ArchiveController::editDvdNo); - // set file type - mArchiveFilesTypeA = new QAction(QIcon(":/letter_t.png"), tr("Set file type..."), this); - connect(mArchiveFilesTypeA, &QAction::triggered, c, &ArchiveController::editFileType); - // set file no - mArchiveFilesFileNoA = new QAction(QIcon(":/letter_n.png"), tr("Set File No. ..."), this); - connect(mArchiveFilesFileNoA, &QAction::triggered, c, &ArchiveController::editFileNo); - // show properties - mArchiveFilesPropertiesA = new QAction(QIcon(":/bizarre_amputee.png"), tr("Properties..."), this); - connect(mArchiveFilesPropertiesA, &QAction::triggered, c, &ArchiveController::showProperties); - // preview - mArchiveFilesPreviewA = new QAction(QIcon(":/male_chastity_belt.png"), tr("Preview..."), this); - connect(mArchiveFilesPreviewA, &QAction::triggered, c, &ArchiveController::showPreview); - // delete from archive - mArchiveRemoveFilesA = new QAction(QIcon(":/delete.png"), tr("Remove..."), this); - connect(mArchiveRemoveFilesA, &QAction::triggered, c->archiveFiles(), &ArchiveFiles::deleteFromFiles); - //ArchiveBrowser Actions mArchiveBrowserMoveToBurnA = new QAction(QIcon(":/shackles.png"), tr("Move to burn..."), this); connect(mArchiveBrowserMoveToBurnA, &QAction::triggered, mArchiveBrowser, &ArchiveBrowser::moveToBurn); @@ -649,14 +541,6 @@ void SheMov::createMenus(){ mArchiveBrowserViewMenu->addSeparator(); mArchiveBrowserViewMenu->addAction(mArchiveBrowserRefreshA); - //Movie archive - QMenu *archiveHeaderMenu = new QMenu(tr("Show headers"), this); - archiveHeaderMenu->addActions(mArchiveFilesAG->actions()); - mArchiveViewMenu = new QMenu(tr("&View"), this); - archiveHeaderMenu->addActions(mArchiveFilesAG->actions()); - mArchiveViewMenu->addMenu(archiveHeaderMenu); - mArchiveViewMenuA = menuBar()->addMenu(mArchiveViewMenu); - QMenu *helpMenu = new QMenu(tr("&Help"), this); helpMenu->addAction(mAboutShemovA); helpMenu->addAction(mAboutQtA); @@ -664,44 +548,6 @@ void SheMov::createMenus(){ helpMenu->addAction(mStatisticsA); menuBar()->addMenu(helpMenu); - // Movie archive - ArchiveController *c = SmGlobals::instance()->archiveController(); - c->addActionForTree(mArchiveViewRenameA); - c->addActionForTree(mArchiveViewNewPartA); - c->addActionForTree(createSeparator()); - c->addActionForTree(mArchiveViewActorsA); - c->addActionForTree(mArchiveViewGenresA); - c->addActionForTree(mArchiveViewPartnoA); - c->addActionForTree(mArchiveViewMetadataA); - c->addActionForTree(mArchiveViewAddCoversA); - c->addActionForTree(createSeparator()); - c->addActionForTree(mArchiveViewMarkFavA); - c->addActionForTree(createSeparator()); - c->addActionForTree(mArchiveViewExpandAllA); - c->addActionForTree(mArchiveViewCollapseAllA); - c->addActionForTree(createSeparator()); - c->addActionForTree(mArchiveViewDeleteA); - c->addActionForTree(createSeparator()); - c->addActionForTree(mArchiveViewRefreshA); - QMenu *archiveTreeM = new QMenu(tr("Archive"), this); - archiveTreeM->addActions(c->archiveTree()->actions()); - - // Archive files (exp.) - c->archiveFiles()->addAction(mArchiveFilesPlayA); - c->archiveFiles()->addAction(createSeparator()); - c->archiveFiles()->addAction(mArchiveFilesQualityA); - c->archiveFiles()->addAction(mArchiveFilesDvdNoA); - c->archiveFiles()->addAction(mArchiveFilesTypeA); - c->archiveFiles()->addAction(mArchiveFilesFileNoA); - c->archiveFiles()->addAction(createSeparator()); - c->archiveFiles()->addAction(mArchiveRemoveFilesA); - c->archiveFiles()->addAction(createSeparator()); - c->archiveFiles()->addAction(mArchiveFilesPreviewA); - c->archiveFiles()->addAction(createSeparator()); - c->archiveFiles()->addAction(mArchiveFilesPropertiesA); - QMenu *archiveFilesM = new QMenu(tr("Files"), this); - archiveFilesM->addActions(c->archiveFiles()->actions()); - // ArchiveBrowser context menu mArchiveBrowser->archiveTree()->addAction(mArchiveBrowserPlaySelectedA); mArchiveBrowser->archiveTree()->addAction(createSeparator()); @@ -713,26 +559,12 @@ void SheMov::createMenus(){ mArchiveBrowser->archiveTree()->addAction(createSeparator()); mArchiveBrowser->archiveTree()->addAction(mArchiveBrowserRefreshA); - mArchiveEditMenu->addMenu(archiveTreeM); - mArchiveEditMenu->addMenu(archiveFilesM); - // Random mRandomEditMenu = mRandomTab->editMenu(); mRandomEditMenuA = menuBar()->insertMenu(mArchiveMenuA, mRandomEditMenu); } void SheMov::createToolBar(){ - mArchive->toolBar()->addAction(mArchiveFilesQualityA); - mArchive->toolBar()->addAction(mArchiveFilesDvdNoA); - mArchive->toolBar()->addAction(mArchiveFilesTypeA); - mArchive->toolBar()->addAction(mArchiveFilesFileNoA); - mArchive->toolBar()->addSeparator(); - mArchive->toolBar()->addAction(mArchiveFilesPreviewA); - mArchive->toolBar()->addAction(mArchiveFilesPropertiesA); - mArchive->toolBar()->addAction(mArchiveViewAddCoversA); - mArchive->toolBar()->addSeparator(); - mArchive->toolBar()->addAction(mConfigA); - mArchiveBrowser->toolBar()->addAction(mArchiveBrowserPlaySelectedA); mArchiveBrowser->toolBar()->addSeparator(); mArchiveBrowser->toolBar()->addAction(mArchiveBrowserRefreshA); @@ -813,11 +645,3 @@ void SheMov::toggleHover(QObject *object){ emit configChanged(); } } - -void SheMov::searchResult(int seriesPartId){ - mSearchDialog->hide(); - mTab->setCurrentIndex(Movies); - ArchiveController *c = SmGlobals::instance()->archiveController(); - c->archiveTree()->setFocus(); - c->setSeriesPart(seriesPartId); -} -- cgit v1.2.3-70-g09d2