summaryrefslogtreecommitdiffabout
path: root/korganizer
Side-by-side diff
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/kodaymatrix.cpp57
-rw-r--r--korganizer/kodaymatrix.h1
2 files changed, 46 insertions, 12 deletions
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 53ebdb2..4366265 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -202,19 +202,52 @@ QString KODayMatrix::getWhatsThisText( QPoint p )
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
//qDebug("TTT: %s ", mToolTipText.latin1());
- mToolTip.append( mToolTipText );
+ mToolTip.append( deTag( mToolTipText ) );
+ }
+ if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) {
+ QPtrList<Todo> todolist = mCalendar->todos(mDate);
+ Todo *todo;
+ for(todo=todolist.first();todo != 0;todo=todolist.next()) {
+ QString mToolTipText;
+ if ( !todo->doesFloat() )
+ mToolTipText += KGlobal::locale()->formatTime(todo->dtDue().time())+" ";
+ mToolTipText += todo->summary();
+ if ( !todo->location().isEmpty() )
+ mToolTipText += " (" + todo->location() + ")";
+ mToolTipText = deTag( mToolTipText);
+ mToolTipText = "<b>" + i18n("Todo: ") + "</b>"+ mToolTipText;
+ mToolTip.append( mToolTipText );
+ }
}
mToolTip.sort();
+ if (KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) {
+ Journal *j = mCalendar->journal( mDate );
+ if ( j ) {
+ QString mToolTipText = j->description().left(100);
+ if ( j->description().length() > 100 )
+ mToolTipText += " ...";
+ mToolTipText = deTag( mToolTipText);
+ mToolTipText = "<b>" + i18n("Journal: ") + "</b>"+ mToolTipText;
+ mToolTip.append( mToolTipText );
+ }
+ }
return "<b>"+KGlobal::locale()->formatDate(days[tmp]) + "</b><br>" + mToolTip.join("<br>");
}
+
+
+QString KODayMatrix::deTag( QString mToolTipText )
+{
+
+#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
+ return mToolTipText;
+}
void KODayMatrix::setCalendar( Calendar *cal )
diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h
index a3216d6..b96e08f 100644
--- a/korganizer/kodaymatrix.h
+++ b/korganizer/kodaymatrix.h
@@ -209,2 +209,3 @@ signals:
protected:
+ QString deTag( QString mToolTipText );