author | zautrix <zautrix> | 2005-03-21 12:34:49 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-21 12:34:49 (UTC) |
commit | 3b7ba9f46c78816bae8c4b30a455e261d7da9f4a (patch) (side-by-side diff) | |
tree | db85cf3f0520828c358aadc3867705a95fcb9d88 /korganizer | |
parent | b40a7cc0a8cf0bd06b0f404f58e89980d1291beb (diff) | |
download | kdepimpi-3b7ba9f46c78816bae8c4b30a455e261d7da9f4a.zip kdepimpi-3b7ba9f46c78816bae8c4b30a455e261d7da9f4a.tar.gz kdepimpi-3b7ba9f46c78816bae8c4b30a455e261d7da9f4a.tar.bz2 |
fixes
-rw-r--r-- | korganizer/kodaymatrix.cpp | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 5133519..9c1f5f3 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -171,40 +171,55 @@ QString KODayMatrix::getWhatsThisText( QPoint p ) prefix ="->" ;multiday = 1; } else if (mDate == event->dtEnd().date()) { prefix ="<-" ;multiday = 3; } } if ( !event->doesFloat() ) { if ( mDate == event->dtStart().date () ) time = KGlobal::locale()->formatTime(event->dtStart().time())+" "; else if ( mDate == event->dtEnd().date () ) time = KGlobal::locale()->formatTime(event->dtEnd().time())+" "; } + qDebug("event->isMultiDay() %s", event->summary().latin1() ); text = time + event->summary(); mToolTipText += prefix + text; } else { if (event->doesFloat()) { text = event->summary(); mToolTipText += text; } else { text = KGlobal::locale()->formatTime(event->dtStart().time()); text += " " + event->summary(); mToolTipText += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary(); } } + if ( !event->location().isEmpty() ) + mToolTipText += " (" + event->location() + ")"; +#if QT_VERSION >= 0x030000 + mToolTipText.replace( '<' , "<" ); + mToolTipText.replace( '>' , ">" ); +#else + if ( mToolTipText.find ('<') > 0 ) { + mToolTipText.replace( QRegExp("<") , "<" ); + } + if ( mToolTipText.find ('>') > 0 ) { + mToolTipText.replace( QRegExp(">") , ">" ); + } +#endif mToolTip.append( mToolTipText ); } mToolTip.sort(); + qDebug("%s ", mToolTip.join("<br>").latin1()); return "<b>"+KGlobal::locale()->formatDate(days[tmp]) + "</b><br>" + mToolTip.join("<br>"); } void KODayMatrix::setCalendar( Calendar *cal ) { mCalendar = cal; setAcceptDrops( mCalendar ); updateEvents(); } QColor KODayMatrix::getShadedColor(QColor color) @@ -214,25 +229,25 @@ QColor KODayMatrix::getShadedColor(QColor color) int s=0; int v=0; color.hsv(&h,&s,&v); s = s/4; v = 192+v/4; shaded.setHsv(h,s,v); return shaded; } KODayMatrix::~KODayMatrix() { - delete mKODaymatrixWhatsThis; + // delete mKODaymatrixWhatsThis; delete [] days; delete [] daylbls; delete [] events; delete mToolTip; } /* void KODayMatrix::setStartDate(QDate start) { updateView(start); } */ @@ -328,29 +343,33 @@ void KODayMatrix::updateViewTimed() QString holiStr = ""; bDays.clearBit(i); for(event=eventlist.first();event != 0;event=eventlist.next()) { ushort recurType = event->recurrence()->doesRecur(); if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) || (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) { numEvents--; } if ( event->categories().contains( i18n("Holiday") ) || event->categories().contains( "Holiday" )) { if ( !holiStr.isEmpty() ) holiStr += "\n"; holiStr += event->summary(); + if ( !event->location().isEmpty() ) + holiStr += " (" + event->location() + ")"; } if ( event->categories().contains( i18n("Birthday") ) || event->categories().contains( "Birthday" )) { if ( !holiStr.isEmpty() ) holiStr += "\n"; - holiStr += event->summary(); + holiStr += i18n("Birthday") + ": "+event->summary(); + if ( !event->location().isEmpty() ) + holiStr += " (" + event->location() + ")"; bDays.setBit(i); } } events[i] = numEvents; //if it is a holy day then draw it red. Sundays are consider holidays, too if ( (KOGlobals::self()->calendarSystem()->dayOfWeek(days[i]) == KOGlobals::self()->calendarSystem()->weekDayOfPray()) || !holiStr.isEmpty()) { mHolidays[i] = holiStr; } else { mHolidays[i] = QString::null; } } |