MCL/sf/app/commonemail: comparison emailuis/emailui/src/FreestyleEmailUiMailListVisualiser.cpp

equal deleted inserted replaced

-:3533d4323edc
+:968773a0b6ef
 {
 if( !iNewMailTimer->IsActive() && iNewMailTimer->iStatus != KErrInUse )
 	{
 // Size sorting does not use nodes, so disable those, otherwise check from CR
 iNodesInUse = iAppUi.GetCRHandler()->TitleDividers();
-SetSortButtonTextAndIconL();
+SetSortButtonIconL();
 iFocusedControl = EControlBarComponent;
 iMailList->SetFocusedL( EFalse );
 iControlBarControl->SetFocusByIdL( iSortButtonId );
 }
 }
 if( aTriggeredTimer == iNewMailTimer )
 {
+if ( ! iThisViewActive ) // don't proceed if view is not active
+{
+iNewMailTimer->Stop();
+return;
+}
 TInt count = Min( KNewMailMaxBatch, iNewMailIds.Count() );
 CFSMailClient* mailClient = iAppUi.GetMailClient();
 // Enter critical section
 // Because CFSMailClient::GetMessageByUidL can use CActiveSchedulerWait
 iNewMailTimer->iStatus = KErrNone;
 iNewMailTimer->Stop();
 return; // leave  method
 }
-CFSMailMessage* msgPtr = mailClient->GetMessageByUidL( iAppUi.GetActiveMailboxId(),
+CFSMailMessage* msgPtr(NULL);
+TRAPD( err, msgPtr = mailClient->GetMessageByUidL( iAppUi.GetActiveMailboxId(),
 iMailFolder->GetFolderId(),
 iNewMailIds[ 0 ],
-EFSMsgDataEnvelope );
+EFSMsgDataEnvelope ) );
+if ( KErrNone != err )
+{
+iNewMailTimer->iStatus = KErrNone;
+User::Leave(err);
+}
 if ( msgPtr != NULL )
 {
 __ASSERT_DEBUG( FolderId() == msgPtr->GetFolderId(), User::Invariant() );
 CleanupStack::PushL( msgPtr );
 //first item - show scrollbar
 {
 iAppUi.FolderList().HidePopupL();
 }
 DisableMailList( EFalse );
+UpdateFolderAndMarkingModeTextsL();
 	// inform baseView if view entered with forward navigation
 	TBool forwardNavigation = EFalse;
 	if ( aCustomMessageId != KStartListReturnToPreviousFolder &&
 	     aCustomMessageId != TUid::Uid(KMailSettingsReturnFromPluginSettings) )
 	    {
 TRect clientRect = iAppUi.ClientRect();
 iScreenAnchorLayout->SetSize( clientRect.Size() );
 SetMailListLayoutAnchors();
 //if the view is already active don't update the icons so they won't "blink"
 //when the view is activated.
-if(!iThisViewActive)
+if(!iThisViewActive && !iMarkingMode)
 {
 ScaleControlBarL();
 // Set icons on toolbar
 iAppUi.FsTextureManager()->ClearTextureByIndex( EListControlBarMailboxDefaultIcon );
 {
 iForceRefresh = EFalse;
 // Set initial sort criteria when folder is changed
 iCurrentSortCriteria.iField = EFSMailSortByDate;
 iCurrentSortCriteria.iOrder = EFSMailDescending;
-SetSortButtonTextAndIconL();
+SetSortButtonIconL();
 SafeDelete(iMailFolder);
 TRAP_IGNORE( iMailFolder = iAppUi.GetMailClient()->GetFolderByUidL(
 activationData.iMailBoxId, activationData.iFolderId ) );
 if ( !iMailFolder )
 }
 // Safety, try to revert back to standard folder inbox
 TFSMailMsgId inboxId = iAppUi.GetActiveMailbox()->GetStandardFolderId( EFSInbox );
 iMailFolder = iAppUi.GetMailClient()->GetFolderByUidL( activationData.iMailBoxId, inboxId );
 }
-HBufC* newFolderName = CreateFolderNameLC( iMailFolder );
-iFolderListButton->SetTextL( *newFolderName );
-CleanupStack::PopAndDestroy( newFolderName );
 iMailList->SetFocusedItemL( KFsTreeNoneID );
 refreshState = EFullRefreshNeeded;
 }
 // Set mailbox name to status pane
 	else
 	    {
 	    SetControlBarFocusedL();
 	    iControlBarControl->MakeSelectorVisible( iAppUi.IsFocusShown() );
 	    }
-	UpdateButtonTextsL();
 	FocusVisibilityChange( iAppUi.IsFocusShown() );
 	iAppUi.ShowTitlePaneConnectionStatus();
+// if timer stoped when quitting view then restart if more messages available
+if ( iNewMailIds.Count() && ( ! iNewMailTimer->IsActive() ) && iSortState == ESortNone )
+{
+iNewMailTimer->Start( KNewMailTimerDelay );
+}
 	TIMESTAMP( "Message list view opened" );
-	}
+	}  // CFSEmailUiMailListVisualiser::ChildDoActivateL
 // ---------------------------------------------------------------------------
 // Sets status bar layout
 // ---------------------------------------------------------------------------
 //
 	    TRAP_IGNORE( {
 iMailList->HideListL();
 iMailList->SetFocusedL( EFalse );
 	        } );
 	    iMailTreeListVisualizer->NotifyControlVisibilityChange( EFalse );
