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

equal deleted inserted replaced

-:0396474f30f5
+:4ce476e64c59
 #include "FreestyleEmailUiFileSystemInfo.h"
 #include "FreestyleEmailUiAppui.h"
 #include "FreestyleEmailUi.hrh"
 #include "FreestyleEmailUiTextureManager.h"
 #include "FreestyleEmailUiMailListControl.h"
-#include "FreestyleEmailUiMailViewerVisualiser.h"
 #include "FreestyleEmailUiStatusIndicator.h"
 #include "freestyleemailcenrephandler.h"
 #include "FreestyleEmailUiFolderListVisualiser.h"
 #include "FreestyleEmailUiShortcutBinding.h"
 #include "FreestyleEmailUiMsgDetailsVisualiser.h"
 iDeleteTask = new (ELeave) TDeleteTask<CFSEmailUiMailListVisualiser> (*this, HandleDeleteTaskL);
 	iTouchFeedBack = MTouchFeedback::Instance();
 	}
+// ---------------------------------------------------------------------------
+// Second phase constructor.
+// ---------------------------------------------------------------------------
+//
 // CFSEmailUiMailListVisualiser::DoFirstStartL()
 // Purpose of this function is to do first start things only when list is
 // really needed to be shown. Implemented to make app startuo faster.
 void CFSEmailUiMailListVisualiser::DoFirstStartL()
 {
 // Create screen control and anchor layout
 iMailListControl = CFreestyleEmailUiMailListControl::NewL( iEnv, this );
 iScreenAnchorLayout = CAlfAnchorLayout::AddNewL( *iMailListControl );
 iScreenAnchorLayout->SetFlags(EAlfVisualFlagAutomaticLocaleMirroringEnabled);
-//<cmail>
 iTouchManager = CEUiEmailListTouchManager::NewL(*this);
-//</cmail>
 // Create control bar control and append to control group and anchor layout
 iControlBarControl = CFsControlBar::NewL( iEnv );
 iControlBarControl->AddObserverL( *this );
-//<cmail>
 iControlBarControl->AddObserverL( *iTouchManager );
-//</cmail>
 CreateControlBarLayoutL();
 SetMailListLayoutAnchors();
 iControlBarControl->SetSelectorTransitionTimeL( KControlBarTransitionTime );
 // Set mark type and icon
 iMailList->SetMarkTypeL( CFsTreeList::EFsTreeListMultiMarkable );
 iMailList->SetIndentationL(0);
-//<cmail> Compared to S60 3.2.3 in S60 5.0 Alf offers the key events in
-// opposite order.
 ControlGroup().AppendL( iMailListControl );
 ControlGroup().AppendL( iControlBarControl );
 ControlGroup().AppendL( iMailList->TreeControl() );
-//</cmail>
 iTreeItemArray.Reset();
 // Set empty text
 HBufC* emptyText = StringLoader::LoadLC( R_FREESTYLE_EMAIL_UI_EMPTY_MSG_LIST_TEXT );
 iNewEmailText = StringLoader::LoadL( R_COMMAND_AREA_NEW_EMAIL );
 // Set menu, mark and background icons
 iMailTreeListVisualizer->SetMarkIcon( iAppUi.FsTextureManager()->TextureByIndex( EListControlMarkIcon ) );
 iMailTreeListVisualizer->SetMenuIcon( iAppUi.FsTextureManager()->TextureByIndex( EListControlMenuIcon ) );
-//<cmail> s60 skin support
-//iMailTreeListVisualizer->SetBackgroundTextureL( iAppUi.FsTextureManager()->TextureByIndex( EBackgroundTextureMailList ) );
-//</cmail>
 iMailList->AddObserverL( *this );
-//<cmail>
 iMailList->AddObserverL( *iTouchManager );
-//</cmail>
 // Initializing the default stylus long tap popup menu
 if( !iStylusPopUpMenu )
 {
 TPoint point( 0, 0 );
 iStylusPopUpMenu = CAknStylusPopUpMenu::NewL( this , point );
 : CFsEmailUiViewBase( aMailListControlGroup, *aAppUi ),
 iEnv( aEnv ),
 iListMarkItemsState( ETrue ), //Initlly list has no markings
 iMoveToFolderOngoing( EFalse ),
 iConsumeStdKeyYes_KeyUp( EFalse ), // use to prevent Call application execution if call for contact processed
-iMailOpened(EFalse)
+iMailOpened( EFalse ),
+	iMarkingMode( EFalse ),
+iMarkingModeWaitingToExit( EFalse ),
+iMarkingModeTextVisual( NULL )
 	{
 FUNC_LOG;
 	}
 // ---------------------------------------------------------------------------
 if (forwardNavigation)
 {
 iAppUi.StartMonitoringL();
 }
 SetListAndCtrlBarFocusL(); // ShowListL() makes list focused and this may need to be reverted
-UnmarkAllItemsL();
 if ( aCustomMessageId == TUid::Uid(KMailSettingsReturnFromPluginSettings) )
 {
 // Better to refresh launcher grid view because mailbox branding might be changed.
 iAppUi.LauncherGrid().SetRefreshNeeded();
 }
 	if ( iMailFolder )
 	    {
 	    currentFolderType = iMailFolder->GetFolderType();
 	    }
+	if ( aResourceId == R_FSEMAILUI_MAILLIST_MARKING_MODE_MENUPANE )
+	    {
+if (!CountMarkedItemsL())
+{
+aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkingModeDelete, ETrue );
+aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkingModeUnread, ETrue );
+aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkingModeRead, ETrue );
+aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkingModeMove, ETrue );
+aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkingModeFollowUp, ETrue );
+aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkingModeMarkAll, EFalse );
+aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkingModeUnmarkAll, ETrue );
+}
+else
+{
+aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkingModeDelete, EFalse );
+if ( AreAllMarkedItemsUnreadL() )
+{
+aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkingModeUnread, ETrue );
+}
+else
+{
+aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkingModeUnread, EFalse );
+}
+if ( AreAllMarkedItemsReadL() )
+{
+aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkingModeRead, ETrue );
+}
+else
+{
+aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkingModeRead, EFalse );
+}
+aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkingModeMove, !supportsMoving );
+aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkingModeFollowUp, !supportsFlag );
+if ( AreAllItemsMarked() )
+{
+aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkingModeMarkAll, ETrue );
+aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkingModeUnmarkAll, EFalse );
+}
+else if ( AreAllItemsUnmarked() )
+{
+aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkingModeMarkAll, EFalse );
+aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkingModeUnmarkAll, ETrue );
+}
+else
+{
+aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkingModeMarkAll, EFalse );
+aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkingModeUnmarkAll, EFalse );
+}
+}
+	    }
 // MAIN MENU ***************************************************************************
 	if ( aResourceId == R_FSEMAILUI_MAILLIST_MENUPANE )
 	    {
 // Sync/cancel sync
 	    CFSMailBox* activeMailbox = iAppUi.GetActiveMailbox();
 // Hide all the normal email message specific actions
 aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsReply, ETrue );
 aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsReplyAll, ETrue );
 aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsForward, ETrue );
 aMenuPane->SetItemDimmed( EFsEmailUiCmdMailActions, ETrue);
