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

List:       kde-commits
Subject:    extragear/multimedia/amarok/src/context/applets/photos
From:       Simon Esneault <simon.esneault () gmail ! com>
Date:       2009-07-13 7:04:11
Message-ID: 1247468651.734008.24824.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 995603 by sesneault:

Fix crash on applet loading


 M  +9 -2      PhotosApplet.cpp  
 M  +2 -2      PhotosScrollWidget.h  
 M  +3 -3      photosSettings.ui  


--- trunk/extragear/multimedia/amarok/src/context/applets/photos/PhotosApplet.cpp \
#995602:995603 @@ -74,15 +74,22 @@
     connect( m_settingsIcon, SIGNAL( activated() ), this, SLOT( \
showConfigurationInterface() ) );  
     m_widget = new PhotosScrollWidget( this );
+
+    
     // Read config and inform the engine.
     KConfigGroup config = Amarok::config("Photos Applet");
     m_nbPhotos = config.readEntry( "NbPhotos", "10" ).toInt();
     m_Animation = config.readEntry( "Animation", "Interactive" );
     dataEngine( "amarok-photos" )->query( QString( "photos:nbphotos:" ) + \
                QString().setNum( m_nbPhotos ) );
-    
-    m_widget->setMode( ui_Settings.animationComboBox->currentIndex() );
 
+    if ( m_Animation == i18n( "Automatic" ) )
+        m_widget->setMode( 0 );
     
+    if ( m_Animation == i18n( "Interactive" ) )
+        m_widget->setMode( 1 );
+    
+    if ( m_Animation == i18n( "Fading" ) )
+        m_widget->setMode( 2 );
     constraintsEvent();
 
     connectSource( "photos" );
--- trunk/extragear/multimedia/amarok/src/context/applets/photos/PhotosScrollWidget.h \
#995602:995603 @@ -21,8 +21,8 @@
 
 #include "../../engines/photos/PhotosInfo.h"
 
-#define PHOTOS_MODE_INTERACTIVE 0
-#define PHOTOS_MODE_AUTOMATIC   1
+#define PHOTOS_MODE_AUTOMATIC   0
+#define PHOTOS_MODE_INTERACTIVE 1
 #define PHOTOS_MODE_FADING      2
 
 //forward
--- trunk/extragear/multimedia/amarok/src/context/applets/photos/photosSettings.ui \
#995602:995603 @@ -15,7 +15,7 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>201</width>
+     <width>211</width>
      <height>80</height>
     </rect>
    </property>
@@ -34,12 +34,12 @@
      <widget class="KComboBox" name="animationComboBox">
       <item>
        <property name="text">
-        <string>Interactive</string>
+        <string>Automatic</string>
        </property>
       </item>
       <item>
        <property name="text">
-        <string>Scrolling</string>
+        <string>Interactive</string>
        </property>
       </item>
       <item>


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