agenda fix

1 files changed, 3 insertions, 3 deletions

diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index d9d1283..1d4d6de 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -590,531 +590,531 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
                     Incidence *incidence = mActionItem->incidence();
                     if ( incidence->isReadOnly() /*|| incidence->doesRecur() */) {
                         mActionItem = 0;
                     } else {
                         startItemAction(viewportPos);
                     }
                 }
             }
         } else { // ---------- viewport()
             mPopupItem = 0;
             mPopupKind = 2;
             selectItem(0);
             mActionItem = 0;   
             if (me->button() == RightButton) {
                 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;
                 mPopupKind = 4;
                 popupMenu();
             } else if (me->button() == LeftButton) {
                 setCursor(arrowCursor);
                 startSelectAction(viewportPos);
             }
         }
         break;
 
     case QEvent::MouseButtonRelease:
         if (me->button() == LeftButton ) {  
             mPopupTimer->stop();
         }
         if (object != viewport()) { 
             if (me->button() == LeftButton && mLeftMouseDown) {
                 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();
                         mActionItem->resetMove();
                         placeSubCells( mActionItem );
                         // emit startDragSignal( mActionItem->incidence() );
                         setCursor( arrowCursor );
                         mActionItem = 0;
                         mActionType = NOP;
                         mItemMoved = 0;
                         mLeftMouseDown = false;
                         return true;
                     }
                     endItemAction();
                 }
             }
             
         } else { // ---------- viewport()
            if (me->button() == LeftButton && mLeftMouseDown ) { //left click
                 endSelectAction( true ); // emit new event signal
             }
         }
         if (me->button() == LeftButton) 
             mLeftMouseDown = false;
        
         break;
 
     case QEvent::MouseMove:
         //qDebug("mm ");
         if (  !mLeftMouseDown )
             return false;
         if ( blockMoving ) {
             int dX, dY; 
             dX = startX - viewportPos.x();
             if ( dX < 0   )
                 dX = -dX;
             dY = viewportPos.y() - startY;
             if ( dY < 0 )
                 dY = -dY;
             //qDebug("%d %d %d ", dX, dY , blockmoveDist  );
             if (  dX > blockmoveDist  || dY > blockmoveDist  ) {
                 blockMoving = false;
             }
         } 
         if ( ! blockMoving  )
             mPopupTimer->stop();
         if (object != viewport()) {
             KOAgendaItem *moveItem = (KOAgendaItem *)object;
             if (!moveItem->incidence()->isReadOnly()  ) {
                 if (!mActionItem)
                     setNoActionCursor(moveItem,viewportPos);
                 else {
                     if ( !blockMoving )
                         performItemAction(viewportPos);
                 }
             }
         } else { // ---------- viewport() 
             mPopupPos =  viewport()->mapToGlobal( me->pos() );
             if ( mActionType == SELECT ) {
                 performSelectAction( viewportPos );
             }
         }
         break;
 
     case QEvent::MouseButtonDblClick:
         mPopupTimer->stop();
         if (object == viewport()) {
             selectItem(0);
             int x,y;
             viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
             int gx,gy;
             contentsToGrid(x,y,gx,gy);
             emit newEventSignal(gx,gy);
         } else {
             KOAgendaItem *doubleClickedItem = (KOAgendaItem *)object;
             selectItem(doubleClickedItem);
             if ( KOPrefs::instance()->mEditOnDoubleClick )
                 emit editIncidenceSignal(doubleClickedItem->incidence());
             else
                 emit showIncidenceSignal(doubleClickedItem->incidence());
         }
         break;
 
     default:
         break;
     }
     return true;
 
 }
 
 void KOAgenda::newItem( int item )
 {
     if ( item == 1 ) { //new event
         newEventSignal(mStartCellX ,mStartCellY  );
     } else
         if ( item == 2 ) { //new event
             newTodoSignal(mStartCellX ,mStartCellY  );
         } else 
             {
                 emit showDateView( item, mStartCellX );
                 // 3Day view
                 // 4Week view
                 // 5Month view
                 // 6Journal view
             }
 }
 void KOAgenda::slotClearSelection()
 {
     if (mSelectionHeight) {
         int selectionX = mSelectionCellX * mGridSpacingX; 
         int top = mSelectionYTop - 2 *mGridSpacingY;
         int hei = mSelectionHeight + 4 *mGridSpacingY;
         clearSelection();
         repaintContents( selectionX, top,
                      mGridSpacingX, hei ,false );
     }
 
 }
 void KOAgenda::startSelectAction(QPoint viewportPos)
 {
    
     emit signalClearSelection();
     slotClearSelection();
 
     mActionType = SELECT;
 
     int x,y;
     viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
     int gx,gy;
     contentsToGrid(x,y,gx,gy);
 
     mStartCellX = gx;
     mStartCellY = gy;
     mCurrentCellX = gx;
     mCurrentCellY = gy;
 
     // Store new selection
     mSelectionCellX = gx;
     mSelectionYTop = gy * mGridSpacingY;
     mSelectionHeight = mGridSpacingY;
   
     // Paint new selection
     repaintContents( mSelectionCellX * mGridSpacingX+1, mSelectionYTop,
                      mGridSpacingX-1, mSelectionHeight );
 }
 
 void KOAgenda::performSelectAction(QPoint viewportPos)
 {
   int x,y;
   viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
   int gx,gy;
   contentsToGrid(x,y,gx,gy);
 
   QPoint clipperPos = clipper()->
                       mapFromGlobal(viewport()->mapToGlobal(viewportPos));
   
   // Scroll if cursor was moved to upper or lower end of agenda.
   if (clipperPos.y() < mScrollBorderWidth) {
     mScrollUpTimer.start(mScrollDelay);
   } else if (visibleHeight() - clipperPos.y() <
              mScrollBorderWidth) {
     mScrollDownTimer.start(mScrollDelay);
   } else {
     mScrollUpTimer.stop();
     mScrollDownTimer.stop();
   }
 
   if ( gy > mCurrentCellY ) {
     mSelectionHeight = ( gy + 1 ) * mGridSpacingY - mSelectionYTop;
 
 
     repaintContents( (KOGlobals::self()->reverseLayout() ?
                      mColumns - 1 - mSelectionCellX : mSelectionCellX) *
                      mGridSpacingX, mSelectionYTop,
                      mGridSpacingX, mSelectionHeight , false);
 
     mCurrentCellY = gy;
   } else if ( gy < mCurrentCellY ) {
     if ( gy >= mStartCellY ) {
       int selectionHeight = mSelectionHeight;
       mSelectionHeight = ( gy + 1 ) * mGridSpacingY - mSelectionYTop;
 
       repaintContents( (KOGlobals::self()->reverseLayout() ?
                        mColumns - 1 - mSelectionCellX : mSelectionCellX) *
                        mGridSpacingX, mSelectionYTop,
                        mGridSpacingX, selectionHeight,false );
     
       mCurrentCellY = gy;
     } else {
     }
   }
 }
 
 void KOAgenda::endSelectAction( bool emitNewEvent )
 {
   mActionType = NOP;
   mScrollUpTimer.stop();
   mScrollDownTimer.stop();
   
   emit newTimeSpanSignal(mStartCellX,mStartCellY,mCurrentCellX,mCurrentCellY);
   if ( emitNewEvent && mStartCellY < mCurrentCellY ) {
       emit newEventSignal(mStartCellX,mStartCellY,mCurrentCellX,mCurrentCellY);
   }
 }
 
 void KOAgenda::startItemAction(QPoint viewportPos)
 {
   int x,y;
   viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
   int gx,gy;
   contentsToGrid(x,y,gx,gy);
 
   mStartCellX = gx;
   mStartCellY = gy;
   mCurrentCellX = gx;
   mCurrentCellY = gy;
+  bool allowResize = ( mActionItem->incidence()->typeID() != todoID );
 
   if (mAllDayMode) {
     int gridDistanceX = (x - gx * mGridSpacingX);
-    if (gridDistanceX < mResizeBorderWidth &&
+    if ( allowResize && gridDistanceX < mResizeBorderWidth &&
         mActionItem->cellX() == mCurrentCellX) {
       mActionType = RESIZELEFT;
       setCursor(sizeHorCursor);
-    } else if ((mGridSpacingX - gridDistanceX) < mResizeBorderWidth &&
+    } else if ( allowResize && (mGridSpacingX - gridDistanceX) < mResizeBorderWidth &&
                mActionItem->cellXWidth() == mCurrentCellX) {
       mActionType = RESIZERIGHT;
       setCursor(sizeHorCursor);
     } else {
       mActionType = MOVE;
       mActionItem->startMove();
       setCursor(sizeAllCursor);
     }
   } else {
     int gridDistanceY = (y - gy * mGridSpacingY);
-    bool allowResize = ( mActionItem->incidence()->typeID() != todoID );
     if (allowResize && gridDistanceY < mResizeBorderWidth &&
         mActionItem->cellYTop() == mCurrentCellY &&
         !mActionItem->firstMultiItem()) {
       mActionType = RESIZETOP;
       setCursor(sizeVerCursor);
     } else if (allowResize &&(mGridSpacingY - gridDistanceY) < mResizeBorderWidth &&
                mActionItem->cellYBottom() == mCurrentCellY &&
                !mActionItem->lastMultiItem())  {
       mActionType = RESIZEBOTTOM;
       setCursor(sizeVerCursor);
     } else {
       mActionType = MOVE;
       mActionItem->startMove();
       setCursor(sizeAllCursor);
     }
   }
 }
 
 void KOAgenda::performItemAction(QPoint viewportPos)
 {
 //  kdDebug() << "viewportPos: " << viewportPos.x() << "," << viewportPos.y() << endl;
 //  QPoint point = viewport()->mapToGlobal(viewportPos);
 //  kdDebug() << "Global: " << point.x() << "," << point.y() << endl;
 //  point = clipper()->mapFromGlobal(point);
 //  kdDebug() << "clipper: " << point.x() << "," << point.y() << endl;
 //  kdDebug() << "visible height: " << visibleHeight() << endl;
   int x,y;
   viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
 //  kdDebug() << "contents: " << x << "," << y << "\n" << endl;
   int gx,gy;
   contentsToGrid(x,y,gx,gy);
   QPoint clipperPos = clipper()->
                       mapFromGlobal(viewport()->mapToGlobal(viewportPos));
 
   // Cursor left active agenda area.
   // This starts a drag.
   if ( /*clipperPos.y() < 0 || clipperPos.y() > visibleHeight() ||*/
        clipperPos.x() < 0 || clipperPos.x() > visibleWidth() ) {
     if ( mActionType == MOVE ) {
       mScrollUpTimer.stop();
       mScrollDownTimer.stop();
       mActionItem->resetMove();
       placeSubCells( mActionItem );
       // emit startDragSignal( mActionItem->incidence() );
       setCursor( arrowCursor );
       mActionItem = 0;
       mActionType = NOP;
       mItemMoved = 0;
       return;
     }
   } else {
     switch ( mActionType ) {
       case MOVE:
         setCursor( sizeAllCursor );
         break;
       case RESIZETOP:
       case RESIZEBOTTOM:
         setCursor( sizeVerCursor );
         break;
       case RESIZELEFT:
       case RESIZERIGHT:
         setCursor( sizeHorCursor );
         break;
       default:
         setCursor( arrowCursor );
     }
   }
 
   // Scroll if item was moved to upper or lower end of agenda.
   if (clipperPos.y() < mScrollBorderWidth) {
     mScrollUpTimer.start(mScrollDelay);
   } else if (visibleHeight() - clipperPos.y() <
              mScrollBorderWidth) {
     mScrollDownTimer.start(mScrollDelay);
   } else {
     mScrollUpTimer.stop();
     mScrollDownTimer.stop();
   }
 
   // Move or resize item if necessary
   if (mCurrentCellX != gx || mCurrentCellY != gy) {
     mItemMoved = true;
     mActionItem->raise();
     if (mActionType == MOVE) {
       // Move all items belonging to a multi item
       KOAgendaItem *moveItem = mActionItem->firstMultiItem();
       bool isMultiItem = (moveItem || mActionItem->lastMultiItem());
       if (!moveItem) moveItem = mActionItem;
       while (moveItem) {
         int dy;
         if (isMultiItem) dy = 0;
         else dy = gy - mCurrentCellY;
         moveItem->moveRelative(gx - mCurrentCellX,dy);
         int x,y;
         gridToContents(moveItem->cellX(),moveItem->cellYTop(),x,y);
         int diff = moveItem->resizeMe(mGridSpacingX, mGridSpacingX* moveItem->cellWidth(),
                          mGridSpacingY * moveItem->cellHeight());
         moveItem->raise();
         moveChild(moveItem,x+diff,y);
         moveItem = moveItem->nextMultiItem();
       }
     } else if (mActionType == RESIZETOP) {
       if (mCurrentCellY <= mActionItem->cellYBottom()) {
         mActionItem->expandTop(gy - mCurrentCellY);
         mActionItem->resize(mActionItem->width(),
                             mGridSpacingY * mActionItem->cellHeight());
         int x,y;
         gridToContents(mCurrentCellX,mActionItem->cellYTop(),x,y);
         //moveChild(mActionItem,childX(mActionItem),y);
         QScrollView::moveChild( mActionItem,childX(mActionItem),y );
       }
     } else if (mActionType == RESIZEBOTTOM) {
       if (mCurrentCellY >= mActionItem->cellYTop()) {
         mActionItem->expandBottom(gy - mCurrentCellY);
         mActionItem->resize(mActionItem->width(),
                             mGridSpacingY * mActionItem->cellHeight());
       }
     } else if (mActionType == RESIZELEFT) {
        if (mCurrentCellX <= mActionItem->cellXWidth()) {
          mActionItem->expandLeft(gx - mCurrentCellX);
          int diff =  mActionItem->resizeMe(mGridSpacingX ,
                                            mGridSpacingX * mActionItem->cellWidth(),
                                            mActionItem->height());
         int x,y;
         gridToContents(mActionItem->cellX(),mActionItem->cellYTop(),x,y);
         moveChild(mActionItem,x+diff,childY(mActionItem));
        }
     } else if (mActionType == RESIZERIGHT) {
        if (mCurrentCellX >= mActionItem->cellX()) {
          mActionItem->expandRight(gx - mCurrentCellX);
          mActionItem->resizeMe(mGridSpacingX, mGridSpacingX * mActionItem->cellWidth(),
                              mActionItem->height());
        }
     }
     mCurrentCellX = gx;
     mCurrentCellY = gy;
   }
 }
 
 void KOAgenda::endItemAction()
 {
  
     if ( mItemMoved ) {
         KOAgendaItem *placeItem = mActionItem->firstMultiItem();
         if ( !placeItem ) {
             placeItem = mActionItem;      
         }
         if ( placeItem->incidence()->doesRecur() ) {
             Incidence* oldInc =  placeItem->incidence();
             placeItem->recreateIncidence();
             emit addToCalSignal(placeItem->incidence(), oldInc );
         }
         int type = mActionType;
         if ( mAllDayMode )
             type = -1;
         KOAgendaItem *modifiedItem = placeItem;
         //emit itemModified( placeItem, mActionType /*KOGlobals::EVENTEDITED */);
         QPtrList<KOAgendaItem> oldconflictItems ;//= placeItem->conflictItems();
         KOAgendaItem *item;
   
         if ( placeItem->incidence()->typeID() == todoID ) {
             mSelectedItem = 0;
             //qDebug("todo %d %d %d ", mCurrentCellX, modifiedItem->cellX() ,modifiedItem->cellXWidth());
             modifiedItem->mLastMoveXPos = mCurrentCellX;
             emit itemModified( modifiedItem, mActionType ); 
         }  
         else {  
 
 
             globalFlagBlockAgendaItemPaint = 1;
             for ( item=oldconflictItems.first(); item != 0;
                   item=oldconflictItems.next() ) {
                 placeSubCells(item);    
             } 
             while ( placeItem ) { 
                 //qDebug("placeItem  %s ", placeItem->incidence()->summary().latin1());  
                 oldconflictItems = placeItem->conflictItems();
                 for ( item=oldconflictItems.first(); item != 0;
                       item=oldconflictItems.next() ) {
                     placeSubCells(item);    
                 } 
                 placeSubCells( placeItem );
                 placeItem = placeItem->nextMultiItem();
             } 
             globalFlagBlockAgendaItemPaint = 0;
             for ( item=oldconflictItems.first(); item != 0;
                   item=oldconflictItems.next() ) {
                 globalFlagBlockAgendaItemUpdate = 0;
                 item->repaintMe();
                 globalFlagBlockAgendaItemUpdate = 1;
                 item->repaint( false );    
             } 
             placeItem = modifiedItem;
         
             while ( placeItem ) { 
                 //qDebug("placeItem  %s ", placeItem->incidence()->summary().latin1());  
                 globalFlagBlockAgendaItemUpdate = 0;
                 placeItem->repaintMe();
                 globalFlagBlockAgendaItemUpdate = 1;
                 placeItem->repaint(false);
                 placeItem = placeItem->nextMultiItem();
             }  
             emit itemModified( modifiedItem, mActionType ); 
          
 
             placeItem = modifiedItem;
             while ( placeItem ) {
                 oldconflictItems = placeItem->conflictItems();
                 for ( item=oldconflictItems.first(); item != 0;
                       item=oldconflictItems.next() ) {
                     placeSubCells(item);    
                 } 
                 placeSubCells( placeItem );
                 placeItem = placeItem->nextMultiItem();
 
             } 
             placeItem = modifiedItem;
             while ( placeItem ) {
                 oldconflictItems = placeItem->conflictItems();
                 for ( item=oldconflictItems.first(); item != 0;
                       item=oldconflictItems.next() ) {
                     globalFlagBlockAgendaItemUpdate = 0;
                     item->repaintMe();
                     globalFlagBlockAgendaItemUpdate = 1;
                     item->repaint(false);    
                 }
                 placeItem = placeItem->nextMultiItem();
             } 
             /*
 
             oldconflictItems = modifiedItem->conflictItems();
             for ( item=oldconflictItems.first(); item != 0;
             item=oldconflictItems.next() ) {
             globalFlagBlockAgendaItemUpdate = 0;
             item->paintMe(false);
             globalFlagBlockAgendaItemUpdate = 1;
             item->repaint(false);    
             }
             */
 
  
         }
      
     }
     if ( mActionItem )
         emit incidenceSelected( mActionItem->incidence() );
     mScrollUpTimer.stop();
     mScrollDownTimer.stop();
     setCursor( arrowCursor );
     mActionItem = 0;
     mActionType = NOP;
     mItemMoved = 0;
 
 }
 
 void KOAgenda::setNoActionCursor(KOAgendaItem *moveItem,QPoint viewportPos)