-TInt markedCount = CountMarkedItemsL();
-// Hide mark/unmark all when not applicable
-if ( markedCount == EmailsInModelL() ) // Hide mark all
-		       {
-		       aMenuPane->SetItemDimmed( EFsEmailUiCmdSubMenuMark, ETrue );
-		       }
-if ( markedCount == 0 ) // Hide unmark all
-		       {
-		       aMenuPane->SetItemDimmed( EFsEmailUiCmdSubMenuUnmark, ETrue );
-		       }
 }
 else
 	    {
 		CFSMailMessage* targetMessage = NULL;
 if ( targetEntries.Count() == 1 )
 // Reply all is hidden also when the single target message has multiple recipients
 else if ( !targetMessage || numRecipients <= 1 )
 {
 aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsReplyAll, ETrue );
 }
-aMenuPane->SetItemDimmed( EFsEmailUiCmdSubMenuUnmark, ETrue);
 }
 	    // EMPTY LIST, MOST OPTIONS ARE HIDDEN
 	    if ( !iModel->Count() || !iMailFolder )
 	        {
 	        aMenuPane->SetItemDimmed( EFsEmailUiCmdMailActions, ETrue );
-	        aMenuPane->SetItemDimmed( EFsEmailUiCmdSubMenuMark, ETrue );
-	        aMenuPane->SetItemDimmed( EFsEmailUiCmdSubMenuUnmark, ETrue );
 	        aMenuPane->SetItemDimmed( EFsEmailUiCmdSearch, ETrue );
+	        aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkingMode, ETrue );
 	        }
 	    // FOLDER SPECIFIC COMMAND HIDING
 	    // "Clear deleted folder" command is available only in Deleted folder
 	    if ( currentFolderType != EFSDeleted || !iModel->Count() )
 aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsFlag, ETrue );
 }
 		}
 // ACTIONS SUBMENU *********************************************************************
-	// MARK SUBMENU ************************************************************************
-	// Mark submenu show only when focus is visible
-	if ( aResourceId == R_FSEMAILUI_MAILLIST_SUBMENU_MARK)
-		{
-	    // Checks if a device has a keyboard or not.
-		if( !iLastFocus )
-	    {
-aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkMark, ETrue );
-aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkMarkAll, ETrue );
-	        }
-else
-	    {
-aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkSubAll, ETrue );
-	        }
-		}
-// MARK SUBMENU ************************************************************************
-	// UNMARK SUBMENU ************************************************************************
-	// Unmark submenu show only when focus is not visible
-	if ( aResourceId == R_FSEMAILUI_MAILLIST_SUBMENU_UNMARK)
-		{
-		// Nothing to do yet
-		}
-// UNMARK SUBMENU ************************************************************************
 	CleanupStack::PopAndDestroy( &targetEntries );
 	// Add shortcut hints
 	iAppUi.ShortcutBinding().AppendShortcutHintsL( *aMenuPane,
 	                             CFSEmailUiShortcutBinding::EContextMailList );
 CleanupClosePushL( markedEntries );
 iMailList->GetMarkedItemsL( markedEntries );
 TInt count = markedEntries.Count();
 CleanupStack::PopAndDestroy( &markedEntries );
 return count;
