1 files changed, 40 insertions, 50 deletions

diff --git a/noncore/multimedia/showimg/showimg.h b/noncore/multimedia/showimg/showimg.h
index 0d3bc7d..8555ff0 100644
--- a/noncore/multimedia/showimg/showimg.h
+++ b/noncore/multimedia/showimg/showimg.h
@@ -30,5 +30,9 @@
 #include <qdialog.h>
 #include <qstringlist.h>
+#include <qvaluelist.h>
+#include <qwmatrix.h>
 
+
+class QAction;
 class QPEToolBar;
 class QPEMenuBar;
@@ -41,5 +45,5 @@ class QAction;
 class QSpinBox;
 class ImageFileSelector;
-
+class QTimer;
 
 
@@ -48,17 +52,11 @@ class ImageWidget : public QWidget
     Q_OBJECT
     public:
-    ImageWidget(
-               QWidget *parent=0                  
-               ) : QWidget( parent ) 
-    {
+    ImageWidget( QWidget *parent=0 )
+        : QWidget( parent )   {
         setBackgroundMode(NoBackground);        
     }
-    ~ImageWidget()
-    {
+    ~ImageWidget() {  }
         
-    }
-
-    void setPixmap( const QPixmap &pm ) 
-    {
+    void setPixmap( const QPixmap &pm )  {
         pixmap = pm;
         show();
@@ -117,8 +115,5 @@ class ImagePane : public QWidget
     public:
     ImagePane( QWidget *parent=0 );
-    ~ImagePane()
-    {
-        
-    }
+    ~ImagePane() { }
 
     //void showStatus();
@@ -131,21 +126,17 @@ class ImagePane : public QWidget
 
 
-    int  paneWidth() const
-    {
+    int  paneWidth() const {
         return image->visibleWidth(); 
     }
 
-    int  paneHeight() const
-    {
+    int  paneHeight() const {
         return image->visibleHeight(); 
     }
 
-    void setPosition(int x, int y)
-    {
+    void setPosition(int x, int y) {
         image->setContentsPos (x,y );
     }
 
-    void disable()
-    {
+    void disable() {
         pic->hide();
     }
@@ -176,6 +167,5 @@ class ImageViewer : public QMainWindow
 
 
-    enum INFO_STRINGS
-    {
+    enum INFO_STRINGS {
         PATH,
         FORMAT,
@@ -187,6 +177,5 @@ class ImageViewer : public QMainWindow
     };
 
-    enum RotateDirection
-    {
+    enum RotateDirection   {
         Rotate90, Rotate180, Rotate270
     };
@@ -196,4 +185,5 @@ class ImageViewer : public QMainWindow
     static QImage& intensity(QImage &image, float percent);
     static QImage& toGray(QImage &image, bool fast = false);
+    bool showThumbView;              // a flag to indicate if FileSelector should be initialized with thumbnail view
 
 protected:
@@ -202,4 +192,6 @@ protected:
 
 private:
+    int  imageIndex(void);
+
     void updateCaption( QString name );
     bool loadSelected();
@@ -214,9 +206,13 @@ private:
     void updateImage();
 
-
-
-
 private slots:
 
+    void slideShow( bool on );
+    void help(); 
+    void slideUpdate();
+    bool nextImage();
+    bool prevImage();
+    void settings();
+
     void switchThumbView();
     void switchSizeToScreen();
@@ -224,5 +220,5 @@ private slots:
     void doDelayedLoad();
     void openFile( const DocLnk &file );
-    //void openFile();
+    void openFile();
     void open();
     void closeFileSelector();
@@ -234,24 +230,12 @@ private slots:
     void normalView();
     void fullScreen();
+    void stopSlideShow();
     void blackAndWhite();
     void displayInfoDialog();
     void displayControlsDialog();
-
-
-
-
-
-
-
-
-
-
 private:
-
-
-
-
-    enum MENU_ITEMS
-    {
+    QWMatrix matrix;
+    bool rotated90;
+    enum MENU_ITEMS  {
         SHOW_THUMBNAILS,
         SIZE_TO_SCREEN,
@@ -259,6 +243,4 @@ private:
     };
 
-
-
     QString filename;
     QString delayLoad;
@@ -290,5 +272,13 @@ private:
                                     // launched from the document view...
 
-    bool showThumbView;              // a flag to indicate if FileSelector should be initialized with thumbnail view
+    int slideDelay;
+    bool slideRepeat;
+    bool slideReverse;      // show slideshow in reverse order
+    bool rotateOnLoad;      // rotate by 90 degrees on loading
+    bool fastLoad;
+    QTimer *slideTimer;
+    QValueList<DocLnk> imageList;
+    QAction *slideAction;
+    
 
     QString imageInfo[LAST];