| -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 @@ -181,4 +181,5 @@ QString KODayMatrix::getWhatsThisText( QPoint p ) } + qDebug("event->isMultiDay() %s", event->summary().latin1() ); text = time + event->summary(); mToolTipText += prefix + text; @@ -194,7 +195,21 @@ QString KODayMatrix::getWhatsThisText( QPoint p ) } } + 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>"); } @@ -224,5 +239,5 @@ QColor KODayMatrix::getShadedColor(QColor color) KODayMatrix::~KODayMatrix() { - delete mKODaymatrixWhatsThis; + // delete mKODaymatrixWhatsThis; delete [] days; delete [] daylbls; @@ -338,9 +353,13 @@ void KODayMatrix::updateViewTimed() 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); } |