fixesss

1 files changed, 28 insertions, 2 deletions

diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 0280c74..c339b57 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -39,48 +39,49 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kglobal.h>
 
 #include "koagendaitem.h"
 #include "koprefs.h"
 #include "koglobals.h"
 
 #include "koagenda.h"
 
 #include <libkcal/event.h>
 #include <libkcal/todo.h>
 
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #endif
 
 //extern bool globalFlagBlockPainting;
 extern int globalFlagBlockAgenda;
 extern int globalFlagBlockAgendaItemPaint;
 extern int globalFlagBlockAgendaItemUpdate;
 extern int globalFlagBlockStartup;
 
+bool KOAgenda::mInvalidPixmap = false;
 ////////////////////////////////////////////////////////////////////////////
 MarcusBains::MarcusBains(KOAgenda *_agenda,const char *name)
     : QFrame(_agenda->viewport(),name), agenda(_agenda)
 {
     setLineWidth(0);
     setMargin(0);
     setBackgroundColor(Qt::red);
     minutes = new QTimer(this);
     connect(minutes, SIGNAL(timeout()), this, SLOT(updateLoc()));
     minutes->start(0, true);
     mTimeBox = new QLabel(this);
     mTimeBox->setAlignment(Qt::AlignRight | Qt::AlignBottom);
     QPalette pal = mTimeBox->palette();
     pal.setColor(QColorGroup::Foreground, Qt::red);
     mTimeBox->setPalette(pal);
     //mTimeBox->setAutoMask(true);
 
     agenda->addChild(mTimeBox);
 
     oldToday = -1;
 }
 
 MarcusBains::~MarcusBains()
 {
@@ -157,48 +158,49 @@ void MarcusBains::updateLocation(bool recalculate)
 }
 
 
 ////////////////////////////////////////////////////////////////////////////
 
 
 /*
   Create an agenda widget with rows rows and columns columns.
 */
 KOAgenda::KOAgenda(int columns,int rows,int rowSize,QWidget *parent,
                    const char *name,WFlags f) :
   QScrollView(parent,name,f)
 {
    
     mAllAgendaPopup = 0;
   mColumns = columns;
   mRows = rows;
   mGridSpacingY = rowSize;
   mAllDayMode = false; 
 #ifndef DESKTOP_VERSION
   //QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold );
 #endif
   mHolidayMask = 0;
   init();
+  connect ( this, SIGNAL (contentsMoving ( int , int )   ), this, SLOT ( slotContentMove(int,int)) );
 }
 
 /*
   Create an agenda widget with columns columns and one row. This is used for
   all-day events.
 */
 KOAgenda::KOAgenda(int columns,QWidget *parent,const char *name,WFlags f) :
   QScrollView(parent,name,f)
 {
     mAllAgendaPopup = 0;
   blockResize = false;
   mColumns = columns;
   mRows = 1;
   //qDebug("aaaaaaaaaaaaaaaaaaldays %d ", KOPrefs::instance()->mAllDaySize);
   mGridSpacingY = KOPrefs::instance()->mAllDaySize;
   mAllDayMode = true;
 #ifndef DESKTOP_VERSION
   //QPEApplication::setStylusOperation( viewport(), QPEApplication::RightOnHold );
 #endif
   mHolidayMask = 0;
   init();
 }
 
 
@@ -296,50 +298,66 @@ void KOAgenda::init()
   // controlled in a way that the contents horizontally always fits. Then it is
   // not necessary to turn off the scrollbar.
   setHScrollBarMode(AlwaysOff);
   if ( ! mAllDayMode ) 
       setVScrollBarMode(AlwaysOn);
   else
       setVScrollBarMode(AlwaysOff);
       
   setStartHour(KOPrefs::instance()->mDayBegins);
 
   calculateWorkingHours();
 
   connect(verticalScrollBar(),SIGNAL(valueChanged(int)),
           SLOT(checkScrollBoundaries(int)));
 
   // Create the Marcus Bains line.
   if(mAllDayMode)
       mMarcusBains = 0;
   else {
       mMarcusBains = new MarcusBains(this);
       addChild(mMarcusBains);
   }  
   mPopupKind = 0;
   mPopupItem =  0; 
+  mInvalidPixmap = false;
+  
 }
 
+void KOAgenda::shrinkPixmap()
+{
+    mPaintPixmap.resize( 20,20);
+    mInvalidPixmap = true;
+}
+void KOAgenda::slotContentMove(int,int)
+{
+    if ( mActionType == NOP )
+        slotClearSelection(); 
+    if ( mSelectedItem && !mActionItem ) {
+        deselectItem();
+        emit incidenceSelected( 0 );
+    }
+}
 void KOAgenda::clear()
 {
   KOAgendaItem *item;
   for ( item=mItems.first(); item != 0; item=mItems.next() ) {
     mUnusedItems.append( item );
     //item->hide();
   }
   mItems.clear();
   mSelectedItem = 0;
   clearSelection();
 }
 
 void KOAgenda::clearSelection()
 {
   mSelectionCellX = 0;
   mSelectionYTop = 0;
   mSelectionHeight = 0;
 }
 
 void KOAgenda::marcus_bains()
 {
     if(mMarcusBains) mMarcusBains->updateLocation(true);
 }
 