+}
+// ---------------------------------------------------------------------------
+//
+//
+// ---------------------------------------------------------------------------
+//
+TBool CFSEmailUiMailListVisualiser::AreAllItemsMarked()
+{
+FUNC_LOG;
+TBool ret(ETrue);
+	if ( iTreeItemArray.Count() )
+		{
+		for ( TInt i=0;i<iTreeItemArray.Count(); i++ )
+			{
+			if ( !iMailList->IsNode(iTreeItemArray[i].iListItemId ) &&
+			     !iMailList->IsMarked( iTreeItemArray[i].iListItemId ))
+{
+				ret = EFalse;
+				break;
+				}
+			}
+		}
+return ret;
+}
+// ---------------------------------------------------------------------------
+//
+//
+// ---------------------------------------------------------------------------
+//
+TBool CFSEmailUiMailListVisualiser::AreAllItemsUnmarked()
+{
+FUNC_LOG;
+TBool ret(ETrue);
+	if ( iTreeItemArray.Count() )
+		{
+		for ( TInt i=0;i<iTreeItemArray.Count(); i++ )
+			{
+			if ( !iMailList->IsNode(iTreeItemArray[i].iListItemId ) &&
+			     iMailList->IsMarked( iTreeItemArray[i].iListItemId ))
+{
+				ret = EFalse;
+				break;
+				}
+			}
+		}
+return ret;
+}
+// ---------------------------------------------------------------------------
+//
+//
+// ---------------------------------------------------------------------------
+//
+TBool CFSEmailUiMailListVisualiser::AreAllMarkedItemsReadL()
+{
+FUNC_LOG;
+TBool ret(ETrue);
+	if ( iTreeItemArray.Count() )
+		{
+for ( TInt i=0;i<iTreeItemArray.Count(); i++ )
+{
+if ( !iMailList->IsNode(iTreeItemArray[i].iListItemId ) &&
+iMailList->IsMarked( iTreeItemArray[i].iListItemId ))
+{
+CFSEmailUiMailListModelItem* item =
+static_cast<CFSEmailUiMailListModelItem*>( Model()->Item(i) );
+CFSMailMessage* confirmedMsgPtr(0);
+confirmedMsgPtr = iAppUi.GetMailClient()->GetMessageByUidL(iAppUi.GetActiveMailboxId(),
+iMailFolder->GetFolderId(), item->MessagePtr().GetMessageId(), EFSMsgDataEnvelope );
+TBool isReadMessage = confirmedMsgPtr->IsFlagSet( EFSMsgFlag_Read );
+delete confirmedMsgPtr;
+if ( !isReadMessage )
+{
+ret = EFalse;
+break;
+}
+}
+}
+		}
+return ret;
+}
+// ---------------------------------------------------------------------------
+//
+//
+// ---------------------------------------------------------------------------
+//
+TBool CFSEmailUiMailListVisualiser::AreAllMarkedItemsUnreadL()
+{
+FUNC_LOG;
+TBool ret(ETrue);
+if ( iTreeItemArray.Count() )
+{
+for ( TInt i=0;i<iTreeItemArray.Count(); i++ )
+{
+if ( !iMailList->IsNode(iTreeItemArray[i].iListItemId ) &&
+iMailList->IsMarked( iTreeItemArray[i].iListItemId ))
+{
+CFSEmailUiMailListModelItem* item =
+static_cast<CFSEmailUiMailListModelItem*>( Model()->Item(i) );
+CFSMailMessage* confirmedMsgPtr(0);
+confirmedMsgPtr = iAppUi.GetMailClient()->GetMessageByUidL(iAppUi.GetActiveMailboxId(),
+iMailFolder->GetFolderId(), item->MessagePtr().GetMessageId(), EFSMsgDataEnvelope );
+TBool isReadMessage = confirmedMsgPtr->IsFlagSet( EFSMsgFlag_Read );
+delete confirmedMsgPtr;
+if ( isReadMessage )
+{
+ret = EFalse;
+break;
+}
+}
+}
+}
+return ret;
 }
 // ---------------------------------------------------------------------------
 //
 //
 // ---------------------------------------------------------------------------
 //
 //
 // ---------------------------------------------------------------------------
 //
