layout fixes

5 files changed, 44 insertions, 86 deletions

diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 2820ca2..66ad4ec 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -172,13 +172,13 @@ KOAgenda::KOAgenda(int columns,int rows,int rowSize,QWidget *parent,
 
   mColumns = columns;
   mRows = rows;
   mGridSpacingY = rowSize;
   mAllDayMode = false; 
 #ifndef DESKTOP_VERSION
-  //QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold );
+  QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold );
 #endif
   mHolidayMask = 0;
   init();
 }
 
 /*
@@ -395,32 +395,36 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
     }
     static int startX = 0;
     static int startY = 0;
     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) {
                     if ( mSelectionHeight > 0 ) { 
                         int selectionCellX = mSelectionCellX * mGridSpacingX;
                         int selectionYTop = mSelectionYTop;
@@ -442,33 +446,35 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
         } else { // ---------- viewport()
             selectItem(0);
             mActionItem = 0;
             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  );
                     if ( mActionType == MOVE && (clipperPos.y() > visibleHeight()-2 ||clipperPos.y() < 0 ) ) {
                         mScrollUpTimer.stop();
                         mScrollDownTimer.stop();
@@ -484,41 +490,23 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
                     }
                     endItemAction();
                 }
             }
             
         } 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; 
             dX = startX - viewportPos.x();
             if ( dX < 0   )
                 dX = -dX;
@@ -547,13 +535,12 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
         }
         break;
 
     case QEvent::MouseButtonDblClick:
         blockMoving = false;
         leftMouseDown = false;
-        rightMouseDown = false;
         if (object == viewport()) {
             selectItem(0);
             int x,y;
             viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
             int gx,gy;
             contentsToGrid(x,y,gx,gy);
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index b30ad75..905c1bf 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -72,13 +72,13 @@ private:
 
 KOAgendaItem::KOAgendaItem(Incidence *incidence, QDate qd, QWidget *parent,bool allday,
                            const char *name,WFlags) :
     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
     setWFlags ( wflags);
     mAllDay = allday;
     init ( incidence, qd );
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 3519985..6b63d7f 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -305,13 +305,13 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
       SLOT(hideDates()));
     */
     QObject::connect(mListView,SIGNAL( newEvent()),
                      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 *)),
                      SLOT(processSelectionChange(QListViewItem *)));
     QObject::connect(mListView,SIGNAL(showIncidence(Incidence *)),
                      SIGNAL(showIncidenceSignal(Incidence *)) );
@@ -1156,18 +1156,14 @@ void KOListViewListView::keyPressEvent ( QKeyEvent *e)
 KOListViewListView::KOListViewListView(KOListView * lv ) 
     : KListView( 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)
 {
     if (!e) return;
     QPoint vp = contentsToViewport(e->pos());
     QListViewItem *item = itemAt(vp);
@@ -1175,53 +1171,25 @@ void KOListViewListView::contentsMouseDoubleClickEvent(QMouseEvent *e)
         emit newEvent();
         return;
     }
     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 );
-}
-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(); 
+        clearSelection () ;
         if ( ci ) 
             ci->setSelected( true );
     }
+}
+void KOListViewListView::contentsMouseReleaseEvent(QMouseEvent *e)
+{
     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
@@ -220,15 +220,13 @@ class KOListViewListView : public KListView
  private: 
     void keyPressEvent ( QKeyEvent * ) ;
     void contentsMouseDoubleClickEvent(QMouseEvent *e);
     void contentsMousePressEvent(QMouseEvent *e);
     void contentsMouseReleaseEvent(QMouseEvent *e);
     void contentsMouseMoveEvent(QMouseEvent *e);
-    bool mAllowPopupMenu;
     bool mMouseDown;
-    int mYMousePos;
 };
 
 class KOListView : public KOEventView
 {
     Q_OBJECT
   public:
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 12233ee..9085775 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -511,12 +511,17 @@ void MonthViewCell::startUpdateCell()
         return;
     MonthViewItem *mitem = (MonthViewItem*) firstItem ();
     while ( mitem ) {
         mitem->setBlockRepaint( true );
         mitem = (MonthViewItem *)mitem->next();
     }
+    if ( mAvailItemList.count() > 20 ) {
+        mAvailItemList.setAutoDelete( true );
+        mAvailItemList.clear();
+        mAvailItemList.setAutoDelete( false );
+    }
     /*    
           if ( !isVisible() ){
           return;
           }
     */
     // qDebug("MonthViewCell::updateCell() ");
@@ -814,19 +819,19 @@ void MonthViewCell::updateConfig( bool bigFont ) // = false
     //updateCell(); 
 }
 
 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
                 setVScrollBarMode(QScrollView::Auto);
             if ( ihei *3 > height() )
                 setHScrollBarMode(QScrollView::AlwaysOff);
             else
                 setHScrollBarMode(QScrollView::Auto);