-rw-r--r-- | korganizer/koagendaitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index df7d612..6a312b3 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp | |||
@@ -272,97 +272,97 @@ void KOAgendaItem::select(bool selected) | |||
272 | } | 272 | } |
273 | } | 273 | } |
274 | globalFlagBlockAgendaItemUpdate = 0; | 274 | globalFlagBlockAgendaItemUpdate = 0; |
275 | paintMe( selected ); | 275 | paintMe( selected ); |
276 | globalFlagBlockAgendaItemUpdate = 1; | 276 | globalFlagBlockAgendaItemUpdate = 1; |
277 | repaint( false ); | 277 | repaint( false ); |
278 | } | 278 | } |
279 | 279 | ||
280 | 280 | ||
281 | /* | 281 | /* |
282 | The eventFilter has to filter the mouse events of the agenda item childs. The | 282 | The eventFilter has to filter the mouse events of the agenda item childs. The |
283 | events are fed into the event handling method of KOAgendaItem. This allows the | 283 | events are fed into the event handling method of KOAgendaItem. This allows the |
284 | KOAgenda to handle the KOAgendaItems by using an eventFilter. | 284 | KOAgenda to handle the KOAgendaItems by using an eventFilter. |
285 | */ | 285 | */ |
286 | bool KOAgendaItem::eventFilter ( QObject *object, QEvent *e ) | 286 | bool KOAgendaItem::eventFilter ( QObject *object, QEvent *e ) |
287 | { | 287 | { |
288 | if (e->type() == QEvent::MouseButtonPress || | 288 | if (e->type() == QEvent::MouseButtonPress || |
289 | e->type() == QEvent::MouseButtonDblClick || | 289 | e->type() == QEvent::MouseButtonDblClick || |
290 | e->type() == QEvent::MouseButtonRelease || | 290 | e->type() == QEvent::MouseButtonRelease || |
291 | e->type() == QEvent::MouseMove) { | 291 | e->type() == QEvent::MouseMove) { |
292 | QMouseEvent *me = (QMouseEvent *)e; | 292 | QMouseEvent *me = (QMouseEvent *)e; |
293 | QPoint itemPos = this->mapFromGlobal(((QWidget *)object)-> | 293 | QPoint itemPos = this->mapFromGlobal(((QWidget *)object)-> |
294 | mapToGlobal(me->pos())); | 294 | mapToGlobal(me->pos())); |
295 | QMouseEvent returnEvent (e->type(),itemPos,me->button(),me->state()); | 295 | QMouseEvent returnEvent (e->type(),itemPos,me->button(),me->state()); |
296 | return event(&returnEvent); | 296 | return event(&returnEvent); |
297 | } else { | 297 | } else { |
298 | return false; | 298 | return false; |
299 | } | 299 | } |
300 | } | 300 | } |
301 | void KOAgendaItem::repaintMe( ) | 301 | void KOAgendaItem::repaintMe( ) |
302 | { | 302 | { |
303 | paintMe ( mSelected ); | 303 | paintMe ( mSelected ); |
304 | } | 304 | } |
305 | void KOAgendaItem::paintMe( bool selected, QPainter* paint ) | 305 | void KOAgendaItem::paintMe( bool selected, QPainter* paint ) |
306 | { | 306 | { |
307 | if ( globalFlagBlockAgendaItemUpdate && ! selected) | 307 | if ( globalFlagBlockAgendaItemUpdate && ! selected) |
308 | return; | 308 | return; |
309 | QPainter pa; | 309 | QPainter pa; |
310 | 310 | ||
311 | if ( mSelected ) { | 311 | if ( mSelected ) { |
312 | pa.begin( paintPixSel() ); | 312 | pa.begin( paintPixSel() ); |
313 | } else { | 313 | } else { |
314 | if ( mAllDay ) | 314 | if ( mAllDay ) |
315 | pa.begin( paintPixAllday() ); | 315 | pa.begin( paintPixAllday() ); |
316 | else | 316 | else |
317 | pa.begin( paintPix() ); | 317 | pa.begin( paintPix() ); |
318 | } | 318 | } |
319 | int x, yy, w, h; | 319 | int x, yy, w, h; |
320 | float nfh; | 320 | float nfh = 7.0; |
321 | x = pos().x(); w = width(); h = height (); | 321 | x = pos().x(); w = width(); h = height (); |
322 | if ( mAllDay ) | 322 | if ( mAllDay ) |
323 | yy = y(); | 323 | yy = y(); |
324 | else | 324 | else |
325 | yy = mCellYTop * ( height() / cellHeight() ); | 325 | yy = mCellYTop * ( height() / cellHeight() ); |
326 | xPaintCoord= x; | 326 | xPaintCoord= x; |
327 | yPaintCoord = yy; | 327 | yPaintCoord = yy; |
328 | wPaintCoord = width(); | 328 | wPaintCoord = width(); |
329 | hPaintCoord = height(); | 329 | hPaintCoord = height(); |
330 | //qDebug("paintMe %s %d %d %d %d",incidence()->summary().latin1(), x, yy, width(), height()); | 330 | //qDebug("paintMe %s %d %d %d %d",incidence()->summary().latin1(), x, yy, width(), height()); |
331 | if ( paint == 0 ) | 331 | if ( paint == 0 ) |
332 | paint = &pa; | 332 | paint = &pa; |
333 | bool horLayout = ( w < h ); | 333 | bool horLayout = ( w < h ); |
334 | int maxhei = mFontPixelSize+4; | 334 | int maxhei = mFontPixelSize+4; |
335 | if ( horLayout ) | 335 | if ( horLayout ) |
336 | maxhei += AGENDA_ICON_SIZE -4; | 336 | maxhei += AGENDA_ICON_SIZE -4; |
337 | bool small = ( h < maxhei ); | 337 | bool small = ( h < maxhei ); |
338 | if ( ! small ) | 338 | if ( ! small ) |
339 | paint->setFont(KOPrefs::instance()->mAgendaViewFont); | 339 | paint->setFont(KOPrefs::instance()->mAgendaViewFont); |
340 | else { | 340 | else { |
341 | QFont f = KOPrefs::instance()->mAgendaViewFont; | 341 | QFont f = KOPrefs::instance()->mAgendaViewFont; |
342 | f.setBold( false ); | 342 | f.setBold( false ); |
343 | int fh = f.pointSize(); | 343 | int fh = f.pointSize(); |
344 | nfh = (((float)height())/(float)(mFontPixelSize+4))*fh; | 344 | nfh = (((float)height())/(float)(mFontPixelSize+4))*fh; |
345 | if ( nfh < 6 ) | 345 | if ( nfh < 6 ) |
346 | nfh = 6; | 346 | nfh = 6; |
347 | f.setPointSize( nfh ); | 347 | f.setPointSize( nfh ); |
348 | paint->setFont(f); | 348 | paint->setFont(f); |
349 | } | 349 | } |
350 | paint->fillRect ( x, yy, w, h, mBackgroundColor ); | 350 | paint->fillRect ( x, yy, w, h, mBackgroundColor ); |
351 | static const QPixmap completedPxmp = SmallIcon("greenhook16"); | 351 | static const QPixmap completedPxmp = SmallIcon("greenhook16"); |
352 | static const QPixmap overduePxmp = SmallIcon("redcross16"); | 352 | static const QPixmap overduePxmp = SmallIcon("redcross16"); |
353 | if ( mIncidence->type() == "Todo" ) { | 353 | if ( mIncidence->type() == "Todo" ) { |
354 | Todo* tempTodo = static_cast<Todo*>(mIncidence); | 354 | Todo* tempTodo = static_cast<Todo*>(mIncidence); |
355 | int xx = pos().x()+(width()-completedPxmp.width()-3 ); | 355 | int xx = pos().x()+(width()-completedPxmp.width()-3 ); |
356 | int yyy = yy+3; | 356 | int yyy = yy+3; |
357 | if ( tempTodo->isCompleted() ) | 357 | if ( tempTodo->isCompleted() ) |
358 | paint->drawPixmap ( xx, yyy, completedPxmp ); | 358 | paint->drawPixmap ( xx, yyy, completedPxmp ); |
359 | else { | 359 | else { |
360 | paint->drawPixmap ( xx, yyy, overduePxmp ); | 360 | paint->drawPixmap ( xx, yyy, overduePxmp ); |
361 | 361 | ||
362 | } | 362 | } |
363 | } | 363 | } |
364 | bool addIcon = false; | 364 | bool addIcon = false; |
365 | if ( ! small || w > 3 * h || h > 3* w ) | 365 | if ( ! small || w > 3 * h || h > 3* w ) |
366 | addIcon = updateIcons( paint, horLayout ); | 366 | addIcon = updateIcons( paint, horLayout ); |
367 | 367 | ||
368 | qDrawShadePanel (paint, x, yy, w, h, mColorGroup, selected , 2, 0); | 368 | qDrawShadePanel (paint, x, yy, w, h, mColorGroup, selected , 2, 0); |