1 files changed, 31 insertions, 16 deletions

diff --git a/shemov.cpp b/shemov.cpp
index 894489f..a85c038 100644
--- a/shemov.cpp
+++ b/shemov.cpp
@@ -56,6 +56,7 @@
 #include "mappingtreewidget.h"
 #include "newpicsdialog.h"
 #include "pictureswidget.h"
+#include "pictureviewer2.h"
 
 SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, flags), mOpenWithGroupFS(0), mOpenWithGroupAV(0) {
 	//application icon
@@ -176,6 +177,17 @@ void SheMov::tabChanged(int newTab){
     mShowTreeGroup->setEnabled(newTab == 1);
     mPicActionGroup->setEnabled(newTab == 2);
     mFilterFavoritesA->setEnabled(newTab == 1);
+    mPVSelectAllA->disconnect();
+    switch(newTab){
+        case 0:
+            connect(mPVSelectAllA, SIGNAL(triggered()), mFSWidget, SLOT(selectAllPV()));
+            break;
+        case 2:
+            connect(mPVSelectAllA, SIGNAL(triggered()), mPicWidget->picView(), SLOT(setPVAll()));
+            break;
+        default:
+            ;;
+    }
 }
 
 void SheMov::setFsFree(){
@@ -590,13 +602,16 @@ void SheMov::createActions(){
         mPicWidget->picView()->addAction(pvSep1);
 
         // viewer actions
+        PictureViewer2 *picViewer = SmGlobals::instance()->pictureViewer();
         mPVToggleA = new QAction(QIcon(":/dick_in_cage.png"), tr("Show/Hide Picture Viewer"), this);
         mPVToggleA->setCheckable(true);
         mPVToggleA->setData(PictureViewer2::HideAction);
-        connect(mPVToggleA, SIGNAL(toggled(bool)), mPicWidget, SLOT(showPicViewer(bool)));
+        connect(mPVToggleA, SIGNAL(toggled(bool)), picViewer, SLOT(setVisible(bool)));
         mPVToggleA->setChecked(false);
         mPicWidget->picView()->addAction(mPVToggleA);
-        mPicWidget->picView()->PV()->addAction(mPVToggleA);
+        picViewer->addAction(mPVToggleA);
+
+        //add or replace pictures: pictureviewer
         QSignalMapper *PVAddMapper = new QSignalMapper(this);
         mPVAddA = new QAction(QIcon(":/used_tampon.png"), tr("Add selected"), this);
         connect(mPVAddA, SIGNAL(triggered()), PVAddMapper, SLOT(map()));
@@ -607,40 +622,40 @@ void SheMov::createActions(){
         PVAddMapper->setMapping(mPVReplaceA, true);
         mPicWidget->picView()->addAction(mPVReplaceA);
         connect(PVAddMapper, SIGNAL(mapped(int)), mPicWidget->picView(), SLOT(setPVData(int)));
+
+        //select all from current, see tabChanged(int)
         mPVSelectAllA = new QAction(QIcon(":/blue_syringe.png"), tr("Select all pics"), this);
-        connect(mPVSelectAllA, SIGNAL(triggered()), mPicWidget->picView(), SLOT(setPVAll()));
-        mPicWidget->picView()->addAction(mPVSelectAllA);
-        connect(mPVSelectAllA, SIGNAL(triggered()), mPicWidget->picView(), SLOT(setPVAll()));
-        mPicWidget->picView()->addAction(mPVSelectAllA);
-        mPicWidget->picView()->PV()->addAction(mPVSelectAllA);
+        picViewer->addAction(mPVSelectAllA);
+
+        //slide
         QAction *pvSep2 = new QAction(this);
         pvSep2->setSeparator(true);
         mPicWidget->picView()->addAction(pvSep2);
         mPVSlideA = new QAction(QIcon(":/chastity_belt_with_cuffs.png"), tr("Slide"), this);
         mPVSlideA->setCheckable(true);
         mPVSlideA->setData(PictureViewer2::SlideAction);
-        connect(mPVSlideA, SIGNAL(toggled(bool)), mPicWidget->picView()->PV(), SLOT(slide(bool)));
+        connect(mPVSlideA, SIGNAL(toggled(bool)), picViewer, SLOT(slide(bool)));
         connect(mPVSlideA, SIGNAL(toggled(bool)), this, SLOT(setSlide(bool)));
-        mPicWidget->picView()->addAction(mPVSlideA);
         QAction *pv2Sep1 = new QAction(this);
         pv2Sep1->setSeparator(true);
-        mPicWidget->picView()->PV()->addAction(pv2Sep1);
-        mPicWidget->picView()->PV()->addAction(mPVSlideA);
+        picViewer->addAction(pv2Sep1);
+        picViewer->addAction(mPVSlideA);
+
+        //shuffle
         QAction *pvSep3 = new QAction(this);
         pvSep3->setSeparator(true);
         mPicWidget->picView()->addAction(pvSep3);
         mPVShuffleA = new QAction(QIcon(":/bizarre_amputee.png"), tr("Shuffle"), this);
-        connect(mPVShuffleA, SIGNAL(triggered()), mPicWidget->picView()->PV(), SLOT(shuffle()));
-        mPicWidget->picView()->PV()->addAction(mPVShuffleA);
+        connect(mPVShuffleA, SIGNAL(triggered()), picViewer, SLOT(shuffle()));
+        picViewer->addAction(mPVShuffleA);
 
         // refresh
         mPWRefreshA = new QAction(QIcon(":/huge_bra.png"), tr("Refresh"), this);
         mPicWidget->picView()->addAction(mPWRefreshA);
         connect(mPWRefreshA, SIGNAL(triggered()), mPicWidget->picView(), SLOT(refresh()));
-
-
         mPicWidget->setPicViewerAction(mPVToggleA);
-        mPicWidget->picView()->PV()->initActions();
+        picViewer->initActions();
+
     //don't add actions with checkable(true) unless you know what you're doing!
     mPicActionGroup = new QActionGroup(this);
     mPicActionGroup->addAction(mPWDeletePicFromA);