5 files changed, 48 insertions, 90 deletions

diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 2820ca2..66ad4ec 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -175,7 +175,7 @@ KOAgenda::KOAgenda(int columns,int rows,int rowSize,QWidget *parent,
   mGridSpacingY = rowSize;
   mAllDayMode = false; 
 #ifndef DESKTOP_VERSION
-  //QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold );
+  QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold );
 #endif
   mHolidayMask = 0;
   init();
@@ -398,26 +398,30 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
     static int blockmoveDist = ( QApplication::desktop()->width() < 480 ? 15 : 20 );
     static bool blockMoving = true;
     static bool leftMouseDown = false;
-    static bool rightMouseDown = false;
-    static QTime rightClickTime;
     bool rightButtonPressed = false;
     switch (me->type())  {
     case QEvent::MouseButtonPress:
-        rightClickTime.restart();
         if (me->button() == LeftButton) {
             leftMouseDown = true;
         }
-        else if (me->button() == RightButton) 
-            rightMouseDown = true;
+        else if (me->button() == RightButton) {
+            leftMouseDown = false;
+        }
         blockMoving = true;
         startX = viewportPos.x();
         startY = viewportPos.y(); 
-        if (object != viewport()) {
+        if (object != viewport()) { // item clicked **************
             if (me->button() == RightButton) {
+                leftMouseDown = false;
                 mClickedItem = (KOAgendaItem *)object;
+                if (mActionItem ) {
+                    endItemAction();
+                }
                 if (mClickedItem) {
                     selectItem(mClickedItem);
-                }
+                    emit showIncidencePopupSignal(mClickedItem->incidence());
+                } 
+                return true;
             } else if (me->button() == LeftButton) {
                 mActionItem = (KOAgendaItem *)object;
                 if (mActionItem) {
@@ -445,27 +449,29 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
             if (me->button() == LeftButton ) {
                 setCursor(arrowCursor);
                 startSelectAction(viewportPos);
+            } else if (me->button() == RightButton ) {
+                setCursor(arrowCursor);
+                if ( leftMouseDown ) { // we have a simulated right click - clear left mouse action
+                    endSelectAction( false ); // do not emit new event signal
+                    leftMouseDown = false; // no more leftMouse computation
+                }
+                int x,y;
+                viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
+                int gx,gy;
+                contentsToGrid(x,y,gx,gy); 
+                mCurrentCellX = gx;
+                mCurrentCellY = gy;
+                mStartCellX = gx;
+                mStartCellY = gy;
+                mNewItemPopup->popup( viewport()->mapToGlobal( me->pos() ) );
             }
         }
         break;
 
     case QEvent::MouseButtonRelease:
-        if (  rightClickTime.elapsed() > 500 &&  blockMoving )
-            rightButtonPressed = true;
+       
         if (object != viewport()) { 
-            if (me->button() == RightButton  || rightButtonPressed ) {
-                if ( blockMoving ) {
-                    mClickedItem = (KOAgendaItem *)object;
-                    if (mActionItem ) {
-                        endItemAction();
-                    }
-                    leftMouseDown = false; // no more leftMouse computation
-                    if (mClickedItem) {
-                        selectItem(mClickedItem);
-                        emit showIncidencePopupSignal(mClickedItem->incidence());
-                    } 
-                }
-            } else if (me->button() == LeftButton && leftMouseDown) {
+            if (me->button() == LeftButton && leftMouseDown) {
                 if (mActionItem) {  
                     QPoint clipperPos = clipper()->mapFromGlobal(viewport()->mapToGlobal(viewportPos));
                     //qDebug(" %d %d %d  ",clipperPos.y(),visibleHeight() , 9  );
@@ -487,35 +493,17 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
             }
             
         } else { // ---------- viewport()
-            if (me->button() == RightButton || rightButtonPressed ) { //right click
-                if ( blockMoving ) { // we did mot moved the mouse much - popup menu
-                    if ( leftMouseDown ) { // we have a simulated right click - clear left mouse action
-                        endSelectAction( false ); // do not emit new event signal
-                        leftMouseDown = false; // no more leftMouse computation
-                    }
-                    int x,y;
-                    viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
-                    int gx,gy;
-                    contentsToGrid(x,y,gx,gy); 
-                    mCurrentCellX = gx;
-                    mCurrentCellY = gy;
-                    mStartCellX = gx;
-                    mStartCellY = gy;
-                    mNewItemPopup->popup( viewport()->mapToGlobal( me->pos() ) );
-                }
-            }
-            else if (me->button() == LeftButton && leftMouseDown ) { //left click
+            if (me->button() == LeftButton && leftMouseDown ) { //left click
                 endSelectAction( true ); // emit new event signal
             }
         }
         if (me->button() == LeftButton) 
             leftMouseDown = false;
-        else if (me->button() == RightButton) 
-            rightMouseDown = false;
+       
         break;
 
     case QEvent::MouseMove:
-        if ( !rightMouseDown && !leftMouseDown )
+        if ( !leftMouseDown )
             return true;
         if ( blockMoving ) {
             int dX, dY; 
@@ -550,7 +538,6 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
     case QEvent::MouseButtonDblClick:
         blockMoving = false;
         leftMouseDown = false;
-        rightMouseDown = false;
         if (object == viewport()) {
             selectItem(0);
             int x,y;
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index b30ad75..905c1bf 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -75,7 +75,7 @@ KOAgendaItem::KOAgendaItem(Incidence *incidence, QDate qd, QWidget *parent,bool
     QWidget(parent, name), mIncidence(incidence), mDate(qd)
 {
 #ifndef DESKTOP_VERSION
-    //QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold );
+    QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold );
 #endif
     mKOAgendaItemWhatsThis =  new KOAgendaItemWhatsThis(this);
     int wflags = getWFlags() |WRepaintNoErase;// WResizeNoErase
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);
 }
diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h
index 0d9c525..eca71e2 100644
--- a/korganizer/kolistview.h
+++ b/korganizer/kolistview.h
@@ -223,9 +223,7 @@ class KOListViewListView : public KListView
     void contentsMousePressEvent(QMouseEvent *e);
     void contentsMouseReleaseEvent(QMouseEvent *e);
     void contentsMouseMoveEvent(QMouseEvent *e);
-    bool mAllowPopupMenu;
     bool mMouseDown;
-    int mYMousePos;
 };
 
 class KOListView : public KOEventView
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 12233ee..9085775 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -514,6 +514,11 @@ void MonthViewCell::startUpdateCell()
         mitem->setBlockRepaint( true );
         mitem = (MonthViewItem *)mitem->next();
     }
+    if ( mAvailItemList.count() > 20 ) {
+        mAvailItemList.setAutoDelete( true );
+        mAvailItemList.clear();
+        mAvailItemList.setAutoDelete( false );
+    }
     /*    
           if ( !isVisible() ){
           return;
@@ -817,14 +822,14 @@ void MonthViewCell::updateConfig( bool bigFont ) // = false
 void MonthViewCell::enableScrollBars( bool enabled )
 {
     if ( enabled ) {
-        
         QListBoxItem *fi =  firstItem ();
         if (fi ) {
             int ihei = fi->height( this );
             int hei = numRows ()  * ihei;
-            if ( hei < height() - horizontalScrollBar()->height () )
+            if ( hei < height() - horizontalScrollBar()->height () ) {
                 setVScrollBarMode(QScrollView::AlwaysOff);
-            else
+            }
+            else 
                 setVScrollBarMode(QScrollView::Auto);
             if ( ihei *3 > height() )
                 setHScrollBarMode(QScrollView::AlwaysOff);