-rw-r--r-- | korganizer/koagendaview.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index c1b149f..6e65a03 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp | |||
@@ -364,32 +364,33 @@ void EventIndicator::changeColumns(int columns) | |||
364 | update(); | 364 | update(); |
365 | } | 365 | } |
366 | 366 | ||
367 | void EventIndicator::enableColumn(int column, bool enable) | 367 | void EventIndicator::enableColumn(int column, bool enable) |
368 | { | 368 | { |
369 | mEnabled[column] = enable; | 369 | mEnabled[column] = enable; |
370 | } | 370 | } |
371 | 371 | ||
372 | 372 | ||
373 | //////////////////////////////////////////////////////////////////////////// | 373 | //////////////////////////////////////////////////////////////////////////// |
374 | //////////////////////////////////////////////////////////////////////////// | 374 | //////////////////////////////////////////////////////////////////////////// |
375 | //////////////////////////////////////////////////////////////////////////// | 375 | //////////////////////////////////////////////////////////////////////////// |
376 | 376 | ||
377 | KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) : | 377 | KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) : |
378 | KOEventView (cal,parent,name) | 378 | KOEventView (cal,parent,name) |
379 | { | 379 | { |
380 | flag_blockfillAgenda = false; | ||
380 | mBlockUpdating = true; | 381 | mBlockUpdating = true; |
381 | mStartHour = 8; | 382 | mStartHour = 8; |
382 | mSelectedDates.append(QDate::currentDate()); | 383 | mSelectedDates.append(QDate::currentDate()); |
383 | 384 | ||
384 | mLayoutDayLabels = 0; | 385 | mLayoutDayLabels = 0; |
385 | mDayLabelsFrame = 0; | 386 | mDayLabelsFrame = 0; |
386 | mDayLabels = 0; | 387 | mDayLabels = 0; |
387 | bool isRTL = KOGlobals::self()->reverseLayout(); | 388 | bool isRTL = KOGlobals::self()->reverseLayout(); |
388 | QPixmap expandPix; | 389 | QPixmap expandPix; |
389 | if ( KOPrefs::instance()->mVerticalScreen ) { | 390 | if ( KOPrefs::instance()->mVerticalScreen ) { |
390 | expandPix = SmallIcon( "1updownarrow" ); | 391 | expandPix = SmallIcon( "1updownarrow" ); |
391 | } else { | 392 | } else { |
392 | expandPix = SmallIcon("1leftrightarrow" ); | 393 | expandPix = SmallIcon("1leftrightarrow" ); |
393 | } | 394 | } |
394 | 395 | ||
395 | QBoxLayout *topLayout = new QVBoxLayout(this); | 396 | QBoxLayout *topLayout = new QVBoxLayout(this); |
@@ -1129,36 +1130,35 @@ void KOAgendaView::changeEventDisplay(Event *, int) | |||
1129 | // are just playing dumb. | 1130 | // are just playing dumb. |
1130 | fillAgenda(); | 1131 | fillAgenda(); |
1131 | } | 1132 | } |
1132 | 1133 | ||
1133 | void KOAgendaView::fillAgenda(const QDate &) | 1134 | void KOAgendaView::fillAgenda(const QDate &) |
1134 | { | 1135 | { |
1135 | // qDebug("KOAgendaView::fillAgenda "); | 1136 | // qDebug("KOAgendaView::fillAgenda "); |
1136 | fillAgenda(); | 1137 | fillAgenda(); |
1137 | } | 1138 | } |
1138 | 1139 | ||
1139 | void KOAgendaView::fillAgenda() | 1140 | void KOAgendaView::fillAgenda() |
1140 | { | 1141 | { |
1141 | if ( globalFlagBlockStartup ) | 1142 | if ( globalFlagBlockStartup ) |
1142 | return; | 1143 | return; |
1143 | if ( globalFlagBlockAgenda == 1 ) | 1144 | if ( globalFlagBlockAgenda == 1 ) |
1144 | return; | 1145 | return; |
1145 | static bool onlyOne = false; | 1146 | if ( flag_blockfillAgenda ) |
1146 | if ( onlyOne ) | ||
1147 | return; | 1147 | return; |
1148 | onlyOne = true; | 1148 | flag_blockfillAgenda = true; |
1149 | //if ( globalFlagBlockAgenda == 2 ) | 1149 | //if ( globalFlagBlockAgenda == 2 ) |
1150 | //globalFlagBlockAgenda = 0; | 1150 | //globalFlagBlockAgenda = 0; |
1151 | // globalFlagBlockPainting = false; | 1151 | // globalFlagBlockPainting = false; |
1152 | if ( globalFlagBlockAgenda == 0 ) | 1152 | if ( globalFlagBlockAgenda == 0 ) |
1153 | globalFlagBlockAgenda = 1; | 1153 | globalFlagBlockAgenda = 1; |
1154 | // clearView(); | 1154 | // clearView(); |
1155 | //qDebug("fillAgenda()++++ "); | 1155 | //qDebug("fillAgenda()++++ "); |
1156 | globalFlagBlockAgendaItemPaint = 1; | 1156 | globalFlagBlockAgendaItemPaint = 1; |
1157 | 1157 | ||
1158 | mAllDayAgenda->changeColumns(mSelectedDates.count()); | 1158 | mAllDayAgenda->changeColumns(mSelectedDates.count()); |
1159 | mAgenda->changeColumns(mSelectedDates.count()); | 1159 | mAgenda->changeColumns(mSelectedDates.count()); |
1160 | qApp->processEvents(); | 1160 | qApp->processEvents(); |
1161 | mEventIndicatorTop->changeColumns(mSelectedDates.count()); | 1161 | mEventIndicatorTop->changeColumns(mSelectedDates.count()); |
1162 | mEventIndicatorBottom->changeColumns(mSelectedDates.count()); | 1162 | mEventIndicatorBottom->changeColumns(mSelectedDates.count()); |
1163 | setHolidayMasks(); | 1163 | setHolidayMasks(); |
1164 | 1164 | ||
@@ -1341,33 +1341,33 @@ void KOAgendaView::fillAgenda() | |||
1341 | deleteSelectedDateTime(); | 1341 | deleteSelectedDateTime(); |
1342 | createDayLabels(); | 1342 | createDayLabels(); |
1343 | emit incidenceSelected( 0 ); | 1343 | emit incidenceSelected( 0 ); |
1344 | 1344 | ||
1345 | if ( globalFlagBlockAgenda == 2 ) { | 1345 | if ( globalFlagBlockAgenda == 2 ) { |
1346 | if ( KOPrefs::instance()->mSetTimeToDayStartAt ) | 1346 | if ( KOPrefs::instance()->mSetTimeToDayStartAt ) |
1347 | setStartHour( KOPrefs::instance()->mDayBegins ); | 1347 | setStartHour( KOPrefs::instance()->mDayBegins ); |
1348 | else if ( KOPrefs::instance()->mCenterOnCurrentTime ) | 1348 | else if ( KOPrefs::instance()->mCenterOnCurrentTime ) |
1349 | setStartHour( QTime::currentTime ().hour() ); | 1349 | setStartHour( QTime::currentTime ().hour() ); |
1350 | } | 1350 | } |
1351 | qApp->processEvents(); | 1351 | qApp->processEvents(); |
1352 | globalFlagBlockAgenda = 0; | 1352 | globalFlagBlockAgenda = 0; |
1353 | mAllDayAgenda->drawContentsToPainter(); | 1353 | mAllDayAgenda->drawContentsToPainter(); |
1354 | mAgenda->drawContentsToPainter(); | 1354 | mAgenda->drawContentsToPainter(); |
1355 | repaintAgenda(); | 1355 | repaintAgenda(); |
1356 | startIdleTimeout(); | 1356 | startIdleTimeout(); |
1357 | onlyOne = false; | 1357 | flag_blockfillAgenda = false; |
1358 | } | 1358 | } |
1359 | void KOAgendaView::repaintAgenda() | 1359 | void KOAgendaView::repaintAgenda() |
1360 | { | 1360 | { |
1361 | mAgenda->viewport()->repaint( false ); | 1361 | mAgenda->viewport()->repaint( false ); |
1362 | mAllDayAgenda->viewport()->repaint( false ); | 1362 | mAllDayAgenda->viewport()->repaint( false ); |
1363 | mAgenda->finishUpdate(); | 1363 | mAgenda->finishUpdate(); |
1364 | mAllDayAgenda->finishUpdate(); | 1364 | mAllDayAgenda->finishUpdate(); |
1365 | } | 1365 | } |
1366 | 1366 | ||
1367 | 1367 | ||
1368 | void KOAgendaView::clearView() | 1368 | void KOAgendaView::clearView() |
1369 | { | 1369 | { |
1370 | mAllDayAgenda->clear(); | 1370 | mAllDayAgenda->clear(); |
1371 | mAgenda->clear(); | 1371 | mAgenda->clear(); |
1372 | } | 1372 | } |
1373 | void KOAgendaView::clearList() | 1373 | void KOAgendaView::clearList() |