1 files changed, 242 insertions, 37 deletions

diff --git a/noncore/multimedia/showimg/showimg.cpp b/noncore/multimedia/showimg/showimg.cpp
index d7d53ec..0fbffe7 100644
--- a/noncore/multimedia/showimg/showimg.cpp
+++ b/noncore/multimedia/showimg/showimg.cpp
@@ -26,3 +26,8 @@
 #include "ImageFileSelector.h"
+#include "settingsdialog.h"
+
            
+#include <opie/ofiledialog.h>
+
+#include <qpe/qpeapplication.h>
 #include <qpe/config.h>
@@ -51,3 +56,4 @@
 
-ControlsDialog::ControlsDialog(const QString &caption,QImage image,int *brightness,QWidget *parent):QDialog(parent,0,true)
+ControlsDialog::ControlsDialog(const QString &caption,QImage image,int *brightness,QWidget *parent)
+        : QDialog(parent,0,true)
 {
@@ -55,4 +61,3 @@ ControlsDialog::ControlsDialog(const QString &caption,QImage image,int *brightne
 
-    if ( parent )
-    {
+    if ( parent )  {
         setPalette(parent->palette());
@@ -103,5 +108,6 @@ void ControlsDialog::accept()
 
+//===========================================================================
 
-
-InfoDialog::InfoDialog(const QString &caption, const QStringList text,QWidget *parent):QDialog(parent,0,true)
+InfoDialog::InfoDialog(const QString &caption, const QStringList text,QWidget *parent)
+        : QDialog(parent,0,true)
 {
@@ -151,2 +157,4 @@ void InfoDialog::displayInfo(const QString &caption, const QStringList text, QWi
 
+//===========================================================================
+
 
@@ -231,3 +239,4 @@ ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags )
     //menuBarmenubarFile->insertItem( tr("File"), fileMenu );
-    fileMenuFile->insertItem(tr("Open"), this, SLOT(openFile()), 0);
+    fileMenuFile->insertItem(tr("Open"),
+                            this, SLOT(openFile()), 0);
 
@@ -235,3 +244,4 @@ ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags )
     //menubarFile->insertItem( tr("View"), viewMenu );    
-    viewMenuFile->insertItem( tr("Thumbnail View"), this, SLOT(switchThumbView()), 0, SHOW_THUMBNAILS );
+    viewMenuFile->insertItem( tr("Thumbnail View"),
+                              this, SLOT(switchThumbView()), 0, SHOW_THUMBNAILS );
     
@@ -244,9 +254,14 @@ ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags )
     //menubarFile->insertItem( tr("Options"),optionsMenu );
-    optionsMenuFile->insertItem( tr("Slideshow") );
-    optionsMenuFile->insertSeparator();
-    optionsMenuFile->insertItem( tr("Preferences.."));
-    optionsMenuFile->insertItem( tr("Help"));
-
+    slideAction = new QAction( tr( "Slide show" ), Resource::loadIconSet( "slideshow" ),
+                               QString::null, 0, this, 0 );
+    slideAction->setToggleAction( TRUE );
+    connect( slideAction, SIGNAL( toggled(bool) ), this, SLOT( slideShow(bool) ) );
+    slideAction->addTo( optionsMenuFile);
+//     slideAction->addTo( toolBar );
 
 
+//     optionsMenuFile->insertItem( tr("Slideshow") );
+    optionsMenuFile->insertSeparator();
+    optionsMenuFile->insertItem( tr("Preferences.."), this, SLOT(settings()), 0);
+//    optionsMenuFile->insertItem( tr("Help"), this, SLOT(help()), 0);
 
@@ -293,3 +308,7 @@ ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags )
     connect( fileSelector, SIGNAL( closeMe() ), this, SLOT( closeFileSelector() ) );
-    connect( fileSelector, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( openFile( const DocLnk & ) ) );
+    connect( fileSelector, SIGNAL( fileSelected( const DocLnk &) ),
+             this, SLOT( openFile( const DocLnk & ) ) );
+
+    imageList = fileSelector->fileList();
+    slideAction->setEnabled( imageList.count() != 0);
 
@@ -338,3 +357,4 @@ ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags )
 
-    a = new QAction( tr( "Fullscreen" ), Resource::loadPixmap( "fullscreen" ), QString::null, 0, this, 0 );
+    a = new QAction( tr( "Fullscreen" ), Resource::loadPixmap( "fullscreen" ),
+                     QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( fullScreen() ) );
@@ -343,2 +363,21 @@ ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags )
 
