author | zautrix <zautrix> | 2005-03-21 12:34:49 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-21 12:34:49 (UTC) |
commit | 3b7ba9f46c78816bae8c4b30a455e261d7da9f4a (patch) (unidiff) | |
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 | |||
@@ -181,4 +181,5 @@ QString KODayMatrix::getWhatsThisText( QPoint p ) | |||
181 | 181 | ||
182 | } | 182 | } |
183 | qDebug("event->isMultiDay() %s", event->summary().latin1() ); | ||
183 | text = time + event->summary(); | 184 | text = time + event->summary(); |
184 | mToolTipText += prefix + text; | 185 | mToolTipText += prefix + text; |
@@ -194,7 +195,21 @@ QString KODayMatrix::getWhatsThisText( QPoint p ) | |||
194 | } | 195 | } |
195 | } | 196 | } |
197 | if ( !event->location().isEmpty() ) | ||
198 | mToolTipText += " (" + event->location() + ")"; | ||
199 | #if QT_VERSION >= 0x030000 | ||
200 | mToolTipText.replace( '<' , "<" ); | ||
201 | mToolTipText.replace( '>' , ">" ); | ||
202 | #else | ||
203 | if ( mToolTipText.find ('<') > 0 ) { | ||
204 | mToolTipText.replace( QRegExp("<") , "<" ); | ||
205 | } | ||
206 | if ( mToolTipText.find ('>') > 0 ) { | ||
207 | mToolTipText.replace( QRegExp(">") , ">" ); | ||
208 | } | ||
209 | #endif | ||
196 | mToolTip.append( mToolTipText ); | 210 | mToolTip.append( mToolTipText ); |
197 | } | 211 | } |
198 | mToolTip.sort(); | 212 | mToolTip.sort(); |
213 | qDebug("%s ", mToolTip.join("<br>").latin1()); | ||
199 | return "<b>"+KGlobal::locale()->formatDate(days[tmp]) + "</b><br>" + mToolTip.join("<br>"); | 214 | return "<b>"+KGlobal::locale()->formatDate(days[tmp]) + "</b><br>" + mToolTip.join("<br>"); |
200 | } | 215 | } |
@@ -224,5 +239,5 @@ QColor KODayMatrix::getShadedColor(QColor color) | |||
224 | KODayMatrix::~KODayMatrix() | 239 | KODayMatrix::~KODayMatrix() |
225 | { | 240 | { |
226 | delete mKODaymatrixWhatsThis; | 241 | // delete mKODaymatrixWhatsThis; |
227 | delete [] days; | 242 | delete [] days; |
228 | delete [] daylbls; | 243 | delete [] daylbls; |
@@ -338,9 +353,13 @@ void KODayMatrix::updateViewTimed() | |||
338 | holiStr += "\n"; | 353 | holiStr += "\n"; |
339 | holiStr += event->summary(); | 354 | holiStr += event->summary(); |
355 | if ( !event->location().isEmpty() ) | ||
356 | holiStr += " (" + event->location() + ")"; | ||
340 | } | 357 | } |
341 | if ( event->categories().contains( i18n("Birthday") ) || event->categories().contains( "Birthday" )) { | 358 | if ( event->categories().contains( i18n("Birthday") ) || event->categories().contains( "Birthday" )) { |
342 | if ( !holiStr.isEmpty() ) | 359 | if ( !holiStr.isEmpty() ) |
343 | holiStr += "\n"; | 360 | holiStr += "\n"; |
344 | holiStr += event->summary(); | 361 | holiStr += i18n("Birthday") + ": "+event->summary(); |
362 | if ( !event->location().isEmpty() ) | ||
363 | holiStr += " (" + event->location() + ")"; | ||
345 | bDays.setBit(i); | 364 | bDays.setBit(i); |
346 | } | 365 | } |