+void CFSEmailUiMailListVisualiser::ExitMarkingModeL()
+{
+FUNC_LOG;
+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();
+menu->StopDisplayingMenuBar();
+menu->SetMenuTitleResourceId(R_FSEMAILUI_MAILLIST_MENUBAR);
+// Change background back to normal
+DisplayMarkingModeBgL( EFalse );
+// Display drop down menu buttons
+iNewEmailButton->ShowButtonL();
+iFolderListButton->ShowButtonL();
+iSortButton->ShowButtonL();
+iNewEmailButton->SetDimmed( EFalse );
+iFolderListButton->SetDimmed( EFalse );
+iSortButton->SetDimmed( EFalse );
+// Hide marking mode text on the place of drop down menus
+RemoveMarkingModeTitleTextL();
+}
+// ---------------------------------------------------------------------------
+//
+//
+// ---------------------------------------------------------------------------
+//
+void CFSEmailUiMailListVisualiser::EnterMarkingModeL()
+{
+FUNC_LOG;
+iMarkingMode = ETrue;
+	iListMarkItemsState = ETrue; // shift-scrolling does marking after one item is marked
+HandleCommandL( EFsEmailUiCmdActionsExpandAll );
+// Change softkeys for marking mode
+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
+if( Layout_Meta_Data::IsLandscapeOrientation() )
+{
+iNewEmailButton->SetDimmed();
+iFolderListButton->SetDimmed();
+iSortButton->SetDimmed();
+}
+else
+{
+iNewEmailButton->HideButton();
+iFolderListButton->HideButton();
+iSortButton->HideButton();
+}
+// Display marking mode text on the place of drop down menus
+DisplayMarkingModeTitleTextL();
+}
+// ---------------------------------------------------------------------------
+//
+//
+// ---------------------------------------------------------------------------
+//
+void CFSEmailUiMailListVisualiser::RefreshMarkingModeL()
+{
+FUNC_LOG;
+if ( iMarkingMode )
+{
+// Hide drop down menu buttons
+if( !Layout_Meta_Data::IsLandscapeOrientation() )
+{
+iNewEmailButton->ShowButtonL();
+iNewEmailButton->HideButton();
+iFolderListButton->ShowButtonL();
+iFolderListButton->HideButton();
+iSortButton->ShowButtonL();
+iSortButton->HideButton();
+}
+else
+{
+iNewEmailButton->ShowButtonL();
+iNewEmailButton->SetDimmed();
+iFolderListButton->ShowButtonL();
+iFolderListButton->SetDimmed();
+iSortButton->ShowButtonL();
+iSortButton->SetDimmed();
+}
+RemoveMarkingModeTitleTextL();
+DisplayMarkingModeTitleTextL();
+}
+}
+// ---------------------------------------------------------------------------
+//
+//
+// ---------------------------------------------------------------------------
+//
+void CFSEmailUiMailListVisualiser::DisplayMarkingModeTitleTextL()
+{
+FUNC_LOG;
+if (!iMarkingModeTextVisual)
+{
+const TRect sortButtonRect( iAppUi.LayoutHandler()->GetControlBarSortButtonRect() );
+const TRect newMailButtonRect( iAppUi.LayoutHandler()->GetControlBarNewEmailButtonRect() );
+iMarkingModeTextRect = TRect( newMailButtonRect.iTl, sortButtonRect.iBr );
+iMarkingModeTextParentLayout = CAlfDeckLayout::AddNewL( *iMailListControl );
+iMarkingModeTextParentLayout->SetFlags( EAlfVisualFlagManualLayout );
+iMarkingModeTextParentLayout->SetRect( iMarkingModeTextRect );
+iMarkingModeTextContentLayout = CAlfAnchorLayout::AddNewL( *iMailListControl, iMarkingModeTextParentLayout );
+iMarkingModeTextVisual = CAlfTextVisual::AddNewL( *iMailListControl, iMarkingModeTextContentLayout );
+iMarkingModeTextVisual->SetWrapping( CAlfTextVisual::ELineWrapTruncate );
+if ( AknLayoutUtils::LayoutMirrored() )
+{
+iMarkingModeTextVisual->SetAlign( EAlfAlignHRight, EAlfAlignVCenter );
+}
+else
+{
+iMarkingModeTextVisual->SetAlign( EAlfAlignHLeft, EAlfAlignVCenter );
+}
+iMarkingModeTextVisual->SetStyle( EAlfTextStyleTitle );
+TRgb color = iAppUi.LayoutHandler()->ListNodeTextColor();
+iMarkingModeTextVisual->SetColor ( color );
+if( !Layout_Meta_Data::IsLandscapeOrientation() )
+{
+HBufC* msg = StringLoader::LoadLC( R_FREESTYLE_EMAIL_UI_MARKINGMODE );
+iMarkingModeTextVisual->SetTextL( *msg );
+CleanupStack::PopAndDestroy( msg );
+}
+else
+{
+iMarkingModeTextVisual->SetTextL( KNullDesC );
+}
+}
+}
+// ---------------------------------------------------------------------------
+//
+//
+// ---------------------------------------------------------------------------
+//
+void CFSEmailUiMailListVisualiser::RemoveMarkingModeTitleTextL()
+{
+FUNC_LOG;
+if (iMarkingModeTextVisual)
+{
+iMarkingModeTextVisual->SetTextL( KNullDesC );
+iMarkingModeTextVisual->RemoveAndDestroyAllD();
+iMarkingModeTextVisual = NULL;
+iMarkingModeTextContentLayout->RemoveAndDestroyAllD();
+iMarkingModeTextContentLayout = NULL;
+iMarkingModeTextParentLayout->RemoveAndDestroyAllD();
+iMarkingModeTextParentLayout = NULL;
+}
+}
+// ---------------------------------------------------------------------------
+//
+//
+// ---------------------------------------------------------------------------
+//
+void CFSEmailUiMailListVisualiser::DisplayMarkingModeBgL( TBool aDisplay )
+{
+FUNC_LOG;
+if (aDisplay)
+{
+CAlfBrush* brush = iAppUi.FsTextureManager()->NewMailListMarkingModeBgBrushLC();
+iMailTreeListVisualizer->SetBackgroundBrushL( brush );
+CleanupStack::Pop( brush );
+}
+else
+{
+iMailTreeListVisualizer->ClearBackground();
+}
+}
+// ---------------------------------------------------------------------------
+//
+//
+// ---------------------------------------------------------------------------
+//
 void CFSEmailUiMailListVisualiser::RefreshL( TFSMailMsgId* aFocusToMessage )
 	{
 FUNC_LOG;
 	iMailList->RemoveAllL();
 	iTreeItemArray.Reset();
 {
 iAsyncRedrawer->Cancel();
 DoRefresh( this );
 }
+if (iMarkingModeWaitingToExit)
+{
+if ( iAppUi.CurrentActiveView()->Id() == MailListId )
+{
+iMarkingModeWaitingToExit = EFalse;
+TRAP_IGNORE( ExitMarkingModeL() );
+}
+}
 }
 // ---------------------------------------------------------------------------
 //
 //
 UpdateButtonTextsL();
 	}
 if ( aType == ESkinChanged )
 {
-UpdateTheme();
+UpdateThemeL();
 }
 else
 {
 iMailTreeListVisualizer->HideList();
 // screen layout changed
 if ( iAppUi.FolderList().IsPopupShown() )
 {
 iAppUi.FolderList().HandleDynamicVariantSwitchL( aType );
 }
 }
+if (iMarkingMode)
+{
+RefreshMarkingModeL();
+}
 	}
 // ---------------------------------------------------------------------------
 //
 //
 {
 FUNC_LOG;
 CFsEmailUiViewBase::HandleDynamicVariantSwitchOnBackgroundL( aType );
 if ( aType == ESkinChanged )
 {
-UpdateTheme();
+UpdateThemeL();
 }
 else if ( aType == EScreenLayoutChanged )
 {
 UpdateButtonTextsL();
 }
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
-void CFSEmailUiMailListVisualiser::UpdateTheme(const TBool aSystemUpdate)
+void CFSEmailUiMailListVisualiser::UpdateThemeL(const TBool aSystemUpdate)
 {
 iSkinChanged = aSystemUpdate;
 TRgb focusedTextColor = iAppUi.LayoutHandler()->ListFocusedStateTextSkinColor();
 TRgb normalTextColor = iAppUi.LayoutHandler()->ListNormalStateTextSkinColor();
 iFolderListButton->SetNormalTextColor( normalTextColor );
 iFolderListButton->SetFocusedTextColor( focusedTextColor );
 iSortButton->SetNormalTextColor( normalTextColor );
 iSortButton->SetFocusedTextColor( focusedTextColor );
+//TJOS-83DELP fix/workaround
+//sometimes theme wasn't properly refreshed on buttons, this helps
+iNewEmailButton->HideButton();
+iNewEmailButton->ShowButtonL();
+iFolderListButton->HideButton();
+iFolderListButton->ShowButtonL();
+iSortButton->HideButton();
+iSortButton->ShowButtonL();
 }
 // ---------------------------------------------------------------------------
 // HandleForegroundEventL
 // Function checks in foregroundevent that whether settings have changed and
 	            }
 	        CleanupStack::PopAndDestroy( &markedMessages );
 	        iSkinChanged = EFalse; // Toggle handled
 	        iDateChanged = EFalse; // Toggle handled
 	        }
