--- a/calendarui/views/src/calenmissedeventview.cpp Mon Mar 15 12:40:18 2010 +0200
+++ b/calendarui/views/src/calenmissedeventview.cpp Wed Mar 31 21:29:10 2010 +0300
@@ -234,10 +234,13 @@
}
UpdateCbaL();
-
- // Draw even viewer toolbar by adding Edit, Delete and Send buttons
- AddToolbarButtonsL();
-
+ //no tool bar in missed event view
+ MCalenToolbar* toolbar = iServices.ToolbarOrNull();
+ if(toolbar)
+ {
+ toolbar->SetToolbarVisibilityL(EFalse);
+ }
+
TRACE_EXIT_POINT;
}
@@ -252,9 +255,7 @@
iPreviousViewId.iViewUid = KNullUid;
- // Remove the toolbar buttons for event viewer before exiting from event view
- TRAP_IGNORE(RemoveToolbarButtonsL());
-
+
TRACE_EXIT_POINT;
}
@@ -315,9 +316,24 @@
case EAknSoftkeyClose:
case EAknSoftkeyBack:
{
+ MCalenToolbar* toolbar = iServices.ToolbarOrNull();
+ if(toolbar)
+ {
+ toolbar->SetToolbarVisibilityL(ETrue);
+ }
iServices.IssueNotificationL(ECalenNotifyMissedEventViewClosed);
break;
}
+ case EAknSoftkeyExit:
+ {
+ MCalenToolbar* toolbar = iServices.ToolbarOrNull();
+ if(toolbar)
+ {
+ toolbar->SetToolbarVisibilityL(ETrue);
+ }
+ CCalenNativeView::HandleCommandL(aCommand);
+ }
+ break;
default:
if(cnt->GetFindItemMenu()->CommandIsValidL(aCommand))
{
@@ -372,7 +388,7 @@
{
if(cnt->IsEventHasMapLocationL() || cnt->IsEventHasNoLocationTextL())
{
- aMenuPane->DeleteMenuItem( ECalenGetLocationAndSave );
+ aMenuPane->DeleteMenuItem( ECalenGetLocationAndReplace );
}
if(!cnt->IsEventHasMapLocationL())
{
@@ -384,6 +400,10 @@
aMenuPane->DeleteMenuItem( ECalenGetLocationAndReplace );
aMenuPane->DeleteMenuItem( ECalenShowLocation );
}
+ //as no toolbar in missedeventview no need to handle thees commands
+ aMenuPane->DeleteMenuItem( ECalenCmdPromptThenEdit );
+ aMenuPane->DeleteMenuItem( ECalenDeleteCurrentEntry );
+ aMenuPane->DeleteMenuItem( ECalenSend );
break;
}
default: