-rw-r--r-- | korganizer/koviewmanager.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 2cd8792..c95917f 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -117,12 +117,13 @@ void KOViewManager::showDateView( int view, QDate date) | |||
117 | } else if (view == 5 ) { | 117 | } else if (view == 5 ) { |
118 | mMainView->dateNavigator()->selectDates( date, 14); | 118 | mMainView->dateNavigator()->selectDates( date, 14); |
119 | } else if (view == 6 ) { | 119 | } else if (view == 6 ) { |
120 | mMainView->dateNavigator()->blockSignals( true ); | 120 | mMainView->dateNavigator()->blockSignals( true ); |
121 | showMonthView(); | ||
122 | qApp->processEvents(); | ||
121 | mMainView->dateNavigator()->selectMonthByDate( date ); | 123 | mMainView->dateNavigator()->selectMonthByDate( date ); |
122 | mMainView->dateNavigator()->selectDate( date ); | ||
123 | mMainView->dateNavigator()->blockSignals( false ); | 124 | mMainView->dateNavigator()->blockSignals( false ); |
124 | showMonthView(); | 125 | mMainView->dateNavigator()->selectDate( date ); |
125 | } else if (view == 7 ) { | 126 | } else if (view == 7 ) { |
126 | mMainView->dateNavigator()->selectDate( date ); | 127 | mMainView->dateNavigator()->selectDate( date ); |
127 | showJournalView(); | 128 | showJournalView(); |
128 | } else if (view == 8 ) { | 129 | } else if (view == 8 ) { |
@@ -149,9 +150,9 @@ void KOViewManager::showDateView( int view, QDate date) | |||
149 | 150 | ||
150 | 151 | ||
151 | void KOViewManager::writeSettings(KConfig *config) | 152 | void KOViewManager::writeSettings(KConfig *config) |
152 | { | 153 | { |
153 | config->setGroup("General"); | 154 | config->setGroup("General"); |
154 | 155 | ||
155 | QString view; | 156 | QString view; |
156 | if (mCurrentView == mWhatsNextView) view = "WhatsNext"; | 157 | if (mCurrentView == mWhatsNextView) view = "WhatsNext"; |
157 | else if (mCurrentView == mMonthView) view = "Month"; | 158 | else if (mCurrentView == mMonthView) view = "Month"; |
@@ -522,13 +523,9 @@ void KOViewManager::showMonthView() | |||
522 | 523 | ||
523 | globalFlagBlockAgenda = 1; | 524 | globalFlagBlockAgenda = 1; |
524 | //mFlagShowNextxDays = false; | 525 | //mFlagShowNextxDays = false; |
525 | // if(mMonthView == mCurrentView) return; | 526 | // if(mMonthView == mCurrentView) return; |
526 | mMainView->dateNavigator()->blockSignals( true ); | ||
527 | mMainView->dateNavigator()->selectMonth(); | 527 | mMainView->dateNavigator()->selectMonth(); |
528 | mMainView->dateNavigator()->blockSignals( false); | ||
529 | // DateList tmpList = mMainView->dateNavigator()->selectedDates( ); | ||
530 | //mMonthView->showDates(tmpList.first(), tmpList.last()); | ||
531 | 528 | ||
532 | showView(mMonthView, true ); | 529 | showView(mMonthView, true ); |
533 | 530 | ||
534 | } | 531 | } |