+    a = new QAction( tr( "Stop Slideshow" ), Resource::loadPixmap( "quit_icon" ),
+                     QString::null, 0, this, 0 );
+    connect( a, SIGNAL( activated() ), this, SLOT( stopSlideShow() ) );
+    a->addTo( iconToolBar );
+    a->addTo( viewMenuView);
+
+
+    Config config( "ImageViewer" );
+    config.setGroup( "SlideShow" );
+    slideDelay = config.readNumEntry( "Delay", 2);
+    slideRepeat = config.readBoolEntry( "Repeat", FALSE );
+    slideReverse = config.readBoolEntry("Reverse", FALSE);
+
+    config.setGroup("Default");
+    rotateOnLoad = config.readBoolEntry("Rotate", FALSE);
+    fastLoad = config.readBoolEntry("FastLoad", TRUE);
+    slideTimer = new QTimer( this );
+    connect( slideTimer, SIGNAL(timeout()), this, SLOT(slideUpdate()) );
+
     switchToFileSelector();
@@ -358,2 +397,11 @@ ImageViewer::~ImageViewer()
 
+    cfg.setGroup( "SlideShow" );
+    cfg.writeEntry( "Delay", slideDelay);
+    cfg.writeEntry( "Repeat", slideRepeat );
+    cfg.writeEntry("Reverse",  slideReverse);
+
+    cfg.setGroup("Default");
+    cfg.writeEntry("Rotate", rotateOnLoad);
+    cfg.writeEntry("FastLoad", fastLoad);
+
     delete imagePanel; // in case it is fullscreen
@@ -361,2 +409,36 @@ ImageViewer::~ImageViewer()
 
+void ImageViewer::help() {
+
+}
+
+
+void ImageViewer::settings()
+{
+    SettingsDialog dlg( this, 0, TRUE );
+    dlg.setDelay( slideDelay );
+    dlg.setRepeat( slideRepeat );
+    dlg.setReverse( slideReverse );
+    dlg.setRotate(rotateOnLoad);
+    dlg.setFastLoad(fastLoad);
+
+    if ( QPEApplication::execDialog(&dlg) == QDialog::Accepted ) {
+        qDebug("<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>");
+        slideDelay = dlg.delay();
+        slideRepeat = dlg.repeat();
+        slideReverse = dlg.reverse();
+        rotateOnLoad = dlg.rotate();
+        fastLoad = dlg.fastLoad();
+
+        Config config( "ImageViewer" );
+        config.setGroup( "SlideShow" );
+        config.writeEntry( "Delay", slideDelay );
+        config.writeEntry( "Repeat", slideRepeat );
+        config.writeEntry("Reverse", slideReverse);
+
+        config.setGroup("Default");
+        config.writeEntry("Rotate", rotateOnLoad);
+        config.writeEntry("FastLoad", fastLoad);
+    }
+}
+
 void ImageViewer::switchSizeToScreen()
