diff -r bd7edf625bdd -r 97232defd20e calendarui/views/src/calentodoview.cpp --- a/calendarui/views/src/calentodoview.cpp Wed Sep 01 12:32:31 2010 +0100 +++ b/calendarui/views/src/calentodoview.cpp Tue Sep 14 21:17:03 2010 +0300 @@ -584,7 +584,7 @@ { if( Container()->MarkedCount() ) { - aMenuPane->SetItemSpecific( ECalenDeleteCurrentEntry, ETrue ); + aMenuPane->SetItemSpecific( ECalenDeleteCurrentEntry, EFalse ); if(Container()->IsCurrentItemSelected()) // If focused list item is marked { aMenuPane->DeleteMenuItem( ECalenViewCurrentEntry ); @@ -593,24 +593,30 @@ aMenuPane->DeleteMenuItem( ECalenCompleteTodo ); aMenuPane->DeleteMenuItem( ECalenRestoreTodo ); aMenuPane->DeleteMenuItem( ECalenSend ); - aMenuPane->DeleteMenuItem(ECalenCopyToCalendars); - - TBool crossout( EFalse ); - //When mark as done, crossout is ETrue. - crossout = CheckMarkedItemCompletedL(); - if( crossout ) + + if(Container()->MarkedCount() == 1) { - aMenuPane->SetItemSpecific(ECalenMarkUnDone, ETrue); + aMenuPane->DeleteMenuItem( ECalenCmdComplete ); + TBool crossout( EFalse ); + crossout = CheckMarkedItemCompletedL(); + if( crossout ) + { + aMenuPane->DeleteMenuItem( ECalenMarkDone ); + } + else + { + aMenuPane->DeleteMenuItem( ECalenMarkUnDone ); + } } else { - aMenuPane->SetItemSpecific(ECalenMarkDone, ETrue); + aMenuPane->DeleteMenuItem( ECalenMarkDone ); + aMenuPane->DeleteMenuItem( ECalenMarkUnDone ); } - - if(Container()->MarkedCount() == 1) - { - aMenuPane->DeleteMenuItem( ECalenCmdComplete ); - } + if(Container()->MarkedCount() > 1) + { + aMenuPane->DeleteMenuItem( ECalenCopyToCalendars ); + } } else {