From 0ee7cc932ca9c973b086f847a38d29531a815712 Mon Sep 17 00:00:00 2001 From: zautrix Date: Mon, 31 Jan 2005 11:47:44 +0000 Subject: many fixes --- (limited to 'korganizer/koviewmanager.cpp') diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 35774d6..2cd8792 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp @@ -204,12 +204,12 @@ void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen ) if ( mAgendaView ) mAgendaView->deleteSelectedDateTime(); //raiseCurrentView( full ); mMainView->processIncidenceSelection( 0 ); - mMainView->updateView(); - raiseCurrentView( full ); + //mMainView->updateView(); + raiseCurrentView( full, true ); mMainView->adaptNavigationUnits(); } -void KOViewManager::raiseCurrentView( bool fullScreen ) +void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView ) { mCurrentAgendaView = 0; int wid = mMainView->width() ; @@ -231,6 +231,9 @@ void KOViewManager::raiseCurrentView( bool fullScreen ) wid -= mMainView->leftFrame()->width(); } emit signalFullScreen( !fullScreen ); + if ( callUpdateView ) + mMainView->updateView(); + if ( globalFlagBlockAgenda == 5 ) { globalFlagBlockAgenda = 4; globalFlagBlockAgendaItemPaint = 1; @@ -272,7 +275,7 @@ void KOViewManager::updateView(const QDate &start, const QDate &end) if (mCurrentView) mCurrentView->showDates(start, end); - if (mTodoView) mTodoView->updateView(); + if (mTodoView && mTodoView == mCurrentView ) mTodoView->updateView(); } @@ -520,7 +523,9 @@ void KOViewManager::showMonthView() 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()); -- cgit v0.9.0.2