MCL/sf/app/photos: comparison photosgallery/viewframework/views/fullscreenview/src/glxfullscreenviewimp.cpp

equal deleted inserted replaced

-:b023a8d2866a
+:ea65f74e6de4
 	if(!iPeriodic)
 		{
 		iPeriodic = CPeriodic::NewL(CActive::EPriorityStandard);
 		}
 	iGlxTvOut = CGlxTv::NewL(*this);
+	iNaviState = CGlxNavigationalState::InstanceL();
 }
 // ---------------------------------------------------------------------------
 // ~CGlxFullScreenViewImp()
 // ---------------------------------------------------------------------------
 if (iPeriodic)
 		{
 		iPeriodic->Cancel();
 		delete iPeriodic;
 		}
+if (iNaviState)
+{
+iNaviState->Close();
+}
 	}
 // ---------------------------------------------------------------------------
 // From CGlxViewBase
 // ---------------------------------------------------------------------------
 //
 TRACER("CGlxFullScreenViewImp::DoMLViewActivateL");
 // hide the toolbar
 EnableFSToolbar(EFalse);
-CGlxNavigationalState* navigationalState =  CGlxNavigationalState::InstanceL();
+if (iMediaList->Count() == 0)
-CleanupClosePushL( *navigationalState );
+{
-CMPXCollectionPath* naviState = navigationalState->StateLC();
+GLX_LOG_INFO("CGlxFullScreenViewImp::DoMLViewActivateL() - No items!");
+		// While in slideshow from fullscreen view,
-if(!iMediaList->Count())
+// 1) Connect USB in mass storage mode or
-		{
+// 2) Delete items through file manager
-//Fix For EPKA-7U5DT7-slideshow launched from FullScreen and connect USB in mass storage mode results in Photos crash
+// shall result in activating fullscreen view with no items; so, goto grid view.
-navigationalState->ActivatePreviousViewL();
+iNaviState->ActivatePreviousViewL();
 }
-	else
+else
-		{
+{
-		//fix for ESLM-7YYDXC: When in FullScreen View, view mode must be 'EView'
+//fix for ESLM-7YYDXC: When in FullScreen View, view mode must be 'EView'
-		//While coming back from SlideShow to FullScreen view, need to set view mode.
+//While coming back from SlideShow to FullScreen view, need to set view mode.
-		if(navigationalState->ViewingMode() != NGlxNavigationalState::EView)
+if (iMediaList->Count() && iNaviState->ViewingMode()
-		   	{
+!= NGlxNavigationalState::EView)
-		   	navigationalState->SetToViewMode();
+{
-		   	}
+iNaviState->SetToViewMode();
-		}
+}
+}
-if(naviState->Id() == TMPXItemId(KGlxCollectionPluginImageViewerImplementationUid))
+CMPXCollectionPath* collPath = iNaviState->StateLC();
+if (collPath->Id() == TMPXItemId(
+KGlxCollectionPluginImageViewerImplementationUid))
 {
 iImgViewerMode = ETrue;
 CreateImageViewerInstanceL();
 }
-//destroy and close navistate and navipath
+CleanupStack::PopAndDestroy(collPath);
-CleanupStack::PopAndDestroy( naviState );
-CleanupStack::PopAndDestroy( navigationalState );
 iScrnSize = iUiUtility->DisplaySize();
 iGridIconSize = iUiUtility->GetGridIconSize();
 iHdmiWidth = (iScrnSize.iWidth > iScrnSize.iHeight ?iScrnSize.iWidth :iScrnSize.iHeight);
 iSliderWidget->AddEventHandler(*this);
 iSliderWidget->SetHandleKeyEvent(EFalse);
 iSliderModel = widgetFactory.createModel<IMulSliderModel> ("mulslidermodel");
 iSliderModel->SetTemplate(ESliderTemplate3);
 iSliderWidget->setModel(iSliderModel);
+iSliderWidget->control()->disableState(IAlfWidgetControl::Focusable);
 //adding the range and slider tick value
 if(iSliderModel)
 {
 iSliderModel->SetTick(KGlxSliderTickValue);
 	    if(iZoomControl->Activated())
 	        {
 	        HideUi(iSliderWidget->IsHidden());
 	        }
 		}
-iViewWidget->show(ETrue);
 }
 // ---------------------------------------------------------------------------
 //ActivateFullScreen function.
 // ---------------------------------------------------------------------------
 }
 if(iSliderWidget)
 {
 iSliderWidget->AddEventHandler(*this);
 }
