From aba573026ec3ca79e30d0350a645d91169421443 Mon Sep 17 00:00:00 2001 From: Arno Date: Tue, 29 Mar 2016 20:29:26 +0200 Subject: Make the SlideDialog do somethin Well, implement functionality. Seems to work as intended. --- pictureviewer2.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'pictureviewer2.h') diff --git a/pictureviewer2.h b/pictureviewer2.h index 730296f..f8e7a06 100644 --- a/pictureviewer2.h +++ b/pictureviewer2.h @@ -14,6 +14,8 @@ #include #include #include +#include +#include class PictureViewerGraphicsScene; class BoundingRectItem; @@ -36,6 +38,7 @@ class QLabel; class QPushButton; class QSpinBox; class MappingEditWidget; +class PictureViewerSlideDlg; typedef QList PicData; typedef QList > PicDataList; @@ -83,6 +86,7 @@ class PictureViewer2 : public QGraphicsView { void markCurrent(); void clearMarks(); void doControl(QGraphicsItem *item); + void showSlide(); void doSlide(); protected: @@ -94,6 +98,7 @@ class PictureViewer2 : public QGraphicsView { virtual void resizeEvent(QResizeEvent *event); private slots: + void nextSlide(); void showFile(const PicData &data); void constructInfoItem(const PicData &file, QSize picSize, bool converted = false); void constructMappingItem(const PicData &file); @@ -104,6 +109,7 @@ class PictureViewer2 : public QGraphicsView { private: void constructControlItem(); void setGradient(const QPixmap &pic); + void showNext(); void setNextBatch(); QTextDocument *treeToString(const SmTreeItem *root) const; void treeToStringRecursive(const SmTreeItem *parent, QTextCursor *cursor, int indent) const; @@ -113,10 +119,17 @@ class PictureViewer2 : public QGraphicsView { PicDataList mMarkedFiles; PictureViewerGraphicsScene *mScene; QGraphicsPixmapItem *mCur; + PictureViewerSlideDlg *mSlideDlg; + QList > mPicData; + //QStringList mFullPaths; + int mTotal; + int mNextSlideCtr; + int mCurPos; int mConfigInfoPos; int mConfigMapPos; int mCursorOffset; + QTimer *mTimer; QTimer *mSlideTimer; QTimer *mSlideTimerAll; QTimer *mSlideTimerRecent; @@ -162,6 +175,10 @@ class PictureViewerSlideDlg : public QDialog { public: enum SlideResult { SlideAll, SlideRecent, SlideSelection, NoSlide }; explicit PictureViewerSlideDlg(QWidget *parent = 0, Qt::WindowFlags f = 0); + int result() const { return mSlideResult; } + int days() const { return mRecentDays->value(); } + bool shuffle() const { return mShuffle->isChecked(); } + MappingEditWidget *mappingEditWidget() const { return mMappingEditWidget; } private slots: void slideAllToggled(bool checked); -- cgit v1.2.3-70-g09d2