diff -r 99ad1390cd33 -r c499df2dbb33 ui/viewmanagement/statehandler/src/glxstatemanager.cpp --- a/ui/viewmanagement/statehandler/src/glxstatemanager.cpp Fri Apr 16 14:58:46 2010 +0300 +++ b/ui/viewmanagement/statehandler/src/glxstatemanager.cpp Mon May 03 12:31:32 2010 +0300 @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -39,7 +40,7 @@ #include #include #include -#include +#include #include GlxStateManager::GlxStateManager() : mAllMediaModel(NULL), mAlbumGridMediaModel(NULL), @@ -110,8 +111,7 @@ createModel(GLX_FULLSCREENVIEW_ID); mCurrentModel->setData( mCurrentModel->index(0,0), 0, GlxFocusIndexRole ); mViewManager->launchApplication( GLX_FULLSCREENVIEW_ID, mCurrentModel); - //todo remove state dependency from view manager - mViewManager->setupItems(IMAGEVIEWER_S); + setupItems(); } void GlxStateManager::actionTriggered(qint32 id) @@ -276,6 +276,8 @@ case GLX_SLIDESHOWVIEW_ID : return new GlxSlideShowState( this, mCurrentState ); + case GLX_SLIDESHOWSETTINGSVIEW_ID : + return new GlxSlideShowSettingsState(this, mCurrentState ); default : return NULL; @@ -305,6 +307,7 @@ if ( mCurrentState->state() == IMAGEVIEWER_S) { GlxModelParm modelParm (KGlxCollectionPluginImageViewerImplementationUid, 0); mCurrentModel = mImageviewerMediaModel = new GlxMediaModel (modelParm); + mCollectionId = KGlxCollectionPluginImageViewerImplementationUid; } else if ( mCurrentState->state() == EXTERNAL_S) { if(!mAllMediaModel) { @@ -324,7 +327,7 @@ break; case GLX_SLIDESHOWVIEW_ID : - if ( mCurrentState->state() == ALBUM_ITEM_S ) { + if ( mCurrentState->state() == SLIDESHOW_ALBUM_ITEM_S ) { GlxModelParm modelParm ( KGlxAlbumsMediaId , 0); mCurrentModel = mAlbumGridMediaModel = new GlxMediaModel( modelParm ); } @@ -429,6 +432,10 @@ id = EGlxCmdHandled; break; + case EGlxCmdSlideshowSettings: + nextState(GLX_SLIDESHOWSETTINGSVIEW_ID,-1 ); + id = EGlxCmdHandled; + break; case EGlxCmdDetailsOpen: qDebug("GlxStateManager::eventHandler EGlxCmdDetailsOpen"); nextState( GLX_DETAILSVIEW_ID, -1 ); @@ -454,9 +461,7 @@ case EGlxCmdOviOpen: { - HbMessageBox box(HbMessageBox::MessageTypeInformation); - box.setText("Not Implemented"); - box.exec(); + HbNotificationDialog::launchDialog("Not Implemented"); id = EGlxCmdHandled; } break;