author | zautrix <zautrix> | 2005-05-24 19:56:05 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-05-24 19:56:05 (UTC) |
commit | bebdc6ca63f4bcbfb735c3d75710ca53959ef48f (patch) (unidiff) | |
tree | ed755ca04104d571799e91a31443fe94bbf00fdd | |
parent | b441ef64338079e3e29c07d8884a02588050a54a (diff) | |
download | kdepimpi-bebdc6ca63f4bcbfb735c3d75710ca53959ef48f.zip kdepimpi-bebdc6ca63f4bcbfb735c3d75710ca53959ef48f.tar.gz kdepimpi-bebdc6ca63f4bcbfb735c3d75710ca53959ef48f.tar.bz2 |
menu fix
-rw-r--r-- | korganizer/koagenda.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index 355f4bb..99009a5 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp | |||
@@ -383,3 +383,3 @@ void KOAgenda::popupMenu() | |||
383 | mPopupTimer->stop(); | 383 | mPopupTimer->stop(); |
384 | if ( mPopupKind == 1 ) { | 384 | if ( mPopupKind == 1 || mPopupKind == 3 ) { |
385 | if (mActionItem ) { | 385 | if (mActionItem ) { |
@@ -391,3 +391,3 @@ void KOAgenda::popupMenu() | |||
391 | selectItem(mPopupItem); | 391 | selectItem(mPopupItem); |
392 | if ( mAllAgendaPopup && KOPrefs::instance()->mBlockPopupMenu ) | 392 | if ( mAllAgendaPopup && KOPrefs::instance()->mBlockPopupMenu && mPopupKind == 1 ) |
393 | mAllAgendaPopup->installEventFilter( this ); | 393 | mAllAgendaPopup->installEventFilter( this ); |
@@ -396,3 +396,3 @@ void KOAgenda::popupMenu() | |||
396 | } | 396 | } |
397 | } else if ( mPopupKind == 2 ) { | 397 | } else if ( mPopupKind == 2 || mPopupKind == 4 ) { |
398 | if ( mLeftMouseDown ) { // we have a simulated right click - clear left mouse action | 398 | if ( mLeftMouseDown ) { // we have a simulated right click - clear left mouse action |
@@ -401,3 +401,3 @@ void KOAgenda::popupMenu() | |||
401 | } | 401 | } |
402 | if ( KOPrefs::instance()->mBlockPopupMenu ) | 402 | if ( KOPrefs::instance()->mBlockPopupMenu && mPopupKind == 2 ) |
403 | mNewItemPopup->installEventFilter( this ); | 403 | mNewItemPopup->installEventFilter( this ); |
@@ -472,2 +472,3 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) | |||
472 | if (me->button() == RightButton) { | 472 | if (me->button() == RightButton) { |
473 | mPopupKind = 3; | ||
473 | popupMenu(); | 474 | popupMenu(); |
@@ -501,2 +502,3 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me) | |||
501 | mStartCellY = gy; | 502 | mStartCellY = gy; |
503 | mPopupKind = 4; | ||
502 | popupMenu(); | 504 | popupMenu(); |