equal
deleted
inserted
replaced
35 #include "calenlocationui.h" |
35 #include "calenlocationui.h" |
36 #include "calensettingsui.h" |
36 #include "calensettingsui.h" |
37 #include "calennotifier.h" |
37 #include "calennotifier.h" |
38 #include "calenmultipledbui.h" |
38 #include "calenmultipledbui.h" |
39 #include "calenattachmentui.h" |
39 #include "calenattachmentui.h" |
|
40 #include "CalenUid.h" |
|
41 #include "calenviewmanager.h" |
40 |
42 |
41 // ---------------------------------------------------------------------------- |
43 // ---------------------------------------------------------------------------- |
42 // CCalenActionUi::NewL |
44 // CCalenActionUi::NewL |
43 // 1st phase of construction |
45 // 1st phase of construction |
44 // (other items were commented in a header). |
46 // (other items were commented in a header). |
302 TInt retValue = KErrNone; |
304 TInt retValue = KErrNone; |
303 // Trap showing settings so settings watcher is always resumed. |
305 // Trap showing settings so settings watcher is always resumed. |
304 PIM_TRAPD_HANDLE( retValue = dlg->ExecuteLD( R_CALEN_MULTIPLEDB_DIALOG ) ); |
306 PIM_TRAPD_HANDLE( retValue = dlg->ExecuteLD( R_CALEN_MULTIPLEDB_DIALOG ) ); |
305 notifier.ResumeSettingsNotifications(); |
307 notifier.ResumeSettingsNotifications(); |
306 |
308 |
307 // Unhide the toolbar when settings is closed |
309 // Unhide the toolbar when manage calendar view is closed |
308 if(toolbar) |
310 TUid activeViewUid = iController.ViewManager().CurrentView(); |
|
311 if(toolbar && (activeViewUid != KUidCalenMissedAlarmsView ) &&(activeViewUid != KUidCalenMissedEventView ) ) |
309 { |
312 { |
310 toolbar->SetToolbarVisibilityL(ETrue); |
313 toolbar->SetToolbarVisibilityL(ETrue); |
311 } |
314 } |
312 |
315 |
313 // When setting is closed, swap back old titlepane and navipane |
316 // When setting is closed, swap back old titlepane and navipane |
412 // Trap showing settings so settings watcher is always resumed. |
415 // Trap showing settings so settings watcher is always resumed. |
413 PIM_TRAPD_HANDLE( retValue = dlg->ExecuteLD( R_CALEN_SETTING_DIALOG ) ); |
416 PIM_TRAPD_HANDLE( retValue = dlg->ExecuteLD( R_CALEN_SETTING_DIALOG ) ); |
414 notifier.ResumeSettingsNotifications(); |
417 notifier.ResumeSettingsNotifications(); |
415 |
418 |
416 // Unhide the toolbar when settings is closed |
419 // Unhide the toolbar when settings is closed |
417 if(toolbar) |
420 TUid activeViewUid = iController.ViewManager().CurrentView(); |
|
421 if(toolbar && (activeViewUid != KUidCalenMissedAlarmsView ) &&(activeViewUid != KUidCalenMissedEventView ) ) |
418 { |
422 { |
419 toolbar->SetToolbarVisibilityL(ETrue); |
423 toolbar->SetToolbarVisibilityL(ETrue); |
420 } |
424 } |
421 |
425 |
422 // When setting is closed, swap back old titlepane and navipane |
426 // When setting is closed, swap back old titlepane and navipane |