summaryrefslogtreecommitdiffabout
path: root/korganizer/koagenda.cpp
authorzautrix <zautrix>2005-04-10 23:19:20 (UTC)
committer zautrix <zautrix>2005-04-10 23:19:20 (UTC)
commit726d9302b230f53cc058d2dbfd89c7a3c4f18fb2 (patch) (unidiff)
tree8d4416e152b1c1eeb81c7f67ea486300ad589365 /korganizer/koagenda.cpp
parentef11b9d4de01d601bfcfb8efacb0aeff1e657edb (diff)
downloadkdepimpi-726d9302b230f53cc058d2dbfd89c7a3c4f18fb2.zip
kdepimpi-726d9302b230f53cc058d2dbfd89c7a3c4f18fb2.tar.gz
kdepimpi-726d9302b230f53cc058d2dbfd89c7a3c4f18fb2.tar.bz2
fixxxxxx
Diffstat (limited to 'korganizer/koagenda.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koagenda.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 18c506e..114ed75 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -386,23 +386,24 @@ void KOAgenda::popupMenu()
386 endItemAction(); 386 endItemAction();
387 } 387 }
388 mLeftMouseDown = false; // no more leftMouse computation 388 mLeftMouseDown = false; // no more leftMouse computation
389 if (mPopupItem) { 389 if (mPopupItem) {
390 //mClickedItem = mPopupItem; 390 //mClickedItem = mPopupItem;
391 selectItem(mPopupItem); 391 selectItem(mPopupItem);
392 if ( mAllAgendaPopup ) 392 if ( mAllAgendaPopup && KOPrefs::instance()->mBlockPopupMenu )
393 mAllAgendaPopup->installEventFilter( this ); 393 mAllAgendaPopup->installEventFilter( this );
394 emit showIncidencePopupSignal(mPopupItem->incidence()); 394 emit showIncidencePopupSignal(mPopupItem->incidence());
395 395
396 } 396 }
397 } else if ( mPopupKind == 2 ) { 397 } else if ( mPopupKind == 2 ) {
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
399 endSelectAction( false ); // do not emit new event signal 399 endSelectAction( false ); // do not emit new event signal
400 mLeftMouseDown = false; // no more leftMouse computation 400 mLeftMouseDown = false; // no more leftMouse computation
401 } 401 }
402 mNewItemPopup->installEventFilter( this ); 402 if ( KOPrefs::instance()->mBlockPopupMenu )
403 mNewItemPopup->installEventFilter( this );
403 mNewItemPopup->popup( mPopupPos); 404 mNewItemPopup->popup( mPopupPos);
404 405
405 } 406 }
406 mLeftMouseDown = false; 407 mLeftMouseDown = false;
407 mPopupItem = 0; 408 mPopupItem = 0;
408 mPopupKind = 0; 409 mPopupKind = 0;