Customize menus and toolbar for PictureView

* Added 4 new icons for PictureView-actions.
* simplified SheMov::tabChanged(int)
* fix long standing bug with QActionGroups in SheMov. Enable and disable
all actions according to the active tab

1 files changed, 32 insertions, 17 deletions

diff --git a/shemov.cpp b/shemov.cpp
index 21ba39a..63dfd51 100644
--- a/shemov.cpp
+++ b/shemov.cpp
@@ -85,6 +85,7 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla
     //pictures
     mPicWidget = new PicturesWidget;
     mTab->addTab(mPicWidget, tr("Pictures"));
+    connect(mPicWidget, SIGNAL(needWindowTitleChange(QString)), this, SLOT(setWindowTitle(QString)));
 
     //newmoviewizard + dbanalyzer
 	mNewMovieWizard = new NewMovieWizard(this);
@@ -182,22 +183,17 @@ void SheMov::configure(){
 void SheMov::tabChanged(int newTab){
 	mEditFSMenuA->setVisible(newTab == 0);
 	mEditAVMenuA->setVisible(newTab == 1);
+    mEditPicMenuA->setVisible(newTab == 2);
 	mViewFSMenuA->setVisible(newTab == 0);
 	mViewAVMenuA->setVisible(newTab == 1);
-	if(newTab == 0){
-		setWindowTitle(mFSWidget->windowTitle());
-		mCdupA->setEnabled(true);
-		mBackDirA->setEnabled(true);
-		mFilesTreeHeadersGroup->setEnabled(false);
-		mFilterGroup->setEnabled(false);
-	}
-	if(newTab == 1){
-		setWindowTitle(mATree->windowTitle());
-		mCdupA->setEnabled(false);
-		mBackDirA->setEnabled(false);
-		mFilesTreeHeadersGroup->setEnabled(true);
-		mFilterGroup->setEnabled(true);
-	}
+    mViewPicMenuA->setVisible(newTab == 2);
+    mCdupA->setEnabled(newTab == 0);
+    mBackDirA->setEnabled(newTab == 0);
+    mFilesTreeHeadersGroup->setEnabled(newTab == 1);
+    mFilterGroup->setEnabled(newTab == 1);
+    mShowTreeGroup->setEnabled(newTab == 1);
+    mPicActionGroup->setEnabled(newTab == 2);
+    mFilterFavoritesA->setEnabled(newTab == 1);
 	updateSelectionCount(QItemSelection(), QItemSelection());
 }
 
@@ -481,6 +477,7 @@ void SheMov::createActions(){
 	mShowNormalA->setChecked(true);
 	mShowAllFilesA = new QAction(QIcon(":/male_chastity_belt.png"), tr("Show All files"), this);
 	mShowAllFilesA->setCheckable(true);
+    mShowTreeGroup->addAction(mShowAllFilesA);
 	connect(mShowAllFilesA, SIGNAL(toggled(bool)), mATree, SLOT(showAllFiles(bool)));
 
 	//Tree view headers
@@ -603,17 +600,22 @@ void SheMov::createActions(){
 	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);
 
     //picture widget actions
-    mDeletePicFromA = new QAction(tr("Delete..."), this);
+    mDeletePicFromA = new QAction(QIcon(":/huge_balls_pierced.png"), tr("Delete..."), this);
     mPicWidget->picView()->addAction(mDeletePicFromA);
     connect(mDeletePicFromA, SIGNAL(triggered()), mPicWidget->picView(), SLOT(deletePics()));
-    mEditPicsMappingsA = new QAction(tr("Edit mappings..."), this);
+    mEditPicsMappingsA = new QAction(QIcon(":/squirting_nipple.png"), tr("Edit mappings..."), this);
     mPicWidget->picView()->addAction(mEditPicsMappingsA);
     connect(mEditPicsMappingsA, SIGNAL(triggered()), mPicWidget->picView(), SIGNAL(editPicsMappings()));
-    mRefreshPicsA = new QAction(tr("Refresh"), this);
+    mRefreshPicsA = new QAction(QIcon(":/huge_bra.png"), tr("Refresh"), this);
     mPicWidget->picView()->addAction(mRefreshPicsA);
     connect(mRefreshPicsA, SIGNAL(triggered()), mPicWidget->picView(), SLOT(refresh()));
+    mPicActionGroup = new QActionGroup(this);
+    mPicActionGroup->addAction(mDeletePicFromA);
+    mPicActionGroup->addAction(mEditPicsMappingsA);
+    mPicActionGroup->addAction(mRefreshPicsA);
 
 	// misc
 	mOpenWithMapperFS = new QSignalMapper(this);
@@ -685,6 +687,12 @@ void SheMov::createMenus(){
 	mEditAVMenu->addAction(mEditActorsA);
 	mEditAVMenu->addAction(mEditGenresA);
 
+    //Pictures edit menu
+    mEditPicMenu = new QMenu(tr("&Edit"), this);
+    mEditPicMenu->addAction(mDeletePicFromA);
+    mEditPicMenu->addAction(mEditPicsMappingsA);
+    mEditPicMenuA = menuBar()->addMenu(mEditPicMenu);
+
 	//TreeView view menu
 	mTreeViewMenu = new QMenu(tr("&View"), this);
 	mTreeViewMenu->addAction(mShowNormalA);
@@ -723,6 +731,11 @@ void SheMov::createMenus(){
 	mFSViewMenu->addMenu(mFSHoverMenu);
 	mViewFSMenuA = menuBar()->addMenu(mFSViewMenu);
 
+    //Pictures view menu
+    mPicViewMenu = new QMenu(tr("&View"), this);
+    mPicViewMenu->addAction(mRefreshPicsA);
+    mViewPicMenuA = menuBar()->addMenu(mPicViewMenu);
+
 	QMenu *helpMenu = new QMenu(tr("&Help"), this);
 	helpMenu->addAction(mAboutShemovA);
 	helpMenu->addAction(mAboutQtA);
@@ -899,6 +912,8 @@ void SheMov::createToolBar(){
 	toolBar->addActions(mFilterGroup->actions());
 	toolBar->addAction(mFilterFavoritesA);
 	toolBar->addSeparator();
+    toolBar->addActions(mPicActionGroup->actions());
+    toolBar->addSeparator();
 	toolBar->addAction(mHoverPicsA);
 	toolBar->addAction(mHoverArchiveA);
 	toolBar->addAction(mHoverDirectoriesA);