Get rid of old archive

Yeah, finally it's gone! Lot's of useless, unneeded code vanished :)

1 files changed, 15 insertions, 403 deletions

diff --git a/shemov.cpp b/shemov.cpp
index 78097f1..7a905c4 100644
--- a/shemov.cpp
+++ b/shemov.cpp
@@ -5,17 +5,17 @@
   2 of the License, or (at your option) any later version.
 */
 
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QVBoxLayout>
-#include <QtWidgets/QMenuBar>
-#include <QtWidgets/QStatusBar>
-#include <QtWidgets/QLabel>
+#include <QApplication>
+#include <QVBoxLayout>
+#include <QMenuBar>
+#include <QStatusBar>
+#include <QLabel>
 #include <QSignalMapper>
 #include <QSettings>
-#include <QtWidgets/QMessageBox>
+#include <QMessageBox>
 #include <QCloseEvent>
-#include <QtWidgets/QToolBar>
-#include <QtWidgets/QSplashScreen>
+#include <QToolBar>
+#include <QSplashScreen>
 
 #include <sys/vfs.h>
 
@@ -24,13 +24,8 @@
 #include "fileview.h"
 #include "configurationdialog.h"
 #include "statisticsdialog.h"
-#include "archivetreeview.h"
 #include "smglobals.h"
-#include "seriestreewidget.h"
-#include "seriestreemodel.h"
 #include "newmoviewizard.h"
-#include "filestreewidget.h"
-#include "filestreemodel.h"
 #include "consistencycheck.h"
 #include "mappingtableeditor.h"
 #include "mappingtablemodel.h"
@@ -63,23 +58,11 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla
 	mTab->addTab(mFSWidget, tr("Filemanager"));
 	connect(this, SIGNAL(configChanged()), mFSWidget, SLOT(configChanged()));
 
-	//ArchiveTreeView
-    splash.showMessage(tr("Creating Archive..."), Qt::AlignHCenter, Qt::yellow);
-    qApp->processEvents();
-	mATree = new ArchiveTreeView;
-	mTab->addTab(mATree, "Archive");
-	connect(mATree->filesWidget(), SIGNAL(statusMessage(QString)), this, SLOT(statusbarMessage(QString)));
-	connect(mATree, SIGNAL(needWindowTitleChange(QString)), this, SLOT(setWindowTitle(QString)));
-    connect(mATree->filesWidget(), SIGNAL(numSelected(int)), this, SLOT(updateSelectedCount(int)));
-    connect(mATree->filesWidget(), SIGNAL(selectedSize(qint64)), this, SLOT(setSize(qint64)));
-    connect(mATree->filesWidget(), SIGNAL(statusMessage(QString)), this, SLOT(statusbarMessage(QString)));
-	connect(this, SIGNAL(configChanged()), mATree, SLOT(readSettings()));
-
     //experimental
-    splash.showMessage(tr("Creating experimental"), Qt::AlignHCenter, Qt::yellow);
+    splash.showMessage(tr("Creating Movie archive..."), Qt::AlignHCenter, Qt::yellow);
     qApp->processEvents();
     mArchive = new ArchiveView;
-    mTab->addTab(mArchive, "Experimental");
+    mTab->addTab(mArchive, "Movies");
     connect(mArchive->archiveModel(), SIGNAL(message(QString)), this, SLOT(statusbarMessage(QString)));
 
     //pictures
@@ -131,7 +114,6 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla
 	connect(mFSWidget->dirModel(), SIGNAL(layoutChanged()), this, SLOT(setFsFree()));
 	connect(mFSWidget->dirModel(), SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SLOT(setFsFree()));
 	connect(this, SIGNAL(configChanged()), mFSWidget->fileView(), SLOT(readConfig()));
-	connect(this, SIGNAL(configChanged()), mATree->seriesWidget(), SLOT(readSettings()));
     connect(this, SIGNAL(configChanged()), picViewer, SLOT(readSettings()));
     connect(this, SIGNAL(configChanged()), c->archiveTreeModel(), SLOT(readConfig()));
 	connect(mFSWidget, SIGNAL(mounted(bool)), this, SLOT(checkMount(bool)));
@@ -142,7 +124,6 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla
 
 	show();
     splash.finish(this);
-    mATree->readSettings();
     mFSWidget->readSettings();
 	mFSWidget->fileView()->setFocus(Qt::ActiveWindowFocusReason);
     mPicWidget->readSettings();
