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

List:       kde-commits
Subject:    extragear/utils/rsibreak/src
From:       Juan Luis Baptiste <juan.baptiste () kdemail ! net>
Date:       2010-08-24 2:29:19
Message-ID: 20100824022919.088ABAC857 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1167219 by jbaptiste:

- Added a config option to the slide image effect to enable/disable checking for \
                small images instead of removing them always.
- BUG: 216446
GUI


 M  +3 -1      rsiwidget.cpp  
 M  +8 -0      setupmaximized.cpp  
 M  +4 -3      slideshoweffect.cpp  
 M  +2 -1      slideshoweffect.h  


--- trunk/extragear/utils/rsibreak/src/rsiwidget.cpp #1167218:1167219
@@ -334,6 +334,8 @@
     int slideInterval = config.readEntry( "SlideInterval", 10 );
     bool recursive =
         config.readEntry( "SearchRecursiveCheck", false );
+    bool showSmallImages =
+        config.readEntry( "ShowSmallImagesCheck", true );	
     QString path = config.readEntry( "ImageFolder" );
 
     bool timertype = config.readEntry( "UseNoIdleTimer", false );
@@ -350,7 +352,7 @@
     }
     case SlideShow: {
         SlideEffect* slide = new SlideEffect( 0 );
-        slide->reset( path, recursive, slideInterval );
+        slide->reset( path, recursive, showSmallImages, slideInterval );
         if ( slide->hasImages() )
             m_effect = slide;
         else {
--- trunk/extragear/utils/rsibreak/src/setupmaximized.cpp #1167218:1167219
@@ -59,6 +59,7 @@
     QCheckBox*        readOnlyPlasma;
     KComboBox*        effectBox;
     QSlider*          graySlider;
+    QCheckBox* showSmallImagesCheck;
 };
 
 SetupMaximized::SetupMaximized( QWidget* parent )
@@ -143,6 +144,8 @@
                                            imageFolderBox );
     d->searchRecursiveCheck = new QCheckBox( i18n( "Search path recursively" ),
             this );
+    d->showSmallImagesCheck = new QCheckBox( i18n( "Show small images" ),
+            this );
 
     connect( d->changePathButton, SIGNAL( clicked() ),
              this, SLOT( slotFolderPicker() ) );
@@ -152,6 +155,7 @@
     QVBoxLayout *vbox2 = new QVBoxLayout( d->slideshowBox );
     vbox2->addWidget( imageFolderBox );
     vbox2->addWidget( d->searchRecursiveCheck );
+    vbox2->addWidget( d->showSmallImagesCheck );
     d->slideshowBox->setLayout( vbox2 );
 
     //---------------- Popup setup
@@ -266,6 +270,8 @@
                        d->hideMinimizeButton->isChecked() );
     config.writeEntry( "SearchRecursiveCheck",
                        d->searchRecursiveCheck->isChecked() );
+    config.writeEntry( "ShowSmallImagesCheck",
+                       d->showSmallImagesCheck->isChecked() );
     config.writeEntry( "Effect",
                        d->effectBox->itemData( d->effectBox->currentIndex() ) );
 
@@ -300,6 +306,8 @@
 
     d->searchRecursiveCheck->setChecked(
         config.readEntry( "SearchRecursiveCheck", false ) );
+    d->showSmallImagesCheck->setChecked(
+        config.readEntry( "ShowSmallImagesCheck", true ) );
     d->disableAccel->setChecked( config.readEntry( "DisableAccel", false ) );
     d->readOnlyPlasma->setChecked(
         config.readEntry( "UsePlasmaReadOnly", true ) );
--- trunk/extragear/utils/rsibreak/src/slideshoweffect.cpp #1167218:1167219
@@ -30,7 +30,7 @@
 
 
 SlideEffect::SlideEffect( QObject *parent )
-        : BreakBase( parent ), m_searchRecursive( false )
+        : BreakBase( parent ), m_searchRecursive( false ), m_showSmallImages(false)
 {
     // Make all other screens gray...
     setGrayEffectOnAllScreens( true );
@@ -104,7 +104,7 @@
         image.load( name );
 
         // Check size
-        if ( image.width() * image.height() >= min_image_surface ) {
+        if ( image.width() * image.height() >= min_image_surface || \
m_showSmallImages) {  // Image is big enough, leave while loop
             m_files_done.append( name );
             break;
@@ -170,12 +170,13 @@
     loadImage();
 }
 
-void SlideEffect::reset( const QString& path, bool recursive, int slideInterval )
+void SlideEffect::reset( const QString& path, bool recursive, bool showSmallImages, \
int slideInterval )  {
     m_files.clear();
     m_files_done.clear();
     m_basePath = path;
     m_searchRecursive = recursive;
+    m_showSmallImages = showSmallImages;
     m_slideInterval = slideInterval;
 
     findImagesInFolder( path );
--- trunk/extragear/utils/rsibreak/src/slideshoweffect.h #1167218:1167219
@@ -33,7 +33,7 @@
 public:
     SlideEffect( QObject *parent );
     ~SlideEffect();
-    void reset( const QString& path, bool recursive, int interval );
+    void reset( const QString& path, bool recursive, bool skipSmallImages, int \
interval );  void activate();
     void deactivate();
     bool hasImages();
@@ -51,6 +51,7 @@
     QTimer*         m_timer_slide;
 
     bool            m_searchRecursive;
+    bool            m_showSmallImages;
     int             m_slideInterval;
 
     QStringList     m_files;


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