[Kde-imaging] branches/extragear/kde3/libs/kipi-plugins/slideshow

[Valerio Fuoglio]

SVN commit 737715 by vfuoglio:

Fixed OpenGL effect selection issue.

Not reported in NEWS file: bug introduced in svn (rev. 736830)

CCMAIL: kde-imaging at kde.org


 M  +10 -11    slideshowconfig.cpp  


--- branches/extragear/kde3/libs/kipi-plugins/slideshow/slideshowconfig.cpp #737714:737715
@@ -215,7 +215,7 @@
 
     // Update GUI
     
-    effects.sort();
+   effects.sort();
     m_effectsComboBox->insertStringList(effects);
 
     for (int i=0; i<m_effectsComboBox->count(); i++) {
@@ -388,27 +388,26 @@
     }
     else 
     {
-      QStringList effects;
+      QMap<QString,QString> effects;
       QMap<QString,QString> effectNames;
       QMap<QString,QString>::Iterator it;
     
-    // Load slideshowgl effects
+      // Load slideshowgl effects
       effectNames = SlideShowGL::effectNamesI18N();
 
       for (it = effectNames.begin(); it != effectNames.end(); ++it)
-        effects.append(it.data());
+        effects.insert(it.key(),it.data());
 
-    // Load Ken Burns effect
+      // Load Ken Burns effect
       effectNames = SlideShowKB::effectNamesI18N();
       for (it = effectNames.begin(); it != effectNames.end(); ++it)
-        effects.append(it.data());
+        effects.insert(it.key(),it.data());
 
         QString effect;
-        QStringList::Iterator it1;
 
-        for (it1 = effects.begin(); it1 != effects.end(); ++it1) {
-            if ( *it1 == m_effectsComboBox->currentText()) {
-                effect = *it1;
+        for (it = effects.begin(); it != effects.end(); ++it) {
+            if ( it.data() == m_effectsComboBox->currentText()) {
+                effect = it.key();
                 break;
             }
         }
@@ -531,7 +530,7 @@
     
     ShowNumberImages( m_ImagesFilesListBox->count() );
     
-    slotEffectChanged();
+//    slotEffectChanged();
 }
 
 void SlideShowConfig::slotDelayChanged()