diff -r 74c9f037fd5d -r 99ad1390cd33 ui/views/slideshowview/src/glxslideshowwidget.cpp --- a/ui/views/slideshowview/src/glxslideshowwidget.cpp Fri Mar 19 09:28:59 2010 +0200 +++ b/ui/views/slideshowview/src/glxslideshowwidget.cpp Fri Apr 16 14:58:46 2010 +0300 @@ -29,6 +29,7 @@ //User Includes +#include "glxicondefs.h" //Contains the icon names/Ids #include "glxmodelparm.h" #include "glxeffectengine.h" #include "glxdocloaderdefs.h" @@ -46,18 +47,19 @@ void GlxSlideShowWidget::setSlideShowWidget(HbDocumentLoader *DocLoader) { - //To:Do error handling - TRACER("GlxSlideShowWidget::setSlideShowWidget()"); + TRACER("GlxSlideShowWidget::setSlideShowWidget()"); + //create the effect engine mEffectEngine = new GlxSlideShowEffectEngine(); // Now load the view and the contents. + // and then set the play icon to the button mContinueButton = static_cast(DocLoader->findWidget(GLXSLIDESHOW_PB)); + mContinueButton->setIcon(HbIcon(GLXICON_PLAY)); mContinueButton->hide(); mIsPause = false; - for ( int i = 0; i < NBR_ITEM ; i++) { mIconItems[i] = new HbIconItem(this); mIconItems[i]->setBrush(QBrush(Qt::black)); @@ -105,7 +107,8 @@ delete mEffectEngine; mEffectEngine = NULL; } - + + for ( int i = 0; i < NBR_ITEM ; i++) { delete mIconItems[i] ; @@ -405,6 +408,9 @@ void GlxSlideShowWidget::resetSlideShow() { TRACER("GlxSlideShowWidget::resetSlideShow()" ); + if(! mModel) { + return; + } QVariant variant = mModel->data( mModel->index( mSelIndex, 0 ), GlxFocusIndexRole ); if ( variant.isValid() && variant.canConvert () ) { mSelIndex = variant.value() ;