+if (iMarkingMode)
+{
+RefreshMarkingModeL();
+}
 	    }
 	}
 // ---------------------------------------------------------------------------
 aCommand == EFsEmailUiCmdActionsDelete ||
 	   aCommand == EFsEmailUiCmdMarkAsRead ||
 	   aCommand == EFsEmailUiCmdMarkAsUnread ||
 	   aCommand == EFsEmailUiCmdActionsMove ||
 	   aCommand == EFsEmailUiCmdActionsMoveMessage ||
-	   aCommand == EFsEmailUiCmdMarkUnmarkToggle ||
+	   aCommand == EFsEmailUiCmdMarkingModeFromPopUp ||
 	   aCommand == EFsEmailUiCmdActionsCollapseAll ||
 	   aCommand == EFsEmailUiCmdActionsExpandAll ) )
 	{
 		// 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.
 		if ( !iAppUi.ViewSwitchingOngoing() )
 				{
 				NavigateBackL();
 				}
 	break;
+case EAknSoftkeyCancel:
+if (iMarkingMode)
+{
+ExitMarkingModeL();
+}
+break;
 case EEikCmdExit:
 case EAknSoftkeyExit:
 case EFsEmailUiCmdExit:
 TIMESTAMP( "Exit selected from message list" );
 iAppUi.Exit();
 // <cmail> Prevent Download Manager opening with attachments
 //       	case EFsEmailUiCmdDownloadManager:
 //  			iAppUi.EnterFsEmailViewL( DownloadManagerViewId );
 //			break;
 // </cmail>
-	case EFsEmailUiCmdMarkMark:
+case EFsEmailUiCmdMarkingModeFromPopUp:
-		{
+{
-iListMarkItemsState = ETrue; // shift-scrolling does marking after one item is marked
+EnterMarkingModeL();
-	        iMailList->MarkItemL( iMailList->FocusedItem(), ETrue );
+// Mark current item first
-		}
+TInt focusedItem = iMailList->FocusedItem();
-			break;
+if ( focusedItem > 0 && iFocusedControl == EMailListComponent )
-		case EFsEmailUiCmdMarkMarkAll:
+{
-			{
+CFSEmailUiMailListModelItem* item = dynamic_cast<CFSEmailUiMailListModelItem*>(iModel->Item(HighlightedIndex()));
-			MarkAllItemsL();
+				if ( item && item->ModelItemType() == ETypeMailItem )
-			}
+				    {
-			break;
+iMailList->MarkItemL( iMailList->FocusedItem(), ETrue );
-		case EFsEmailUiCmdMarkUnmark:
+					}
-			{
+				else if ( item && item->ModelItemType() == ETypeSeparator )
-iListMarkItemsState = EFalse; // shift-scrolling does unmarking after one item is unmarked
+					{
-	        iMailList->MarkItemL( iMailList->FocusedItem(), EFalse );
+					TInt index = HighlightedIndex();
-			}
+					MarkItemsUnderSeparatorL( ETrue, index );
-			break;
+					}
-		case EFsEmailUiCmdMarkUnmarkAll:
+}
-			{
+}
-			UnmarkAllItemsL();
+break;
-			}
+case EFsEmailUiCmdMarkingMode:
-			break;
+{
+EnterMarkingModeL();
-		case EFsEmailUiCmdMarkSubAll:
+}
-			{
+break;
-			MarkAllItemsL();
+case EFsEmailUiCmdMarkingModeDelete:
-			}
+{
-			break;
+DeleteMessagesL();
-		case EFsEmailUiCmdUnmarkSubAll:
+}
-			{
+break;
-			UnmarkAllItemsL();
+case EFsEmailUiCmdMarkingModeUnread:
-			}
+{
-			break;
+ChangeReadStatusOfMarkedL( EFalse );
+ExitMarkingModeL();
+}
+break;
+case EFsEmailUiCmdMarkingModeRead:
+{
+ChangeReadStatusOfMarkedL( ETrue );
+ExitMarkingModeL();
+}
+break;
+case EFsEmailUiCmdMarkingModeFollowUp:
+{
+SetMessageFollowupFlagL();
+}
+break;
+case EFsEmailUiCmdMarkingModeMarkAll:
+{
+MarkAllItemsL();
+}
+break;
+case EFsEmailUiCmdMarkingModeUnmarkAll:
+{
+UnmarkAllItemsL();
+}
+break;
 		case EFsEmailUiCmdReadEmail:
 			{
 			iAppUi.StartReadingEmailsL();
 			}
 			break;
 				        }
 				    }
 				}
 		}
 			break;
