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
@@ -182,2 +182,3 @@ QString KODayMatrix::getWhatsThisText( QPoint p )
             }
+            qDebug("event->isMultiDay() %s", event->summary().latin1() );
             text = time + event->summary();
@@ -195,2 +196,15 @@ QString KODayMatrix::getWhatsThisText( QPoint p )
         }
+        if ( !event->location().isEmpty() )
+            mToolTipText += " (" + event->location() + ")";
+#if QT_VERSION >= 0x030000
+        mToolTipText.replace( '<' , "&lt;" );
+        mToolTipText.replace( '>' , "&gt;" );
+#else
+        if ( mToolTipText.find ('<') > 0 ) {
+            mToolTipText.replace( QRegExp("<") , "&lt;" );
+        }
+        if ( mToolTipText.find ('>') > 0 ) {
+            mToolTipText.replace( QRegExp(">") , "&gt;" );
+        }
+#endif
         mToolTip.append( mToolTipText );
@@ -198,2 +212,3 @@ QString KODayMatrix::getWhatsThisText( QPoint p )
     mToolTip.sort();
+    qDebug("%s ", mToolTip.join("<br>").latin1());
     return  "<b>"+KGlobal::locale()->formatDate(days[tmp]) + "</b><br>" + mToolTip.join("<br>");
@@ -225,3 +240,3 @@ KODayMatrix::~KODayMatrix()
 {
-    delete mKODaymatrixWhatsThis;
+    //  delete mKODaymatrixWhatsThis;
   delete [] days;
@@ -339,2 +354,4 @@ void KODayMatrix::updateViewTimed()
                 holiStr += event->summary();
+                if ( !event->location().isEmpty() )
+                     holiStr += " (" + event->location() + ")";
             }
@@ -343,3 +360,5 @@ void KODayMatrix::updateViewTimed()
                     holiStr += "\n";
-                holiStr += event->summary();
+                holiStr += i18n("Birthday") + ": "+event->summary();
+                if ( !event->location().isEmpty() )
+                     holiStr += " (" + event->location() + ")";
                 bDays.setBit(i);