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
@@ -180,6 +180,7 @@ QString KODayMatrix::getWhatsThisText( QPoint p )
                     time = KGlobal::locale()->formatTime(event->dtEnd().time())+" ";
 
             }
+            qDebug("event->isMultiDay() %s", event->summary().latin1() );
             text = time + event->summary();
             mToolTipText += prefix + text;
         } else {
@@ -193,9 +194,23 @@ QString KODayMatrix::getWhatsThisText( QPoint p )
                 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( '<' , "&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 );
     }
     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 )
@@ -223,7 +238,7 @@ QColor KODayMatrix::getShadedColor(QColor color)
 
 KODayMatrix::~KODayMatrix()
 {
-    delete mKODaymatrixWhatsThis;
+    //  delete mKODaymatrixWhatsThis;
   delete [] days;
   delete [] daylbls;
   delete [] events;
@@ -337,11 +352,15 @@ void KODayMatrix::updateViewTimed()
                 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);
             }
         }