+	case EFsEmailUiCmdMarkingModeMove:
+{
+			iMarkingModeWaitingToExit = ETrue;
+			}
+			// Flow through
 	case EFsEmailUiCmdActionsMove:
 	case EFsEmailUiCmdActionsMoveMessage:
 			{
 			TFSMailMsgId folderID;
 			folderID.SetNullId(); // Selection is popped up with NULL
 }
 break;
 case EFsEmailUiCmdMarkAsReadUnreadToggle:
 {
 			ShortcutReadUnreadToggleL();
-}
-break;
-case EFsEmailUiCmdMarkUnmarkToggle:
-{
-TInt focusedItem = iMailList->FocusedItem();
-if ( focusedItem > 0 && iFocusedControl == EMailListComponent )
-{
-CFSEmailUiMailListModelItem* item = dynamic_cast<CFSEmailUiMailListModelItem*>(iModel->Item(HighlightedIndex()));
-				if ( item && item->ModelItemType() == ETypeMailItem )
-				    {
-if ( iMailList->IsMarked( focusedItem ) )
-{
-HandleCommandL(EFsEmailUiCmdMarkUnmark);
-}
-else
-{
-HandleCommandL(EFsEmailUiCmdMarkMark);
-}
-					}
-				else if ( item && item->ModelItemType() == ETypeSeparator )
-					{
-					// Currently only mark is done since mark should activate
-					// marking mode for messages. Unmark can be done via message long tap menu.
-					TInt index = HighlightedIndex();
-					MarkItemsUnderSeparatorL( ETrue, index );
-					}
-}
 }
 break;
 case EFsEmailUiCmdGoToSwitchFolder:
 {
 iControlBarControl->SetFocusByIdL( iFolderListButtonId );
 	                            iListOrderMayBeOutOfDate = ETrue;
 	                            }
 	                        }
 	                    }
 				    }
+if ( iMarkingMode )
+{
+ExitMarkingModeL();
+}
 				}
 			CleanupStack::PopAndDestroy( &targetMsgIds );
 			}
 		CleanupStack::PopAndDestroy( &targetItems );
 		}
 if ( iFocusedControl == EMailListComponent )
 {
 TInt modelCount( modelCount = iModel->Count() );
 if ( modelCount ) // Safety check
 {
-CFSEmailUiMailListModelItem* item =
+if (iMarkingMode)
-dynamic_cast<CFSEmailUiMailListModelItem*>( iModel->Item( HighlightedIndex() ) );
-// MAIL ITEM; OPEN MAIL
-if ( item && item->ModelItemType() == ETypeMailItem )
 {
-CFSMailMessage* messagePtr = &item->MessagePtr();
+//Do not open mail or expand/collapse separator in marking mode
-if ( messagePtr )
+DoHandleListItemOpenL();
+}
+else
+{
+CFSEmailUiMailListModelItem* item =
+dynamic_cast<CFSEmailUiMailListModelItem*>( iModel->Item( HighlightedIndex() ) );
+// MAIL ITEM; OPEN MAIL
+if ( item && item->ModelItemType() == ETypeMailItem )
 {
-TIMESTAMP( "Open email selected from message list" );
+CFSMailMessage* messagePtr = &item->MessagePtr();
-OpenHighlightedMailL();
+if ( messagePtr )
+{
+TIMESTAMP( "Open email selected from message list" );
+OpenHighlightedMailL();
+return EKeyWasConsumed;
+}
+}
+// SEPARAOR ITEM; COLLAPSE / EXPAND NODE
+else if ( item && item->ModelItemType() == ETypeSeparator )
+{
+ExpandOrCollapseL();
 return EKeyWasConsumed;
 }
-}
-// SEPARAOR ITEM; COLLAPSE / EXPAND NODE
-else if ( item && item->ModelItemType() == ETypeSeparator )
-{
-if ( iMailList->IsExpanded( iMailList->FocusedItem()) )
-{
-ExpandOrCollapseL();
-}
-else
-{
-ExpandOrCollapseL();
-}
-return EKeyWasConsumed;
 }
 }
 }
 else
 {
 FUNC_LOG;
 if ( 0 < iModel->Count() ) // Safety check
 {
 CFSEmailUiMailListModelItem* item =
 dynamic_cast<CFSEmailUiMailListModelItem*>( iModel->Item( HighlightedIndex() ) );
-// MAIL ITEM; OPEN MAIL
+if ( iMarkingMode )
-if ( item && item->ModelItemType() == ETypeMailItem )
+			{
-{
+// In marking mode. Mark/unmark it instead of opening it.
-CFSMailMessage* messagePtr = &item->MessagePtr();
+			if ( item && item->ModelItemType() == ETypeMailItem )
-if ( messagePtr )
+				{
-{
+				if (iMailList->IsMarked( iMailList->FocusedItem() ))
-TIMESTAMP( "Open email selected from message list" );
+{
-OpenHighlightedMailL();
+				    iMailList->MarkItemL( iMailList->FocusedItem(), EFalse );
 }
+				else
-// Give feedback to user (vibration)
+				    {
-iTouchFeedBack->InstantFeedback(ETouchFeedbackBasic);
+iMailList->MarkItemL( iMailList->FocusedItem(), ETrue );
-}
+				    }
-// SEPARATOR ITEM; COLLAPSE / EXPAND NODE
+				}
-else if ( item && item->ModelItemType() == ETypeSeparator )
+			else if ( item && item->ModelItemType() == ETypeSeparator )
-{
+			    {
-ExpandOrCollapseL();
+TInt index = HighlightedIndex();
-SetMskL();
+if ( AreAllItemsMarkedUnderSeparatorL( index ) )
-}
+{
+MarkItemsUnderSeparatorL( EFalse, index );
+}
+else
+{
+MarkItemsUnderSeparatorL( ETrue, index );
+}
+			    }
+			}
+		else
+			{
+			// MAIL ITEM; OPEN MAIL
+			if ( item && item->ModelItemType() == ETypeMailItem )
+				{
+				CFSMailMessage* messagePtr = &item->MessagePtr();
+				if ( messagePtr )
+					{
+					TIMESTAMP( "Open email selected from message list" );
+					OpenHighlightedMailL();
+					}
+				// Give feedback to user (vibration)
+				iTouchFeedBack->InstantFeedback(ETouchFeedbackBasic);
+				}
+			// SEPARATOR ITEM; COLLAPSE / EXPAND NODE
+			else if ( item && item->ModelItemType() == ETypeSeparator )
+				{
+					ExpandOrCollapseL();
+					SetMskL();
+				}
+			}
 }
 }
 // ---------------------------------------------------------------------------
 // CFSEmailUiMailListVisualiser::DoHandleControlBarOpenL
 {
 FUNC_LOG;
 if ( 0 < iModel->Count() ) // Safety check
 {
-RFsTreeItemIdList markedEntries;
+if ( iMarkingMode )
-iMailList->GetMarkedItemsL( markedEntries );
+			{
-if ( markedEntries.Count() >= 0 )
+iMailTreeListVisualizer->SetFocusVisibility( EFalse );
-{
+TInt currentFocusState = iMailList->IsFocused();
+iMailList->SetFocusedL( EFalse );
+iMailList->SetFocusedL( currentFocusState );
+			CFSEmailUiMailListModelItem* item =
+dynamic_cast<CFSEmailUiMailListModelItem*>( iModel->Item( HighlightedIndex() ) );
+// In marking mode. Mark/unmark it instead of open popup.
+			if ( item && item->ModelItemType() == ETypeMailItem )
+				{
+				if (iMailList->IsMarked( iMailList->FocusedItem() ))
+{
+				    iMailList->MarkItemL( iMailList->FocusedItem(), EFalse );
+}
+				else
+				    {
+iMailList->MarkItemL( iMailList->FocusedItem(), ETrue );
+				    }
+				}
+			else if ( item && item->ModelItemType() == ETypeSeparator )
+			    {
+TInt index = HighlightedIndex();
+if ( AreAllItemsMarkedUnderSeparatorL( index ) )
+{
+MarkItemsUnderSeparatorL( EFalse, index );
+}
+else
+{
+MarkItemsUnderSeparatorL( ETrue, index );
+}
+			    }
+			}
+		else
+		    {
 LaunchStylusPopupMenuL( aPoint );
 }
 }
 }
 horizontalAlign = EAlfAlignHRight;
 }
 // Icons and sort button text
 iFolderListButton->SetIconL( iAppUi.FsTextureManager()->TextureByIndex( EListControlBarMailboxDefaultIcon ) );
-iNewEmailButton->SetIconL( iAppUi.FsTextureManager()->TextureByIndex( EListTextureNewEmailDefaultIcon ) );
+iNewEmailButton->SetIconL( iAppUi.FsTextureManager()->TextureByIndex( EListTextureCreateNewMessageIcon ) );
 SetSortButtonTextAndIconL();
 iNewEmailButton->SetElemAlignL(
 ECBElemIconA,
 EAlfAlignHCenter,
 	textLayout.LayoutText(TRect(0,0,0,0), AknLayoutScalable_Apps::main_sp_fs_ctrlbar_ddmenu_pane_t1(var));
 	iNewEmailButton->SetTextFontL( textLayout.Font()->FontSpecInTwips() );
 	iFolderListButton->SetTextFontL( textLayout.Font()->FontSpecInTwips() );
 	iSortButton->SetTextFontL( textLayout.Font()->FontSpecInTwips() );
-	UpdateTheme(EFalse);
+	UpdateThemeL(EFalse);
+	if (!iMarkingMode)
-	iNewEmailButton->ShowButtonL();
+	    {
-	iFolderListButton->ShowButtonL();
+iNewEmailButton->ShowButtonL();
-	iSortButton->ShowButtonL();
+iFolderListButton->ShowButtonL();
+iSortButton->ShowButtonL();
+	    }
 	}
 // ---------------------------------------------------------------------------
 //
 //
 msgPtr.ResetFlag( EFSMsgFlag_Read );
 }
 msgPtr.SaveMessageL();  // Save flag
 // Switch icon to correct one if mail list is visible