@@ -370,8 +452,5 @@ void ImageViewer::updateImage()
 {
-    if ( isSized )
-    {
+    if ( isSized ) {
         imagePanel->setPixmap(pmScaled);
-    }
-    else
-    {
+    } else {
         imagePanel->setPixmap(pm);
@@ -398,2 +477,3 @@ void ImageViewer::switchToFileSelector()
     imagePanel->disable();
+    slideShow(false);
 
@@ -436,2 +516,3 @@ void ImageViewer::show(const QString& fileref)
 {
+//    qDebug("Show "+fileref);
     bFromDocView = TRUE;
@@ -439,8 +520,5 @@ void ImageViewer::show(const QString& fileref)
     DocLnk link(fileref);
-    if ( link.isValid() )
-    {
+    if ( link.isValid() ) {
         openFile(link);
-    }
-    else
-    {
+    } else {
         filename = fileref;
@@ -451,8 +529,26 @@ void ImageViewer::show(const QString& fileref)
 
-void ImageViewer::openFile( const DocLnk &file )
+void ImageViewer::openFile() {
+    MimeTypes types;
+    QStringList image;
+    image << "image/*";
+    types.insert("Images",  image);
+    
+    QString str = OFileDialog::getOpenFileName( 1,QPEApplication::documentDir(),"", types, 0 );
+    DocLnk link(str);
+    if ( link.isValid() )
+        openFile(link);
+
+}
+
+void ImageViewer::openFile( const DocLnk &link )
 {
     closeFileSelector();
-    DocLnk link(file);
+//    DocLnk link(file);
+    qDebug("open "+link.name());
     updateCaption( link.name() );
     loadImage( link.file() );
+    if (slideTimer->isActive()) {
+        slideTimer->start(slideDelay * 1000, FALSE);
+    }
+    
 }
@@ -484,4 +580,3 @@ void ImageViewer::loadImage( const char *fileName )
     filename = fileName;
-    if ( filename )
-    {
+    if ( filename )  {
         QApplication::setOverrideCursor( waitCursor ); // this might take time
@@ -490,4 +585,3 @@ void ImageViewer::loadImage( const char *fileName )
         bool ok = image.load(filename, 0); 
-        if ( ok )
-        {
+        if ( ok ) {
             ok = reconvertImage();
@@ -495,4 +589,3 @@ void ImageViewer::loadImage( const char *fileName )
         }
-        if ( !ok )
-        {
+        if ( !ok ) {
             pm.resize(0,0);             // couldn't load image
@@ -502,2 +595,16 @@ void ImageViewer::loadImage( const char *fileName )
     }
+
+//    fastLoad ? ", Fast" : "",
+//    fastLoad ? QMAX(imagewidth/maxsize, imageheight/maxsize) : 1);
+
+  
+//    matrix.reset();
+    rotated90 = FALSE;
+
+    if (rotateOnLoad) {
+        rotated90 = TRUE;
+        rot90();      
+//        matrix.rotate( -90.0 );
+    }
+    
     switchToImageView();
@@ -621,2 +728,4 @@ void ImageViewer::hFlip()
 {
+//    matrix.scale( -1.0, 1.0 );
+    
     setImage(image.mirror(TRUE,FALSE));
@@ -626,2 +735,3 @@ void ImageViewer::vFlip()
 {
+//    matrix.scale( 1.0, -1.0 );
     setImage(image.mirror(FALSE,TRUE));
@@ -631,3 +741,3 @@ void ImageViewer::rot180()
 {
-
+//    matrix.rotate( 180.0 );
     setImage(image.mirror(TRUE,TRUE));
@@ -639,2 +749,3 @@ void ImageViewer::rot90()
     oldimage = image.convertDepth(32);
+//    matrix.rotate( -90.0 );
     setImage(rotate(oldimage,Rotate90));
@@ -647,2 +758,3 @@ void ImageViewer::rot270()
     oldimage = image.convertDepth(32);
+//    matrix.rotate(90.0);
     setImage(rotate(oldimage,Rotate270));
@@ -656,4 +768,2 @@ void ImageViewer::blackAndWhite()
     setImage(toGray(image,false));
-
-
 }
@@ -674,4 +784,3 @@ void ImageViewer::displayControlsDialog()
     dlg->exec();
-    if ( newB )
-    {
+    if ( newB ) {
         intensity(image,(float)newB/100);
@@ -709,2 +818,7 @@ void ImageViewer::normalView()
 
+void ImageViewer::stopSlideShow() {
+    if (slideTimer->isActive())
+    slideTimer->stop();
+}
+
 void ImageViewer::fullScreen()
@@ -1036,9 +1150,100 @@ QImage  ImageViewer::rotate(QImage &img, RotateDirection r)
     return (dest);
+}
+
+void ImageViewer::slideShow( bool on )
+{
+    if (on) {
+        if (!imageList.isEmpty()) {
+            slideTimer->start(slideDelay * 1000, FALSE);
+            filename = "";    // force restart
+            slideReverse ? prevImage() : nextImage();
+        }
+    } else {
+        slideTimer->stop();
+        slideAction->setOn( false);
+    }
+}
+
+void ImageViewer::slideUpdate()
+{
+    bool final_image = slideReverse ? prevImage() : nextImage();
+
+    if (final_image && !slideRepeat) {
+        slideTimer->stop();
+        slideAction->setOn(FALSE);
+    }
+}
 
+//
+// Display the image after the current one in the image list.
+// Return TRUE if the next call to nextImage() will wrap around to the
+// first image in the list (ie. we're now viewing the last image in the list).
+//
+bool ImageViewer::nextImage(void)
+{
+    int idx = 0;
+
+    if (imageList.count() > 0) {
+        idx = imageIndex();
+        if (idx != -1) {
+            if (idx == int(imageList.count() - 1)) {
+                idx = 0;
+            } else {
+                idx++;
+            }
+        } else {
+            idx = 0;
+        }
+        openFile(imageList[idx]);
+    }
 
+    return idx == int(imageList.count() - 1) ? TRUE : FALSE;
 }
 
+//
+// Display the image preceeding the current one in the image list.
+// Return TRUE if the next call to prevImage() will wrap around to the last
+// image in the list (ie. we're now viewing the first image in the list).
+//
+bool ImageViewer::prevImage(void)
+{
+    int idx = -1;
+
+    if (imageList.count() > 0) {
+        idx = imageIndex();
+        if (idx != -1) {
+            if (idx == 0) {
+                idx = imageList.count() - 1;
+            } else {
+                idx--;
+            }
+        } else {
+            idx = imageList.count() - 1;
+        }
+        openFile(imageList[idx]);
+    }
 
+    return idx == 0 ? TRUE : FALSE;
+}
 
+//
+// Return the index into the imageList of the currently viewed
+// image (ie. ImageViewer::filename in ImageViewer::imageList).
+//
+int ImageViewer::imageIndex(void)
+{
+    QValueListConstIterator<DocLnk> i;
+    int index;
 
+    if (imageList.count() == 0) {
+        return -1;
+    }
 
+    for (index = 0, i = imageList.begin(); i != imageList.end(); ++i, index++) {
+        if ((*i).file() == filename) {
+            return index;
+        }
+    }
+
+    return -1;
+}