-rw-r--r-- | korganizer/koagendaitem.cpp | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index 23afe7a..e545ca8 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp | |||
@@ -442,24 +442,33 @@ void KOAgendaItem::resizePixmap( int w , int h ) | |||
442 | } | 442 | } |
443 | QPixmap * KOAgendaItem::paintPix() | 443 | QPixmap * KOAgendaItem::paintPix() |
444 | { | 444 | { |
445 | static QPixmap* mPaintPix = 0; | 445 | static QPixmap* mPaintPix = 0; |
446 | if ( ! mPaintPix ) | 446 | if ( ! mPaintPix ) { |
447 | mPaintPix = new QPixmap(1,1); | 447 | int w = QApplication::desktop()->width(); |
448 | int h = QApplication::desktop()->height(); | ||
449 | mPaintPix = new QPixmap(w,h); | ||
450 | } | ||
448 | return mPaintPix ; | 451 | return mPaintPix ; |
449 | } | 452 | } |
450 | QPixmap * KOAgendaItem::paintPixAllday() | 453 | QPixmap * KOAgendaItem::paintPixAllday() |
451 | { | 454 | { |
452 | static QPixmap* mPaintPixA = 0; | 455 | static QPixmap* mPaintPixA = 0; |
453 | if ( ! mPaintPixA ) | 456 | if ( ! mPaintPixA ) { |
454 | mPaintPixA = new QPixmap(1,1); | 457 | int w = QApplication::desktop()->width(); |
458 | int h = QApplication::desktop()->height()/3; | ||
459 | mPaintPixA = new QPixmap(w,h); | ||
460 | } | ||
455 | return mPaintPixA ; | 461 | return mPaintPixA ; |
456 | } | 462 | } |
457 | QPixmap * KOAgendaItem::paintPixSel() | 463 | QPixmap * KOAgendaItem::paintPixSel() |
458 | { | 464 | { |
459 | static QPixmap* mPaintPixSel = 0; | 465 | static QPixmap* mPaintPixSel = 0; |
460 | if ( ! mPaintPixSel ) | 466 | if ( ! mPaintPixSel ) { |
461 | mPaintPixSel = new QPixmap(1,1); | 467 | int w = QApplication::desktop()->width(); |
468 | int h = QApplication::desktop()->height(); | ||
469 | mPaintPixSel = new QPixmap(w,h); | ||
470 | } | ||
462 | return mPaintPixSel ; | 471 | return mPaintPixSel ; |
463 | } | 472 | } |
464 | void KOAgendaItem::paintEvent ( QPaintEvent *e ) | 473 | void KOAgendaItem::paintEvent ( QPaintEvent *e ) |
465 | { | 474 | { |
@@ -524,9 +533,8 @@ void KOAgendaItem::paintEvent ( QPaintEvent *e ) | |||
524 | bitBlt (this, rx, ry, paintFrom, xx ,yPaintCoord+ry, rw, rh ,CopyROP); | 533 | bitBlt (this, rx, ry, paintFrom, xx ,yPaintCoord+ry, rw, rh ,CopyROP); |
525 | } | 534 | } |
526 | void KOAgendaItem::computeText() | 535 | void KOAgendaItem::computeText() |
527 | { | 536 | { |
528 | |||
529 | mDisplayedText = mIncidence->summary(); | 537 | mDisplayedText = mIncidence->summary(); |
530 | if ( (mIncidence->type() == "Todo") ) { | 538 | if ( (mIncidence->type() == "Todo") ) { |
531 | if ( static_cast<Todo*>(mIncidence)->hasDueDate() ) { | 539 | if ( static_cast<Todo*>(mIncidence)->hasDueDate() ) { |
532 | if ( static_cast<Todo*>(mIncidence)->dtDue().date() < QDate::currentDate() ) | 540 | if ( static_cast<Todo*>(mIncidence)->dtDue().date() < QDate::currentDate() ) |
@@ -552,9 +560,9 @@ void KOAgendaItem::computeText() | |||
552 | else | 560 | else |
553 | mDisplayedText += "\n("; | 561 | mDisplayedText += "\n("; |
554 | mDisplayedText += mIncidence->location() +")"; | 562 | mDisplayedText += mIncidence->location() +")"; |
555 | } | 563 | } |
556 | 564 | #ifdef DESKTOP_VERSION | |
557 | QString tipText = mIncidence->summary(); | 565 | QString tipText = mIncidence->summary(); |
558 | if ( !mIncidence->doesFloat() ) { | 566 | if ( !mIncidence->doesFloat() ) { |
559 | if ( mIncidence->type() == "Event" ) { | 567 | if ( mIncidence->type() == "Event" ) { |
560 | if ( (static_cast<Event*>(mIncidence))->isMultiDay() ) { | 568 | if ( (static_cast<Event*>(mIncidence))->isMultiDay() ) { |
@@ -582,9 +590,9 @@ void KOAgendaItem::computeText() | |||
582 | if (!mIncidence->location().isEmpty()) { | 590 | if (!mIncidence->location().isEmpty()) { |
583 | tipText += "\n"+i18n("Location: ")+mIncidence->location(); | 591 | tipText += "\n"+i18n("Location: ")+mIncidence->location(); |
584 | } | 592 | } |
585 | QToolTip::add(this,tipText,toolTipGroup(),""); | 593 | QToolTip::add(this,tipText,toolTipGroup(),""); |
586 | 594 | #endif | |
587 | } | 595 | } |
588 | void KOAgendaItem::updateItem() | 596 | void KOAgendaItem::updateItem() |
589 | { | 597 | { |
590 | computeText(); | 598 | computeText(); |