-// UpdateMsgIconAndBoldingL( aIndex );
+UpdateMsgIconAndBoldingL( aIndex );
 if ( iCurrentSortCriteria.iField == EFSMailSortByUnread )
 {
 // Attribute affecting the current sorting order has been changed.
 // Thus, the list order may now be incorrect.
 FUNC_LOG;
 if ( aItemData && aItemVis && aMsgPtr )
 {
 CAlfTexture* itemTexture = &TFsEmailUiUtility::GetMsgIcon( aMsgPtr, *iAppUi.FsTextureManager() );
 aItemData->SetIcon( *itemTexture );
+TInt variety( Layout_Meta_Data::IsLandscapeOrientation() ? 1 : 0 );
-// Set font according the read status
+CAlfTextStyle& textStyle =
-if ( aMsgPtr->IsFlagSet( EFSMsgFlag_Read ) )
+iAppUi.LayoutHandler()->FSTextStyleFromLayoutL(
-{
+AknLayoutScalable_Apps::list_single_dyc_row_text_pane_t1( variety ) );
-CAlfTextStyle* textStyle = iAppUi.LayoutHandler()->FSTextStyleFromIdL( EFSFontTypeSmall );
+const TBool isNotRead( !aMsgPtr->IsFlagSet( EFSMsgFlag_Read ) );
-aItemVis->SetTextStyleId ( textStyle->Id() );
+textStyle.SetBold( isNotRead );
-aItemVis->SetTextBold( EFalse );
+aItemVis->SetTextBold( isNotRead );
-}
+aItemVis->SetTextStyleId ( textStyle.Id() );
-else
-{
-CAlfTextStyle* textStyle = iAppUi.LayoutHandler()->FSTextStyleFromIdL( EFSFontTypeSmallBold );
-aItemVis->SetTextStyleId ( textStyle->Id() );
-aItemVis->SetTextBold( ETrue );
-}
 // Set follow up flag icon
 if ( aMsgPtr->IsFlagSet( EFSMsgFlag_FollowUp ) )
 {
 aItemData->SetFlagIcon( iAppUi.FsTextureManager()->TextureByIndex( EFollowUpFlagList ) );
 aItemVis->SetFlagIconVisible( ETrue );
 // ---------------------------------------------------------------------------
 //
 void CFSEmailUiMailListVisualiser::RemoveMsgItemsFromListIfFoundL( const RArray<TFSMailMsgId>& aEntryIds )
 	{
 FUNC_LOG;
-	for ( TInt i=0 ; i<aEntryIds.Count() ; ++i )
+	TBool itemFound = EFalse;
+for ( TInt i=0 ; i<aEntryIds.Count() ; ++i )
 	    {
 	    const TFSMailMsgId& entryId = aEntryIds[i];
 	if ( !entryId.IsNullId() )
 		{
 	TInt idx = ItemIndexFromMessageId( entryId );
 	if ( idx >= 0 )
 	    {
 			iMailList->RemoveL( iTreeItemArray[idx].iListItemId ); // remove from list
 			iTreeItemArray.Remove( idx ); // remove from internal array.
 	 		iModel->RemoveAndDestroy( idx ); // Remove from model
+	 		itemFound = ETrue;
 	    }
 		}
 	    }
-	if ( aEntryIds.Count() > 0  )
-		{
+if ( !itemFound )
-if ( iMailListUpdater )
+{
-{
+return;  // no items to be removed
-if ( iMailListUpdater->IsActive() )
+}
-{
-iMailListUpdater->Stop();
-}
-iMailListUpdater->StartL();
-}
-		}
 	if ( iNodesInUse )
 		{
 		RemoveUnnecessaryNodesL();
 		}
 const RFsTreeItemIdList& entries(aTask->Entries());
 if (entries.Count())
 {
 if (ConfirmDeleteL(entries.Count(), entries[0]))
 {
+ExitMarkingModeL();
 if (entries.Count() > KMsgDeletionWaitNoteAmount)
 {
 TFsEmailUiUtility::ShowWaitNoteL(iDeletingWaitNote,
 R_FSE_WAIT_DELETING_TEXT, EFalse, ETrue);
 }
 		{
 		iMoveToFolderOngoing = EFalse;
 		switch ( aResponse )
 			{
 			case EFSEmailUiCtrlBarResponseCancel:
+			    iMarkingModeWaitingToExit = EFalse;
 			    SetMskL();
 				return;
 			case EFSEmailUiCtrlBarResponseSelect:
 			    {
 				MoveMsgsToFolderL( aSelectedFolderId );
 iAppUi.ShowSortListInPopupL( iCurrentSortCriteria, folderType, this, iSortButton );
 }
 				}
 				return;
 			case EFSEmailUiCtrlBarResponseCancel:
+			    iMarkingModeWaitingToExit = EFalse;
 			    SetMskL();
 			    // <cmail> Touch
 //Set touchmanager back to active
 DisableMailList(EFalse);
 // </cmail>
 			iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdActionsMoveMessage, !supportsMoving );
 			// Hide / show follow up
 			TBool supportsFlag = TFsEmailUiUtility::IsFollowUpSupported( *iAppUi.GetActiveMailbox() );
 			iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdActionsFlag, !supportsFlag );
-			// Hide mark if applicable
-			if ( iMailList->IsMarked( iMailList->FocusedItem() ) )
-				{
-				iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdMark, ETrue );
-				}
 			// Hide collapse / expand all
 			iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdActionsCollapseAll, ETrue );
 			iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdActionsExpandAll, ETrue );
 			}
 TBool CFSEmailUiMailListVisualiser::DoScrollMarkUnmarkL()
 {
 FUNC_LOG;
 TBool ret = EFalse;
+if ( !iMarkingMode )
+{
+EnterMarkingModeL();
+}
 // <cmail>
 if ( iFocusedControl == EMailListComponent && iModel->Count() )
 // </cmail>
 {
 		CFSEmailUiMailListModelItem* item =
 				break;
 				}
 			}
 		}
 	}
