fixxx

4 files changed, 44 insertions, 17 deletions

diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index c339b57..662576f 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -55,17 +55,17 @@
 #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);
@@ -325,16 +325,17 @@ void KOAgenda::init()
 
 void KOAgenda::shrinkPixmap()
 {
     mPaintPixmap.resize( 20,20);
     mInvalidPixmap = true;
 }
 void KOAgenda::slotContentMove(int,int)
 {
+    emit sendPing(); 
     if ( mActionType == NOP )
         slotClearSelection(); 
     if ( mSelectedItem && !mActionItem ) {
         deselectItem();
         emit incidenceSelected( 0 );
     }
 }
 void KOAgenda::clear()
@@ -433,16 +434,25 @@ void KOAgenda::categoryChanged(Incidence * inc)
         if ( item->incidence() == inc ) {
             item->initColor ();
             item->updateItem();
         }
     }
 }
 bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
 {
+
+    if ( mInvalidPixmap ) {
+        mInvalidPixmap = false;
+        qDebug("InvalidPixmap ");
+        computeSizes();
+        emit updateViewSignal();
+        return true;
+    } 
+    emit sendPing(); 
     static int startX = 0;
     static int startY = 0;
     int blockmoveDist = ( QApplication::desktop()->width() < 480 ? 7 : 9 );
     static bool blockMoving = true;
 
     //qDebug("KOAgenda::eventFilter_mous ");
     if ( object == mNewItemPopup ) {
         //qDebug("mNewItemPopup ");
@@ -1262,26 +1272,30 @@ void KOAgenda::placeSubCells(KOAgendaItem *placeItem)
 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() ));
+        computeSizes();
+        emit updateViewSignal();
         return;
     }
     if ( ! mAllDayMode ) {
         // currently not working for
    
         //qDebug("KOAgenda::drawContents ");
-        if (  mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() )
-            ;//drawContentsToPainter();
-   
+#if 0
+        if (  mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() ) {
+            qDebug("WAU ");
+            drawContentsToPainter();
+        }
+#endif
         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) ;
@@ -1315,20 +1329,23 @@ void KOAgenda::drawContents(QPainter* p, int cx, int cy, int cw, int ch)
                     hei -= 5;
                     bitBlt ( pd, vx+1, vy+offset, &mHighlightPixmap, 0, 0, mGridSpacingX-1, p_hei ,CopyROP); 
                     offset += 5;
                 }
             }     
         } 
         p->begin( pd );
     } else {
- 
-        if (  mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() )
-            ;//drawContentsToPainter();
-   
+#if 0
+        qDebug("mCurPixWid  %d %d ",mCurPixWid, contentsWidth() );
+        if (  mCurPixWid != contentsWidth() || mCurPixHei != contentsHeight() ) {
+            qDebug("WAUWAU ");
+            drawContentsToPainter();
+        }
+#endif
         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 ",  cx, cy, cw,ch) ;
diff --git a/korganizer/koagenda.h b/korganizer/koagenda.h
index 5d813b2..0e3aed8 100644
--- a/korganizer/koagenda.h
+++ b/korganizer/koagenda.h
@@ -70,17 +70,17 @@ class KOAgenda : public QScrollView
     enum MouseActionType { NOP, MOVE, SELECT,
                            RESIZETOP, RESIZEBOTTOM, RESIZELEFT, RESIZERIGHT };
 
     KOAgenda ( int columns, int rows, int columnSize, QWidget * parent=0,
                const char * name=0, WFlags f=0 );
     KOAgenda ( int columns, QWidget * parent=0,
                const char * name=0, WFlags f=0 );
     virtual ~KOAgenda();
-    static bool mInvalidPixmap;
+    bool mInvalidPixmap;
 
     Incidence *selectedIncidence() const;
     QDate selectedIncidenceDate() const;
 
     virtual bool eventFilter ( QObject *, QEvent * );
 
     void contentsToGrid (int x, int y, int& gx, int& gy);
     void gridToContents (int gx, int gy, int& x, int& y);
@@ -169,16 +169,17 @@ class KOAgenda : public QScrollView
 
     void lowerYChanged(int);
     void upperYChanged(int);
 
     void startDragSignal(Incidence *);
     void addToCalSignal(Incidence *, Incidence *);
     void resizedSignal();
     void updateViewSignal();
+    void sendPing();
 
   protected:
     KOEventPopupMenu * mAllAgendaPopup;
     QPainter mPixPainter;
     QPixmap mPaintPixmap;
     QPixmap mHighlightPixmap;
     void drawContents(QPainter *p,int cx, int cy, int cw, int ch);
     virtual void resizeEvent ( QResizeEvent * );
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 488d9d4..1b21a71 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -71,17 +71,17 @@
 //extern bool globalFlagBlockPainting;
 extern int globalFlagBlockAgenda;
 extern int globalFlagBlockStartup;
 extern int globalFlagBlockAgendaItemPaint;
 extern int globalFlagBlockAgendaItemUpdate;
 extern int globalFlagBlockLabel;
 using namespace KOrg;
 
-#define IDLETIMEOUT 3
+#define IDLETIMEOUT 15
 
 TimeLabels::TimeLabels(int rows,QWidget *parent,const char *name,WFlags f) :
     QScrollView(parent,name,f)
 {
     myPix.resize( 1, 1 );
     mRows = rows;
 
     mRedrawNeeded = true;
@@ -570,31 +570,40 @@ KOAgendaView::KOAgendaView(Calendar *cal,QWidget *parent,const char *name) :
              SLOT( addToCalSlot(Incidence * , Incidence *) ) );  
     // connect( mAgenda, SIGNAL( cloneIncidenceSignal(Incidence *) ), SIGNAL( cloneIncidenceSignal(Incidence *) ) );
     //connect( mAllDayAgenda, SIGNAL( cloneIncidenceSignal(Incidence *) ), SIGNAL( cloneIncidenceSignal(Incidence *) ) );
 
     connect( mAllDayAgenda, SIGNAL( signalClearSelection() ),mAgenda, SLOT( slotClearSelection()) ); 
     connect( mAgenda, SIGNAL( signalClearSelection() ),mAllDayAgenda, SLOT( slotClearSelection()) );   
     connect( mAllDayAgenda, SIGNAL( updateViewSignal() ),this, SLOT( fillAgenda()) ); 
     connect( mAgenda, SIGNAL( updateViewSignal() ), this, SLOT( fillAgenda()) );   
- 
+  
+    connect( mAllDayAgenda, SIGNAL( sendPing() ),this, SLOT( startIdleTimeout()) ); 
+    connect( mAgenda, SIGNAL( sendPing() ), this, SLOT( startIdleTimeout()) );   
+
+
     mIdleTimer = new QTimer ( this );;
     connect(mIdleTimer,SIGNAL(timeout()),SLOT(slotIdleTimeout()));
 }
