equal
deleted
inserted
replaced
394 case ECalenDayView: |
394 case ECalenDayView: |
395 if (mController.MainWindow().currentView() == mCalenDayView) { |
395 if (mController.MainWindow().currentView() == mCalenDayView) { |
396 // This happens when settings view or event viewer is opened |
396 // This happens when settings view or event viewer is opened |
397 // from the agenda view. Simply repopulate the view |
397 // from the agenda view. Simply repopulate the view |
398 if (mCalenDayView) { |
398 if (mCalenDayView) { |
|
399 // Remove month view from mainwindow. |
|
400 mController.MainWindow().removeView(mCalenMonthView); |
399 mCalenDayView->doPopulation(); |
401 mCalenDayView->doPopulation(); |
400 mController.MainWindow().setCurrentView(mCalenDayView); |
402 mController.MainWindow().setCurrentView(mCalenDayView); |
401 } |
403 } |
402 } else if (mController.MainWindow().currentView() == mCalenDayViewAlt){ |
404 } else if (mController.MainWindow().currentView() == mCalenDayViewAlt){ |
403 // This happens when settings view or event viewer is opened |
405 // This happens when settings view or event viewer is opened |
404 // from the agenda view. Simply repopulate the view |
406 // from the agenda view. Simply repopulate the view |
405 if (mCalenDayViewAlt) { |
407 if (mCalenDayViewAlt) { |
406 mCalenDayViewAlt->doPopulation(); |
408 mCalenDayViewAlt->doPopulation(); |
500 TBool commandUsed(EFalse); |
502 TBool commandUsed(EFalse); |
501 |
503 |
502 switch (command.Command()) { |
504 switch (command.Command()) { |
503 case ECalenMonthView: |
505 case ECalenMonthView: |
504 removeDayViews(); |
506 removeDayViews(); |
505 // Add month view to mainwindow. |
507 // Add month view to mainwindow. |
506 mController.MainWindow().addView(mCalenMonthView); |
508 mController.MainWindow().addView(mCalenMonthView); |
507 mCurrentViewId = ECalenMonthView; |
509 mCurrentViewId = ECalenMonthView; |
508 activateCurrentView(); |
510 activateCurrentView(); |
509 break; |
511 break; |
510 case ECalenDayView: |
512 case ECalenDayView: |
511 // Remove month view from mainwindow. |
|
512 mController.MainWindow().removeView(mCalenMonthView); |
|
513 mCurrentViewId = ECalenDayView; |
513 mCurrentViewId = ECalenDayView; |
514 activateCurrentView(); |
514 activateCurrentView(); |
515 break; |
515 break; |
516 case ECalenEventView: |
516 case ECalenEventView: |
517 launchEventView(); |
517 launchEventView(); |