Remove PVActions from SheMov

Remove actions that are now triggered by the ControlItem.

5 files changed, 1 insertions, 75 deletions

diff --git a/pictureswidget.cpp b/pictureswidget.cpp
index 8e6dc7b..59007ca 100644
--- a/pictureswidget.cpp
+++ b/pictureswidget.cpp
@@ -213,7 +213,6 @@ void PictureView::setPVData(int replace){
 void PictureView::setPVAll(){
     PicDataList data = mModel->allFiles();
     mPV->addFiles(data, true);
-    mPV->setSlideSelected();
 }
 
 void PictureView::setHoverWinVisible(bool visible) const {
diff --git a/pictureviewer2.cpp b/pictureviewer2.cpp
index ee61f60..4575c95 100644
--- a/pictureviewer2.cpp
+++ b/pictureviewer2.cpp
@@ -161,11 +161,6 @@ void PictureViewer2::setPixmap(const QPixmap &pm){
     setFile(tf.fileName());
 }
 
-void PictureViewer2::setSlideSelected(){
-    mCurTimer = mSlideTimer;
-    mSlideA->setChecked(true);
-}
-
 PicData PictureViewer2::picData(const QString &fullPath, int fileId){
     QFileInfo fi(fullPath);
     if(!fi.exists()){
@@ -330,15 +325,6 @@ void PictureViewer2::initActions(){
         if(a->data().toInt() == HideAction){
             mHideA = a;
         }
-        if(a->data().toInt() == SlideSelectedAction){
-            mSlideA = a;
-        }
-        if(a->data().toInt() == ToggleSlideAction){
-            mToggleSlideA = a;
-        }
-        if(a->data().toInt() == SlideAllAction){
-            mSlideAllA = a;
-        }
         if(a->data().toInt() == MarkAction){
             mMarkA = a;
         }
@@ -526,9 +512,7 @@ void PictureViewer2::showEvent(QShowEvent *e){
 }
 
 void PictureViewer2::hideEvent(QHideEvent *e){
-    if(mSlideTimer->isActive()){
-        mSlideA->toggle();
-    }
+    stopSlide();
     mHideA->setChecked(false);
     QGraphicsView::hideEvent(e);
 }
diff --git a/pictureviewer2.h b/pictureviewer2.h
index 1592b5d..89d0320 100644
--- a/pictureviewer2.h
+++ b/pictureviewer2.h
@@ -49,7 +49,6 @@ class PictureViewer2 : public QGraphicsView {
         void setShowMappingItem(bool show) { mShowMappingItem = show; }
         void setShowMarkItem(bool show) { mShowMarkItem = show; }
         void setCurrentDir(const QString &curDir) { mCurrentDir = curDir; }
-        void setSlideSelected();
         const PicDataList marked() { return mMarkedFiles; }
         PicData picData(const QString &fullPath, int fileId = -1);
 
@@ -128,9 +127,6 @@ class PictureViewer2 : public QGraphicsView {
         QPointF mInfoPos;
         QPointF mMappingPos;
         QPointF mBoundingPos;
-        QAction *mSlideA;
-        QAction *mToggleSlideA;
-        QAction *mSlideAllA;
         QAction *mHideA;
         QAction *mMarkA;
         QAction *mDeleteA;
diff --git a/shemov.cpp b/shemov.cpp
index e080039..a0873d3 100644
--- a/shemov.cpp
+++ b/shemov.cpp
@@ -585,42 +585,6 @@ void SheMov::createActions(){
     picViewer->addAction(mPVDeleteA);
     picViewer->addAction(createSeparator());
 
-    // Slide
-    mPVToggleSlideA = new QAction(QIcon(":/chastity_belt.png"), tr("Slide"), this);
-    mPVToggleSlideA->setCheckable(true);
-    mPVToggleSlideA->setChecked(false);
-    mPVToggleSlideA->setData(PictureViewer2::ToggleSlideAction);
-    QActionGroup *slideGroup = new QActionGroup(this);
-    slideGroup->setExclusive(true);
-    connect(mPVToggleSlideA, SIGNAL(toggled(bool)), picViewer, SLOT(toggleSlide(bool)));
-    connect(mPVToggleSlideA, SIGNAL(toggled(bool)), this, SLOT(setSlide(bool)));
-    mPVSlideA = new QAction(QIcon(":/chastity_belt_with_cuffs.png"), tr("Slide"), this);
-    mPVSlideA->setCheckable(true);
-    mPVSlideA->setData(PictureViewer2::SlideSelectedAction);
-    mPVSlideA->setChecked(true);
-    connect(mPVSlideA, SIGNAL(toggled(bool)), picViewer, SLOT(slide(bool)));
-    slideGroup->addAction(mPVSlideA);
-    mPVSlideAllA = new QAction(QIcon(":/nipple_up.png"), tr("Slide all"), this);
-    mPVSlideAllA->setCheckable(true);
-    mPVSlideAllA->setData(PictureViewer2::SlideAllAction);
-    connect(mPVSlideAllA, SIGNAL(triggered(bool)), picViewer, SLOT(slideThrouhghAll(bool)));
-    slideGroup->addAction(mPVSlideAllA);
-    picViewer->addAction(createSeparator());
-    picViewer->addAction(mPVToggleSlideA);
-    picViewer->addAction(mPVSlideA);
-    picViewer->addAction(mPVSlideAllA);
-    picViewer->addAction(createSeparator());
-    mPVSkipForwardA = new QAction(tr("Skip 25 forward"), this);
-    connect(mPVSkipForwardA, SIGNAL(triggered()), this, SLOT(skipForward()));
-    mPVSkipForwardA->setData(PictureViewer2::SkipForwardAction);
-    mPVSkipBackA = new QAction(tr("Skip 25 back"), this);
-    connect(mPVSkipBackA, SIGNAL(triggered()), this, SLOT(skipBack()));
-    mPVSkipBackA->setData(PictureViewer2::SkipBackwardAction);
-    picViewer->addAction(createSeparator());
-    picViewer->addAction(mPVSkipForwardA);
-    picViewer->addAction(mPVSkipBackA);
-    picViewer->addAction(createSeparator());
-
     // Shuffle
     mPVShuffleA = new QAction(QIcon(":/bizarre_amputee.png"), tr("Shuffle"), this);
     connect(mPVShuffleA, SIGNAL(triggered()), picViewer, SLOT(shuffle()));
@@ -1149,16 +1113,6 @@ void SheMov::newPicsDialogWithFiles(){
     mNewPicsDialog->exec();
 }
 
-void SheMov::skipForward(){
-    PictureViewer2 *picViewer = SmGlobals::instance()->pictureViewer();
-    picViewer->skip(25);
-}
-
-void SheMov::skipBack(){
-    PictureViewer2 *picViewer = SmGlobals::instance()->pictureViewer();
-    picViewer->skip(-25);
-}
-
 void SheMov::searchResult(int seriesPartId){
     mSearchDialog->hide();
     mTab->setCurrentIndex(Movies);
diff --git a/shemov.h b/shemov.h
index b19ba77..f427f46 100644
--- a/shemov.h
+++ b/shemov.h
@@ -52,8 +52,6 @@ class SheMov : public QMainWindow {
 		void checkMount(bool mounted);
         void newPicsDialog();
         void newPicsDialogWithFiles();
-        void skipForward();
-        void skipBack();
         void searchResult(int seriesPartId);
         void gotoArchive();
 
@@ -139,15 +137,10 @@ class SheMov : public QMainWindow {
         QAction *mPVClearMarksA;
         QAction *mPVReplaceA;
         QAction *mPVSelectAllA;
-        QAction *mPVToggleSlideA;
-        QAction *mPVSlideA;
-        QAction *mPVSlideAllA;
         QAction *mPVShuffleA;
         QAction *mPVCopyToA;
         QAction *mPVShowNPDialogA;
         QAction *mPVAddToNPA;
-        QAction *mPVSkipForwardA;
-        QAction *mPVSkipBackA;
         QActionGroup *mPicActionGroup;
 		//EndActions