-rw-r--r-- | korganizer/koagenda.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index ffa2678..a72e470 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp | |||
@@ -399,13 +399,12 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) | |||
399 | switch (me->type()) { | 399 | switch (me->type()) { |
400 | case QEvent::MouseButtonPress: | 400 | case QEvent::MouseButtonPress: |
401 | //qDebug("QEvent::MouseButtonPress: "); | 401 | //qDebug("QEvent::MouseButtonPress: "); |
402 | // kdDebug() << "koagenda: filtered button press" << endl; | 402 | // kdDebug() << "koagenda: filtered button press" << endl; |
403 | if (object != viewport()) { | 403 | if (object != viewport()) { |
404 | if (me->button() == RightButton) { | 404 | if (me->button() == RightButton) { |
405 | |||
406 | mClickedItem = (KOAgendaItem *)object; | 405 | mClickedItem = (KOAgendaItem *)object; |
407 | if (mClickedItem) { | 406 | if (mClickedItem) { |
408 | selectItem(mClickedItem); | 407 | selectItem(mClickedItem); |
409 | // emit showIncidencePopupSignal(mClickedItem->incidence()); | 408 | // emit showIncidencePopupSignal(mClickedItem->incidence()); |
410 | } | 409 | } |
411 | //mItemPopup->popup(QCursor::pos()); | 410 | //mItemPopup->popup(QCursor::pos()); |
@@ -451,23 +450,34 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) | |||
451 | //qDebug("QEvent::MouseButtonRelease: %d",blockNewEvent ); | 450 | //qDebug("QEvent::MouseButtonRelease: %d",blockNewEvent ); |
452 | if (me->button() == RightButton && blockNewEvent && !block) { | 451 | if (me->button() == RightButton && blockNewEvent && !block) { |
453 | int x,y; | 452 | int x,y; |
454 | viewportToContents(viewportPos.x(),viewportPos.y(),x,y); | 453 | viewportToContents(viewportPos.x(),viewportPos.y(),x,y); |
455 | int gx,gy; | 454 | int gx,gy; |
456 | contentsToGrid(x,y,gx,gy); | 455 | contentsToGrid(x,y,gx,gy); |
456 | if ( object == viewport() ) { | ||
457 | if ( mCurrentCellY < mStartCellY +1 ) { | 457 | if ( mCurrentCellY < mStartCellY +1 ) { |
458 | //qDebug("mCurrentCellY %d mStartCellY %d ", mCurrentCellY,mStartCellY); | 458 | //qDebug("mCurrentCellY %d mStartCellY %d ", mCurrentCellY,mStartCellY); |
459 | mCurrentCellX = gx; | 459 | mCurrentCellX = gx; |
460 | mCurrentCellY = gy; | 460 | mCurrentCellY = gy; |
461 | mStartCellX = gx; | 461 | mStartCellX = gx; |
462 | mStartCellY = gy; | 462 | mStartCellY = gy; |
463 | mNewItemPopup->popup( viewport()->mapToGlobal( me->pos() ) ); | 463 | mNewItemPopup->popup( viewport()->mapToGlobal( me->pos() ) ); |
464 | break; | 464 | break; |
465 | } else { | 465 | } else { |
466 | blockNewEvent = false; | 466 | blockNewEvent = false; |
467 | } | 467 | } |
468 | } else { | ||
469 | mClickedItem = (KOAgendaItem *)object; | ||
470 | if (mActionItem ) { | ||
471 | endItemAction(); | ||
472 | } | ||
473 | if (mClickedItem) { | ||
474 | selectItem(mClickedItem); | ||
475 | emit showIncidencePopupSignal(mClickedItem->incidence()); | ||
476 | } | ||
477 | } | ||
468 | } else if (me->button() == RightButton && block ) { | 478 | } else if (me->button() == RightButton && block ) { |
469 | if (object != viewport()) { | 479 | if (object != viewport()) { |
470 | mClickedItem = (KOAgendaItem *)object; | 480 | mClickedItem = (KOAgendaItem *)object; |
471 | if (mActionItem ) { | 481 | if (mActionItem ) { |
472 | endItemAction(); | 482 | endItemAction(); |
473 | } | 483 | } |