equal
deleted
inserted
replaced
153 cnt->CompletePopulationL(); |
153 cnt->CompletePopulationL(); |
154 if(!iAvkonAppUi->IsDisplayingMenuOrDialog()) |
154 if(!iAvkonAppUi->IsDisplayingMenuOrDialog()) |
155 { |
155 { |
156 RedrawStatusPaneL(); |
156 RedrawStatusPaneL(); |
157 } |
157 } |
158 |
|
159 //no tool bar in missed event view |
|
160 MCalenToolbar* toolbar = iServices.ToolbarOrNull(); |
|
161 if(toolbar && toolbar->IsVisible()) |
|
162 { |
|
163 toolbar->SetToolbarVisibilityL(EFalse); |
|
164 } |
|
165 nextStep = CCalenView::EDone; |
158 nextStep = CCalenView::EDone; |
166 } |
159 } |
167 break; |
160 break; |
168 } |
161 } |
169 TRACE_EXIT_POINT; |
162 TRACE_EXIT_POINT; |
258 void CCalenMissedEventView::DoDeactivateImpl() |
251 void CCalenMissedEventView::DoDeactivateImpl() |
259 { |
252 { |
260 TRACE_ENTRY_POINT; |
253 TRACE_ENTRY_POINT; |
261 |
254 |
262 iPreviousViewId.iViewUid = KNullUid; |
255 iPreviousViewId.iViewUid = KNullUid; |
263 MCalenToolbar* toolbar = iServices.ToolbarOrNull(); |
256 /*MCalenToolbar* toolbar = iServices.ToolbarOrNull(); |
264 if(toolbar) |
257 if(toolbar) |
265 { |
258 { |
266 toolbar->SetToolbarVisibilityL(ETrue); |
259 toolbar->SetToolbarVisibilityL(ETrue); |
267 } |
260 }*/ |
268 |
261 |
269 |
262 |
270 TRACE_EXIT_POINT; |
263 TRACE_EXIT_POINT; |
271 } |
264 } |
272 |
265 |
322 case ECalenRestoreTodo: |
315 case ECalenRestoreTodo: |
323 { |
316 { |
324 CCalenNativeView::HandleCommandL(aCommand); |
317 CCalenNativeView::HandleCommandL(aCommand); |
325 } |
318 } |
326 break; |
319 break; |
327 case EAknSoftkeyClose: |
320 case EAknSoftkeyClose: |
|
321 { |
|
322 MCalenToolbar* toolbar = iServices.ToolbarOrNull(); |
|
323 if(toolbar) |
|
324 { |
|
325 toolbar->SetToolbarVisibilityL(ETrue); |
|
326 } |
|
327 iServices.IssueNotificationL(ECalenNotifyMissedEventViewClosed); |
|
328 break; |
|
329 } |
|
330 |
328 case EAknSoftkeyBack: |
331 case EAknSoftkeyBack: |
329 { |
332 { |
330 |
|
331 iServices.IssueNotificationL(ECalenNotifyMissedEventViewClosed); |
333 iServices.IssueNotificationL(ECalenNotifyMissedEventViewClosed); |
332 break; |
334 break; |
333 } |
335 } |
334 case EAknSoftkeyExit: |
336 case EAknSoftkeyExit: |
335 { |
337 { |