+	    TRAP_IGNORE( UpdateFolderAndMarkingModeTextsL() );
 	    }
 	iThisViewActive = EFalse;
 	}
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 void CFSEmailUiMailListVisualiser::ExitMarkingModeL()
 {
 FUNC_LOG;
+iMarkingMode = EFalse;
 // Hide marking mode text on the place of drop down menus
-RemoveMarkingModeTitleTextL();
+UpdateFolderAndMarkingModeTextsL();
-iMarkingMode = EFalse;
 UnmarkAllItemsL();
 // Change softkeys back to normal
 SetViewSoftkeysL( R_FREESTYLE_EMAUIL_UI_SK_OPTIONS_BACK );
 // Change options menu back to normal
 CEikMenuBar* menu = iAppUi.CurrentActiveView()->MenuBar();
 iControlBarControl->SetRectL( iAppUi.LayoutHandler()->GetControlBarRect() );
 iNewEmailButton->SetDimmed( EFalse );
 iFolderListButton->SetDimmed( EFalse );
 iSortButton->SetDimmed( EFalse );
 ScaleControlBarL();
+iMailTreeListVisualizer->HideList();
+SetMailListLayoutAnchors();
+iMailTreeListVisualizer->ShowListL();
 }
 // ---------------------------------------------------------------------------
 //
 //
 SetViewSoftkeysL( R_FREESTYLE_EMAUIL_UI_SK_OPTIONS_CANCEL );
 // Change options menu for marking mode
 CEikMenuBar* menu = iAppUi.CurrentActiveView()->MenuBar();
 menu->StopDisplayingMenuBar();
 menu->SetMenuTitleResourceId(R_FSEMAILUI_MAILLIST_MENUBAR_MARKING_MODE);
-// Change background to marking mode
-DisplayMarkingModeBgL( ETrue );
 // Hide drop down menu buttons
 iNewEmailButton->SetDimmed();
 iFolderListButton->SetDimmed();
 iSortButton->SetDimmed();
-if( !Layout_Meta_Data::IsLandscapeOrientation() )
+TRect rect(0,0,0,0);
-{
+iControlBarControl->SetRectL( rect );
+UpdateFolderAndMarkingModeTextsL();
+iMailTreeListVisualizer->HideList();
+SetMailListLayoutAnchors();
+iMailTreeListVisualizer->ShowListL();
+// Change background to marking mode
+DisplayMarkingModeBgL( ETrue );
+}
+// ---------------------------------------------------------------------------
+//
+//
+// ---------------------------------------------------------------------------
+//
+void CFSEmailUiMailListVisualiser::RefreshMarkingModeL()
+{
+FUNC_LOG;
+if ( iMarkingMode )
+{
+// Hide drop down menu buttons
 TRect rect(0,0,0,0);
 iControlBarControl->SetRectL( rect );
-// Display marking mode text on the place of drop down menus
+iNewEmailButton->SetDimmed();
-DisplayMarkingModeTitleTextL();
+iFolderListButton->SetDimmed();
-}
+iSortButton->SetDimmed();
-}
+UpdateFolderAndMarkingModeTextsL();
+}
-// ---------------------------------------------------------------------------
+}
-//
-//
+// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
+//
 //
