MCL/sf/app/messaging: comparison messagingappbase/mce/src/MceMessageListView.cpp

equal deleted inserted replaced

-:fbb813aef148
+:7e4e4bcc75b6
 // Save the sort ordering in the message store
 // Set the default sort order
 iSortOrder = EMceCmdSortByDate;
 iOrdering = EFalse;
-	    if ( iMsgListContainer )
+if ( iMsgListContainer )
-	        {
+{
 TMsvId fId = iMsgListContainer->CurrentFolderId();
 for( TInt loop = 0; loop < iFolderItemArray->Count() ; loop++ )
 {
 TMceFolderItem item = ((*iFolderItemArray)[loop]);
 if ( item.iFolderId == fId && aPrevViewId == TDRVIEWID)
 {
 iSortOrder = item.iSortOrder;
 iOrdering = item.iOrdering;
 }
 }
-	        }
+}
-	    if (aPrevViewId != TDRVIEWID )
+if (aPrevViewId != TDRVIEWID )
 {
 // Reset the sort order
-iFolderItemArray->Reset();
+	iFolderItemArray->Reset();
 }
 if ( iMsgListContainer )
 {
 iMsgListContainer->SetSortTypeL( iSortOrder, iOrdering );
 }
 TMsvId id = 0;
 TBool editorLaunched = EFalse;
 TBool launchingFromOutside = EFalse;
 TMsvId service = KMsvLocalServiceIndexEntryId;
 TMsvEntry entry;
+TInt msgMtmUid = 0;
 if ( aCustomMessageId.iUid > KMsvRootIndexEntryId )
 {
 if ( iSession->GetEntry( aCustomMessageId.iUid, service, entry ) != KErrNone )
 {
 iSession->GetEntry( KMsvGlobalInBoxIndexEntryId, service, entry ); // this should always succeed!
 }
 // outside the app.
 launchingFromOutside = ETrue;
-//check, if message store has been changed from MMC to phone
-iMceUi->ToPhoneMemoryQueryL( ETrue );
 // Set the forder containing the entry
-	if ( entry.iType == KUidMsvMessageEntry )
+if ( entry.iType == KUidMsvMessageEntry )
-	{
+{
 // The aCustomMessageId is an ID of a message, set Inbox
-	SetFolderL( entry.Parent() );
+SetFolderL( entry.Parent() );
-	id = aCustomMessageId.iUid;
+id = aCustomMessageId.iUid;
-	}
+}
-	else
+else
-	{
+{
 // Set the folder based on the given ID
 iFolderId = aCustomMessageId.iUid;
+// this is performance optimization, start to launch viewer before container creation
-	}
+if ( !iMsgListContainer && entry.Id() == KMsvGlobalInBoxIndexEntryId )
+{
+if ( LaunchViewerWhenOneUnreadL( msgMtmUid ) > KErrNotFound )
+{
+editorLaunched = ETrue;
+}
+}
+}
 iMceUi->SetDontExitOnNextOperationComplete();
 }
-	if ( iMsgListContainer &&
-	     iCurrentListType != GetFolderListBoxType())
+if ( iMsgListContainer &&
-	    {
+iCurrentListType != GetFolderListBoxType())
-	    ListboxTypeChangedL();
+{
-	    }
+ListboxTypeChangedL();
-	else
+}
-	    {
+else
-	    CreateListboxL();
+{
-	    }
+CreateListboxL();
+}
 if ( iMsgListContainer && aPrevViewId == TDRVIEWID )
 {
 // Save the sort ordering in the message store
 // Set the default sort order
 iSortOrder = EMceCmdSortByDate;
 void CMceMessageListView::DynInitMenuPaneL(
 TInt aResourceId,
 CEikMenuPane* aMenuPane )
 {
+TInt listPopulated = 1;
+//Get the value, accordingly we can dim/undim mark/unmark for one row list only
+if ( iCurrentListType == EMceListTypeOneRow )
+{
+TInt r = RProperty::Get(KPSUidMuiu, KMuiuOneRowListPopulated,listPopulated);
+if ( r!= KErrNone )
+{
+User::LeaveIfError(r);
+}
+}
 if ( !iMceViewActivated )
 {
 return;
 }
 		}
 switch ( aResourceId )
 {
 case R_MCE_FOLDER_MENU:
+if(!listPopulated)
+{
+	aMenuPane->SetItemDimmed( EMceCmdEditList, ETrue );
+}
 aMenuPane->SetItemDimmed( EAknCmdHelp,
 !FeatureManager::FeatureSupported( KFeatureIdHelp ) );
 iMsgListContainer->MarkItemSelectionL();
 if ( !iHideExitCommand &&
 //check also open
 CBaseMtmUiData* uiData = iMceUi->GetMtmUiDataL( KUidMsgMMSNotification );
 // Coverty change, NULL Return, http://ousrv057/cov.cgi?cid=101800
 if ( uiData )
 {
-aMenuPane->SetItemDimmed( EAknCmdOpen,
-uiData->OperationSupportedL( KMtmUiFunctionOpenMessage, currentEntry ) );
 aMenuPane->SetItemDimmed( EMceCmdDelete,
 uiData->OperationSupportedL( KMtmUiFunctionDeleteMessage, currentEntry ) );
 }
 }
 // ----------------------------------------------------
 // CMceMessageListView::EditMenuL
 // ----------------------------------------------------
 void CMceMessageListView::EditMenuL( CEikMenuPane* aMenuPane ) const
 {
-TInt listPopulated =1;
+// This function is not called if empty folder/list is yet to be populated
-//Get the value, accordingly we can dim/undim mark all for one row list only
+// because in that case EditMenu is hidden
-if(!iCurrentListType)
-{
-TInt r = RProperty::Get( KPSUidMuiu, KMuiuOneRowListPopulated, listPopulated );
-if ( r != KErrNone )
-	{
-User::LeaveIfError( r );
-}
-}
-// This function is not called if empty folder because in that case
-// EditMenu is hidden
 aMenuPane->SetItemDimmed( EAknCmdMarkReadMsgs, ETrue );
 TInt count = iMsgListContainer->SelectionCount();
 if ( count == 0 )
 {
 aMenuPane->SetItemDimmed( EAknCmdMarkReadMsgs, EFalse );
 }
 }
-if ( ( count + SubfolderCount() ) == iMsgListContainer->Count() || !listPopulated)
+if ( ( count + SubfolderCount() ) == iMsgListContainer->Count())
 {
 //if all selected, disable markall
 aMenuPane->SetItemDimmed( EAknMarkAll, ETrue );
 }

branch	RCL_3
changeset 19	7e4e4bcc75b6
parent 15	52d61119153d
child 24	696bfeff199e