[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/graphics/digikam/utilities/slideshow
From:       Gilles Caulier <caulier.gilles () kdemail ! net>
Date:       2007-02-15 9:18:13
Message-ID: 1171531093.170739.2573.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 633757 by cgilles:

digikam from trunk: native Slideshow Tool : limit Comments string lenght to 60 char to print. 

 M  +12 -6     slideshow.cpp  
 M  +8 -8      slideshow.h  


--- trunk/extragear/graphics/digikam/utilities/slideshow/slideshow.cpp #633756:633757
@@ -18,6 +18,8 @@
  * 
  * ============================================================ */
 
+#define MAXSTRINGLEN 60 
+
 // Qt includes.
 
 #include <qtimer.h>
@@ -139,10 +141,10 @@
 
     // ---------------------------------------------------------------
     
-    d->previewThread         = new PreviewLoadThread();
-    d->previewPreloadThread  = new PreviewLoadThread();
-    d->timer                 = new QTimer();
-    d->mouseMoveTimer        = new QTimer();
+    d->previewThread        = new PreviewLoadThread();
+    d->previewPreloadThread = new PreviewLoadThread();
+    d->timer                = new QTimer();
+    d->mouseMoveTimer       = new QTimer();
 
     connect(d->previewThread, SIGNAL(signalPreviewLoaded(const LoadingDescription &, const QImage &)),
             this, SLOT(slotGotImagePreview(const LoadingDescription &, const QImage&)));
@@ -275,7 +277,7 @@
 void SlideShow::preloadNextImage()
 {
     int index = d->fileIndex + 1;
-    int num = d->settings.fileList.count();
+    int num   = d->settings.fileList.count();
 
     if (index >= num)
     {
@@ -318,7 +320,7 @@
             if (d->settings.printComment)
             {
                 str = d->settings.pictInfoMap[d->currentImage].comment;
-
+                if (str.length() > MAXSTRINGLEN) str = str.left(MAXSTRINGLEN-3) + "...";
                 printInfoText(p, offset, str);
             }   
 
@@ -515,6 +517,7 @@
     {
         d->timer->stop();
         d->pause = true;
+        d->toolBar->setPaused(true);
         slotNext();
     }
 
@@ -522,6 +525,7 @@
     {
         d->timer->stop();
         d->pause = true;
+        d->toolBar->setPaused(true);
         slotPrev();
     }
 }
@@ -535,12 +539,14 @@
     {
         d->timer->stop();
         d->pause = true;
+        d->toolBar->setPaused(true);
         slotNext();
     }
     else if (e->button() == Qt::RightButton && d->fileIndex-1 >= 0)
     {
         d->timer->stop();
         d->pause = true;
+        d->toolBar->setPaused(true);
         slotPrev();
     }
 }
--- trunk/extragear/graphics/digikam/utilities/slideshow/slideshow.h #633756:633757
@@ -47,14 +47,6 @@
 
     void setCurrent(const KURL& url);
 
-private:
-
-    void loadNextImage();
-    void loadPrevImage();
-    void preloadNextImage();
-    void updatePixmap();
-    void printInfoText(QPainter &p, int &offset, const QString& str);
-
 protected:
 
     void paintEvent(QPaintEvent *);
@@ -77,6 +69,14 @@
 
 private:
 
+    void loadNextImage();
+    void loadPrevImage();
+    void preloadNextImage();
+    void updatePixmap();
+    void printInfoText(QPainter &p, int &offset, const QString& str);
+
+private:
+
     SlideShowPriv *d;
 };
 
[prev in list] [next in list] [prev in thread] [next in thread]