equal
deleted
inserted
replaced
519 |
519 |
520 // Reset the flag |
520 // Reset the flag |
521 isEditorActive = EFalse; |
521 isEditorActive = EFalse; |
522 |
522 |
523 // Unhide the toolbar when settings is closed |
523 // Unhide the toolbar when settings is closed |
524 if(toolbar) |
524 TUid activeViewUid = iController.ViewManager().CurrentView(); |
|
525 if(toolbar && (activeViewUid != KUidCalenMissedAlarmsView ) &&(activeViewUid != KUidCalenMissedEventView ) ) |
525 { |
526 { |
526 toolbar->SetToolbarVisibilityL(ETrue); |
527 toolbar->SetToolbarVisibilityL(ETrue); |
527 } |
528 } |
528 |
529 |
529 CleanupStack::PopAndDestroy( svc ); |
530 CleanupStack::PopAndDestroy( svc ); |
554 |
555 |
555 if( aEditorMode == MAgnEntryUi::ECreateNewEntry ) |
556 if( aEditorMode == MAgnEntryUi::ECreateNewEntry ) |
556 { |
557 { |
557 // Show saved note for new entries |
558 // Show saved note for new entries |
558 TInt res; |
559 TInt res; |
559 if( aEntry->EntryTypeL() == CCalEntry::ETodo ) |
560 if( context.InstanceId().iType == CCalEntry::ETodo ) |
560 { |
561 { |
561 res = R_QTN_CALE_NOTE_TODO_SAVED; |
562 res = R_QTN_CALE_NOTE_TODO_SAVED; |
562 } |
563 } |
563 else |
564 else |
564 { |
565 { |