diff -r 6b5524b4f673 -r 38bb213f60ba phonebookui/Phonebook2/USIMExtension/src/CPsu2FixedDialingView.cpp --- a/phonebookui/Phonebook2/USIMExtension/src/CPsu2FixedDialingView.cpp Wed Sep 15 11:56:55 2010 +0300 +++ b/phonebookui/Phonebook2/USIMExtension/src/CPsu2FixedDialingView.cpp Wed Oct 13 14:15:33 2010 +0300 @@ -32,8 +32,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -149,8 +149,7 @@ CPbk2UIExtensionView& aExtensionView, CPsu2ViewManager& aViewManager ) : CPsu2NameListViewBase( aExtensionView, aViewManager ), - iShowFdnNotActiveNote( ETrue ), - iMarkingModeOn( EFalse ) + iShowFdnNotActiveNote( ETrue ) { } @@ -525,6 +524,11 @@ { aMenuPane->SetItemDimmed( EPsu2CmdNewContact , ETrue ); aMenuPane->SetItemDimmed( EPbk2CmdEditMe , ETrue ); + aMenuPane->SetItemSpecific( EPbk2CmdDeleteMe, EFalse ); + } + else + { + aMenuPane->SetItemSpecific( EPbk2CmdDeleteMe, ETrue ); } } break; @@ -536,25 +540,16 @@ { aMenuPane->SetItemDimmed( EPbk2CmdCopy, ETrue ); } - break; - } - case R_AVKON_MENUPANE_MARK_MULTIPLE: + if ( marked ) { - TInt markedContactCount = 0; - - CCoeControl* ctrl = iControl->ComponentControl(0); - CEikListBox* listbox = static_cast (ctrl); - if ( listbox ) - { - markedContactCount = listbox->SelectionIndexes()->Count(); - } - // dim the makr all item if all contacts are marked. - if ( markedContactCount > 0 && markedContactCount == iControl->NumberOfContacts() ) - { - aMenuPane->SetItemDimmed( EAknCmdMarkingModeMarkAll, ETrue ); - } - - break; + aMenuPane->SetItemSpecific( EPbk2CmdCopy, EFalse ); + aMenuPane->SetItemDimmed( EPsu2CmdCopyFromContacts, ETrue ); + } + else + { + aMenuPane->SetItemSpecific( EPbk2CmdCopy, ETrue); + } + break; } case R_PSU2_FIXED_DIALING_DELETE_MENUPANE: { @@ -731,29 +726,6 @@ CCoeEnv::Static()->HandleError(aErrorCode); } -// ----------------------------------------------------------------------------- -// CPsu2FixedDialingView::MarkingModeStatusChanged -// ----------------------------------------------------------------------------- -// -void CPsu2FixedDialingView::MarkingModeStatusChanged( TBool aActivated ) - { - iMarkingModeOn = aActivated; - } - -// ----------------------------------------------------------------------------- -// CPsu2FixedDialingView::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 CPsu2FixedDialingView::ExitMarkingMode() const - { - return ETrue; - } - - - // -------------------------------------------------------------------------- // CPsu2FixedDialingView::UpdateNaviPaneTextL // --------------------------------------------------------------------------