-void CFSEmailUiMailListVisualiser::RefreshMarkingModeL()
+// ---------------------------------------------------------------------------
-{
+//
-FUNC_LOG;
+void CFSEmailUiMailListVisualiser::DisplayMarkingModeTextOnButtonsL()
-if ( iMarkingMode )
-{
-// Hide drop down menu buttons
-if( !Layout_Meta_Data::IsLandscapeOrientation() )
-{
-TRect rect(0,0,0,0);
-iControlBarControl->SetRectL( rect );
-DisplayMarkingModeTitleTextL();
-}
-else
-{
-iControlBarControl->SetRectL( iAppUi.LayoutHandler()->GetControlBarRect() );
-iNewEmailButton->SetDimmed();
-iFolderListButton->SetDimmed();
-iSortButton->SetDimmed();
-RemoveMarkingModeTitleTextL();
-}
-}
-}
-// ---------------------------------------------------------------------------
-//
-//
-// ---------------------------------------------------------------------------
-//
-void CFSEmailUiMailListVisualiser::DisplayMarkingModeTitleTextL()
 {
 FUNC_LOG;
 if (!iMarkingModeTextVisual)
 {
 const TRect sortButtonRect( iAppUi.LayoutHandler()->GetControlBarSortButtonRect() );
 }
 else
 {
 iMarkingModeTextVisual->SetTextL( KNullDesC );
 }
 }
 }
 // ---------------------------------------------------------------------------
 //
 //
 // ---------------------------------------------------------------------------
 //
-void CFSEmailUiMailListVisualiser::RemoveMarkingModeTitleTextL()
+void CFSEmailUiMailListVisualiser::RemoveMarkingModeTextOnButtonsL()
 {
 FUNC_LOG;
 if (iMarkingModeTextVisual)
 {
 iMarkingModeTextVisual->SetTextL( KNullDesC );
 if ( iFirstStartCompleted ) // Safety
 {
 if ( aType == EScreenLayoutChanged )
 	{
 SetStatusBarLayout();
-UpdateButtonTextsL();
 	}
 if ( aType == ESkinChanged )
 {
 UpdateThemeL();
 }
 }
 if (iMarkingMode)
 {
 RefreshMarkingModeL();
 }
+UpdateFolderAndMarkingModeTextsL();
 	}
 // ---------------------------------------------------------------------------
 //
 //
 FUNC_LOG;
 CFsEmailUiViewBase::HandleDynamicVariantSwitchOnBackgroundL( aType );
 if ( aType == ESkinChanged )
 {
 UpdateThemeL();
-}
-else if ( aType == EScreenLayoutChanged )
-{
-UpdateButtonTextsL();
-}
-}
-// ---------------------------------------------------------------------------
-// Update texts for command area buttons
-// ---------------------------------------------------------------------------
-//
-void CFSEmailUiMailListVisualiser::UpdateButtonTextsL()
-{
-if ( !Layout_Meta_Data::IsLandscapeOrientation() )
-{
-// No texts in portrait mode
-iNewEmailButton->SetTextL( KNullDesC() );
-iSortButton->SetTextL( KNullDesC() );
-}
-else
-{
-// Set button text if necessary
-HBufC* buttonText = GetSortButtonTextLC();
-if ( buttonText )
-{
-iSortButton->SetTextL( *buttonText );
-CleanupStack::PopAndDestroy( buttonText );
-}
-iNewEmailButton->SetTextL( *iNewEmailText );
 }
 }
 // ---------------------------------------------------------------------------
 //
 	   aCommand == EFsEmailUiCmdMarkAsUnread ||
 	   aCommand == EFsEmailUiCmdActionsMove ||
 	   aCommand == EFsEmailUiCmdActionsMoveMessage ||
 	   aCommand == EFsEmailUiCmdMarkingModeFromPopUp ||
 	   aCommand == EFsEmailUiCmdActionsCollapseAll ||
