summaryrefslogtreecommitdiffstats
path: root/pictureviewer2.h
diff options
context:
space:
mode:
Diffstat (limited to 'pictureviewer2.h')
-rw-r--r--pictureviewer2.h17
1 files changed, 17 insertions, 0 deletions
diff --git a/pictureviewer2.h b/pictureviewer2.h
index 730296f..f8e7a06 100644
--- a/pictureviewer2.h
+++ b/pictureviewer2.h
@@ -14,6 +14,8 @@
#include <QGraphicsItem>
#include <QStaticText>
#include <QDialog>
+#include <QSpinBox>
+#include <QCheckBox>
class PictureViewerGraphicsScene;
class BoundingRectItem;
@@ -36,6 +38,7 @@ class QLabel;
class QPushButton;
class QSpinBox;
class MappingEditWidget;
+class PictureViewerSlideDlg;
typedef QList<QVariant> PicData;
typedef QList<QList<QVariant> > 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<QList<QVariant> > 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);