--- a/calendarui/views/src/calenmissedeventview.cpp Tue Apr 27 16:36:22 2010 +0300
+++ b/calendarui/views/src/calenmissedeventview.cpp Tue May 11 16:12:24 2010 +0300
@@ -151,6 +151,13 @@
{
cnt->CompletePopulationL();
RedrawStatusPaneL();
+
+ //no tool bar in missed event view
+ MCalenToolbar* toolbar = iServices.ToolbarOrNull();
+ if(toolbar && toolbar->IsVisible())
+ {
+ toolbar->SetToolbarVisibilityL(EFalse);
+ }
nextStep = CCalenView::EDone;
}
break;
@@ -234,12 +241,7 @@
}
UpdateCbaL();
- //no tool bar in missed event view
- MCalenToolbar* toolbar = iServices.ToolbarOrNull();
- if(toolbar)
- {
- toolbar->SetToolbarVisibilityL(EFalse);
- }
+
TRACE_EXIT_POINT;
}
@@ -254,6 +256,11 @@
TRACE_ENTRY_POINT;
iPreviousViewId.iViewUid = KNullUid;
+ MCalenToolbar* toolbar = iServices.ToolbarOrNull();
+ if(toolbar)
+ {
+ toolbar->SetToolbarVisibilityL(ETrue);
+ }
TRACE_EXIT_POINT;
@@ -316,21 +323,13 @@
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;