+// Check if all items under current separator are marked
+TBool CFSEmailUiMailListVisualiser::AreAllItemsMarkedUnderSeparatorL( TInt aSeparatorId )
+{
+FUNC_LOG;
+TBool ret(ETrue);
+if ( iTreeItemArray.Count() )
+{
+// Find all items under wanted separator.
+for ( TInt i = aSeparatorId + 1; i < iTreeItemArray.Count(); i++ )
+{
+CFSEmailUiMailListModelItem* item =
+static_cast<CFSEmailUiMailListModelItem*>( iModel->Item( i ) );
+// Mark / unmark mail items.
+if ( item &&
+item->ModelItemType() == ETypeMailItem &&
+!iMailList->IsNode( iTreeItemArray[i].iListItemId ) )
+{
+if ( !iMailList->IsMarked( iTreeItemArray[i].iListItemId ))
+{
+// Att least one unmarked item found
+ret = EFalse;
+break;
+}
+}
+else
+{
+// Stop iteration since another iterator was reached.
+break;
+}
+}
+}
+return ret;
+}
 // Navigation functions, used mainly from viewer
 TBool CFSEmailUiMailListVisualiser::IsNextMsgAvailable( TFSMailMsgId aCurrentMsgId,
 														TFSMailMsgId& aFoundNextMsgId,
 														TFSMailMsgId& aFoundNextMsgFolder ) const
 	{

branch	RCL_3
changeset 12	4ce476e64c59
parent 11	0396474f30f5
child 13	8592a65ad3fb