-rw-r--r-- | korganizer/koagenda.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index 7e9fa71..7d9d674 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp | |||
@@ -88,49 +88,50 @@ MarcusBains::~MarcusBains() | |||
88 | //delete minutes; | 88 | //delete minutes; |
89 | } | 89 | } |
90 | void MarcusBains::hideMe() | 90 | void MarcusBains::hideMe() |
91 | { | 91 | { |
92 | hide(); mTimeBox->hide(); | 92 | hide(); mTimeBox->hide(); |
93 | } | 93 | } |
94 | int MarcusBains::todayColumn() | 94 | int MarcusBains::todayColumn() |
95 | { | 95 | { |
96 | QDate currentDate = QDate::currentDate(); | 96 | QDate currentDate = QDate::currentDate(); |
97 | 97 | ||
98 | DateList dateList = agenda->dateList(); | 98 | DateList dateList = agenda->dateList(); |
99 | DateList::ConstIterator it; | 99 | DateList::ConstIterator it; |
100 | int col = 0; | 100 | int col = 0; |
101 | for(it = dateList.begin(); it != dateList.end(); ++it) { | 101 | for(it = dateList.begin(); it != dateList.end(); ++it) { |
102 | if((*it) == currentDate) | 102 | if((*it) == currentDate) |
103 | return KOGlobals::self()->reverseLayout() ? | 103 | return KOGlobals::self()->reverseLayout() ? |
104 | agenda->columns() - 1 - col : col; | 104 | agenda->columns() - 1 - col : col; |
105 | ++col; | 105 | ++col; |
106 | } | 106 | } |
107 | 107 | ||
108 | return -1; | 108 | return -1; |
109 | } | 109 | } |
110 | void MarcusBains::updateLoc() | 110 | void MarcusBains::updateLoc() |
111 | { | 111 | { |
112 | updateLocation(); | 112 | if ( !agenda->invalidPixmap() ) |
113 | updateLocation(); | ||
113 | } | 114 | } |
114 | void MarcusBains::updateLocation(bool recalculate) | 115 | void MarcusBains::updateLocation(bool recalculate) |
115 | { | 116 | { |
116 | 117 | ||
117 | QTime tim = QTime::currentTime(); | 118 | QTime tim = QTime::currentTime(); |
118 | //qDebug(" MarcusBains::updateLocation %s ", tim.toString().latin1()); | 119 | //qDebug(" MarcusBains::updateLocation %s ", tim.toString().latin1()); |
119 | if((tim.hour() == 0) && (oldTime.hour()==23)) | 120 | if((tim.hour() == 0) && (oldTime.hour()==23)) |
120 | recalculate = true; | 121 | recalculate = true; |
121 | 122 | ||
122 | int mins = tim.hour()*60 + tim.minute(); | 123 | int mins = tim.hour()*60 + tim.minute(); |
123 | int minutesPerCell = 24 * 60 / agenda->rows(); | 124 | int minutesPerCell = 24 * 60 / agenda->rows(); |
124 | int y = mins*agenda->gridSpacingY()/minutesPerCell; | 125 | int y = mins*agenda->gridSpacingY()/minutesPerCell; |
125 | int today = recalculate ? todayColumn() : oldToday; | 126 | int today = recalculate ? todayColumn() : oldToday; |
126 | int x = agenda->gridSpacingX()*today; | 127 | int x = agenda->gridSpacingX()*today; |
127 | bool disabled = !(KOPrefs::instance()->mMarcusBainsEnabled); | 128 | bool disabled = !(KOPrefs::instance()->mMarcusBainsEnabled); |
128 | 129 | ||
129 | oldTime = tim; | 130 | oldTime = tim; |
130 | oldToday = today; | 131 | oldToday = today; |
131 | 132 | ||
132 | if(disabled || (today<0)) { | 133 | if(disabled || (today<0)) { |
133 | hide(); mTimeBox->hide(); | 134 | hide(); mTimeBox->hide(); |
134 | return; | 135 | return; |
135 | } else { | 136 | } else { |
136 | show(); mTimeBox->show(); | 137 | show(); mTimeBox->show(); |
@@ -420,54 +421,58 @@ void KOAgenda::popupMenu() | |||
420 | } else if ( mPopupKind == 2 || mPopupKind == 4 ) { | 421 | } else if ( mPopupKind == 2 || mPopupKind == 4 ) { |
421 | if ( mLeftMouseDown ) { // we have a simulated right click - clear left mouse action | 422 | if ( mLeftMouseDown ) { // we have a simulated right click - clear left mouse action |
422 | endSelectAction( false ); // do not emit new event signal | 423 | endSelectAction( false ); // do not emit new event signal |
423 | mLeftMouseDown = false; // no more leftMouse computation | 424 | mLeftMouseDown = false; // no more leftMouse computation |
424 | } | 425 | } |
425 | if ( KOPrefs::instance()->mBlockPopupMenu && mPopupKind == 2 ) | 426 | if ( KOPrefs::instance()->mBlockPopupMenu && mPopupKind == 2 ) |
426 | mNewItemPopup->installEventFilter( this ); | 427 | mNewItemPopup->installEventFilter( this ); |
427 | mNewItemPopup->popup( mPopupPos); | 428 | mNewItemPopup->popup( mPopupPos); |
428 | 429 | ||
429 | } | 430 | } |
430 | mLeftMouseDown = false; | 431 | mLeftMouseDown = false; |
431 | mPopupItem = 0; | 432 | mPopupItem = 0; |
432 | mPopupKind = 0; | 433 | mPopupKind = 0; |
433 | } | 434 | } |
434 | void KOAgenda::categoryChanged(Incidence * inc) | 435 | void KOAgenda::categoryChanged(Incidence * inc) |
435 | { | 436 | { |
436 | KOAgendaItem *item; | 437 | KOAgendaItem *item; |
437 | for ( item=mItems.first(); item != 0; item=mItems.next() ) { | 438 | for ( item=mItems.first(); item != 0; item=mItems.next() ) { |
438 | if ( item->incidence() == inc ) { | 439 | if ( item->incidence() == inc ) { |
439 | item->initColor (); | 440 | item->initColor (); |
440 | item->updateItem(); | 441 | item->updateItem(); |
441 | } | 442 | } |
442 | } | 443 | } |
443 | } | 444 | } |
445 | bool KOAgenda::invalidPixmap() | ||
446 | { | ||
447 | return mInvalidPixmap; | ||
448 | } | ||
444 | bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) | 449 | bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) |
445 | { | 450 | { |
446 | 451 | ||
447 | if ( mInvalidPixmap ) { | 452 | if ( mInvalidPixmap ) { |
448 | mInvalidPixmap = false; | 453 | mInvalidPixmap = false; |
449 | qDebug("KO: Upsizing Pixmaps "); | 454 | qDebug("KO: efm Upsizing Pixmaps %s", QDateTime::currentDateTime().toString().latin1()); |
450 | computeSizes(); | 455 | computeSizes(); |
451 | emit updateViewSignal(); | 456 | emit updateViewSignal(); |
452 | return true; | 457 | return true; |
453 | } | 458 | } |
454 | emit sendPing(); | 459 | emit sendPing(); |
455 | static int startX = 0; | 460 | static int startX = 0; |
456 | static int startY = 0; | 461 | static int startY = 0; |
457 | int blockmoveDist = ( QApplication::desktop()->width() < 480 ? 7 : 9 ); | 462 | int blockmoveDist = ( QApplication::desktop()->width() < 480 ? 7 : 9 ); |
458 | static bool blockMoving = true; | 463 | static bool blockMoving = true; |
459 | 464 | ||
460 | //qDebug("KOAgenda::eventFilter_mous "); | 465 | //qDebug("KOAgenda::eventFilter_mous "); |
461 | if ( object == mNewItemPopup ) { | 466 | if ( object == mNewItemPopup ) { |
462 | //qDebug("mNewItemPopup "); | 467 | //qDebug("mNewItemPopup "); |
463 | if ( me->type() == QEvent::MouseButtonRelease ) { | 468 | if ( me->type() == QEvent::MouseButtonRelease ) { |
464 | mNewItemPopup->removeEventFilter( this ); | 469 | mNewItemPopup->removeEventFilter( this ); |
465 | int dX = me->globalPos().x() - mPopupPos.x();; | 470 | int dX = me->globalPos().x() - mPopupPos.x();; |
466 | if ( dX < 0 ) | 471 | if ( dX < 0 ) |
467 | dX = -dX; | 472 | dX = -dX; |
468 | int dY = me->globalPos().y() - mPopupPos.y(); | 473 | int dY = me->globalPos().y() - mPopupPos.y(); |
469 | if ( dY < 0 ) | 474 | if ( dY < 0 ) |
470 | dY = -dY; | 475 | dY = -dY; |
471 | if ( dX > blockmoveDist || dY > blockmoveDist ) { | 476 | if ( dX > blockmoveDist || dY > blockmoveDist ) { |
472 | mNewItemPopup->hide(); | 477 | mNewItemPopup->hide(); |
473 | } | 478 | } |
@@ -1260,53 +1265,54 @@ void KOAgenda::placeSubCells(KOAgendaItem *placeItem) | |||
1260 | placeItem->setSubCell(0); | 1265 | placeItem->setSubCell(0); |
1261 | placeItem->setSubCells(1); | 1266 | placeItem->setSubCells(1); |
1262 | if (mAllDayMode) placeItem->resize(placeItem->width(),mGridSpacingY); | 1267 | if (mAllDayMode) placeItem->resize(placeItem->width(),mGridSpacingY); |
1263 | else placeItem->resize(mGridSpacingX,placeItem->height()); | 1268 | else placeItem->resize(mGridSpacingX,placeItem->height()); |
1264 | int x,y; | 1269 | int x,y; |
1265 | gridToContents(placeItem->cellX(),placeItem->cellYTop(),x,y); | 1270 | gridToContents(placeItem->cellX(),placeItem->cellYTop(),x,y); |
1266 | moveChild(placeItem,x,y); | 1271 | moveChild(placeItem,x,y); |
1267 | } | 1272 | } |
1268 | placeItem->setConflictItems(conflictItems); | 1273 | placeItem->setConflictItems(conflictItems); |
1269 | // for ( item=conflictItems.first(); item != 0; | 1274 | // for ( item=conflictItems.first(); item != 0; |
1270 | // item=conflictItems.next() ) { | 1275 | // item=conflictItems.next() ) { |
1271 | // //item->updateItem(); | 1276 | // //item->updateItem(); |
1272 | // //qDebug("xxx item->updateItem() %s %d %d", item->incidence()->summary().latin1(),item->x(), item->y() ); | 1277 | // //qDebug("xxx item->updateItem() %s %d %d", item->incidence()->summary().latin1(),item->x(), item->y() ); |
1273 | // } | 1278 | // } |
1274 | // placeItem->updateItem(); | 1279 | // placeItem->updateItem(); |
1275 | } | 1280 | } |
1276 | 1281 | ||
1277 | void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch) | 1282 | void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch) |
1278 | { | 1283 | { |
1279 | if ( globalFlagBlockAgenda ) | 1284 | if ( globalFlagBlockAgenda ) |
1280 | return; | 1285 | return; |
1281 | 1286 | ||
1282 | if ( mInvalidPixmap ) { | 1287 | if ( mInvalidPixmap ) { |
1283 | mInvalidPixmap = false; | 1288 | mInvalidPixmap = false; |
1284 | qDebug("KO: Upsizing Pixmaps "); | 1289 | qDebug("KO: dc Upsizing Pixmaps %s", QDateTime::currentDateTime().toString().latin1()); |
1285 | computeSizes(); | 1290 | computeSizes(); |
1286 | emit updateViewSignal(); | 1291 | emit updateViewSignal(); |
1287 | return; | 1292 | return; |
1288 | } | 1293 | } |
1294 | //qDebug("KOAgenda::drawContents %s", QDateTime::currentDateTime().toString().latin1()); | ||
1289 | if ( ! mAllDayMode ) { | 1295 | if ( ! mAllDayMode ) { |
1290 | // currently not working for | 1296 | // currently not working for |
1291 | 1297 | ||
1292 | //qDebug("KOAgenda::drawContents "); | 1298 | //qDebug("KOAgenda::drawContents "); |
1293 | #if 0 | 1299 | #if 0 |
1294 | if ( mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() ) { | 1300 | if ( mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() ) { |
1295 | qDebug("WAU "); | 1301 | qDebug("WAU "); |
1296 | drawContentsToPainter(); | 1302 | drawContentsToPainter(); |
1297 | } | 1303 | } |
1298 | #endif | 1304 | #endif |
1299 | QPaintDevice* pd = p->device(); | 1305 | QPaintDevice* pd = p->device(); |
1300 | p->end(); | 1306 | p->end(); |
1301 | int vx, vy; | 1307 | int vx, vy; |
1302 | int selectionX = KOGlobals::self()->reverseLayout() ? | 1308 | int selectionX = KOGlobals::self()->reverseLayout() ? |
1303 | (mColumns - 1 - mSelectionCellX) * mGridSpacingX : | 1309 | (mColumns - 1 - mSelectionCellX) * mGridSpacingX : |
1304 | mSelectionCellX * mGridSpacingX; | 1310 | mSelectionCellX * mGridSpacingX; |
1305 | contentsToViewport ( cx, cy, vx,vy); | 1311 | contentsToViewport ( cx, cy, vx,vy); |
1306 | //qDebug(" %d %d %d %d %d", cx, cy, cw,ch,mGridSpacingX-1) ; | 1312 | //qDebug(" %d %d %d %d %d", cx, cy, cw,ch,mGridSpacingX-1) ; |
1307 | 1313 | ||
1308 | if ( !(selectionX == cx && cy == mSelectionYTop && cw ==mGridSpacingX && ch == mSelectionHeight ) ) { | 1314 | if ( !(selectionX == cx && cy == mSelectionYTop && cw ==mGridSpacingX && ch == mSelectionHeight ) ) { |
1309 | if ( mGridSpacingX == cw && mSelectionHeight > 0 && ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) && | 1315 | if ( mGridSpacingX == cw && mSelectionHeight > 0 && ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) && |
1310 | ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) ) { | 1316 | ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) ) { |
1311 | 1317 | ||
1312 | int vxSel, vySel; | 1318 | int vxSel, vySel; |