-rw-r--r-- | korganizer/koviewmanager.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 406e741..f1f2dd2 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -578,48 +578,55 @@ void KOViewManager::showNextXView() | |||
578 | 578 | ||
579 | globalFlagBlockAgenda = 1; | 579 | globalFlagBlockAgenda = 1; |
580 | if ( mCurrentAgendaView != 3 ) | 580 | if ( mCurrentAgendaView != 3 ) |
581 | mCurrentAgendaView = -1; | 581 | mCurrentAgendaView = -1; |
582 | showAgendaView(KOPrefs::instance()->mFullViewMonth); | 582 | showAgendaView(KOPrefs::instance()->mFullViewMonth); |
583 | globalFlagBlockAgenda = 2; | 583 | globalFlagBlockAgenda = 2; |
584 | mMainView->dateNavigator()->selectDates( QDate::currentDate(), | 584 | mMainView->dateNavigator()->selectDates( QDate::currentDate(), |
585 | KOPrefs::instance()->mNextXDays ); | 585 | KOPrefs::instance()->mNextXDays ); |
586 | mFlagShowNextxDays = true; | 586 | mFlagShowNextxDays = true; |
587 | mCurrentAgendaView = 3 ; | 587 | mCurrentAgendaView = 3 ; |
588 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_NX_VIEW; | 588 | KOPrefs::instance()->mCurrentDisplayedView = VIEW_NX_VIEW; |
589 | } | 589 | } |
590 | bool KOViewManager::showsNextDays() | 590 | bool KOViewManager::showsNextDays() |
591 | { | 591 | { |
592 | return mFlagShowNextxDays; | 592 | return mFlagShowNextxDays; |
593 | } | 593 | } |
594 | void KOViewManager::createMonthView() | 594 | void KOViewManager::createMonthView() |
595 | { | 595 | { |
596 | if (!mMonthView) { | 596 | if (!mMonthView) { |
597 | mMonthView = new KOMonthView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::MonthView"); | 597 | mMonthView = new KOMonthView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::MonthView"); |
598 | 598 | ||
599 | addView(mMonthView); | 599 | addView(mMonthView); |
600 | // mMonthView->show(); | 600 | // mMonthView->show(); |
601 | // SIGNALS/SLOTS FOR MONTH VIEW | 601 | // SIGNALS/SLOTS FOR MONTH VIEW |
602 | |||
603 | connect(mMonthView,SIGNAL(showJournalSignal( int, QDate )),SLOT(showDateView( int, QDate ))); | ||
604 | |||
605 | connect(mMonthView, SIGNAL(newTodoSignal(QDateTime,bool)), | ||
606 | mMainView, SLOT(newTodoDateTime(QDateTime, bool))); | ||
607 | |||
608 | |||
602 | connect(mMonthView, SIGNAL(newEventSignal(QDateTime)), | 609 | connect(mMonthView, SIGNAL(newEventSignal(QDateTime)), |
603 | mMainView, SLOT(newEvent(QDateTime))); | 610 | mMainView, SLOT(newEvent(QDateTime))); |
604 | 611 | ||
605 | connect(mMonthView, SIGNAL(showIncidenceSignal(Incidence *)), | 612 | connect(mMonthView, SIGNAL(showIncidenceSignal(Incidence *)), |
606 | mMainView, SLOT(showIncidence(Incidence *))); | 613 | mMainView, SLOT(showIncidence(Incidence *))); |
607 | connect(mMonthView, SIGNAL(editIncidenceSignal(Incidence *)), | 614 | connect(mMonthView, SIGNAL(editIncidenceSignal(Incidence *)), |
608 | mMainView, SLOT(editIncidence(Incidence *))); | 615 | mMainView, SLOT(editIncidence(Incidence *))); |
609 | connect(mMonthView, SIGNAL(deleteIncidenceSignal(Incidence *)), | 616 | connect(mMonthView, SIGNAL(deleteIncidenceSignal(Incidence *)), |
610 | mMainView, SLOT(deleteIncidence(Incidence *))); | 617 | mMainView, SLOT(deleteIncidence(Incidence *))); |
611 | 618 | ||
612 | connect( mMonthView, SIGNAL( incidenceSelected( Incidence * ) ), | 619 | connect( mMonthView, SIGNAL( incidenceSelected( Incidence * ) ), |
613 | mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); | 620 | mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); |
614 | connect( mMonthView, SIGNAL( cloneIncidenceSignal( Incidence * ) ), | 621 | connect( mMonthView, SIGNAL( cloneIncidenceSignal( Incidence * ) ), |
615 | mMainView, SLOT ( cloneIncidence( Incidence * ) ) ); | 622 | mMainView, SLOT ( cloneIncidence( Incidence * ) ) ); |
616 | connect( mMonthView, SIGNAL( cancelIncidenceSignal( Incidence * ) ), | 623 | connect( mMonthView, SIGNAL( cancelIncidenceSignal( Incidence * ) ), |
617 | mMainView, SLOT ( cancelIncidence( Incidence * ) ) ); | 624 | mMainView, SLOT ( cancelIncidence( Incidence * ) ) ); |
618 | 625 | ||
619 | connect( mMonthView, SIGNAL( moveIncidenceSignal( Incidence * ) ), | 626 | connect( mMonthView, SIGNAL( moveIncidenceSignal( Incidence * ) ), |
620 | mMainView, SLOT ( moveIncidence( Incidence * ) ) ); | 627 | mMainView, SLOT ( moveIncidence( Incidence * ) ) ); |
621 | connect( mMonthView, SIGNAL( beamIncidenceSignal( Incidence * ) ), | 628 | connect( mMonthView, SIGNAL( beamIncidenceSignal( Incidence * ) ), |
622 | mMainView, SLOT ( beamIncidence( Incidence * ) ) ); | 629 | mMainView, SLOT ( beamIncidence( Incidence * ) ) ); |
623 | connect( mMonthView, SIGNAL( selectWeekNum( int ) ), | 630 | connect( mMonthView, SIGNAL( selectWeekNum( int ) ), |
624 | mMainView->dateNavigator(), SLOT ( selectWeekFromMonthView( int ) ) ); | 631 | mMainView->dateNavigator(), SLOT ( selectWeekFromMonthView( int ) ) ); |
625 | connect( mMonthView, SIGNAL( selectMonth() ), | 632 | connect( mMonthView, SIGNAL( selectMonth() ), |