author | zautrix <zautrix> | 2005-07-04 06:42:00 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-04 06:42:00 (UTC) |
commit | 068a89b64d8ef4cb49702ed53ab4e415a0b90a80 (patch) (unidiff) | |
tree | 9c2f4b77372cfbb2c1dab2717de027d8500a905a /korganizer/koagendaview.cpp | |
parent | ad66f0fe56bb88104fb0065ccb599ab0edd35cf4 (diff) | |
download | kdepimpi-068a89b64d8ef4cb49702ed53ab4e415a0b90a80.zip kdepimpi-068a89b64d8ef4cb49702ed53ab4e415a0b90a80.tar.gz kdepimpi-068a89b64d8ef4cb49702ed53ab4e415a0b90a80.tar.bz2 |
fixx
-rw-r--r-- | korganizer/koagendaview.cpp | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index a42227c..5a63b35 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp | |||
@@ -1116,22 +1116,16 @@ void KOAgendaView::fillAgenda() | |||
1116 | 1116 | ||
1117 | mAllDayAgenda->changeColumns(mSelectedDates.count()); | 1117 | mAllDayAgenda->changeColumns(mSelectedDates.count()); |
1118 | mAgenda->changeColumns(mSelectedDates.count()); | 1118 | mAgenda->changeColumns(mSelectedDates.count()); |
1119 | qApp->processEvents(); | 1119 | qApp->processEvents(); |
1120 | mEventIndicatorTop->changeColumns(mSelectedDates.count()); | 1120 | mEventIndicatorTop->changeColumns(mSelectedDates.count()); |
1121 | mEventIndicatorBottom->changeColumns(mSelectedDates.count()); | 1121 | mEventIndicatorBottom->changeColumns(mSelectedDates.count()); |
1122 | setHolidayMasks(); | 1122 | setHolidayMasks(); |
1123 | 1123 | ||
1124 | //mAgenda->hideUnused(); | ||
1125 | //mAllDayAgenda->hideUnused(); | ||
1126 | |||
1127 | // mAgenda->blockNextRepaint( false ); | ||
1128 | // mAgenda->viewport()->repaint(); | ||
1129 | // mAgenda->blockNextRepaint( true ); | ||
1130 | mMinY.resize(mSelectedDates.count()); | 1124 | mMinY.resize(mSelectedDates.count()); |
1131 | mMaxY.resize(mSelectedDates.count()); | 1125 | mMaxY.resize(mSelectedDates.count()); |
1132 | 1126 | ||
1133 | QPtrList<Event> dayEvents; | 1127 | QPtrList<Event> dayEvents; |
1134 | 1128 | ||
1135 | // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue. | 1129 | // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue. |
1136 | // Therefore, gtodoset all of them. | 1130 | // Therefore, gtodoset all of them. |
1137 | QPtrList<Todo> todos = calendar()->todos(); | 1131 | QPtrList<Todo> todos = calendar()->todos(); |
@@ -1142,17 +1136,17 @@ void KOAgendaView::fillAgenda() | |||
1142 | 1136 | ||
1143 | DateList::ConstIterator dit; | 1137 | DateList::ConstIterator dit; |
1144 | int curCol = 0; | 1138 | int curCol = 0; |
1145 | for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) { | 1139 | for( dit = mSelectedDates.begin(); dit != mSelectedDates.end(); ++dit ) { |
1146 | QDate currentDate = *dit; | 1140 | QDate currentDate = *dit; |
1147 | // kdDebug() << "KOAgendaView::fillAgenda(): " << currentDate.toString() | 1141 | // kdDebug() << "KOAgendaView::fillAgenda(): " << currentDate.toString() |
1148 | // << endl; | 1142 | // << endl; |
1149 | 1143 | ||
1150 | dayEvents = calendar()->events(currentDate,true); | 1144 | dayEvents = calendar()->events(currentDate,false); |
1151 | 1145 | ||
1152 | // Default values, which can never be reached | 1146 | // Default values, which can never be reached |
1153 | mMinY[curCol] = mAgenda->timeToY(QTime(23,59)) + 1; | 1147 | mMinY[curCol] = mAgenda->timeToY(QTime(23,59)) + 1; |
1154 | mMaxY[curCol] = mAgenda->timeToY(QTime(0,0)) - 1; | 1148 | mMaxY[curCol] = mAgenda->timeToY(QTime(0,0)) - 1; |
1155 | 1149 | ||
1156 | unsigned int numEvent; | 1150 | unsigned int numEvent; |
1157 | for(numEvent=0;numEvent<dayEvents.count();++numEvent) { | 1151 | for(numEvent=0;numEvent<dayEvents.count();++numEvent) { |
1158 | Event *event = dayEvents.at(numEvent); | 1152 | Event *event = dayEvents.at(numEvent); |
@@ -1284,72 +1278,49 @@ void KOAgendaView::fillAgenda() | |||
1284 | } | 1278 | } |
1285 | // ---------- display Todos] -------------- | 1279 | // ---------- display Todos] -------------- |
1286 | 1280 | ||
1287 | ++curCol; | 1281 | ++curCol; |
1288 | } | 1282 | } |
1289 | mAgenda->hideUnused(); | 1283 | mAgenda->hideUnused(); |
1290 | mAllDayAgenda->hideUnused(); | 1284 | mAllDayAgenda->hideUnused(); |
1291 | mAgenda->checkScrollBoundaries(); | 1285 | mAgenda->checkScrollBoundaries(); |
1292 | |||
1293 | deleteSelectedDateTime(); | 1286 | deleteSelectedDateTime(); |
1294 | |||
1295 | createDayLabels(); | 1287 | createDayLabels(); |
1296 | emit incidenceSelected( 0 ); | 1288 | emit incidenceSelected( 0 ); |
1297 | 1289 | ||
1298 | if ( globalFlagBlockAgenda == 2 ) { | 1290 | if ( globalFlagBlockAgenda == 2 ) { |
1299 | if ( KOPrefs::instance()->mSetTimeToDayStartAt ) | 1291 | if ( KOPrefs::instance()->mSetTimeToDayStartAt ) |
1300 | setStartHour( KOPrefs::instance()->mDayBegins ); | 1292 | setStartHour( KOPrefs::instance()->mDayBegins ); |
1301 | else if ( KOPrefs::instance()->mCenterOnCurrentTime ) | 1293 | else if ( KOPrefs::instance()->mCenterOnCurrentTime ) |
1302 | setStartHour( QTime::currentTime ().hour() ); | 1294 | setStartHour( QTime::currentTime ().hour() ); |
1303 | // qApp->processEvents(); | ||
1304 | } | 1295 | } |
1305 | qApp->processEvents(); | 1296 | qApp->processEvents(); |
1306 | //qDebug("qApp->processEvents(); END "); | ||
1307 | globalFlagBlockAgenda = 0; | 1297 | globalFlagBlockAgenda = 0; |
1308 | |||
1309 | // mAgenda->hideUnused(); | ||
1310 | //mAllDayAgenda->hideUnused(); | ||
1311 | mAllDayAgenda->drawContentsToPainter(); | 1298 | mAllDayAgenda->drawContentsToPainter(); |
1312 | mAgenda->drawContentsToPainter(); | 1299 | mAgenda->drawContentsToPainter(); |
1313 | repaintAgenda(); | 1300 | repaintAgenda(); |
1314 | onlyOne = false; | 1301 | onlyOne = false; |
1315 | // mAgenda->finishUpdate(); | ||
1316 | //mAllDayAgenda->finishUpdate(); | ||
1317 | |||
1318 | // repaintAgenda(); | ||
1319 | //qApp->processEvents(); | ||
1320 | // globalFlagBlockAgenda = 0; | ||
1321 | } | 1302 | } |
1322 | void KOAgendaView::repaintAgenda() | 1303 | void KOAgendaView::repaintAgenda() |
1323 | { | 1304 | { |
1324 | // mAllDayAgenda->drawContentsToPainter(); | ||
1325 | // mAllDayAgenda->viewport()->repaint( false ); | ||
1326 | // mAgenda->drawContentsToPainter(); | ||
1327 | // mAgenda->viewport()->repaint( false ); | ||
1328 | // qApp->processEvents(); | ||
1329 | |||
1330 | //qDebug("KOAgendaView::repaintAgenda() "); | ||
1331 | //qApp->processEvents(); | ||
1332 | mAgenda->viewport()->repaint( false ); | 1305 | mAgenda->viewport()->repaint( false ); |
1333 | mAllDayAgenda->viewport()->repaint( false ); | 1306 | mAllDayAgenda->viewport()->repaint( false ); |
1334 | mAgenda->finishUpdate(); | 1307 | mAgenda->finishUpdate(); |
1335 | mAllDayAgenda->finishUpdate(); | 1308 | mAllDayAgenda->finishUpdate(); |
1336 | } | 1309 | } |
1337 | 1310 | ||
1338 | 1311 | ||
1339 | void KOAgendaView::clearView() | 1312 | void KOAgendaView::clearView() |
1340 | { | 1313 | { |
1341 | // kdDebug() << "ClearView" << endl; | ||
1342 | mAllDayAgenda->clear(); | 1314 | mAllDayAgenda->clear(); |
1343 | mAgenda->clear(); | 1315 | mAgenda->clear(); |
1344 | } | 1316 | } |
1345 | void KOAgendaView::clearList() | 1317 | void KOAgendaView::clearList() |
1346 | { | 1318 | { |
1347 | // kdDebug() << "ClearView" << endl; | ||
1348 | clearView(); | 1319 | clearView(); |
1349 | mAllDayAgenda->hideUnused(); | 1320 | mAllDayAgenda->hideUnused(); |
1350 | mAgenda->hideUnused(); | 1321 | mAgenda->hideUnused(); |
1351 | } | 1322 | } |
1352 | 1323 | ||
1353 | void KOAgendaView::printPreview(CalPrinter *calPrinter, const QDate &fd, | 1324 | void KOAgendaView::printPreview(CalPrinter *calPrinter, const QDate &fd, |
1354 | const QDate &td) | 1325 | const QDate &td) |
1355 | { | 1326 | { |