FCL/sf/app/contacts: comparison phonebookui/Phonebook2/UIControls/src/CPbk2NamesListControl.cpp

equal deleted inserted replaced

-:2666d9724c76
+:d4f567ce2e7c
 */
 TBool MassUpdateDetected();
 /**
 * Call this function to skip the showing of blocking progress note.
-		* When done MassUpdateSkipProgressNote( EFalse ) must be called to reset.
+* When done MassUpdateSkipProgressNote( EFalse ) must be called to reset.
 */
 void MassUpdateSkipProgressNote( TBool aSkip );
 private:
 CPbk2HandleMassUpdate(CEikListBox& iListBox);
 void HandleMassUpdateResetCounters();
 void HandleMassUpdateDone();
 static TInt HandleMassUpdateTimerCallBack(TAny* aAny);
 private:
-		CEikListBox& iListBox;
+CEikListBox& iListBox;
 TBool iHandleMassUpdateDetected;
 TTime iHandleMassUpdateFirst;
 TTime iHandleMassUpdatePrev;
 TInt  iHandleMassUpdateCount;
 TBool iHandleMassUpdateSkipDialog;
 CPeriodic* iHandleMassUpdateTimer;
-		CAknWaitDialog*  iHandleMassUpdateDialog;
+CAknWaitDialog*  iHandleMassUpdateDialog;
 };
 // --------------------------------------------------------------------------
 // CPbk2UiControlEventSender::CPbk2UiControlEventSender
 // --------------------------------------------------------------------------
 // CPbk2HandleMassUpdate::MassUpdateDetected
 // --------------------------------------------------------------------------
 //
 TBool CPbk2HandleMassUpdate::MassUpdateDetected()
 {
-	return iHandleMassUpdateDetected;
+return iHandleMassUpdateDetected;
-	}
+}
 // --------------------------------------------------------------------------
 // CPbk2HandleMassUpdate::MassUpdateSkipProgressNote
 // --------------------------------------------------------------------------
 //
 iBaseView( &aView ),
 iContainer( aContainer ),
 iNameFormatter( aNameFormatter ),
 iStoreProperties( aStoreProperties ),
 iAllowPointerEvents( ETrue ),
-iOpeningCca( EFalse )
+iOpeningCca( EFalse ),
+iMarkingModeOn( EFalse )
 {
 }
 // --------------------------------------------------------------------------
 // CPbk2NamesListControl::CPbk2NamesListControl
 // inform the command that the control is deleted
 iCommand->ResetUiControl(*this);
 }
 iObservers.Reset();
 iCommandItems.ResetAndDestroy();
-	delete iCheckMassUpdate;
+delete iCheckMassUpdate;
 delete iListBoxSelectionObserver;
 delete iStateFactory;
 delete iListBox;
 delete iFindBox;
 delete iThumbnailLoader;
 }
 iListBox->SetObserver( this );
 iListBox->SetScrollEventObserver( this );
 iListBox->SetListBoxObserver(this);
