-rw-r--r-- | korganizer/koagenda.cpp | 2 | ||||
-rw-r--r-- | korganizer/koagendaview.cpp | 31 |
2 files changed, 2 insertions, 31 deletions
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index f860f7d..94c3b22 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp @@ -1136,5 +1136,5 @@ void KOAgenda::placeSubCells(KOAgendaItem *placeItem) QPtrList<KOAgendaItem> conflictItems; int maxSubCells = 0; - QIntDict<KOAgendaItem> subCellDict(5); + QIntDict<KOAgendaItem> subCellDict(7); KOAgendaItem *item; diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index a42227c..5a63b35 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp @@ -1122,10 +1122,4 @@ void KOAgendaView::fillAgenda() setHolidayMasks(); - //mAgenda->hideUnused(); - //mAllDayAgenda->hideUnused(); - - // mAgenda->blockNextRepaint( false ); - // mAgenda->viewport()->repaint(); - // mAgenda->blockNextRepaint( true ); mMinY.resize(mSelectedDates.count()); mMaxY.resize(mSelectedDates.count()); @@ -1148,5 +1142,5 @@ void KOAgendaView::fillAgenda() // << endl; - dayEvents = calendar()->events(currentDate,true); + dayEvents = calendar()->events(currentDate,false); // Default values, which can never be reached @@ -1290,7 +1284,5 @@ void KOAgendaView::fillAgenda() mAllDayAgenda->hideUnused(); mAgenda->checkScrollBoundaries(); - deleteSelectedDateTime(); - createDayLabels(); emit incidenceSelected( 0 ); @@ -1301,33 +1293,14 @@ void KOAgendaView::fillAgenda() else if ( KOPrefs::instance()->mCenterOnCurrentTime ) setStartHour( QTime::currentTime ().hour() ); - // qApp->processEvents(); } qApp->processEvents(); - //qDebug("qApp->processEvents(); END "); globalFlagBlockAgenda = 0; - - // mAgenda->hideUnused(); - //mAllDayAgenda->hideUnused(); mAllDayAgenda->drawContentsToPainter(); mAgenda->drawContentsToPainter(); repaintAgenda(); onlyOne = false; - // mAgenda->finishUpdate(); - //mAllDayAgenda->finishUpdate(); - - // repaintAgenda(); - //qApp->processEvents(); - // globalFlagBlockAgenda = 0; } void KOAgendaView::repaintAgenda() { - // mAllDayAgenda->drawContentsToPainter(); -// mAllDayAgenda->viewport()->repaint( false ); -// mAgenda->drawContentsToPainter(); -// mAgenda->viewport()->repaint( false ); -// qApp->processEvents(); - - //qDebug("KOAgendaView::repaintAgenda() "); - //qApp->processEvents(); mAgenda->viewport()->repaint( false ); mAllDayAgenda->viewport()->repaint( false ); @@ -1339,5 +1312,4 @@ void KOAgendaView::repaintAgenda() void KOAgendaView::clearView() { - // kdDebug() << "ClearView" << endl; mAllDayAgenda->clear(); mAgenda->clear(); @@ -1345,5 +1317,4 @@ void KOAgendaView::clearView() void KOAgendaView::clearList() { - // kdDebug() << "ClearView" << endl; clearView(); mAllDayAgenda->hideUnused(); |