From 068a89b64d8ef4cb49702ed53ab4e415a0b90a80 Mon Sep 17 00:00:00 2001 From: zautrix Date: Mon, 04 Jul 2005 06:42:00 +0000 Subject: fixx --- diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index f860f7d..94c3b22 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp @@ -1135,7 +1135,7 @@ void KOAgenda::placeSubCells(KOAgendaItem *placeItem) QPtrList conflictItems; int maxSubCells = 0; - QIntDict subCellDict(5); + QIntDict subCellDict(7); KOAgendaItem *item; for ( item=mItems.first(); item != 0; item=mItems.next() ) { diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index a42227c..5a63b35 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp @@ -1121,12 +1121,6 @@ void KOAgendaView::fillAgenda() mEventIndicatorBottom->changeColumns(mSelectedDates.count()); setHolidayMasks(); - //mAgenda->hideUnused(); - //mAllDayAgenda->hideUnused(); - - // mAgenda->blockNextRepaint( false ); - // mAgenda->viewport()->repaint(); - // mAgenda->blockNextRepaint( true ); mMinY.resize(mSelectedDates.count()); mMaxY.resize(mSelectedDates.count()); @@ -1147,7 +1141,7 @@ void KOAgendaView::fillAgenda() // kdDebug() << "KOAgendaView::fillAgenda(): " << currentDate.toString() // << endl; - dayEvents = calendar()->events(currentDate,true); + dayEvents = calendar()->events(currentDate,false); // Default values, which can never be reached mMinY[curCol] = mAgenda->timeToY(QTime(23,59)) + 1; @@ -1289,9 +1283,7 @@ void KOAgendaView::fillAgenda() mAgenda->hideUnused(); mAllDayAgenda->hideUnused(); mAgenda->checkScrollBoundaries(); - deleteSelectedDateTime(); - createDayLabels(); emit incidenceSelected( 0 ); @@ -1300,35 +1292,16 @@ void KOAgendaView::fillAgenda() setStartHour( KOPrefs::instance()->mDayBegins ); 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 ); mAgenda->finishUpdate(); @@ -1338,13 +1311,11 @@ void KOAgendaView::repaintAgenda() void KOAgendaView::clearView() { - // kdDebug() << "ClearView" << endl; mAllDayAgenda->clear(); mAgenda->clear(); } void KOAgendaView::clearList() { - // kdDebug() << "ClearView" << endl; clearView(); mAllDayAgenda->hideUnused(); mAgenda->hideUnused(); -- cgit v0.9.0.2