layout fixes

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
@@ -308,7 +308,7 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
                      this,SIGNAL(signalNewEvent()));
     QObject::connect(mListView,SIGNAL(doubleClicked(QListViewItem *)),
                      this,SLOT(defaultItemAction(QListViewItem *)));
-    QObject::connect(mListView,SIGNAL(rightButtonClicked ( QListViewItem *,
+    QObject::connect(mListView,SIGNAL(rightButtonPressed( QListViewItem *,
                                                            const QPoint &, int )),
                      this,SLOT(popupMenu(QListViewItem *,const QPoint &,int)));
     QObject::connect(mListView,SIGNAL(currentChanged(QListViewItem *)),
@@ -1159,12 +1159,8 @@ KOListViewListView::KOListViewListView(KOListView * lv )
 #ifndef DESKTOP_VERSION
     QPEApplication::setStylusOperation(viewport(), QPEApplication::RightOnHold );
 #endif
-    mYMousePos = -1000;
     setSelectionMode( QListView::Multi );   
     setMultiSelection( true);
-    mAllowPopupMenu = true;
-    mMouseDown = false;
-    
 }
 void KOListViewListView::contentsMouseDoubleClickEvent(QMouseEvent *e)
 {
@@ -1178,50 +1174,22 @@ void KOListViewListView::contentsMouseDoubleClickEvent(QMouseEvent *e)
     KListView::contentsMouseDoubleClickEvent(e);
 }
 
-
 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 );
+    }
 }
 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);
 }
 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);
 }