1 files changed, 13 insertions, 2 deletions
diff --git a/pictureviewer2.h b/pictureviewer2.h
index bfc1977..c9a1f2a 100644
--- a/pictureviewer2.h
+++ b/pictureviewer2.h
@@ -34,11 +34,12 @@ typedef QList<QList<QVariant> > PicDataList;
 class PictureViewer2 : public QGraphicsView {
     Q_OBJECT
     public:
-        enum AssocActions { SlideAction, HideAction, MarkAction, DeleteAction, SkipForwardAction, SkipBackwardAction };
+        enum AssocActions { ToggleSlideAction, SlideSelectedAction, SlideAllAction, HideAction, MarkAction, DeleteAction, SkipForwardAction, SkipBackwardAction };
         explicit PictureViewer2(QWidget *parent = 0);
         void addFiles(const PicDataList &files, bool clear = true);
         void addFiles(const QString &dir, bool clear = true);
         void addFiles(const QStringList &files, bool clear = true);
+        void addFile(const QString &fullPath, int fileId = -1);
         void setFile(const PicData &file);
         void setFile(QString fullPath = mDefaultFile);
         void setPixmap(const QPixmap &pm);
@@ -46,15 +47,18 @@ 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);
+        PicData picData(const QString &fullPath, int fileId = -1);
 
     public slots:
         void next();
         void previous();
         void skip(int amount);
         void selectPic(const QString &path);
+        void toggleSlide(bool slide);
         void slide(bool);
+        void slideThrouhghAll(bool);
         void readSettings();
         void writeSettings();
         void shuffle();
@@ -79,10 +83,12 @@ class PictureViewer2 : public QGraphicsView {
         void constructInfoItem(const PicData &file, QSize picSize);
         void constructMappingItem(const PicData &file);
         void docFromTree(SmTreeItem *start, QTextCursor *cur, int indent);
+        void nextFromAll();
 
     private:
         void setupDialog();
         void setGradient(const QPixmap &pic);
+        void setNextBatch();
         QTextDocument *treeToString(const SmTreeItem *root) const;
         void treeToStringRecursive(const SmTreeItem *parent, QTextCursor *cursor, int indent) const;
         QPointF getPos(PictureViewer2Item *item, int pos, const QPointF &movPos);
@@ -95,6 +101,9 @@ class PictureViewer2 : public QGraphicsView {
         int mConfigInfoPos;
         int mConfigMapPos;
         QTimer *mSlideTimer;
+        QTimer *mSlideTimerAll;
+        QTimer *mCurTimer;
+        bool mSlideTimerAllRestart;
         const static QString mDefaultFile;
         PictureViewer2Item *mFnItem;
         PictureViewer2Item *mMappingItem;
@@ -103,6 +112,8 @@ class PictureViewer2 : public QGraphicsView {
         QPointF mInfoPos;
         QPointF mMappingPos;
         QAction *mSlideA;
+        QAction *mToggleSlideA;
+        QAction *mSlideAllA;
         QAction *mHideA;
         QAction *mMarkA;
         QAction *mDeleteA;