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
@@ -31,3 +31,7 @@
 #include <qstringlist.h>
+#include <qvaluelist.h>
+#include <qwmatrix.h>
 
+
+class QAction;
 class QPEToolBar;
@@ -42,3 +46,3 @@ class QSpinBox;
 class ImageFileSelector;
-
+class QTimer;
 
@@ -49,15 +53,9 @@ class ImageWidget : public QWidget
     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;
@@ -118,6 +116,3 @@ class ImagePane : public QWidget
     ImagePane( QWidget *parent=0 );
-    ~ImagePane()
-    {
-        
-    }
+    ~ImagePane() { }
 
@@ -132,4 +127,3 @@ class ImagePane : public QWidget
 
-    int  paneWidth() const
-    {
+    int  paneWidth() const {
         return image->visibleWidth(); 
@@ -137,4 +131,3 @@ class ImagePane : public QWidget
 
-    int  paneHeight() const
-    {
+    int  paneHeight() const {
         return image->visibleHeight(); 
@@ -142,4 +135,3 @@ class ImagePane : public QWidget
 
-    void setPosition(int x, int y)
-    {
+    void setPosition(int x, int y) {
         image->setContentsPos (x,y );
@@ -147,4 +139,3 @@ class ImagePane : public QWidget
 
-    void disable()
-    {
+    void disable() {
         pic->hide();
@@ -177,4 +168,3 @@ class ImageViewer : public QMainWindow
 
-    enum INFO_STRINGS
-    {
+    enum INFO_STRINGS {
         PATH,
@@ -188,4 +178,3 @@ class ImageViewer : public QMainWindow
 
-    enum RotateDirection
-    {
+    enum RotateDirection   {
         Rotate90, Rotate180, Rotate270
@@ -197,2 +186,3 @@ class ImageViewer : public QMainWindow
     static QImage& toGray(QImage &image, bool fast = false);
+    bool showThumbView;              // a flag to indicate if FileSelector should be initialized with thumbnail view
 
@@ -203,2 +193,4 @@ protected:
 private:
+    int  imageIndex(void);
+
     void updateCaption( QString name );
@@ -215,7 +207,11 @@ private:
 
-
-
-
 private slots:
 
+    void slideShow( bool on );
+    void help(); 
+    void slideUpdate();
+    bool nextImage();
+    bool prevImage();
+    void settings();
+
     void switchThumbView();
@@ -225,3 +221,3 @@ private slots:
     void openFile( const DocLnk &file );
-    //void openFile();
+    void openFile();
     void open();
@@ -235,2 +231,3 @@ private slots:
     void fullScreen();
+    void stopSlideShow();
     void blackAndWhite();
@@ -238,19 +235,6 @@ private slots:
     void displayControlsDialog();
-
-
-
-
-
-
-
-
-
-
 private:
-
-
-
-
-    enum MENU_ITEMS
-    {
+    QWMatrix matrix;
+    bool rotated90;
+    enum MENU_ITEMS  {
         SHOW_THUMBNAILS,
@@ -260,4 +244,2 @@ private:
 
-
-
     QString filename;
@@ -291,3 +273,11 @@ private:
 
-    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;
+