-rw-r--r-- | korganizer/koviewmanager.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index c6e76c4..5a2dce3 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -123,18 +123,19 @@ void KOViewManager::showDateView( int view, QDate date) | |||
123 | //qDebug("%d %d ", lastNDMode, mFlagShowNextxDays ); | 123 | //qDebug("%d %d ", lastNDMode, mFlagShowNextxDays ); |
124 | bool savemFlagShowNextxDays = mFlagShowNextxDays; | 124 | bool savemFlagShowNextxDays = mFlagShowNextxDays; |
125 | mFlagShowNextxDays = false; | 125 | mFlagShowNextxDays = false; |
126 | if ( view == 3 ) { | 126 | if ( view == 3 ) { |
127 | //mCurrentAgendaView = 1 ; | 127 | //mCurrentAgendaView = 1 ; |
128 | lastDate = mMainView->dateNavigator()->selectedDates().first(); | 128 | lastDate = mMainView->dateNavigator()->selectedDates().first(); |
129 | lastCount = mMainView->dateNavigator()->selectedDates().count(); | 129 | lastCount = mMainView->dateNavigator()->selectedDates().count(); |
130 | lastNDMode = savemFlagShowNextxDays; | 130 | lastNDMode = savemFlagShowNextxDays; |
131 | mMainView->showDay( date ); | 131 | mMainView->dateNavigator()->selectDate( date ); |
132 | lastMode = 1; | 132 | lastMode = 1; |
133 | mCurrentAgendaView = 1 ; | ||
133 | } else if (view == 4 ) { | 134 | } else if (view == 4 ) { |
134 | mCurrentAgendaView = 7 ; | 135 | mCurrentAgendaView = 7 ; |
135 | mMainView->dateNavigator()->selectDates( date, 7 ); | 136 | mMainView->dateNavigator()->selectDates( date, 7 ); |
136 | } else if (view == 5 ) { | 137 | } else if (view == 5 ) { |
137 | mCurrentAgendaView = 14 ; | 138 | mCurrentAgendaView = 14 ; |
138 | mMainView->dateNavigator()->selectDates( date, 14); | 139 | mMainView->dateNavigator()->selectDates( date, 14); |
139 | } else if (view == 6 ) { | 140 | } else if (view == 6 ) { |
140 | //mMainView->dateNavigator()->selectDates( date, 7 ); | 141 | //mMainView->dateNavigator()->selectDates( date, 7 ); |
@@ -572,16 +573,23 @@ void KOViewManager::showMonthViewWeek() | |||
572 | full = false; | 573 | full = false; |
573 | else | 574 | else |
574 | full = true; | 575 | full = true; |
575 | } | 576 | } |
576 | mMainView->dateNavigator()->selectWeek(); | 577 | mMainView->dateNavigator()->selectWeek(); |
577 | showView(mMonthView, full ); | 578 | showView(mMonthView, full ); |
578 | } | 579 | } |
579 | 580 | ||
581 | void KOViewManager::showMonth( const QDate & date ) | ||
582 | { | ||
583 | mMainView->dateNavigator()->blockSignals( true ); | ||
584 | mMainView->dateNavigator()->selectDate( date ); | ||
585 | mMainView->dateNavigator()->blockSignals( false ); | ||
586 | showMonthView(); | ||
587 | } | ||
580 | void KOViewManager::showMonthView() | 588 | void KOViewManager::showMonthView() |
581 | { | 589 | { |
582 | 590 | ||
583 | createMonthView(); | 591 | createMonthView(); |
584 | globalFlagBlockAgenda = 1; | 592 | globalFlagBlockAgenda = 1; |
585 | //mFlagShowNextxDays = false; | 593 | //mFlagShowNextxDays = false; |
586 | bool full = true; | 594 | bool full = true; |
587 | if ( mCurrentView == mMonthView) | 595 | if ( mCurrentView == mMonthView) |