FCL/sf/app/photos: comparison ui/viewmanagement/statehandler/src/glxstatemanager.cpp

equal deleted inserted replaced

-:27f2d7aec52a
+:0a8e959402e5
 }
 void GlxStateManager::launchFetcher(int fetcherFilterType)
 {
 qDebug("GlxStateManager::launchFetcher");
-mCurrentState = createState(GLX_GRIDVIEW_ID);
+mCurrentState = createState( GLX_GRIDVIEW_ID );
-mCurrentState->setState(FETCHER_ITEM_S);
+mCurrentState->setState( FETCHER_ITEM_S );
-	mFetcherFilterType = (GlxFetcherFilterType)fetcherFilterType;
+	mFetcherFilterType = ( GlxFetcherFilterType )fetcherFilterType;
-createModel(GLX_GRIDVIEW_ID);
+createModel( GLX_GRIDVIEW_ID );
-mViewManager->launchApplication( GLX_GRIDVIEW_ID, mCurrentModel);
+mViewManager->launchApplication( GLX_GRIDVIEW_ID, mCurrentModel );
 }
 void GlxStateManager::launchApplication()
 {
 qDebug("GlxStateManager::launchApplication");
 bool activitySuccess = false;
 //To:Do use it in future once performance code is removed nextState(GLX_GRIDVIEW_ID, ALL_ITEM_S)
 if( mActivation->reason() == Af::ActivationReasonActivity ) {
 activitySuccess = launchActivity();
-qDebug("GlxStateManager::launchApplication as Activity");
 }
 if( !activitySuccess ) {
 mCurrentState = createState( GLX_GRIDVIEW_ID );
 mCurrentState->setState( ALL_ITEM_S );
 int leftCount = mTNObserver->getTNLeftCount() ;
-if (  leftCount > 0  ) {
+if (  leftCount > 0  || leftCount == KErrNotReady ) {
 mViewManager->launchApplication( GLX_GRIDVIEW_ID, mCurrentModel );
 launchProgressDialog();
 }
 else {
 createModel( GLX_GRIDVIEW_ID );
 mViewManager->launchApplication( GLX_GRIDVIEW_ID, mCurrentModel );
 }
 mTNObserver->startTNObserving() ;
 }
+mActivityStorage->removeActivity( "PhotosMainView" );
-bool ok = mActivityStorage->removeActivity("PhotosMainView");
-if ( !ok )
-{
-qDebug("launchapplication::Remove activity failed" );
-}
 }
 bool GlxStateManager::launchActivity()
 {
 QVariant data = mActivityStorage->activityData("PhotosMainView");
 mViewManager->launchApplication(stateId, mCurrentModel);
 return true;
 }
 bool GlxStateManager::validateActivityData()
 {
+if( ( mSaveActivity.value("ID") == GLX_GRIDVIEW_ID ) ||
-if( (mSaveActivity.value("ID") == GLX_GRIDVIEW_ID) ||
+( ( mSaveActivity.value("ID") == GLX_LISTVIEW_ID ) && ( mSaveActivity.value("InternalState") == ALL_ITEM_S ) ) ||
-( (mSaveActivity.value("ID") == GLX_LISTVIEW_ID) && (mSaveActivity.value("InternalState") == ALL_ITEM_S) ) ||
+( mSaveActivity.value("VisibleIndex") >= 0 ) ) {
-(mSaveActivity.value("VisibleIndex") >= 0 ) ) {
-qDebug("GlxStateManager::validation passed");
 return true;
 }
 qDebug("GlxStateManager::Validation failed");
-qDebug("VIEW : %u", mSaveActivity.value("ID"));
+return false;
-qDebug("SUB STATE: %u", mSaveActivity.value("InternalState"));
-qDebug("Visible Index: %u", mSaveActivity.value("VisibleIndex"));
-return false;
 }
 void GlxStateManager::launchFromExternal()
 {
 void GlxStateManager::setupItems()
 {
 qDebug("GlxStateManager::setupItems()");
 mActionHandler = new GlxActionHandler();
-connect ( mViewManager, SIGNAL(externalCommand(int )), this, SIGNAL(externalCommand(int )) );
 mViewManager->setupItems();
-switch( mSaveActivity.value( "ID" ) ){
+switch( mCurrentState->id() ){
 case GLX_LISTVIEW_ID:
-mViewManager->updateToolBarIcon(GLX_ALBUM_ACTION_ID);
+mViewManager->updateToolBarIcon( GLX_ALBUM_ACTION_ID );
 break;
 case GLX_GRIDVIEW_ID:
+mViewManager->updateToolBarIcon( GLX_ALL_ACTION_ID );
+break;
 default:
-mViewManager->updateToolBarIcon(GLX_ALL_ACTION_ID);
+mViewManager->updateToolBarIcon( GLX_ALL_ACTION_ID );
+break;
 }
 }
 void GlxStateManager::updateTNProgress( int count)
 {
 TRACER("GlxStateManager::updateTNProgress() ");
 // this is case when progress bar is not showing
 // in the case of rename of an image or capture the single item
 // it is also launching the progress bar, to avoid this scenario add the check of count more than 5
 if ( mCurrentModel && ( count > 5  ) ) {
-goBack( GLX_GRIDVIEW_ID, ALL_ITEM_S ) ;
+mViewManager->cancelViewTransitionEffect();
-cleanAllModel();
+goBack( GLX_GRIDVIEW_ID, ALL_ITEM_S ) ;
-launchProgressDialog();
+cleanAllModel();
+launchProgressDialog();
 }
 if ( isProgressbarRunning ){
 if ( count == 0 ) {
 vanishProgressDialog();
 qDebug("SaveData::Save activity failed" );
 }
 }
 }
-void GlxStateManager::nextState(qint32 state, int internalState)
+void GlxStateManager::nextState( qint32 state, int internalState )
 {
 qDebug("GlxStateManager::nextState next state = %u", state);
+//no view transition is aloo during the progress dialog display
+if( isProgressbarRunning ) {
+return ;
+}
 GlxEffect effect = NO_EFFECT ;
 GlxViewEffect viewEffect = NO_VIEW ;
-PERFORMANCE ( d1, State Creation Time ) {
+mCurrentState = createState( state ); //create a new state
-mCurrentState = createState(state); //create a new state
+mCurrentState->setState( internalState );
-mCurrentState->setState(internalState);
+createModel( state ); //model should created after the internal state was set.
-}
+mCurrentState->setTranstionParameter( FORWARD_DIR, effect, viewEffect ); // to run the transtion effect
-createModel(state); //model should created after the internal state was set.
+if ( viewEffect == NO_VIEW ) {
+mViewManager->launchView( state, mCurrentModel );
-PERFORMANCE ( d2, view launch time ) {
+}
-mCurrentState->setTranstionParameter( FORWARD_DIR, effect, viewEffect); // to run the transtion effect
+else {
-if ( viewEffect == NO_VIEW ) {
+mViewManager->launchView( state, mCurrentModel, effect, viewEffect );
-mViewManager->launchView( state, mCurrentModel );
-}
-else {
-mViewManager->launchView( state, mCurrentModel, effect, viewEffect);
-}
 }
 }
 void GlxStateManager::previousState()
 {
 qDebug("GlxStateManager::previousState");
+//no view transition is aloo during the progress dialog display
+if( isProgressbarRunning ) {
+return ;
+}
 GlxEffect effect = NO_EFFECT ;
 GlxViewEffect viewEffect = NO_VIEW ;
 GlxState *state = mCurrentState; // To delete the current state later
 }
 void GlxStateManager::goBack(qint32 stateId, int internalState)
 {
 qDebug("GlxStateManager::goBack()");
+//no view transition is aloo during the progress dialog display
+if( isProgressbarRunning ) {
+return ;
+}
 //if current state and it internal state is same then no need to do any thing
 if ( mCurrentState->id() == stateId  && mCurrentState->state() == internalState ) {
 return ;
 }
 }
 void GlxStateManager::changeState(qint32 stateId, int internalState)
 {
 qDebug("GlxStateManager::changeState %d", stateId);
+//no view transition is aloo during the progress dialog display
+if( isProgressbarRunning ) {
+return ;
+}
 GlxState *state = mCurrentState;
 GlxEffect effect = NO_EFFECT ;
 GlxViewEffect viewEffect = NO_VIEW ;
 mCurrentState = mCurrentState->previousState();//pervious state of current state become the pervious state of new state
 case GLX_DETAILSVIEW_ID:
 return new GlxDetailState( mCurrentState );
 case GLX_SLIDESHOWVIEW_ID :
 return new GlxSlideShowState( this, mCurrentState );
 case GLX_SLIDESHOWSETTINGSVIEW_ID :
 return new GlxSlideShowSettingsState(this, mCurrentState );
 default :
 return NULL;
 	id = EGlxCmdHandled;
 	break;
 case EGlxCmdCameraOpen:
 		{
-		QProcess::startDetached(QString("cxui.exe"));
+		QProcess::startDetached( QString( "cxui.exe" ) );
+		mViewManager->updateToolBarActionState( GLX_CAMERA_ACTION_ID, false );
 		id = EGlxCmdHandled;
 		}
 break;
 case EGlxCmdOviOpen:
 		{
-		HbNotificationDialog::launchDialog("Not Implemented");
+		HbNotificationDialog::launchDialog( "Not Implemented" );
+		mViewManager->updateToolBarActionState( GLX_OVI_ACTION_ID, false );
 id = EGlxCmdHandled;
 		}
 break;
 case EGlxCmdMarkAll :
 delete mActivation;
 delete mActivityStorage;
 qDebug("GlxStateManager::~GlxStateManager delete Model");
 disconnect ( mViewManager, SIGNAL(actionTriggered(qint32 )), this, SLOT(actionTriggered(qint32 )) );
-disconnect ( mViewManager, SIGNAL(externalCommand(int )), this, SIGNAL(externalCommand(int )) );
 disconnect ( mTNObserver, SIGNAL( leftTNCount( int ) ), this, SLOT( updateTNProgress( int ) ) );
 disconnect ( this, SIGNAL( setupItemsSignal() ), this, SLOT( setupItems() ) );
 disconnect ( qobject_cast<HbApplication*>(qApp), SIGNAL (aboutToQuit()), this, SLOT(saveData()));
 delete mTNObserver;

changeset 72	0a8e959402e5
parent 71	27f2d7aec52a