author | zautrix <zautrix> | 2005-01-31 12:09:55 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-31 12:09:55 (UTC) |
commit | 5d52c81be9b43887c13f8534a04164d3b44b821f (patch) (side-by-side diff) | |
tree | 79942122f3745a55fa08371970625f3e8733f5fa /korganizer | |
parent | 0ee7cc932ca9c973b086f847a38d29531a815712 (diff) | |
download | kdepimpi-5d52c81be9b43887c13f8534a04164d3b44b821f.zip kdepimpi-5d52c81be9b43887c13f8534a04164d3b44b821f.tar.gz kdepimpi-5d52c81be9b43887c13f8534a04164d3b44b821f.tar.bz2 |
fix
-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 @@ -109,28 +109,29 @@ void KOViewManager::showDateView( int view, QDate date) mNewItemPopup->insertItem ( SmallIcon( pathString +"month" ), i18n("Next Two Weeks"),5 ); mNewItemPopup->insertItem ( SmallIcon( pathString +"month" ), i18n("Next Month"),6 ); mNewItemPopup->insertItem ( SmallIcon( pathString +"journal" ), i18n("Journal view"),7 ); #endif if ( view == 3 ) { mMainView->showDay( date ); } else if (view == 4 ) { mMainView->dateNavigator()->selectDates( date, 7 ); } else if (view == 5 ) { mMainView->dateNavigator()->selectDates( date, 14); } else if (view == 6 ) { mMainView->dateNavigator()->blockSignals( true ); + showMonthView(); + qApp->processEvents(); mMainView->dateNavigator()->selectMonthByDate( date ); - mMainView->dateNavigator()->selectDate( date ); mMainView->dateNavigator()->blockSignals( false ); - showMonthView(); + mMainView->dateNavigator()->selectDate( date ); } else if (view == 7 ) { mMainView->dateNavigator()->selectDate( date ); showJournalView(); } else if (view == 8 ) { globalFlagBlockAgenda = 1; if ( mCurrentAgendaView != 3 ) mCurrentAgendaView = -1; showAgendaView(KOPrefs::instance()->mFullViewMonth); globalFlagBlockAgenda = 2; mMainView->dateNavigator()->selectDates( date , KOPrefs::instance()->mNextXDays ); mFlagShowNextxDays = true; @@ -141,25 +142,25 @@ void KOViewManager::showDateView( int view, QDate date) dateNavigator()->blockSignals( true ); dateNavigator()->selectDate( d ); dateNavigator()->blockSignals( false ); mViewManager->showDayView(); #endif } void KOViewManager::writeSettings(KConfig *config) { - config->setGroup("General"); + config->setGroup("General"); QString view; if (mCurrentView == mWhatsNextView) view = "WhatsNext"; else if (mCurrentView == mMonthView) view = "Month"; else if (mCurrentView == mListView) view = "List"; else if (mCurrentView == mJournalView) view = "Journal"; else if (mCurrentView == mTimeSpanView) view = "TimeSpan"; else if (mCurrentView == mTodoView) view = "Todo"; else view = "Agenda"; config->writeEntry("Current View",view); @@ -514,29 +515,25 @@ void KOViewManager::showMonthView() mMainView, SLOT ( showDay( QDate ) ) ); connect(mMainView, SIGNAL(configChanged()), mMonthView, SLOT(updateConfig())); connect( mMonthView, SIGNAL(nextMonth() ), mMainView->navigatorBar(), SIGNAL(goNextMonth() ) ); connect( mMonthView, SIGNAL(prevMonth() ), mMainView->navigatorBar(), SIGNAL(goPrevMonth() ) ); mMonthView->updateConfig(); } globalFlagBlockAgenda = 1; //mFlagShowNextxDays = false; // if(mMonthView == mCurrentView) return; - mMainView->dateNavigator()->blockSignals( true ); mMainView->dateNavigator()->selectMonth(); - mMainView->dateNavigator()->blockSignals( false); - // DateList tmpList = mMainView->dateNavigator()->selectedDates( ); - //mMonthView->showDates(tmpList.first(), tmpList.last()); showView(mMonthView, true ); } void KOViewManager::showTodoView() { //mFlagShowNextxDays = false; if ( !mTodoView ) { mTodoView = new KOTodoView( mMainView->calendar(), mMainView->viewStack(), "KOViewManager::TodoView" ); |