-rw-r--r-- | korganizer/koviewmanager.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index f1f2dd2..3aa9b6c 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -529,56 +529,48 @@ void KOViewManager::showDayView() | |||
529 | mMainView->dateNavigator()->selectDates( 1 ); | 529 | mMainView->dateNavigator()->selectDates( 1 ); |
530 | mCurrentAgendaView = 1 ; | 530 | mCurrentAgendaView = 1 ; |
531 | 531 | ||
532 | } | 532 | } |
533 | 533 | ||
534 | void KOViewManager::showWorkWeekView() | 534 | void KOViewManager::showWorkWeekView() |
535 | { | 535 | { |
536 | mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count(); | 536 | mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count(); |
537 | mFlagShowNextxDays = false; | 537 | mFlagShowNextxDays = false; |
538 | globalFlagBlockAgenda = 1; | 538 | globalFlagBlockAgenda = 1; |
539 | globalFlagBlockLabel = 1; | 539 | globalFlagBlockLabel = 1; |
540 | if ( mCurrentAgendaView != 5 ) | 540 | if ( mCurrentAgendaView != 5 ) |
541 | mCurrentAgendaView = -1; | 541 | mCurrentAgendaView = -1; |
542 | showAgendaView(); | 542 | showAgendaView(); |
543 | qApp->processEvents(); | 543 | qApp->processEvents(); |
544 | globalFlagBlockAgenda = 2; | 544 | globalFlagBlockAgenda = 2; |
545 | globalFlagBlockLabel = 0; | 545 | globalFlagBlockLabel = 0; |
546 | mMainView->dateNavigator()->selectWorkWeek(); | 546 | mMainView->dateNavigator()->selectWorkWeek(); |
547 | mCurrentAgendaView = 5 ; | 547 | mCurrentAgendaView = 5 ; |
548 | 548 | ||
549 | } | 549 | } |
550 | 550 | ||
551 | void KOViewManager::showWeekView() | 551 | void KOViewManager::showWeekView() |
552 | { | 552 | { |
553 | /* | ||
554 | globalFlagBlockAgenda = 2; | ||
555 | qDebug("4globalFlagBlockAgenda = 2; "); | ||
556 | //globalFlagBlockPainting = true; | ||
557 | mMainView->dateNavigator()->selectWeek(); | ||
558 | showAgendaView(); | ||
559 | */ | ||
560 | |||
561 | 553 | ||
562 | mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count(); | 554 | mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count(); |
563 | mFlagShowNextxDays = false; | 555 | mFlagShowNextxDays = false; |
564 | globalFlagBlockAgenda = 1; | 556 | globalFlagBlockAgenda = 1; |
565 | globalFlagBlockLabel = 1; | 557 | globalFlagBlockLabel = 1; |
566 | if ( mCurrentAgendaView != 7 ) | 558 | if ( mCurrentAgendaView != 7 ) |
567 | mCurrentAgendaView = -1; | 559 | mCurrentAgendaView = -1; |
568 | showAgendaView(); | 560 | showAgendaView(); |
569 | qApp->processEvents(); | 561 | qApp->processEvents(); |
570 | globalFlagBlockAgenda = 2; | 562 | globalFlagBlockAgenda = 2; |
571 | globalFlagBlockLabel = 0; | 563 | globalFlagBlockLabel = 0; |
572 | mMainView->dateNavigator()->selectWeek(); | 564 | mMainView->dateNavigator()->selectWeek(); |
573 | mCurrentAgendaView = 7 ; | 565 | mCurrentAgendaView = 7 ; |
574 | } | 566 | } |
575 | 567 | ||
576 | void KOViewManager::showNextXView() | 568 | void KOViewManager::showNextXView() |
577 | { | 569 | { |
578 | 570 | ||
579 | globalFlagBlockAgenda = 1; | 571 | globalFlagBlockAgenda = 1; |
580 | if ( mCurrentAgendaView != 3 ) | 572 | if ( mCurrentAgendaView != 3 ) |
581 | mCurrentAgendaView = -1; | 573 | mCurrentAgendaView = -1; |
582 | showAgendaView(KOPrefs::instance()->mFullViewMonth); | 574 | showAgendaView(KOPrefs::instance()->mFullViewMonth); |
583 | globalFlagBlockAgenda = 2; | 575 | globalFlagBlockAgenda = 2; |
584 | mMainView->dateNavigator()->selectDates( QDate::currentDate(), | 576 | mMainView->dateNavigator()->selectDates( QDate::currentDate(), |