Fix menus

Fix sort order of menuBar(). It was different in AV and FSV. First comes
Edit, then View.

Create seperate View menus for FSV and AV.

1 files changed, 68 insertions, 43 deletions

diff --git a/shemov.cpp b/shemov.cpp
index c4b543c..77e4b31 100644
--- a/shemov.cpp
+++ b/shemov.cpp
@@ -163,27 +163,21 @@ void SheMov::configure(){
 void SheMov::tabChanged(int newTab){
 	mEditFSMenuA->setVisible(newTab == 0);
 	mEditAVMenuA->setVisible(newTab == 1);
+	mViewFSMenuA->setVisible(newTab == 0);
+	mViewAVMenuA->setVisible(newTab == 1);
 	if(newTab == 0){
 		setWindowTitle(mFSWidget->windowTitle());
 		mCdupA->setEnabled(true);
 		mBackDirA->setEnabled(true);
-		mShowNormalA->setEnabled(false);
-		mShowArchivedA->setEnabled(false);
-		mShowLocalA->setEnabled(false);
 		mShowNoCoverDialogA->setEnabled(false);
 		mFilesTreeHeadersGroup->setEnabled(false);
-		mTreeHeaderMenu->setEnabled(false);
 	}
 	if(newTab == 1){
 		setWindowTitle(mATree->windowTitle());
 		mCdupA->setEnabled(false);
 		mBackDirA->setEnabled(false);
-		mShowNormalA->setEnabled(true);
-		mShowArchivedA->setEnabled(true);
-		mShowLocalA->setEnabled(true);
 		mShowNoCoverDialogA->setEnabled(true);
 		mFilesTreeHeadersGroup->setEnabled(true);
-		mTreeHeaderMenu->setEnabled(true);
 	}
 	updateSelectionCount(QItemSelection(), QItemSelection());
 }
@@ -420,20 +414,20 @@ void SheMov::createActions(){
 	connect(mEditItemA, SIGNAL(triggered()), mATree->seriesWidget(), SLOT(editItem()));
 
 	//Tree view menu
-	mViewTreeGroup = new QActionGroup(this);
+	mShowTreeGroup = new QActionGroup(this);
 	QSignalMapper *viewMapper = new QSignalMapper(this);
 	mShowArchivedA = new QAction(QIcon(":/gaping_ass.png"), tr("Show archived movies"), this);
-	mViewTreeGroup->addAction(mShowArchivedA);
+	mShowTreeGroup->addAction(mShowArchivedA);
 	viewMapper->setMapping(mShowArchivedA, 1);
 	connect(mShowArchivedA, SIGNAL(triggered()), viewMapper, SLOT(map()));
 	mShowArchivedA->setCheckable(true);
 	mShowLocalA = new QAction(QIcon(":/clitoris.png"), tr("Show local movies"), this);
-	mViewTreeGroup->addAction(mShowLocalA);
+	mShowTreeGroup->addAction(mShowLocalA);
 	viewMapper->setMapping(mShowLocalA, 2);
 	connect(mShowLocalA, SIGNAL(triggered()), viewMapper, SLOT(map()));
 	mShowLocalA->setCheckable(true);
 	mShowNormalA = new QAction(QIcon(":/nipple_up.png"), tr("Normal view"), this);
-	mViewTreeGroup->addAction(mShowNormalA);
+	mShowTreeGroup->addAction(mShowNormalA);
 	viewMapper->setMapping(mShowNormalA, 0);
 	connect(mShowNormalA, SIGNAL(triggered()), viewMapper, SLOT(map()));
 	mShowNormalA->setCheckable(true);
@@ -456,6 +450,42 @@ void SheMov::createActions(){
 	}
 	connect(headerMapper, SIGNAL(mapped(QObject*)), mATree->filesWidget()->filesTree(), SLOT(toggleHeader(QObject*)));
 
+	//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);
+
+	//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()));
@@ -489,28 +519,7 @@ void SheMov::createActions(){
 	connect(viewMapper, SIGNAL(mapped(int)), mATree, SLOT(setFileViewMode(int)));
 
 	//hover
-	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()));
-	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()));
-	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()));
-	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()));
-	connect(hoverMapper, SIGNAL(mapped(QObject*)), this, SLOT(toggleHover(QObject*)));
+
 }
 
 void SheMov::createMenus(){
@@ -558,12 +567,18 @@ 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);
+
 	//TreeView view menu
-	mTreeViewMenu = new QMenu(tr("View"), this);
+	mTreeViewMenu = new QMenu(tr("&View"), this);
 	mTreeViewMenu->addAction(mShowNormalA);
 	mTreeViewMenu->addAction(mShowLocalA);
 	mTreeViewMenu->addAction(mShowArchivedA);
-	menuBar()->addMenu(mTreeViewMenu);
 	QAction *sep14 = new QAction(this);
 	sep14->setSeparator(true);
 	mTreeViewMenu->addAction(sep14);
@@ -572,14 +587,24 @@ void SheMov::createMenus(){
 		mTreeHeaderMenu->addAction(a);
 	}
 	mTreeViewMenu->addMenu(mTreeHeaderMenu);
-
-	//TreeView edit menu
-	mEditAVMenu = new QMenu(tr("Edit"), this);
-	foreach(QAction *a, mEditGroup->actions()){
-		mEditAVMenu->addAction(a);
+	QAction *sep15 = new QAction(this);
+	sep15->setSeparator(true);
+	mTreeViewMenu->addAction(sep15);
+	mTreeHoverMenu = new QMenu(tr("Hover over"), this);
+	foreach(QAction *a, mHoverTreeGroup->actions()){
+		mTreeHoverMenu->addAction(a);
 	}
-	mEditAVMenuA = menuBar()->addMenu(mEditAVMenu);
-
+	mTreeViewMenu->addMenu(mTreeHoverMenu);
+	mViewAVMenuA = menuBar()->addMenu(mTreeViewMenu);
+
+	//FileSystem view menu
+	mFSViewMenu = new QMenu(tr("&View"), this);
+	mFSHoverMenu = new QMenu(tr("Hover over"), this);
+	foreach(QAction *a, mFSHoverGroup->actions()){
+		mFSHoverMenu->addAction(a);
+	}
+	mFSViewMenu->addMenu(mFSHoverMenu);
+	mViewFSMenuA = menuBar()->addMenu(mFSViewMenu);
 
 	QMenu *helpMenu = new QMenu(tr("&Help"), this);
 	helpMenu->addAction(mAboutShemovA);