-rw-r--r-- | korganizer/kolistview.cpp | 46 |
1 files changed, 7 insertions, 39 deletions
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index 3519985..6b63d7f 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -310,3 +310,3 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent, this,SLOT(defaultItemAction(QListViewItem *))); - QObject::connect(mListView,SIGNAL(rightButtonClicked ( QListViewItem *, + QObject::connect(mListView,SIGNAL(rightButtonPressed( QListViewItem *, const QPoint &, int )), @@ -1161,8 +1161,4 @@ KOListViewListView::KOListViewListView(KOListView * lv ) #endif - mYMousePos = -1000; setSelectionMode( QListView::Multi ); setMultiSelection( true); - mAllowPopupMenu = true; - mMouseDown = false; - } @@ -1180,3 +1176,2 @@ void KOListViewListView::contentsMouseDoubleClickEvent(QMouseEvent *e) - void KOListViewListView::contentsMousePressEvent(QMouseEvent *e) @@ -1184,11 +1179,9 @@ void KOListViewListView::contentsMousePressEvent(QMouseEvent *e) //qDebug("contentsMousePressEvent++++ "); - if (! mMouseDown ) { - mAllowPopupMenu = true; - mYMousePos = mapToGlobal( (e->pos())).y(); - } - if ( e->button() == RightButton && mMouseDown ) - return; - if ( e->button() == LeftButton ) - mMouseDown = true; KListView::contentsMousePressEvent( e ); + if ( e->button() == RightButton ) { + QListViewItem* ci = currentItem(); + clearSelection () ; + if ( ci ) + ci->setSelected( true ); + } } @@ -1196,21 +1189,2 @@ void KOListViewListView::contentsMouseReleaseEvent(QMouseEvent *e) { - //qDebug("contentsMouseReleaseEv---- "); - if ( ! mMouseDown ) { - if ( e->button() == RightButton && ! mAllowPopupMenu ) - return; - QListViewItem* ci = currentItem(); - if ( ci ) - ci->setSelected( true ); - KListView::contentsMouseReleaseEvent(e); - return; - } - if ( e->button() == LeftButton ) - mMouseDown = false; - if ( e->button() == RightButton && ! mAllowPopupMenu ) - return; - if ( e->button() == RightButton ) { - QListViewItem* ci = currentItem(); - if ( ci ) - ci->setSelected( true ); - } KListView::contentsMouseReleaseEvent(e); @@ -1219,8 +1193,2 @@ void KOListViewListView::contentsMouseMoveEvent(QMouseEvent *e) { - // qDebug("contentsMouseMoveEv....... "); - // qDebug("start: %d current %d ",mYMousePos , mapToGlobal( (e->pos())).y() ); - int diff = mYMousePos - mapToGlobal( (e->pos())).y(); - if ( diff < 0 ) diff = -diff; - if ( diff > 20 ) - mAllowPopupMenu = false; KListView::contentsMouseMoveEvent(e); |