-	   aCommand == EFsEmailUiCmdActionsExpandAll ) )
+	   aCommand == EFsEmailUiCmdActionsExpandAll ||
+aCommand == EFsEmailUiCmdActionsFlag ) )
 	{
 		// We end up here if the user selects an option from the pop up menu
 	// or exits the menu by tapping outside of it's area.
 	// Remove the focus from a list item if an item is focused.
 	iStylusPopUpMenuVisible = EFalse;
 {
 // If destination folder is not set, it needs to be asked messages are moved after callbak
 if ( aDestinationFolderId.IsNullId() )
 {
 // Activate folder selection view and handle moving after callback gets destination
-RemoveMarkingModeTitleTextL();
 iMoveToFolderOngoing = ETrue;
 TFolderListActivationData folderListData;
 folderListData.iCallback = this;
 if(iMailFolder) // Coverity error fix , assuming that inbox is best bet for safe data.
 {
 TAlfAlignHorizontal horizontalAlign = EAlfAlignHLeft;
 if ( AknLayoutUtils::LayoutMirrored() )
 {
 horizontalAlign = EAlfAlignHRight;
 }
 // Icons and sort button text
 iFolderListButton->SetIconL( iAppUi.FsTextureManager()->TextureByIndex( EListControlBarMailboxDefaultIcon ) );
 iNewEmailButton->SetIconL( iAppUi.FsTextureManager()->TextureByIndex( EListTextureCreateNewMessageIcon ) );
-SetSortButtonTextAndIconL();
+SetSortButtonIconL();
 iNewEmailButton->SetElemAlignL(
 ECBElemIconA,
 EAlfAlignHCenter,
 EAlfAlignVCenter );
 // ---------------------------------------------------------------------------
 //
 //
 // ---------------------------------------------------------------------------
 //
-void CFSEmailUiMailListVisualiser::SetSortButtonTextAndIconL()
+void CFSEmailUiMailListVisualiser::SetSortButtonIconL()
 	{
 FUNC_LOG;
-// Set button text if necessary
-HBufC* buttonText = GetSortButtonTextLC();
-	if ( !Layout_Meta_Data::IsLandscapeOrientation() )
-		{
-		if ( buttonText )
-			{
-			buttonText->Des().Zero();
-			}
-		}
-	if ( buttonText )
-		{
-		iSortButton->SetTextL( *buttonText );
-		}
-	CleanupStack::PopAndDestroy( buttonText );
 	iSortButton->SetIconL(
 			iAppUi.FsTextureManager()->TextureByIndex( GetSortButtonTextureIndex() ),
 			ECBElemIconA );
 	}
 iScreenAnchorLayout->SetAnchor(EAlfAnchorBottomRight, 0,
 EAlfAnchorOriginLeft, EAlfAnchorOriginTop,
 EAlfAnchorMetricRelativeToSize, EAlfAnchorMetricAbsolute,
 TAlfTimedPoint(1, iAppUi.LayoutHandler()->ControlBarHeight() ));
-// <cmail> Platform layout changes
 TRect listRect = iAppUi.LayoutHandler()->GetListRect();
 	// Set anchors so that list leaves space for control bar
 if( Layout_Meta_Data::IsMirrored() )
 {
 TInt tlX = listRect.iTl.iX;
 }
 iScreenAnchorLayout->SetAnchor(EAlfAnchorTopLeft, 1,
 EAlfAnchorOriginLeft, EAlfAnchorOriginTop,
 EAlfAnchorMetricAbsolute, EAlfAnchorMetricAbsolute,
 TAlfTimedPoint(listRect.iTl.iX, listRect.iTl.iY));
-iScreenAnchorLayout->SetAnchor(EAlfAnchorBottomRight, 1,
-EAlfAnchorOriginLeft, EAlfAnchorOriginTop,
+if (iMarkingMode && Layout_Meta_Data::IsLandscapeOrientation())
-EAlfAnchorMetricAbsolute, EAlfAnchorMetricAbsolute,
+{
-TAlfTimedPoint(listRect.iBr.iX, listRect.iBr.iY));
+iScreenAnchorLayout->SetAnchor(EAlfAnchorBottomRight, 1,
-// </cmail> Platform layout changes
+EAlfAnchorOriginLeft, EAlfAnchorOriginTop,
+EAlfAnchorMetricRelativeToSize, EAlfAnchorMetricAbsolute,
+TAlfTimedPoint(1, listRect.iBr.iY));
+}
+else
+{
+iScreenAnchorLayout->SetAnchor(EAlfAnchorBottomRight, 1,
+EAlfAnchorOriginLeft, EAlfAnchorOriginTop,
+EAlfAnchorMetricAbsolute, EAlfAnchorMetricAbsolute,
+TAlfTimedPoint(listRect.iBr.iX, listRect.iBr.iY));
+}
 	// Set anchors for connection icon
-// <cmail> Platform layout changes
 TRect connectionIconRect( iAppUi.LayoutHandler()->GetControlBarConnectionIconRect() );
 const TPoint& tl( connectionIconRect.iTl );
 	iScreenAnchorLayout->SetAnchor(EAlfAnchorTopLeft, 2,
 EAlfAnchorOriginLeft, EAlfAnchorOriginTop,
 EAlfAnchorMetricAbsolute, EAlfAnchorMetricAbsolute,
 const TPoint& br( connectionIconRect.iBr );
 iScreenAnchorLayout->SetAnchor(EAlfAnchorBottomRight, 2,
 EAlfAnchorOriginLeft, EAlfAnchorOriginTop,
 EAlfAnchorMetricAbsolute, EAlfAnchorMetricAbsolute,
 TAlfTimedPoint( br.iX, br.iY ));
-// </cmail> Platform layout changes
 iScreenAnchorLayout->UpdateChildrenLayout();
 }
 // ---------------------------------------------------------------------------
 		{
 		iMoveToFolderOngoing = EFalse;
 		switch ( aResponse )
 			{
 			case EFSEmailUiCtrlBarResponseCancel:
-			    if ( iMarkingMode )
-			        {
-DisplayMarkingModeTitleTextL();
-			        }
 			    iMarkingModeWaitingToExit = EFalse;
 			    SetMskL();
 				return;
 			case EFSEmailUiCtrlBarResponseSelect:
 			    {
 				}
 				return;
 			case EFSEmailUiCtrlBarResponseCancel:
 			    iMarkingModeWaitingToExit = EFalse;
 			    SetMskL();
-			    // <cmail> Touch
 //Set touchmanager back to active
 DisableMailList(EFalse);
-// </cmail>
 				return;
 			case EFSEmailUiCtrlBarResponseSelect:
 			    SetMskL();
-			    // <cmail> Touch
 //Set touchmanager back to active
 DisableMailList(EFalse);
-// </cmail>
 			default:
 				break;
 			}
 		if ( !iMailFolder || ( iMailFolder && iMailFolder->GetFolderId() != aSelectedFolderId ) )
 {
 // Do nothing if can't get the folder object
 return;
 }
-// Set new text to folder button in control bar
+UpdateFolderAndMarkingModeTextsL();
-HBufC* newFolderName = CreateFolderNameLC( iMailFolder );
-iFolderListButton->SetTextL( *newFolderName );
-CleanupStack::PopAndDestroy( newFolderName );
 // Set initial sort criteria when folder has changed
 iCurrentSortCriteria.iField = EFSMailSortByDate;
 iCurrentSortCriteria.iOrder = EFSMailDescending;
 // reload node state because in file sort mode this is disabled even when globally enabled
 iNodesInUse = iAppUi.GetCRHandler()->TitleDividers();
-SetSortButtonTextAndIconL();
+SetSortButtonIconL();
 // Update the mail list contents
 UpdateMailListModelL();
 RefreshL();
 		    }
 	// Set initial sort criteria when folder has changed
 iCurrentSortCriteria.iField = EFSMailSortByDate;
 iCurrentSortCriteria.iOrder = EFSMailDescending;
 // reload node state because in file sort mode this is disabled even when globally enabled
 iNodesInUse = iAppUi.GetCRHandler()->TitleDividers();
-SetSortButtonTextAndIconL();
+SetSortButtonIconL();
 // Set folder name to the control bar button
-HBufC* newFolderName = CreateFolderNameLC( iMailFolder );
+UpdateFolderAndMarkingModeTextsL();
-iFolderListButton->SetTextL( *newFolderName );
-CleanupStack::PopAndDestroy( newFolderName );
 // Set mailbox name and icons
 SetMailboxNameToStatusPaneL();
 SetBrandedListWatermarkL();
 SetBrandedMailBoxIconL();
 						if ( !inboxId.IsNullId() )
 						    {
 						    iMailFolder = iAppUi.GetMailClient()->GetFolderByUidL( aMailboxId, inboxId );
 						    UpdateMailListModelL();
 					        RefreshL();
-							HBufC* newFolderName = CreateFolderNameLC( iMailFolder );
+						    UpdateFolderAndMarkingModeTextsL();
-						    iFolderListButton->SetTextL( *newFolderName );
-							CleanupStack::PopAndDestroy( newFolderName );
 						    }
 						else
 							{
 							// No standard folder inbox, go back to grid as a last option
 							HandleCommandL( EAknSoftkeyBack );
 				    {
 				    iMailFolder = iAppUi.GetMailClient()->GetFolderByUidL( aMailboxId, inboxId );
 				    // Check that mailfolder fetching succeeded
 				    if ( iMailFolder )
 				    	{
-						HBufC* newFolderName = CreateFolderNameLC( iMailFolder );
+					    UpdateFolderAndMarkingModeTextsL();
-					    iFolderListButton->SetTextL( *newFolderName );
-						CleanupStack::PopAndDestroy( newFolderName );
 				    	}
 				    }
 				}
 			// Null pointer check is needed here because of special cases such as new mail
 			// creation in POP/IMAP before first sync where folder does not exists
 }
 }
 void CFSEmailUiMailListVisualiser::GetParentLayoutsL( RPointerArray<CAlfVisual>& aLayoutArray ) const
 {
-aLayoutArray.AppendL( iScreenAnchorLayout );
+if ( iScreenAnchorLayout )
-aLayoutArray.AppendL( iControlBarControl->Visual() );
+{
+aLayoutArray.AppendL( iScreenAnchorLayout );
+}
+if ( iControlBarControl )
+{
+aLayoutArray.AppendL( iControlBarControl->Visual() );
+}
 }
 // hide or show CAlfVisuals ( used for activation or deactivation )
 void CFSEmailUiMailListVisualiser::FadeOut(TBool aDirectionOut)
 	{
 manualSync = extension->IsSetL(EmailSyncInterval);
 box->ReleaseExtension(extension);
 }
 }
 return manualSync;
+}
+void CFSEmailUiMailListVisualiser::UpdateFolderAndMarkingModeTextsL()
+{
+if ( iAppUi.CurrentActiveView()->Id() == MailListId )
+{
+HBufC* folder = CreateFolderNameLC( iMailFolder );
+if( Layout_Meta_Data::IsLandscapeOrientation() )
+{
+iFolderListButton->SetTextL( KNullDesC );
+if (iMarkingMode)
+{
+RemoveMarkingModeTextOnButtonsL();
+HBufC* txt = StringLoader::LoadLC( R_FREESTYLE_EMAIL_UI_MARKINGMODE );
+iAppUi.SetNaviPaneTextL( *txt );
+CleanupStack::PopAndDestroy( txt );
+}
+else
+{
+iAppUi.SetNaviPaneTextL( *folder );
+}
+}
+else // Portrait orientation
+{
+iAppUi.SetNaviPaneTextL( KNullDesC );
+if (iMarkingMode)
+{
+DisplayMarkingModeTextOnButtonsL();
+}
+else
+{
+RemoveMarkingModeTextOnButtonsL();
+iFolderListButton->SetTextL( *folder );
+}
+}
+CleanupStack::PopAndDestroy( folder );
+}
+else
+{
+iAppUi.SetNaviPaneTextL( KNullDesC );
+RemoveMarkingModeTextOnButtonsL();
+}
 }
 //////////////////////////////////////////////////////////////////
 // Class implementation CMailListUpdater
 ///////////////////////////////////////////////////////////////////

branch	RCL_3
changeset 26	968773a0b6ef
parent 25	3533d4323edc