Remove the menuBar() from picture archive

The journey started innocent enough, but turned out to be a commit that
should have been severals. In the end, the picture archive has no
menuBar() any more, as expected, but it's also impossible to call the
slide dialog. Will fix that soon.

1 files changed, 1 insertions, 127 deletions

diff --git a/shemov.cpp b/shemov.cpp
index 1168fc0..8eb699d 100644
--- a/shemov.cpp
+++ b/shemov.cpp
@@ -211,17 +211,11 @@ void SheMov::configure(){
 }
 
 void SheMov::tabChanged(int newTab){
-    if(newTab == FileManager || newTab == Movies){
+    if(newTab == FileManager || newTab == Movies || newTab == Pictures){
         menuBar()->setVisible(false);
     }else{
         menuBar()->setVisible(true);
     }
-    mEditPicMenuA->setVisible(newTab == Pictures);
-    mViewPicMenuA->setVisible(newTab == Pictures);
-    mPicActionGroup->setEnabled(newTab == Pictures);
-    mPVSelectAllA->disconnect();
-    mPVShowNPDialogA->setEnabled(newTab == FileManager);
-    mPVAddToNPA->setEnabled(newTab == FileManager);
     mArchiveBrowserViewMenuA->setVisible(newTab == ArchiveBrowserTab);
     mRandomEditMenuA->setVisible(newTab == RandomDisp);
     statusbarMessage(QString());
@@ -233,7 +227,6 @@ void SheMov::tabChanged(int newTab){
             setWindowTitle(mMovieWidget->wTitle);
             break;
         case Pictures:
-            connect(mPVSelectAllA, &QAction::triggered, mPicWidget->picView(), &PictureListView::setPVAll);
             mPicWidget->constructWindowTitle();
             setDuration(0x0, false);
             break;
@@ -375,102 +368,9 @@ void SheMov::createActions(){
     createHeaderMapper(abrowsermodel, mArchiveBrowser->archiveTree(), mArchiveBrowserAG);
     mArchiveBrowser->archiveTree()->setHeaderGroup(mArchiveBrowserAG);
 
-    /* very unfortunate naming of variables:
-     * picViewer: the actual PictureViewer2 window
-     * picView: the picture files TreeView
-     * First: the Treeview -> picView */
-
-    // Delete... + Edit Mappings...
-    mPWDeletePicFromA = new QAction(QIcon(":/huge_balls_pierced.png"), tr("Delete..."), this);
-    mPicWidget->picView()->addAction(mPWDeletePicFromA);
-    connect(mPWDeletePicFromA, &QAction::triggered, mPicWidget->picView(), &PictureListView::deletePics);
-    mPWEditPicMappingsA = new QAction(QIcon(":/squirting_nipple.png"), tr("Edit mappings..."), this);
-    mPicWidget->picView()->addAction(mPWEditPicMappingsA);
-    connect(mPWEditPicMappingsA, &QAction::triggered, mPicWidget->picView(), &PictureListView::editPicsMappings);
-    mPicWidget->picView()->addAction(createSeparator());
-
-    // Show slide dialog
     PictureViewer2 *picViewer = SmGlobals::instance()->pictureViewer();
-    mPVSlideDlgA = new QAction(QIcon(":/hourglass_figure.png"), tr("Show slide dialog..."), this);
-    mPVSlideDlgA->setData(PictureViewer2::SlideAction);
-    mPicWidget->picView()->addAction(mPVSlideDlgA);
-    connect(mPVSlideDlgA, &QAction::triggered, picViewer, &PictureViewer2::showSlide);
-    mPicWidget->picView()->addAction(createSeparator());
-
-    // Show/Hide Picture Viewer
-    mPVToggleA = new QAction(QIcon(":/dick_in_cage.png"), tr("Show/Hide Picture Viewer"), this);
-    mPVToggleA->setCheckable(true);
-    mPVToggleA->setData(PictureViewer2::HideAction);
-    connect(mPVToggleA, &QAction::toggled, picViewer, &PictureViewer2::setVisible);
-    mPVToggleA->setChecked(false);
-    mPicWidget->picView()->addAction(mPVToggleA);
-
-    // Add selected + Replace with selected
-    mPVAddA = new QAction(QIcon(":/used_tampon.png"), tr("Add selected"), this);
-    connect(mPVAddA, &QAction::triggered, [=] { mPicWidget->picView()->setPVData(false); });
-    mPicWidget->picView()->addAction(mPVAddA);
-    mPVReplaceA = new QAction(QIcon(":/clean_tampon.png"), tr("Replace with selected"), this);
-    connect(mPVReplaceA, &QAction::triggered, [=] { mPicWidget->picView()->setPVData(true); });
-    mPicWidget->picView()->addAction(mPVReplaceA);
-
-    // Refresh
-    mPicWidget->picView()->addAction(createSeparator());
-    mPWRefreshA = new QAction(QIcon(":/huge_bra.png"), tr("Refresh"), this);
-    mPicWidget->picView()->addAction(mPWRefreshA);
-    connect(mPWRefreshA, &QAction::triggered, mPicWidget->picView(), &PictureListView::refresh);
-    mPicWidget->setPicViewerAction(mPVToggleA);
-
-    /* Now the context menu for the actual Viewer
-     * picViewer -> PictureViewer2 */
-
-    // Slide Dialog
-    picViewer->addAction(mPVSlideDlgA);
-    picViewer->addAction(createSeparator());
-
-    // Show/Hide Picture Viewer
-    picViewer->addAction(mPVToggleA);
-
-    // Select all pics
-    mPVSelectAllA = new QAction(QIcon(":/blue_syringe.png"), tr("Select all pics"), this);
-    picViewer->addAction(mPVSelectAllA);
-
-    // PictureViewer mark Action
-    picViewer->addAction(createSeparator());
-    mPVMarkA = new QAction(QIcon(":/higheels.png"), tr("(Un-)Mark"), this);
-    mPVMarkA->setCheckable(true);
-    mPVMarkA->setData(PictureViewer2::MarkAction);
-    connect(mPVMarkA, &QAction::triggered, picViewer, &PictureViewer2::markCurrent);
-    picViewer->addAction(mPVMarkA);
-    mPVClearMarksA = new QAction(tr("Clear marks"), this);
-    connect(mPVClearMarksA, &QAction::triggered, picViewer, &PictureViewer2::clearMarks);
-    picViewer->addAction(mPVClearMarksA);
-    mPVDeleteA = new QAction(QIcon(":/delete.png"), tr("Delete..."), this);
-    mPVDeleteA->setData(PictureViewer2::DeleteAction);
-    connect(mPVDeleteA, &QAction::triggered, picViewer, &PictureViewer2::deleteCurrent);
-    picViewer->addAction(mPVDeleteA);
-    picViewer->addAction(createSeparator());
-
-    // Copy to...
-    mPVCopyToA = new QAction(tr("Copy to..."), this);
-    connect(mPVCopyToA, &QAction::triggered, picViewer, &PictureViewer2::copyCurrent);
-    picViewer->addAction(mPVCopyToA);
-
-    // NewPicsDialog actions
-    mPVShowNPDialogA = new QAction(tr("Show new pics dialog..."), this);
-    mPVShowNPDialogA->setShortcut(tr("CTRL+s"));
-    connect(mPVShowNPDialogA, &QAction::triggered, picViewer, &PictureViewer2::showNewPicsDialog);
-    picViewer->addAction(mPVShowNPDialogA);
-    mPVAddToNPA = new QAction(tr("Set file in new pics dialog"), this);
-    mPVAddToNPA->setShortcut(tr("CTRL+a"));
-    connect(mPVAddToNPA, &QAction::triggered, picViewer, &PictureViewer2::addToNewPics);
-    picViewer->addAction(mPVAddToNPA);
-
-    // assign actions to PictureViewer2 members, so they can be toggled from within
-    picViewer->initActions();
     picViewer->hide();
 
-    /* picView(er) END Actions! */
-
     //ArchiveBrowser Actions
     mArchiveBrowserMoveToBurnA = new QAction(QIcon(":/shackles.png"), tr("Move to burn..."), this);
     connect(mArchiveBrowserMoveToBurnA, &QAction::triggered, mArchiveBrowser, &ArchiveBrowser::moveToBurn);
@@ -484,16 +384,6 @@ void SheMov::createActions(){
     connect(mArchiveBrowserExpandAllA, &QAction::triggered, mArchiveBrowser->archiveTree(), &SmTreeView::expandAll);
     mArchiveBrowserCollapseAllA = new QAction(tr("Collapse all"), this);
     connect(mArchiveBrowserCollapseAllA, &QAction::triggered, mArchiveBrowser->archiveTree(), &SmTreeView::collapseAll);
-
-    // db analyzer dialogs
-    // analyze actors
-
-
-    //don't add actions with checkable(true) unless you know what you're doing!
-    mPicActionGroup = new QActionGroup(this);
-    mPicActionGroup->addAction(mPWDeletePicFromA);
-    mPicActionGroup->addAction(mPWEditPicMappingsA);
-    mPicActionGroup->addAction(mPWRefreshA);
 }
 
 void SheMov::createMenus(){
@@ -505,24 +395,8 @@ void SheMov::createMenus(){
     analyzeMenu->addAction(mAnalyzeSeriesA);
     analyzeMenu->addAction(mAnalyzePartsA);
 
-    //Pictures edit menu
-    mEditPicMenu = new QMenu(tr("&Edit"), this);
-    mEditPicMenu->addAction(mPWDeletePicFromA);
-    mEditPicMenu->addAction(mPWEditPicMappingsA);
-    mEditPicMenuA = menuBar()->addMenu(mEditPicMenu);
-
-    //Pictures view menu
-    mPicViewMenu = new QMenu(tr("&View"), this);
-    mPicViewMenu->addAction(mPVToggleA);
-    mPicViewMenu->addAction(mPVAddA);
-    mPicViewMenu->addAction(mPVReplaceA);
-    mPicViewMenu->addSeparator();
     QMenu *headerMenu = new QMenu(tr("Show headers"), this);
     headerMenu->addActions(mPicsTreeHeaderGroup->actions());
-    mPicViewMenu->addMenu(headerMenu);
-    mPicViewMenu->addSeparator();
-    mPicViewMenu->addAction(mPWRefreshA);
-    mViewPicMenuA = menuBar()->addMenu(mPicViewMenu);
 
     //Archive Browser view menu
     mArchiveBrowserViewMenu = new QMenu(tr("&View"), this);