summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--korganizer/koagenda.cpp10
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()
mPopupTimer->stop();
- if ( mPopupKind == 1 ) {
+ if ( mPopupKind == 1 || mPopupKind == 3 ) {
if (mActionItem ) {
@@ -391,3 +391,3 @@ void KOAgenda::popupMenu()
selectItem(mPopupItem);
- if ( mAllAgendaPopup && KOPrefs::instance()->mBlockPopupMenu )
+ if ( mAllAgendaPopup && KOPrefs::instance()->mBlockPopupMenu && mPopupKind == 1 )
mAllAgendaPopup->installEventFilter( this );
@@ -396,3 +396,3 @@ void KOAgenda::popupMenu()
}
- } else if ( mPopupKind == 2 ) {
+ } else if ( mPopupKind == 2 || mPopupKind == 4 ) {
if ( mLeftMouseDown ) { // we have a simulated right click - clear left mouse action
@@ -401,3 +401,3 @@ void KOAgenda::popupMenu()
}
- if ( KOPrefs::instance()->mBlockPopupMenu )
+ if ( KOPrefs::instance()->mBlockPopupMenu && mPopupKind == 2 )
mNewItemPopup->installEventFilter( this );
@@ -472,2 +472,3 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
if (me->button() == RightButton) {
+ mPopupKind = 3;
popupMenu();
@@ -501,2 +502,3 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
mStartCellY = gy;
+ mPopupKind = 4;
popupMenu();