@@ -901,48 +919,49 @@ void KOAgenda::performItemAction(QPoint viewportPos)
     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);
         moveItem->resize(mGridSpacingX * moveItem->cellWidth(),
                          mGridSpacingY * moveItem->cellHeight());
+        moveItem->raise();
         moveChild(moveItem,x,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);
          mActionItem->resize(mGridSpacingX * mActionItem->cellWidth(),
                              mActionItem->height());
@@ -1223,48 +1242,55 @@ void KOAgenda::placeSubCells(KOAgendaItem *placeItem)
             }
         }
     } else {
         placeItem->setSubCell(0);
         placeItem->setSubCells(1);
         if (mAllDayMode) placeItem->resize(placeItem->width(),mGridSpacingY);
         else placeItem->resize(mGridSpacingX,placeItem->height());
         int x,y;
         gridToContents(placeItem->cellX(),placeItem->cellYTop(),x,y);
         moveChild(placeItem,x,y);
     }
     placeItem->setConflictItems(conflictItems);
   //   for ( item=conflictItems.first(); item != 0;
 //           item=conflictItems.next() ) {
 //         //item->updateItem();
 //         //qDebug("xxx item->updateItem() %s %d %d", item->incidence()->summary().latin1(),item->x(), item->y() );  
 //     }
 //     placeItem->updateItem();
 } 
 
 void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch)
 {
     if ( globalFlagBlockAgenda )
         return;
+
+    if ( mInvalidPixmap ) {
+        mInvalidPixmap = false;
+        qDebug("InvalidPixmap ");
+        QTimer::singleShot( 0, this, SIGNAL( updateViewSignal() ));
+        return;
+    }
     if ( ! mAllDayMode ) {
         // currently not working for
    
         //qDebug("KOAgenda::drawContents ");
         if (  mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() )
             ;//drawContentsToPainter();
    
         QPaintDevice* pd = p->device();
         p->end();
         int vx, vy; 
         int selectionX = KOGlobals::self()->reverseLayout() ?
             (mColumns - 1 - mSelectionCellX) * mGridSpacingX : 
             mSelectionCellX * mGridSpacingX;
         contentsToViewport ( cx, cy, vx,vy); 
         //qDebug("  %d %d %d %d %d",  cx, cy, cw,ch,mGridSpacingX-1) ;
 
         if ( !(selectionX ==  cx &&  cy == mSelectionYTop  &&  cw ==mGridSpacingX && ch == mSelectionHeight ) ) {
             if ( mGridSpacingX == cw && mSelectionHeight > 0  &&  ( ( cx + cw ) >= selectionX && cx <= ( selectionX + mGridSpacingX ) &&
                                                                     ( cy + ch ) >= mSelectionYTop && cy <= ( mSelectionYTop + mSelectionHeight ) ) ) {
             
                 int vxSel, vySel;
                 contentsToViewport ( selectionX, mSelectionYTop, vxSel,vySel); 
                 int off = mSelectionHeight;
                 if ( vySel < 0 )
@@ -1895,55 +1921,55 @@ void KOAgenda::computeSizes()
         if (height() >   mGridSpacingY * mRows + 1 ) {
             KOPrefs::instance()->mHourSize = ((height())/mRows)+1;
             mGridSpacingY = KOPrefs::instance()->mHourSize ;
             resizeContents( mGridSpacingX * mColumns + 1 , mGridSpacingY * mRows + 1 );
             emit resizedSignal();
         } else
             resizeContents( mGridSpacingX * mColumns + 1 , mGridSpacingY * mRows + 1 );
         KOAgendaItem *item;
         int subCellWidth;
     
         for ( item=mItems.first(); item != 0; item=mItems.next() ) {
             subCellWidth = mGridSpacingX / item->subCells();
             item->resize(subCellWidth,item->height());
             moveChild(item,(KOGlobals::self()->reverseLayout() ?
                             (mColumns - 1 - item->cellX()) * mGridSpacingX :
                             item->cellX() * mGridSpacingX) +
                       item->subCell() * subCellWidth,childY(item));
         }
     }
     int cw = contentsWidth();
     int ch = contentsHeight();
     if ( mAllDayMode ) { 
         QPixmap* paintPixAll = KOAgendaItem::paintPixAllday();
         if ( (paintPixAll->width() < cw || paintPixAll->height() <  ch) && cw > 0  && ch > 0  ) {
-            //qDebug("paintPixAll->resize ");
+            qDebug("paintPixAll->resize ");
             paintPixAll->resize( cw, ch ); 
         }
     } else {
         QPixmap* paintPix = KOAgendaItem::paintPix();
         if ( paintPix->width() < cw || paintPix->height() <  ch ) {
-            //qDebug("paintPix->resize ");
+            qDebug("paintPix->resize ");
             paintPix->resize( cw , ch );
         }
     }
 
     checkScrollBoundaries();
     marcus_bains();
     drawContentsToPainter();
     viewport()->repaint(false);
 }
 
 void KOAgenda::scrollUp()
 {
     scrollBy(0,-mScrollOffset);
 }
 
 
 void KOAgenda::scrollDown()
 {
     scrollBy(0,mScrollOffset);
 }
 
 void KOAgenda::popupAlarm()
 {
     if (!mClickedItem) {