@@ -154,8 +135,6 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla
 void SheMov::closeEvent(QCloseEvent *event){
 	mFSWidget->writeSettings();
 	mFSWidget->pictureViewer()->close();
-    mATree->seriesWidget()->writeSettings();
-    mATree->filesWidget()->filesTree()->writeSettings();
     mPicWidget->picViewer2()->writeSettings();
     mPicWidget->writeSettings();
     mArchive->writeSettings();
@@ -178,27 +157,20 @@ void SheMov::configure(){
 	ConfigurationDialog dlg(this);
 	dlg.exec();
 	createOpenWithMenuFS();
-	createOpenWithMenuAV();
     createPalette();
 	emit configChanged();
 }
 
 void SheMov::tabChanged(int newTab){
     mEditFSMenuA->setVisible(newTab == FileManager);
-    mEditAVMenuA->setVisible(newTab == Archive);
     mEditPicMenuA->setVisible(newTab == Pictures);
     mViewFSMenuA->setVisible(newTab == FileManager);
-    mViewAVMenuA->setVisible(newTab == Archive);
     mViewPicMenuA->setVisible(newTab == Pictures);
-    mArchiveViewMenuA->setVisible(newTab == Experimental);
-    mArchiveMenuA->setVisible(newTab == Experimental);
+    mArchiveViewMenuA->setVisible(newTab == Movies);
+    mArchiveMenuA->setVisible(newTab == Movies);
     mCdupA->setEnabled(newTab == FileManager);
     mBackDirA->setEnabled(newTab == FileManager);
-    mFilesTreeHeadersGroup->setEnabled(newTab == Archive);
-    mFilterGroup->setEnabled(newTab == Archive);
-    mShowTreeGroup->setEnabled(newTab == Archive);
     mPicActionGroup->setEnabled(newTab == Pictures);
-    mFilterFavoritesA->setEnabled(newTab == Archive);
     mPVSelectAllA->disconnect();
     mPVShowNPDialogA->setEnabled(newTab == FileManager);
     mPVAddToNPA->setEnabled(newTab == FileManager);
@@ -210,7 +182,7 @@ void SheMov::tabChanged(int newTab){
             mFSWidget->fileView()->selectedFilesChanged();
             mFSWidget->setWindowTitle();
             break;
-        case Experimental:
+        case Movies:
             c->fileSelectionChanged(QItemSelection(), QItemSelection());
             c->archiveTreeModel()->setWindowTitle();
             break;
@@ -464,31 +436,6 @@ void SheMov::createActions(){
     mRefreshA = new QAction(tr("Refresh"), this);
     connect(mRefreshA, SIGNAL(triggered()), mFSWidget->fileModel(), SLOT(refresh()));
 
-	//Edit menu (AV)
-	QSignalMapper *editMapper = new QSignalMapper(this);
-	FilesTreeModel *filesModel = qobject_cast<FilesTreeModel*>(SmGlobals::instance()->model("FilesModel"));
-	const QHash<QString, int> editableColumns = filesModel->editableColumns();
-	mEditGroup = new QActionGroup(this);
-	for(QHash<QString, int>::const_iterator it = editableColumns.constBegin(); it != editableColumns.constEnd(); ++it){
-		QAction *a = new QAction(it.key(), this);
-		connect(a, SIGNAL(triggered()), editMapper, SLOT(map()));
-		a->setData(it.key());
-		mEditGroup->addAction(a);
-		editMapper->setMapping(a, it.value());
-	}
-	connect(editMapper, SIGNAL(mapped(int)), mATree->filesWidget(), SLOT(edit(int)));
-	mToggleFavoriteA = new QAction(tr("Toggle as favorite"), this);
-	mToggleFavoriteA->setShortcut(tr("CTRL+m"));
-	connect(mToggleFavoriteA, SIGNAL(triggered()), mATree->seriesWidget(), SLOT(toggleFavorite()));
-	QSignalMapper *mappingMapper = new QSignalMapper(this);
-	mEditGenresA = new QAction(tr("Edit genres..."), this);
-	mappingMapper->setMapping(mEditGenresA, "genre");
-	connect(mEditGenresA, SIGNAL(triggered()), mappingMapper, SLOT(map()));
-	mEditActorsA = new QAction(tr("Edit actors..."), this);
-	mappingMapper->setMapping(mEditActorsA, "actor");
-	connect(mEditActorsA, SIGNAL(triggered()), mappingMapper, SLOT(map()));
-	connect(mappingMapper, SIGNAL(mapped(QString)), this, SLOT(editMappings(QString)));
-
 	//Help menu
 	QString aboutLabel = QString(tr("About %1...")).arg(qApp->applicationName());
 	mAboutShemovA = new QAction(aboutLabel, this);
@@ -498,52 +445,7 @@ void SheMov::createActions(){
 	mStatisticsA = new QAction(tr("Some statistics..."), this);
 	connect(mStatisticsA, SIGNAL(triggered()), this, SLOT(showStatistics()));
 
-	//Tree series context menu
-	mDeleteFromSeriesA = new QAction(tr("Delete entries..."), this);
-	connect(mDeleteFromSeriesA, SIGNAL(triggered()), mATree->seriesWidget(), SLOT(deleteFromSeries()));
-	mPlaySelectedAVA = new QAction(tr("Play selected movies..."), this);
-	connect(mPlaySelectedAVA, SIGNAL(triggered()), mATree, SLOT(playSelected()));
-	mExpandAllSeriesA = new QAction(tr("Expand all"), this);
-	connect(mExpandAllSeriesA, SIGNAL(triggered()), mATree->seriesWidget()->seriesTree(), SLOT(expandAll()));
-	mCollapseAllSeriesA = new QAction(tr("Collapse all"), this);
-	connect(mCollapseAllSeriesA, SIGNAL(triggered()), mATree->seriesWidget()->seriesTree(), SLOT(collapseAll()));
-	mExpandCurrentA = new QAction(tr("Expand"), this);
-	connect(mExpandCurrentA, SIGNAL(triggered()), mATree->seriesWidget(), SLOT(expandCurrent()));
-	mAddCoverA = new QAction(tr("Add cover..."), this);
-	connect(mAddCoverA, SIGNAL(triggered()), mATree->seriesWidget(), SLOT(addCover()));
-	mEditItemA = new QAction(tr("Edit..."), this);
-	connect(mEditItemA, SIGNAL(triggered()), mATree->seriesWidget(), SLOT(editItem()));
-
-	//Tree view menu
-	mShowTreeGroup = new QActionGroup(this);
-	QSignalMapper *viewMapper = new QSignalMapper(this);
-	mShowArchivedA = new QAction(QIcon(":/gaping_ass.png"), tr("Show archived movies"), this);
-	mShowTreeGroup->addAction(mShowArchivedA);
-	viewMapper->setMapping(mShowArchivedA, SeriesTreeModel::Archived);
-	connect(mShowArchivedA, SIGNAL(triggered()), viewMapper, SLOT(map()));
-	mShowArchivedA->setCheckable(true);
-	mShowLocalA = new QAction(QIcon(":/clitoris.png"), tr("Show local movies"), this);
-	mShowTreeGroup->addAction(mShowLocalA);
-	viewMapper->setMapping(mShowLocalA, SeriesTreeModel::Local);
-	connect(mShowLocalA, SIGNAL(triggered()), viewMapper, SLOT(map()));
-	mShowLocalA->setCheckable(true);
-	mShowNormalA = new QAction(QIcon(":/nipple_up.png"), tr("Normal view"), this);
-    mATree->setNormalViewAction(mShowNormalA);
-	mShowTreeGroup->addAction(mShowNormalA);
-	viewMapper->setMapping(mShowNormalA, SeriesTreeModel::All);
-	connect(mShowNormalA, SIGNAL(triggered()), viewMapper, SLOT(map()));
-	mShowNormalA->setCheckable(true);
-	mShowNormalA->setChecked(true);
-    mShowBurnFilesA = new QAction(QIcon(":/male_chastity_belt.png"), tr("Show Files to Burn"), this);
-    mShowBurnFilesA->setCheckable(true);
-    mShowTreeGroup->addAction(mShowBurnFilesA);
-    connect(mShowBurnFilesA, SIGNAL(toggled(bool)), mATree, SLOT(showForBurn(bool)));
-
     //headers
-    mFilesTreeHeadersGroup = new QActionGroup(this);
-    QSignalMapper *fileTreeHeaderMapper = createHeaderMapper(filesModel, mFilesTreeHeadersGroup);
-    connect(fileTreeHeaderMapper, SIGNAL(mapped(QObject*)), mATree->filesWidget()->filesTree(), SLOT(toggleHeader(QObject*)));
-    mATree->filesWidget()->filesTree()->setHeaderGroup(mFilesTreeHeadersGroup);
     mFileSysHeaderGroup = new QActionGroup(this);
     QSignalMapper *fileSysHeaderMapper = createHeaderMapper(qobject_cast<SmTreeModel*>(mFSWidget->fileModel()), mFileSysHeaderGroup);
     connect(fileSysHeaderMapper, SIGNAL(mapped(QObject*)), mFSWidget->fileView(), SLOT(toggleHeader(QObject*)));
@@ -560,117 +462,14 @@ void SheMov::createActions(){
     connect(aFilesMapper, SIGNAL(mapped(QObject*)), controller->archiveFiles(), SLOT(toggleHeader(QObject*)));
     controller->archiveFiles()->setHeaderGroup(mArchiveFilesAG);
 
-	//Tree view hover
-	mHoverTreeGroup = new QActionGroup(this);
-	mHoverTreeGroup->setExclusive(false);
-	QSignalMapper *hoverMapper = new QSignalMapper(this);
-	mHoverPicsA = new QAction(QIcon(":/bald_pussy.png"), tr("Hover over pictures"), this);
-	mHoverPicsA->setData("ui/hoverpics");
-	mHoverPicsA->setCheckable(true);
-	hoverMapper->setMapping(mHoverPicsA, mHoverPicsA);
-	connect(mHoverPicsA, SIGNAL(triggered()), hoverMapper, SLOT(map()));
-	mHoverTreeGroup->addAction(mHoverPicsA);
-	mHoverArchiveA = new QAction(QIcon(":/prince_albert.png"), tr("Hover over archive tree"), this);
-	mHoverArchiveA->setData("ui/hoverarchive");
-	mHoverArchiveA->setCheckable(true);
-	hoverMapper->setMapping(mHoverArchiveA, mHoverArchiveA);
-	connect(mHoverArchiveA, SIGNAL(triggered()), hoverMapper, SLOT(map()));
-	mHoverTreeGroup->addAction(mHoverArchiveA);
-	mHoverMoviesA = new QAction(QIcon(":/ball_gag.png"), tr("Hover over movies"), this);
-	mHoverMoviesA->setData("ui/hovermovies");
-	mHoverMoviesA->setCheckable(true);
-	hoverMapper->setMapping(mHoverMoviesA, mHoverMoviesA);
-	connect(mHoverMoviesA, SIGNAL(triggered()), hoverMapper, SLOT(map()));
-	mHoverTreeGroup->addAction(mHoverMoviesA);
-
-	//Tree view filter
-	mFilterGroup = new QActionGroup(this);
-	mFilterMapper = new QSignalMapper(this);
-	mFilterBySeriesA = new QAction(QIcon(":/butt_plug.png"), tr("Series name"), this);
-	mFilterBySeriesA->setCheckable(true);
-	mFilterMapper->setMapping(mFilterBySeriesA, SeriesTreeWidget::FilterSeries);
-	connect(mFilterBySeriesA, SIGNAL(triggered()), mFilterMapper, SLOT(map()));
-	mFilterGroup->addAction(mFilterBySeriesA);
-	mFilterByActorA = new QAction(QIcon(":/bizarre_amputee.png"), tr("Actor"), this);
-	mFilterByActorA->setCheckable(true);
-	mFilterMapper->setMapping(mFilterByActorA, SeriesTreeWidget::FilterActor);
-	connect(mFilterByActorA, SIGNAL(triggered()), mFilterMapper, SLOT(map()));
-	mFilterGroup->addAction(mFilterByActorA);
-	mFilterByGenreA = new QAction(QIcon(":/spreadingpants.png"), tr("Genre"), this);
-	mFilterByGenreA->setCheckable(true);
-	mFilterMapper->setMapping(mFilterByGenreA, SeriesTreeWidget::FilterGenre);
-	connect(mFilterByGenreA, SIGNAL(triggered()), mFilterMapper, SLOT(map()));
-	mFilterGroup->addAction(mFilterByGenreA);
-	mFilterByQualityA = new QAction(QIcon(":/shackles.png"), tr("Quality"), this);
-	mFilterByQualityA->setCheckable(true);
-	mFilterMapper->setMapping(mFilterByQualityA, SeriesTreeWidget::FilterQuality);
-	connect(mFilterByQualityA, SIGNAL(triggered()), mFilterMapper, SLOT(map()));
-	mFilterGroup->addAction(mFilterByQualityA);
-	mFilterByFilenameA = new QAction(QIcon(":/steel_collar.png"), tr("Filename"), this);
-	mFilterByFilenameA->setCheckable(true);
-	mFilterMapper->setMapping(mFilterByFilenameA, SeriesTreeWidget::FilterFileName);
-	connect(mFilterByFilenameA, SIGNAL(triggered()), mFilterMapper, SLOT(map()));
-	mFilterGroup->addAction(mFilterByFilenameA);
-	mFilterByDvdNoA = new QAction(QIcon(":/big_ass.png"), tr("Dvd No."), this);
-	mFilterByDvdNoA->setCheckable(true);
-	mFilterMapper->setMapping(mFilterByDvdNoA, SeriesTreeWidget::FilterDvdNo);
-	connect(mFilterByDvdNoA, SIGNAL(triggered()), mFilterMapper, SLOT(map()));
-	mFilterGroup->addAction(mFilterByDvdNoA);
-	mFilterBySizeA = new QAction(QIcon(":/hourglass_figure.png"), tr("Size"), this);
-	mFilterBySizeA->setCheckable(true);
-	mFilterMapper->setMapping(mFilterBySizeA, SeriesTreeWidget::FilterSize);
-	connect(mFilterBySizeA, SIGNAL(triggered()), mFilterMapper, SLOT(map()));
-	mFilterGroup->addAction(mFilterBySizeA);
-	connect(mFilterMapper, SIGNAL(mapped(int)), mATree->seriesWidget(), SLOT(setFilterMode(int)));
-	mFilterFavoritesA = new QAction(QIcon(":/dog_hood.png"), tr("Favorites only"), this);
-	mFilterFavoritesA->setCheckable(true);
-	connect(mFilterFavoritesA, SIGNAL(triggered(bool)), this, SLOT(toggleFilterGroup(bool)));
-	connect(mFilterFavoritesA, SIGNAL(triggered(bool)), mATree->seriesWidget(), SLOT(filterFavorites(bool)));
-
 	//file view hover
 	mFSHoverGroup = new QActionGroup(this);
 	mFSHoverGroup->setExclusive(false);
 	mHoverDirectoriesA = new QAction(QIcon(":/french_maid_dress.png"), tr("Hover over directories"), this);
 	mHoverDirectoriesA->setData("ui/hoverdirs");
 	mHoverDirectoriesA->setCheckable(true);
-	hoverMapper->setMapping(mHoverDirectoriesA, mHoverDirectoriesA);
-	connect(mHoverDirectoriesA, SIGNAL(triggered()), hoverMapper, SLOT(map()));
 	mFSHoverGroup->addAction(mHoverDirectoriesA);
 
-	//connect hovermapper
-	connect(hoverMapper, SIGNAL(mapped(QObject*)), this, SLOT(toggleHover(QObject*)));
-
-	//Tree FileWidget actions
-	mMoveToBurnA = new QAction(tr("Move to burn directory"), this);
-	connect(mMoveToBurnA, SIGNAL(triggered()), mATree->filesWidget(), SLOT(moveToBurn()));
-    mMoveToSeriesA = new QAction(tr("Move to series..."), this);
-    connect(mMoveToSeriesA, SIGNAL(triggered()), mATree->filesWidget(), SLOT(moveToSeries()));
-	mMoveFilesA = new QAction(tr("Move to directory..."), this);
-	connect(mMoveFilesA, SIGNAL(triggered()), mATree->filesWidget(), SLOT(moveToDirectory()));
-	mDeleteFilesFromTreeA = new QAction(tr("Delete file(s)..."), this);
-	connect(mDeleteFilesFromTreeA, SIGNAL(triggered()), mATree->filesWidget(), SLOT(removeFiles()));
-	mFilePropertiesA = new QAction(tr("Properties..."), this);
-	connect(mFilePropertiesA, SIGNAL(triggered()), mATree->filesWidget(), SLOT(fileProperties()));
-	QSignalMapper *copyMapper = new QSignalMapper(this);
-	mCopyUnixFullPathA = new QAction(tr("Copy unix file"), this);
-	copyMapper->setMapping(mCopyUnixFullPathA, ArchiveTreeView::UnixFullPath);
-	connect(mCopyUnixFullPathA, SIGNAL(triggered()), copyMapper, SLOT(map()));
-	mCopyUnixDirA = new QAction(tr("Copy unix directory"), this);
-	copyMapper->setMapping(mCopyUnixDirA, ArchiveTreeView::UnixDir);
-	connect(mCopyUnixDirA, SIGNAL(triggered()), copyMapper, SLOT(map()));
-	mCopyWindowsFullPathA = new QAction(tr("Copy windows file"), this);
-	copyMapper->setMapping(mCopyWindowsFullPathA, ArchiveTreeView::WindowsFullPath);
-	connect(mCopyWindowsFullPathA, SIGNAL(triggered()), copyMapper, SLOT(map()));
-	mCopyWindowsDirA = new QAction(tr("Copy windows directory"), this);
-	copyMapper->setMapping(mCopyWindowsDirA, ArchiveTreeView::WindowsDir);
-	connect(mCopyWindowsDirA, SIGNAL(triggered()), copyMapper, SLOT(map()));
-	connect(copyMapper, SIGNAL(mapped(int)), mATree, SLOT(copyPath(int)));
-	mSuggestFileA = new QAction(QIcon(":/analstretcher.png"), tr("Suggest file for burning"), this);
-	connect(mSuggestFileA, SIGNAL(triggered()), mATree->filesWidget(), SLOT(suggest()));
-    mShowTreeGroup->addAction(mSuggestFileA);
-    mPlaySelectedArchiveFilesA = new QAction(tr("Play selected...."), this);
-    connect(mPlaySelectedArchiveFilesA, SIGNAL(triggered()), mATree->filesWidget(), SLOT(playSelected()));
-
     /* very unfortunate naming of variables:
      * picViewer: the actual PictureViewer2 window
      * picView: the picture files TreeView
@@ -820,10 +619,7 @@ void SheMov::createActions(){
 
 	// misc
 	mOpenWithMapperFS = new QSignalMapper(this);
-	mOpenWithMapperAV = new QSignalMapper(this);
 	connect(mOpenWithMapperFS, SIGNAL(mapped(QString)), mFSWidget, SLOT(playSelected(QString)));
-	connect(mOpenWithMapperAV, SIGNAL(mapped(QString)), mATree, SLOT(playSelected(QString)));
-	connect(viewMapper, SIGNAL(mapped(int)), mATree, SLOT(setFileViewMode(int)));
 }
 
 void SheMov::createMenus(){
@@ -873,16 +669,6 @@ void SheMov::createMenus(){
 	mEditFSMenu->addAction(mConfigA);
 	mEditFSMenuA = menuBar()->addMenu(mEditFSMenu);
 
-	//TreeView edit menu
-	mEditAVMenu = new QMenu(tr("&Edit"), this);
-	foreach(QAction *a, mEditGroup->actions()){
-		mEditAVMenu->addAction(a);
-	}
-	mEditAVMenuA = menuBar()->addMenu(mEditAVMenu);
-    mEditAVMenu->addSeparator();
-	mEditAVMenu->addAction(mEditActorsA);
-	mEditAVMenu->addAction(mEditGenresA);
-
     //Pictures edit menu
     mEditPicMenu = new QMenu(tr("&Edit"), this);
     mEditPicMenu->addAction(mPWDeletePicFromA);
@@ -893,33 +679,6 @@ void SheMov::createMenus(){
     mArchiveEditMenu = new QMenu(tr("&Edit"), this);
     mArchiveMenuA = menuBar()->addMenu(mArchiveEditMenu);
 
-	//TreeView view menu
-	mTreeViewMenu = new QMenu(tr("&View"), this);
-	mTreeViewMenu->addAction(mShowNormalA);
-	mTreeViewMenu->addAction(mShowLocalA);
-	mTreeViewMenu->addAction(mShowArchivedA);
-    mTreeViewMenu->addAction(mShowBurnFilesA);
-	mTreeViewMenu->addAction(mSuggestFileA);
-    mTreeViewMenu->addSeparator();
-
-    mTreeHeaderMenu = new QMenu(tr("Show headers"), this);
-	mTreeHeaderMenu->addActions(mFilesTreeHeadersGroup->actions());
-	mTreeViewMenu->addMenu(mTreeHeaderMenu);
-    mTreeViewMenu->addSeparator();
-
-	mTreeHoverMenu = new QMenu(tr("Hover over"), this);
-	mTreeHoverMenu->addActions(mHoverTreeGroup->actions());
-	mTreeViewMenu->addMenu(mTreeHoverMenu);
-	mViewAVMenuA = menuBar()->addMenu(mTreeViewMenu);
-    mTreeViewMenu->addSeparator();
-
-	mTreeFilterMenu = new QMenu(tr("Filter by"), this);
-	mTreeFilterMenu->addActions(mFilterGroup->actions());
-	mTreeViewMenu->addMenu(mTreeFilterMenu);
-    mTreeViewMenu->addSeparator();
-
-	mTreeViewMenu->addAction(mFilterFavoritesA);
-
 	//FileSystem view menu
 	mFSViewMenu = new QMenu(tr("&View"), this);
 	mFSHoverMenu = new QMenu(tr("Hover over"), this);
@@ -947,7 +706,7 @@ void SheMov::createMenus(){
     mPicViewMenu->addAction(mPWRefreshA);
     mViewPicMenuA = menuBar()->addMenu(mPicViewMenu);
 
-    //<delete me when fin>
+    //Movie archive
     QMenu *archiveHeaderMenu = new QMenu(tr("Show headers"), this);
     archiveHeaderMenu->addActions(mArchiveFilesAG->actions());
     mArchiveViewMenu = new QMenu(tr("&View"), this);
@@ -998,50 +757,7 @@ void SheMov::createMenus(){
     mFSWidget->fileView()->addAction(mArchiveSelectedPicsA);
     mFSWidget->fileView()->addAction(mArchiveSelectedMovsA);
 
-	//ArchiveTreeView context menu
-    mATree->seriesWidget()->seriesTree()->addAction(mEditItemA);
-    mATree->seriesWidget()->seriesTree()->addAction(createSeparator());
-	mATree->seriesWidget()->seriesTree()->addAction(mDeleteFromSeriesA);
-    mATree->seriesWidget()->seriesTree()->addAction(createSeparator());
-
-	mOpenWithMenuAV = new QMenu(tr("Open with"), this);
-	mATree->seriesWidget()->seriesTree()->addAction(mPlaySelectedAVA);
-	createOpenWithMenuAV();
-	mOpenWithMenuAVA = new QAction(tr("Open with"), this);
-	mOpenWithMenuAVA->setMenu(mOpenWithMenuAV);
-	mATree->seriesWidget()->seriesTree()->addAction(mOpenWithMenuAVA);
-    mATree->seriesWidget()->seriesTree()->addAction(createSeparator());
-
-	mATree->seriesWidget()->seriesTree()->addAction(mExpandCurrentA);
-	mATree->seriesWidget()->seriesTree()->addAction(mExpandAllSeriesA);
-	mATree->seriesWidget()->seriesTree()->addAction(mCollapseAllSeriesA);
-    mATree->seriesWidget()->seriesTree()->addAction(createSeparator());
-
-	mATree->seriesWidget()->seriesTree()->addAction(mAddCoverA);
-    mATree->seriesWidget()->seriesTree()->addAction(createSeparator());
-
-	mATree->seriesWidget()->seriesTree()->addAction(mToggleFavoriteA);
-
-	//ArchiveTreeView fileWidget context menu
-    mATree->filesWidget()->filesTree()->addAction(mPlaySelectedArchiveFilesA);
-    mATree->filesWidget()->filesTree()->addAction(createSeparator());
-
-	mATree->filesWidget()->filesTree()->addAction(mMoveToBurnA);
-	mATree->filesWidget()->filesTree()->addAction(mMoveFilesA);
-    mATree->filesWidget()->filesTree()->addAction(mMoveToSeriesA);
-    mATree->filesWidget()->filesTree()->addAction(createSeparator());
-
-	mATree->filesWidget()->filesTree()->addActions(mEditGroup->actions());
-    mATree->filesWidget()->filesTree()->addAction(createSeparator());
-
-    mATree->filesWidget()->filesTree()->addAction(mShowBurnFilesA);
-	mATree->filesWidget()->filesTree()->addAction(mSuggestFileA);
-    mATree->filesWidget()->filesTree()->addAction(createSeparator());
-
-	mATree->filesWidget()->filesTree()->addAction(mDeleteFilesFromTreeA);
-    mATree->filesWidget()->filesTree()->addAction(createSeparator());
-
-    // Archive tree (exp.)
+    // Movie archive
     ArchiveController *c = SmGlobals::instance()->archiveController();
     c->addActionForTree(mArchiveViewRenameA);
     c->addActionForTree(createSeparator());
@@ -1064,23 +780,6 @@ void SheMov::createMenus(){
 
     mArchiveEditMenu->addMenu(archiveTreeM);
     mArchiveEditMenu->addMenu(archiveFilesM);
-    /*mArchiveEditMenu->addActions(c->archiveTree()->actions());
-    mArchiveEditMenu->addAction(createSeparator());
-    mArchiveEditMenu->addActions(c->archiveFiles()->actions());*/
-
-	QMenu *copyMenu = new QMenu(this);
-	copyMenu->addAction(mCopyUnixFullPathA);
-	copyMenu->addAction(mCopyUnixDirA);
-    copyMenu->addSeparator();
-	copyMenu->addAction(mCopyWindowsFullPathA);
-	copyMenu->addAction(mCopyWindowsDirA);
-
-	QAction *copyAction = new QAction(tr("Copy to clipboard"), this);
-	copyAction->setMenu(copyMenu);
-	mATree->filesWidget()->filesTree()->addAction(copyAction);
-    mATree->filesWidget()->filesTree()->addAction(createSeparator());
-
-	mATree->filesWidget()->filesTree()->addAction(mFilePropertiesA);
 }
 
 void SheMov::createOpenWithMenuFS(){
@@ -1113,25 +812,6 @@ void SheMov::createOpenWithMenuFS(){
 	}
 }
 
-void SheMov::createOpenWithMenuAV(){
-	if(mOpenWithGroupAV){
-		foreach(QAction *a, mOpenWithGroupAV->actions()){
-			mOpenWithMenuAV->removeAction(a);
-		}
-		//this deletes all actions in the group also!
-		mOpenWithGroupAV->deleteLater();
-	}
-	mOpenWithGroupAV = new QActionGroup(this);
-	QSettings s;
-	QStringList players = s.value("programs_movieviewer/data").toHash().keys();
-	foreach(QString p, players){
-		QAction *a = new QAction(p, mOpenWithGroupAV);
-		mOpenWithMenuAV->addAction(a);
-		mOpenWithMapperAV->setMapping(a, p);
-		connect(a, SIGNAL(triggered()), mOpenWithMapperAV, SLOT(map()));
-	}
-}
-
 void SheMov::createToolBar(){
 	QToolBar *toolBar = new QToolBar(this);
 	toolBar->addAction(mBackDirA);
@@ -1139,22 +819,10 @@ void SheMov::createToolBar(){
 	toolBar->addSeparator();
 	toolBar->addAction(mConfigA);
 	toolBar->addSeparator();
-	toolBar->addAction(mShowNormalA);
-	toolBar->addAction(mShowArchivedA);
-	toolBar->addAction(mShowLocalA);
-    toolBar->addAction(mShowBurnFilesA);
-	toolBar->addAction(mSuggestFileA);
-	toolBar->addSeparator();
-	toolBar->addActions(mFilterGroup->actions());
-	toolBar->addAction(mFilterFavoritesA);
-	toolBar->addSeparator();
     toolBar->addActions(mPicActionGroup->actions());
     toolBar->addAction(mPVToggleA);
     toolBar->addSeparator();
-	toolBar->addAction(mHoverPicsA);
-	toolBar->addAction(mHoverArchiveA);
 	toolBar->addAction(mHoverDirectoriesA);
-	toolBar->addAction(mHoverMoviesA);
 	toolBar->addSeparator();
 	toolBar->addAction(mMountDvdA);
 	addToolBar(Qt::LeftToolBarArea, toolBar);
@@ -1163,17 +831,6 @@ void SheMov::createToolBar(){
 void SheMov::writeSettings(){
 	QSettings s;
     s.setValue("ui/selectedtab", mTab->currentIndex());
-	FilesTreeModel *filesModel = static_cast<FilesTreeModel*>(SmGlobals::instance()->model("FilesModel"));
-	s.setValue("ui/filestreemode", filesModel->mode());
-	QList<QVariant> visibleHeaders;
-	foreach(QAction *a, mFilesTreeHeadersGroup->actions()){
-		if(a->isChecked()){
-			visibleHeaders << a->data();
-		}
-	}
-	s.setValue("ui/visibleheaders", visibleHeaders);
-	mATree->filesWidget()->filesTree()->writeHeaderConfig();
-    s.setValue("ui/showallfiles", mShowBurnFilesA->isChecked());
 }
 
 void SheMov::readSettings(){
@@ -1183,10 +840,7 @@ void SheMov::readSettings(){
 		mTab->setCurrentIndex(currentTab);
 	}
 	tabChanged(currentTab);
-	mHoverPicsA->setChecked(s.value("ui/hoverpics").toBool());
-	mHoverArchiveA->setChecked(s.value("ui/hoverarchive").toBool());
 	mHoverDirectoriesA->setChecked(s.value("ui/hoverdirs").toBool());
-	mHoverMoviesA->setChecked(s.value("ui/hovermovies").toBool());
 	QString dvdMount = s.value("paths/dvdmount").toString();
 	if(dvdMount.isEmpty()){
 		mMountDvdA->setEnabled(false);
@@ -1197,17 +851,6 @@ void SheMov::readSettings(){
 			mMountDvdA->setChecked(false);
 		}
 	}
-
-	int seriesFilterMode = s.value("archive/filtermode").toInt();
-	QAction *filterAction = qobject_cast<QAction*>(mFilterMapper->mapping(seriesFilterMode));
-	if(filterAction){
-		filterAction->trigger();
-		mATree->seriesWidget()->filter();
-	}
-    bool showAllFiles = s.value("ui/showallfiles").toBool();
-    if(showAllFiles){
-        mShowBurnFilesA->trigger();
-    }
     createPalette();
 }
 
@@ -1268,28 +911,6 @@ void SheMov::checkConsistency(){
 	c.exec();
 }
 
-/*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){
-        return;
-    }
-    MappingTableModel *model = 0;
-    switch(mode){
-        case DbAnalyzerDialog::Actors:
-            model = qobject_cast<MappingTableModel*>(SmGlobals::instance()->model("actors"));
-            break;
-        case DbAnalyzerDialog::Genres:
-            model = qobject_cast<MappingTableModel*>(SmGlobals::instance()->model("genres"));
-            break;
-         default:
-            ;
-    }
-    Q_ASSERT(model);
-    model->deleteItems(ids);
-    mDbAnalyzerDialog->refresh();
-}*/
-
 void SheMov::toggleHover(QObject *object){
 	QAction *action = qobject_cast<QAction*>(object);
 	if(action){
@@ -1305,15 +926,6 @@ void SheMov::checkMount(bool mounted){
 	mMountDvdA->setChecked(mounted);
 }
 
-void SheMov::toggleFilterGroup(bool checked){
-	mFilterGroup->setEnabled(!checked);
-}
-
-void SheMov::editMappings(QString table){
-	MappingTableEditor ed(table, this);
-	ed.exec();
-}
-
 void SheMov::newPicsDialog(){
     mNewPicsDialog->exec();
 }