author | zautrix <zautrix> | 2005-03-21 09:12:37 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-21 09:12:37 (UTC) |
commit | cd02f3880c5567a4bbb7b56e7034787005df7da8 (patch) (unidiff) | |
tree | e55e325b4688733b59232363c1d9c8e1eddb691d | |
parent | 9707cf053ab0e64949518ebd2729d432435f583c (diff) | |
download | kdepimpi-cd02f3880c5567a4bbb7b56e7034787005df7da8.zip kdepimpi-cd02f3880c5567a4bbb7b56e7034787005df7da8.tar.gz kdepimpi-cd02f3880c5567a4bbb7b56e7034787005df7da8.tar.bz2 |
agenda mouse fix
-rw-r--r-- | korganizer/koagenda.cpp | 2 | ||||
-rw-r--r-- | korganizer/koagendaitem.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index dcb46a8..5420822 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp | |||
@@ -437,33 +437,33 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) | |||
437 | } else { | 437 | } else { |
438 | startItemAction(viewportPos); | 438 | startItemAction(viewportPos); |
439 | } | 439 | } |
440 | } | 440 | } |
441 | } | 441 | } |
442 | } else { // ---------- viewport() | 442 | } else { // ---------- viewport() |
443 | selectItem(0); | 443 | selectItem(0); |
444 | mActionItem = 0; | 444 | mActionItem = 0; |
445 | if (me->button() == LeftButton ) { | 445 | if (me->button() == LeftButton ) { |
446 | setCursor(arrowCursor); | 446 | setCursor(arrowCursor); |
447 | startSelectAction(viewportPos); | 447 | startSelectAction(viewportPos); |
448 | } | 448 | } |
449 | } | 449 | } |
450 | break; | 450 | break; |
451 | 451 | ||
452 | case QEvent::MouseButtonRelease: | 452 | case QEvent::MouseButtonRelease: |
453 | if ( rightClickTime.elapsed() > 700 && blockMoving ) | 453 | if ( rightClickTime.elapsed() > 500 && blockMoving ) |
454 | rightButtonPressed = true; | 454 | rightButtonPressed = true; |
455 | if (object != viewport()) { | 455 | if (object != viewport()) { |
456 | if (me->button() == RightButton || rightButtonPressed ) { | 456 | if (me->button() == RightButton || rightButtonPressed ) { |
457 | if ( blockMoving ) { | 457 | if ( blockMoving ) { |
458 | mClickedItem = (KOAgendaItem *)object; | 458 | mClickedItem = (KOAgendaItem *)object; |
459 | if (mActionItem ) { | 459 | if (mActionItem ) { |
460 | endItemAction(); | 460 | endItemAction(); |
461 | } | 461 | } |
462 | leftMouseDown = false; // no more leftMouse computation | 462 | leftMouseDown = false; // no more leftMouse computation |
463 | if (mClickedItem) { | 463 | if (mClickedItem) { |
464 | selectItem(mClickedItem); | 464 | selectItem(mClickedItem); |
465 | emit showIncidencePopupSignal(mClickedItem->incidence()); | 465 | emit showIncidencePopupSignal(mClickedItem->incidence()); |
466 | } | 466 | } |
467 | } | 467 | } |
468 | } else if (me->button() == LeftButton && leftMouseDown) { | 468 | } else if (me->button() == LeftButton && leftMouseDown) { |
469 | if (mActionItem) { | 469 | if (mActionItem) { |
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index 042a789..0ea2860 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp | |||
@@ -62,40 +62,40 @@ public: | |||
62 | KOAgendaItemWhatsThis( KOAgendaItem* view ) : QWhatsThis( view ),_view (view) { }; | 62 | KOAgendaItemWhatsThis( KOAgendaItem* view ) : QWhatsThis( view ),_view (view) { }; |
63 | 63 | ||
64 | protected: | 64 | protected: |
65 | virtual QString text( const QPoint& ) | 65 | virtual QString text( const QPoint& ) |
66 | { | 66 | { |
67 | return _view->getWhatsThisText() ; | 67 | return _view->getWhatsThisText() ; |
68 | } | 68 | } |
69 | private: | 69 | private: |
70 | KOAgendaItem * _view; | 70 | KOAgendaItem * _view; |
71 | }; | 71 | }; |
72 | 72 | ||
73 | KOAgendaItem::KOAgendaItem(Incidence *incidence, QDate qd, QWidget *parent,bool allday, | 73 | KOAgendaItem::KOAgendaItem(Incidence *incidence, QDate qd, QWidget *parent,bool allday, |
74 | const char *name,WFlags) : | 74 | const char *name,WFlags) : |
75 | QWidget(parent, name), mIncidence(incidence), mDate(qd) | 75 | QWidget(parent, name), mIncidence(incidence), mDate(qd) |
76 | { | 76 | { |
77 | #ifndef DESKTOP_VERSION | 77 | #ifndef DESKTOP_VERSION |
78 | QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold ); | 78 | //QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold ); |
79 | #endif | 79 | #endif |
80 | new KOAgendaItemWhatsThis(this); | 80 | new KOAgendaItemWhatsThis(this); |
81 | int wflags = getWFlags() |WRepaintNoErase;// WResizeNoErase | 81 | int wflags = getWFlags() |WRepaintNoErase;// WResizeNoErase |
82 | setWFlags ( wflags); | 82 | setWFlags ( wflags); |
83 | mAllDay = allday; | 83 | mAllDay = allday; |
84 | init ( incidence, qd ); | 84 | init ( incidence, qd ); |
85 | setMouseTracking(true); | 85 | //setMouseTracking(true); |
86 | //setAcceptDrops(true); | 86 | //setAcceptDrops(true); |
87 | xPaintCoord = -1; | 87 | xPaintCoord = -1; |
88 | yPaintCoord = -1; | 88 | yPaintCoord = -1; |
89 | } | 89 | } |
90 | QString KOAgendaItem::getWhatsThisText() | 90 | QString KOAgendaItem::getWhatsThisText() |
91 | { | 91 | { |
92 | if ( mIncidence ) | 92 | if ( mIncidence ) |
93 | return KIncidenceFormatter::instance()->getFormattedText( mIncidence, | 93 | return KIncidenceFormatter::instance()->getFormattedText( mIncidence, |
94 | KOPrefs::instance()->mWTshowDetails, | 94 | KOPrefs::instance()->mWTshowDetails, |
95 | KOPrefs::instance()->mWTshowCreated, | 95 | KOPrefs::instance()->mWTshowCreated, |
96 | KOPrefs::instance()->mWTshowChanged); | 96 | KOPrefs::instance()->mWTshowChanged); |
97 | return "KOAgendaItem::getWhatsThisText()::internal error"; | 97 | return "KOAgendaItem::getWhatsThisText()::internal error"; |
98 | } | 98 | } |
99 | void KOAgendaItem::init ( Incidence *incidence, QDate qd ) | 99 | void KOAgendaItem::init ( Incidence *incidence, QDate qd ) |
100 | { | 100 | { |
101 | mIncidence = incidence; | 101 | mIncidence = incidence; |