| -rw-r--r-- | korganizer/koagendaitem.cpp | 53 |
1 files changed, 31 insertions, 22 deletions
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index 62281d4..39355b4 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp @@ -111,30 +111,8 @@ void KOAgendaItem::init ( Incidence *incidence, QDate qd ) setMultiItem(0,0,0); startMove(); mSelected = true; select(false); - QString tipText = mIncidence->summary(); - // QToolTip::add(this,tipText); - QWhatsThis::add(this,KIncidenceFormatter::instance()->getFormattedText( mIncidence )); - if ( !mIncidence->doesFloat() ) - if ( mIncidence->type() == "Event" ) { - if ( (static_cast<Event*>(mIncidence))->isMultiDay() ) { - tipText += "\n"+i18n("From: ")+mIncidence->dtStartStr(); - tipText += "\n"+i18n("To: ")+(static_cast<Event*>(mIncidence))->dtEndStr(); - } - else { - tipText += "\n"+i18n("Time: ")+mIncidence->dtStartTimeStr(); - tipText += " - "+(static_cast<Event*>(mIncidence))->dtEndTimeStr(); - } - } - else if ( mIncidence->type() == "Todo" ) { - tipText += "\n"+i18n("Due: ")+ (static_cast<Todo*>(mIncidence))->dtDueTimeStr(); - } - - if (!mIncidence->location().isEmpty()) { - tipText += "\n"+i18n("Location: ")+mIncidence->location(); - } - QToolTip::add(this,tipText,toolTipGroup(),""); QFontMetrics fontinf(KOPrefs::instance()->mAgendaViewFont); mFontPixelSize = fontinf.height();; hide(); xPaintCoord = -1; @@ -487,8 +465,9 @@ void KOAgendaItem::paintEvent ( QPaintEvent *e ) bitBlt (this, rx, ry, paintFrom, x()+rx ,yPaintCoord+ry, rw, rh ,CopyROP); } void KOAgendaItem::computeText() { + mDisplayedText = mIncidence->summary(); if ( (mIncidence->type() == "Todo") ) { if ( static_cast<Todo*>(mIncidence)->dtDue().date() < QDate::currentDate() ) mDisplayedText += i18n(" (") +KGlobal::locale()->formatDate((static_cast<Todo*>(mIncidence))->dtDue().date(), true)+")"; @@ -515,8 +494,38 @@ void KOAgendaItem::computeText() else mDisplayedText += "\n("; mDisplayedText += mIncidence->location() +")"; } + + QString tipText = mIncidence->summary(); + QWhatsThis::add(this,KIncidenceFormatter::instance()->getFormattedText( mIncidence )); + if ( !mIncidence->doesFloat() ) { + if ( mIncidence->type() == "Event" ) { + if ( (static_cast<Event*>(mIncidence))->isMultiDay() ) { + tipText += "\n"+i18n("From: ")+mIncidence->dtStartStr(); + tipText += "\n"+i18n("To: ")+(static_cast<Event*>(mIncidence))->dtEndStr(); + } + else { + tipText += "\n"+i18n("Time: ")+mIncidence->dtStartTimeStr(); + tipText += " - "+(static_cast<Event*>(mIncidence))->dtEndTimeStr(); + } + } + else if ( mIncidence->type() == "Todo" ) { + if (mIncidence->hasStartDate()) + tipText += "\n"+i18n("Start: ")+ (static_cast<Todo*>(mIncidence))->dtStartStr(); + tipText += "\n"+i18n("Due: ")+ (static_cast<Todo*>(mIncidence))->dtDueStr(); + } + } else if ( mIncidence->type() == "Todo" ) { + if (mIncidence->hasStartDate()) + tipText += "\n"+i18n("Start: ")+ (static_cast<Todo*>(mIncidence))->dtStartDateStr(); + tipText += "\n"+i18n("Due: ")+ (static_cast<Todo*>(mIncidence))->dtDueDateStr(); + } + + if (!mIncidence->location().isEmpty()) { + tipText += "\n"+i18n("Location: ")+mIncidence->location(); + } + QToolTip::add(this,tipText,toolTipGroup(),""); + } void KOAgendaItem::updateItem() { computeText(); |