+iListBox->SetMarkingModeObserver( this );
 iUiExtension->SetContactUiControlUpdate( this );
 // set command item updater
 TAny* ext = iUiExtension->ContactUiControlExtensionExtension(
 TUid::Uid( KPbk2ContactUiControlExtensionExtensionUID ) );
 if( ext )
 EXPORT_C void CPbk2NamesListControl::Reset()
 {
 PBK2_DEBUG_PRINT(PBK2_DEBUG_STRING("CPbk2NamesListControl::Reset(0x%x) - IN"),
 this );
-// Unmark all contacts and reset the toolbar so that the Call button
-// won't be dimmed
-TRAP_IGNORE( ProcessCommandL( EAknUnmarkAll ) );
 // Reset find box
 TRAP_IGNORE( ResetFindL() );
 // Destroy all the filtered views from the stack
 iViewStack->Reset();
 // Refresh observer to get the view state
 const TInt firstContactIndex = 0;
 // Best effort: try to reset the focus.
 TRAP_IGNORE( iCurrentState->SetFocusedContactIndexL( firstContactIndex ) );
 //scroll listbox into beginning (ignore focus that may be below promotion items)
 iListBox->SetTopItemIndex(firstContactIndex);
+//cancel the marking mode
+iListBox->SetMarkingMode( EFalse );
 // Switch to the background state. This enables the next state to avtivate fully (ActivateStateL()) once phonebook
 // comes from the background.
 TRAP_IGNORE( iCurrentState = &iStateFactory->ActivateHiddenStateL( iCurrentState ); );
 void CPbk2NamesListControl::HandlePointerEventL(
 const TPointerEvent& aPointerEvent )
 {
 if( !iAllowPointerEvents )
 {
-		//Passing event to listbox needed even if iCurrentState would be skipped (fix for ou1cimx1#316139)
+//Passing event to listbox needed even if iCurrentState would be skipped (fix for ou1cimx1#316139)
 iListBox->HandlePointerEventL( aPointerEvent );
 return;
 }
 if ( AknLayoutUtils::PenEnabled() )
 {
 // --------------------------------------------------------------------------
 //
 void CPbk2NamesListControl::ClearMarks()
 {
 iCurrentState->ClearMarks();
-	ClearMarkedContactsInfo();
+ClearMarkedContactsInfo();
 }
 // --------------------------------------------------------------------------
 // CPbk2NamesListControl::SetSelectedContactL
 // --------------------------------------------------------------------------
 // --------------------------------------------------------------------------
 // CPbk2NamesListControl::FilteredContactRemovedFromView
 // --------------------------------------------------------------------------
 //
 void CPbk2NamesListControl::FilteredContactRemovedFromView(
-		MVPbkContactViewBase& /*aView*/ )
+MVPbkContactViewBase& /*aView*/ )
 {
 DrawDeferred();
 }
 // --------------------------------------------------------------------------
 //       CPbk2NamesListControl::DoContactAddedToBaseView
 // --------------------------------------------------------------------------
 //
 void CPbk2NamesListControl::DoHandleContactAdditionL( TInt aIndex )
 {
-	//Prevent messing with focus with always-on when Phonebook hidden in
+//Prevent messing with focus with always-on when Phonebook hidden in
-	//reseted state. Otherwise background-added contacts will change focus.
+//reseted state. Otherwise background-added contacts will change focus.
-	//This would cause Phonebook not to look like freshly started when opened again.
+//This would cause Phonebook not to look like freshly started when opened again.
-	//And also make sure foreground-added contact will show the new contact
+//And also make sure foreground-added contact will show the new contact
-	//even though the focus is not seen.
+//even though the focus is not seen.
 if( (static_cast<CPbk2AppUi*>(
 CEikonEnv::Static()->AppUi()))->IsForeground() )
 {
 SelectAndChangeReadyStateL();
 }
 // result (subset of contacts) of the previous find criteria must be
 // reset too. So, we reset both the find box and the view stack.
 TRAPD( res,
 {
 // This will reset back to base view, however retain original view
-		//when opening CCA
+//when opening CCA
 if( !iOpeningCca )
 {
 iCurrentState->ResetFindL();
 }
 });
 SelectAndChangeReadyStateL();
 }
 }
 else
 {
-Reset();
+if( !iMarkingModeOn )
-}
+{
+Reset();
+}
+}
 }
 // Do not handle contact addition here (DoHandleContactAdditionL),
 // ContactAddedToView to notification is sent separately
 }
 //send event to current state
 //ETrue means that the event came from adaptvie search grid.
 TRAP_IGNORE(iCurrentState->HandleControlEventL( aSearchField, MCoeControlObserver::EEventStateChanged, ETrue));
 }
+// -----------------------------------------------------------------------------
+// CPbk2NamesListControl::MarkingModeStatusChanged
+// -----------------------------------------------------------------------------
+//
+void CPbk2NamesListControl::MarkingModeStatusChanged( TBool /*aActivated*/ )
+{
+}
+// -----------------------------------------------------------------------------
+// CPbk2NamesListControl::ExitMarkingMode
+// Called by avkon, if the return value is ETrue,
+// the Marking mode will be canceled after any operation,
+// otherwise the Marking mode keep active.
+// -----------------------------------------------------------------------------
+//
+TBool CPbk2NamesListControl::ExitMarkingMode() const
+{
+return ETrue;
+}
 // --------------------------------------------------------------------------
 // CPbk2NamesListControl::HandleForegroundEventL
-//
 // --------------------------------------------------------------------------
 //
 void CPbk2NamesListControl::HandleForegroundEventL(TBool aForeground)
 {
 if ( iSearchFilter )
 // ---------------------------------------------------------------------------
 // CPbk2NamesListControl::SetOpeningCca
 // ---------------------------------------------------------------------------
 //
 EXPORT_C void CPbk2NamesListControl::SetOpeningCca( TBool aIsOpening )
-	{
+{
-	iOpeningCca = aIsOpening;
+iOpeningCca = aIsOpening;
-	}
+}
 // ---------------------------------------------------------------------------
 // CPbk2NamesListControlBgTask::CPbk2NamesListControlBgTask
 // ---------------------------------------------------------------------------
 //

branch	RCL_3
changeset 58	d4f567ce2e7c
parent 32	2828b4d142c0
child 64	c1e8ba0c2b16