summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/kodaymatrix.cpp18
-rw-r--r--korganizer/kotodoviewitem.cpp4
2 files changed, 13 insertions, 9 deletions
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 9812321..ca896b5 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -209,21 +209,21 @@ void KODayMatrix::recalculateToday()
209void KODayMatrix::updateView() 209void KODayMatrix::updateView()
210{ 210{
211 updateView(startdate); 211 updateView(startdate);
212} 212}
213void KODayMatrix::repaintViewTimed() 213void KODayMatrix::repaintViewTimed()
214{ 214{
215 //qDebug("KODayMatrix::repaintViewTimed "); 215 qDebug("KODayMatrix::repaintViewTimed ");
216 mRepaintTimer->stop(); 216 mRepaintTimer->stop();
217 repaint(false); 217 repaint(false);
218} 218}
219void KODayMatrix::updateViewTimed() 219void KODayMatrix::updateViewTimed()
220{ 220{
221 221
222 mUpdateTimer->stop(); 222 mUpdateTimer->stop();
223 //qDebug("KODayMatrix::updateView(QDate actdate) %d", ++iii ); 223 qDebug("KODayMatrix::updateView(QDate actdate)");
224 for(int i = 0; i < NUMDAYS; i++) { 224 for(int i = 0; i < NUMDAYS; i++) {
225 225
226 // if events are set for the day then remember to draw it bold 226 // if events are set for the day then remember to draw it bold
227 QPtrList<Event> eventlist = mCalendar->events(days[i]); 227 QPtrList<Event> eventlist = mCalendar->events(days[i]);
228 Event *event; 228 Event *event;
229 int numEvents = eventlist.count(); 229 int numEvents = eventlist.count();
@@ -285,22 +285,22 @@ void KODayMatrix::updateView(QDate actdate)
285 } 285 }
286 } 286 }
287 startdate = actdate; 287 startdate = actdate;
288 mDayChanged = true; 288 mDayChanged = true;
289 recalculateToday(); 289 recalculateToday();
290 } 290 }
291 //qDebug("restart Timer %d vis: %d", mDayChanged, isVisible() ); 291 qDebug("restart Timer %d vis: %d", mDayChanged, isVisible() );
292 if ( !isVisible() ) { 292 if ( !isVisible() ) {
293 mPendingUpdateBeforeRepaint = true; 293 mPendingUpdateBeforeRepaint = true;
294 } else { 294 } else {
295#ifdef DESKTOP_VERSION 295#ifdef DESKTOP_VERSION
296 mRepaintTimer->start( 250 ); 296 //mRepaintTimer->start( 250 );
297 mUpdateTimer->start( 2000 ); 297 mUpdateTimer->start( 250 );
298#else 298#else
299 mRepaintTimer->start( 350 ); 299 mRepaintTimer->start( 350 );
300 mUpdateTimer->start( 4000 ); 300 mUpdateTimer->start( 2000 );
301#endif 301#endif
302 } 302 }
303} 303}
304 304
305const QDate& KODayMatrix::getDate(int offset) 305const QDate& KODayMatrix::getDate(int offset)
306{ 306{
@@ -486,14 +486,14 @@ void KODayMatrix::dropEvent(QDropEvent *e)
486// ---------------------------------------------------------------------------- 486// ----------------------------------------------------------------------------
487 487
488void KODayMatrix::paintEvent(QPaintEvent * pevent) 488void KODayMatrix::paintEvent(QPaintEvent * pevent)
489{ 489{
490//kdDebug() << "KODayMatrix::paintEvent() BEGIN" << endl; 490//kdDebug() << "KODayMatrix::paintEvent() BEGIN" << endl;
491 if ( mPendingUpdateBeforeRepaint ) { 491 if ( mPendingUpdateBeforeRepaint ) {
492 updateViewTimed(); 492 updateViewTimed();
493 mPendingUpdateBeforeRepaint = false; 493 mPendingUpdateBeforeRepaint = false;
494 } 494 }
495 QPainter p(this); 495 QPainter p(this);
496 496
497 QRect sz = frameRect(); 497 QRect sz = frameRect();
498 int dheight = daysize.height(); 498 int dheight = daysize.height();
499 int dwidth = daysize.width(); 499 int dwidth = daysize.width();
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index 1edddac..6bdee18 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -205,12 +205,16 @@ void KOTodoViewItem::stateChange(bool state)
205 if ( m_init ) return; 205 if ( m_init ) return;
206 if (isOn()!=state) { 206 if (isOn()!=state) {
207 setOn(state); 207 setOn(state);
208 //qDebug("SETON "); 208 //qDebug("SETON ");
209 return; 209 return;
210 } 210 }
211 if ( mTodo->isCompleted() == state ) {
212 //qDebug("STATECHANGE:nothing to do ");
213 return;
214 }
211 QString keyd = "=="; 215 QString keyd = "==";
212 QString keyt = "=="; 216 QString keyt = "==";
213 //qDebug("KOTodoViewItem::stateChange %s ", text(0).latin1()); 217 //qDebug("KOTodoViewItem::stateChange %s ", text(0).latin1());
214 mTodo->setCompleted(state); 218 mTodo->setCompleted(state);
215 if (state) mTodo->setCompleted(QDateTime::currentDateTime()); 219 if (state) mTodo->setCompleted(QDateTime::currentDateTime());
216 220