-iViewWidget->show(ETrue);
 iViewWidget->setRect(TRect(TPoint(0,0),AlfUtil::ScreenSize()));
 	GlxSetAppState::SetState(EGlxInFullScreenView);
 }
 // ---------------------------------------------------------------------------
 //
 void CGlxFullScreenViewImp::HandleForegroundEventL(TBool aForeground)
 {
 TRACER("CGlxFullScreenViewImp::HandleForegroundEventL");
 CAknView::HandleForegroundEventL(aForeground);
+iUiUtility->SetForegroundStatus(aForeground);
 if(iMMCState)
 {
 iMMCState =EFalse;
 NavigateToMainListL();
 }
 	else
 		{
 		if (iMediaList)
 			{
 			/** if there is no image to show go back to the previous view */
-			if (!iMediaList->Count())
+			if (!iMediaList->Count() && iNaviState->ViewingMode()
-				{
+== NGlxNavigationalState::EView)
-				iUiUtility->SetViewNavigationDirection(EGlxNavigationBackwards);
+{
-				CGlxNavigationalState* navigationalState =
+iUiUtility->SetViewNavigationDirection(
-						CGlxNavigationalState::InstanceL();
+EGlxNavigationBackwards);
-				CleanupClosePushL(*navigationalState);
+iNaviState->ActivatePreviousViewL();
-				navigationalState ->ActivatePreviousViewL();
+}
-				CleanupStack::PopAndDestroy(navigationalState);
-				}
 			else if (iMediaListMulModelProvider)
 				{
 	            UpdateItems();
 				if (iHdmiController)
 }
 break;
 case ETypeRemove:
 {
-// Handle the "C" key or the BackSpace key to Delete an item.
+// If From photos, delete the img.
-ProcessCommandL(EGlxCmdDelete);
+// If Image-Viewer collection and not in private Path
-return EEventConsumed;
+// handle the "C" or BackSpace key to delete the item
+if (!iImgViewerMode || (iImageViewerInstance
+&& !iImageViewerInstance->IsPrivate()))
+{
+ProcessCommandL(EGlxCmdDelete);
+return EEventConsumed;
+}
+return EEventNotHandled;
 }
 case ETypeDoubleTap:
 {
 GLX_LOG_INFO("CGlxFullScreenViewImp::OfferEventL ETypeDoubleTap");
 MulDoubleTapData* DoubleTapData = (MulDoubleTapData*)(aEvent.CustomEventData());
 }
 return EEventConsumed;
 }
 case ETypeItemRemoved:
 {
+GLX_LOG_INFO("CGlxFullScreenViewImp::OfferEventL ETypeItemRemoved");
+TInt focusIndex = iMediaList->FocusIndex();
+TInt mlCount = iMediaList->Count();
+GLX_LOG_INFO2("CGlxFullScreenViewImp::OfferEventL focusIndex=%d, iOldFocusIndex=%d",
+focusIndex, iOldFocusIndex);
+if (mlCount && (iOldFocusIndex == focusIndex
+|| iOldFocusIndex == mlCount) && iZoomControl
+&& iZoomControl->Activated())
+{
+GLX_LOG_INFO("Fcused item is removed, Exit zoom view!");
+DeactivateZoomControlL();
+}
 SetItemToHDMIL();
-TInt focusIndex = iMediaList->FocusIndex();
 if (focusIndex != KErrNotFound && EUiOn == GetUiState())
 {
 // show/hide the slider
 if (iSliderWidget)
 {
 iSliderWidget->ShowWidget(CheckIfSliderToBeShownL());
 }
 }
 /** if this is the last image deleted when Photo is in foreground, go back to the previous view*/
-				if (!iMediaList->Count() && IsForeground())
+if (mlCount == 0 && IsForeground()
-					{
+&& iNaviState->ViewingMode()
-					iUiUtility->SetViewNavigationDirection(
+== NGlxNavigationalState::EView)
-							EGlxNavigationBackwards);
+{
-					CGlxNavigationalState* navigationalState =
+iUiUtility->SetViewNavigationDirection(
-							CGlxNavigationalState::InstanceL();
+EGlxNavigationBackwards);
-					CleanupClosePushL(*navigationalState);
+iNaviState->ActivatePreviousViewL();
-					navigationalState ->ActivatePreviousViewL();
+}
-					CleanupStack::PopAndDestroy(navigationalState);
+TRAP_IGNORE(ShowDrmExpiryNoteL());
-					}
 return EEventConsumed;
 }
 case ETypeHighlight:
 {
+GLX_LOG_INFO("CGlxFullScreenViewImp::OfferEventL ETypeHighlight");
 iMediaList->SetFocusL( NGlxListDefs::EAbsolute,(aEvent.CustomEventData()));
 if (AknLayoutUtils::PenEnabled())
 	{
 	iMediaList->SetVisibleWindowIndexL(aEvent.CustomEventData());
 	}
 {
 TGlxMedia item = iMediaList->Item( iMediaList->FocusIndex() );
 if(item.Category() == EMPXVideo)
 {
 ProcessCommandL(EGlxCmdPlay);
+iViewWidget->show(false);
 }
 else
 {
 if ( EUiOn == GetUiState() )
 {
 		case EGlxCmdDialogLaunched:
 {
 iIsDialogLaunched = ETrue;
 break;
 }
+case EGlxCmdDialogDismissed:
+{
+if (iIsDialogLaunched && iIsMMCRemoved)
+{
+ProcessCommandL(EAknSoftkeyExit);
+}
+consumed = ETrue;
+iIsDialogLaunched = EFalse;
+break;
+}
+		case EAknSoftkeyBack:
+{
+HideUi(ETrue);
+break;
+}
 }
 return consumed;
 }
 // ---------------------------------------------------------------------------

branch	RCL_3
changeset 24	ea65f74e6de4
parent 23	b023a8d2866a