author | zautrix <zautrix> | 2005-10-26 09:10:50 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-10-26 09:10:50 (UTC) |
commit | 15b9123c6c1f9096a4b1a7729c323433d408c8d7 (patch) (unidiff) | |
tree | 3d9a8a521df355641642172ab1200a0f75529910 /korganizer/koagendaview.cpp | |
parent | f696b904526567d45cd01a5b607644f8aa3bfe6b (diff) | |
download | kdepimpi-15b9123c6c1f9096a4b1a7729c323433d408c8d7.zip kdepimpi-15b9123c6c1f9096a4b1a7729c323433d408c8d7.tar.gz kdepimpi-15b9123c6c1f9096a4b1a7729c323433d408c8d7.tar.bz2 |
fix
-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 | |||
@@ -356,48 +356,49 @@ void EventIndicator::setPaintWidget( KDGanttMinimizeSplitter * w ) | |||
356 | setMaximumHeight(0); | 356 | setMaximumHeight(0); |
357 | setMinimumHeight(0); | 357 | setMinimumHeight(0); |
358 | } | 358 | } |
359 | void EventIndicator::changeColumns(int columns) | 359 | void EventIndicator::changeColumns(int columns) |
360 | { | 360 | { |
361 | mColumns = columns; | 361 | mColumns = columns; |
362 | mEnabled.resize(mColumns); | 362 | mEnabled.resize(mColumns); |
363 | 363 | ||
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); |
396 | 397 | ||
397 | // Create day name labels for agenda columns | 398 | // Create day name labels for agenda columns |
398 | // Create agenda splitter | 399 | // Create agenda splitter |
399 | 400 | ||
400 | mSplitterAgenda = new KDGanttMinimizeSplitter( Qt::Vertical, this); | 401 | mSplitterAgenda = new KDGanttMinimizeSplitter( Qt::Vertical, this); |
401 | mSplitterAgenda->setMinimizeDirection ( KDGanttMinimizeSplitter::Up ); | 402 | mSplitterAgenda->setMinimizeDirection ( KDGanttMinimizeSplitter::Up ); |
402 | topLayout->addWidget( mSplitterAgenda ); | 403 | topLayout->addWidget( mSplitterAgenda ); |
403 | mAllDayFrame = new QHBox(mSplitterAgenda); | 404 | mAllDayFrame = new QHBox(mSplitterAgenda); |
@@ -1121,52 +1122,51 @@ void KOAgendaView::showEvents(QPtrList<Event>) | |||
1121 | kdDebug() << "KOAgendaView::showEvents() is not yet implemented" << endl; | 1122 | kdDebug() << "KOAgendaView::showEvents() is not yet implemented" << endl; |
1122 | } | 1123 | } |
1123 | 1124 | ||
1124 | void KOAgendaView::changeEventDisplay(Event *, int) | 1125 | void KOAgendaView::changeEventDisplay(Event *, int) |
1125 | { | 1126 | { |
1126 | // qDebug("KOAgendaView::changeEventDisplay "); | 1127 | // qDebug("KOAgendaView::changeEventDisplay "); |
1127 | // kdDebug() << "KOAgendaView::changeEventDisplay" << endl; | 1128 | // kdDebug() << "KOAgendaView::changeEventDisplay" << endl; |
1128 | // this should be re-written to be MUCH smarter. Right now we | 1129 | // this should be re-written to be MUCH smarter. Right now we |
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 | ||
1165 | mMinY.resize(mSelectedDates.count()); | 1165 | mMinY.resize(mSelectedDates.count()); |
1166 | mMaxY.resize(mSelectedDates.count()); | 1166 | mMaxY.resize(mSelectedDates.count()); |
1167 | 1167 | ||
1168 | QPtrList<Event> dayEvents; | 1168 | QPtrList<Event> dayEvents; |
1169 | 1169 | ||
1170 | // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue. | 1170 | // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue. |
1171 | // Therefore, gtodoset all of them. | 1171 | // Therefore, gtodoset all of them. |
1172 | QPtrList<Todo> todos = calendar()->todos(); | 1172 | QPtrList<Todo> todos = calendar()->todos(); |
@@ -1333,49 +1333,49 @@ void KOAgendaView::fillAgenda() | |||
1333 | } | 1333 | } |
1334 | // ---------- display Todos] -------------- | 1334 | // ---------- display Todos] -------------- |
1335 | 1335 | ||
1336 | ++curCol; | 1336 | ++curCol; |
1337 | } | 1337 | } |
1338 | mAgenda->hideUnused(); | 1338 | mAgenda->hideUnused(); |
1339 | mAllDayAgenda->hideUnused(); | 1339 | mAllDayAgenda->hideUnused(); |
1340 | mAgenda->checkScrollBoundaries(); | 1340 | mAgenda->checkScrollBoundaries(); |
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() |
1374 | { | 1374 | { |
1375 | clearView(); | 1375 | clearView(); |
1376 | mAllDayAgenda->hideUnused(); | 1376 | mAllDayAgenda->hideUnused(); |
1377 | mAgenda->hideUnused(); | 1377 | mAgenda->hideUnused(); |
1378 | } | 1378 | } |
1379 | 1379 | ||
1380 | void KOAgendaView::printPreview(CalPrinter *calPrinter, const QDate &fd, | 1380 | void KOAgendaView::printPreview(CalPrinter *calPrinter, const QDate &fd, |
1381 | const QDate &td) | 1381 | const QDate &td) |