+void KOAgendaView::startIdleTimeout()
+{
+    mIdleStart = QDateTime::currentDateTime();
+    mIdleTimer->start( IDLETIMEOUT * 1000 );
+}
 void KOAgendaView::slotIdleTimeout()
 {
     qDebug("SECS TO %d ",mIdleStart.secsTo( QDateTime::currentDateTime()  ) );
     int secsfromstart = mIdleStart.secsTo( QDateTime::currentDateTime()  );
     mIdleTimer->stop();
     bool isActice = topLevelWidget()->isActiveWindow();
-    qDebug("KO: Active Window %d ",  isActice);
+    qDebug("KO: Active Window %d %d",  isActice, isVisible());
     // we do nothing if we wake up from a suspend
-    if ( secsfromstart > IDLETIMEOUT + 50 && isActice ) {
+    if ( secsfromstart > IDLETIMEOUT + 30 && isActice ) {
         qDebug("KO: Wakeup from suspend ");
-        mIdleTimer->start( IDLETIMEOUT * 1000 );
+        startIdleTimeout();
         return;
     }
     qDebug("KO: Downsizing Pixmaps ");
     mAgenda->shrinkPixmap();
     mAllDayAgenda->shrinkPixmap();
     KOAgendaItem::paintPix()->resize( 20,20);
     KOAgendaItem::paintPixAllday()->resize( 20,20);
     
@@ -1316,18 +1325,17 @@ void KOAgendaView::fillAgenda()
         else if ( KOPrefs::instance()->mCenterOnCurrentTime )
             setStartHour( QTime::currentTime ().hour() );
     }
     qApp->processEvents(); 
     globalFlagBlockAgenda = 0; 
     mAllDayAgenda->drawContentsToPainter();
     mAgenda->drawContentsToPainter();
     repaintAgenda();
-    mIdleTimer->start ( IDLETIMEOUT *1000 );
-    mIdleStart = QDateTime::currentDateTime();
+    startIdleTimeout();
     onlyOne = false;
 }
 void KOAgendaView::repaintAgenda()
 {
     mAgenda->viewport()->repaint( false );
     mAllDayAgenda->viewport()->repaint( false );
     mAgenda->finishUpdate();
     mAllDayAgenda->finishUpdate();
diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h
index effd7a3..4b7ef5b 100644
--- a/korganizer/koagendaview.h
+++ b/korganizer/koagendaview.h
@@ -206,16 +206,17 @@ class KOAgendaView : public KOEventView {
 
     void setContentsPos(int y);
 
     void scrollOneHourUp();
     void scrollOneHourDown();
     void addToCalSlot(Incidence *, Incidence *);
     void slotShowDateView( int, int );
     void fillAgenda();
+    void startIdleTimeout();
 
   signals:
     void showDateView( int, QDate );
     void newTodoSignal( QDateTime ,bool );
     void toggleExpand();
     void selectWeekNum( int );
     void todoMoved( Todo *, int );
     void incidenceChanged(Incidence * , int );