-rw-r--r-- | korganizer/kodaymatrix.cpp | 43 |
1 files changed, 38 insertions, 5 deletions
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 53ebdb2..4366265 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp | |||
@@ -197,28 +197,61 @@ QString KODayMatrix::getWhatsThisText( QPoint p ) | |||
197 | text += " " + event->summary(); | 197 | text += " " + event->summary(); |
198 | mToolTipText += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary(); | 198 | mToolTipText += KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary(); |
199 | } | 199 | } |
200 | } | 200 | } |
201 | if ( !event->location().isEmpty() ) | 201 | if ( !event->location().isEmpty() ) |
202 | mToolTipText += " (" + event->location() + ")"; | 202 | mToolTipText += " (" + event->location() + ")"; |
203 | //qDebug("TTT: %s ", mToolTipText.latin1()); | ||
204 | mToolTip.append( deTag( mToolTipText ) ); | ||
205 | } | ||
206 | if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) { | ||
207 | QPtrList<Todo> todolist = mCalendar->todos(mDate); | ||
208 | Todo *todo; | ||
209 | for(todo=todolist.first();todo != 0;todo=todolist.next()) { | ||
210 | QString mToolTipText; | ||
211 | if ( !todo->doesFloat() ) | ||
212 | mToolTipText += KGlobal::locale()->formatTime(todo->dtDue().time())+" "; | ||
213 | mToolTipText += todo->summary(); | ||
214 | if ( !todo->location().isEmpty() ) | ||
215 | mToolTipText += " (" + todo->location() + ")"; | ||
216 | mToolTipText = deTag( mToolTipText); | ||
217 | mToolTipText = "<b>" + i18n("Todo: ") + "</b>"+ mToolTipText; | ||
218 | mToolTip.append( mToolTipText ); | ||
219 | } | ||
220 | } | ||
221 | mToolTip.sort(); | ||
222 | if (KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) { | ||
223 | Journal *j = mCalendar->journal( mDate ); | ||
224 | if ( j ) { | ||
225 | QString mToolTipText = j->description().left(100); | ||
226 | if ( j->description().length() > 100 ) | ||
227 | mToolTipText += " ..."; | ||
228 | mToolTipText = deTag( mToolTipText); | ||
229 | mToolTipText = "<b>" + i18n("Journal: ") + "</b>"+ mToolTipText; | ||
230 | mToolTip.append( mToolTipText ); | ||
231 | } | ||
232 | } | ||
233 | return "<b>"+KGlobal::locale()->formatDate(days[tmp]) + "</b><br>" + mToolTip.join("<br>"); | ||
234 | } | ||
235 | |||
236 | |||
237 | QString KODayMatrix::deTag( QString mToolTipText ) | ||
238 | { | ||
239 | |||
203 | #if QT_VERSION >= 0x030000 | 240 | #if QT_VERSION >= 0x030000 |
204 | mToolTipText.replace( '<' , "<" ); | 241 | mToolTipText.replace( '<' , "<" ); |
205 | mToolTipText.replace( '>' , ">" ); | 242 | mToolTipText.replace( '>' , ">" ); |
206 | #else | 243 | #else |
207 | if ( mToolTipText.find ('<') >= 0 ) { | 244 | if ( mToolTipText.find ('<') >= 0 ) { |
208 | mToolTipText.replace( QRegExp("<") , "<" ); | 245 | mToolTipText.replace( QRegExp("<") , "<" ); |
209 | } | 246 | } |
210 | if ( mToolTipText.find ('>') >= 0 ) { | 247 | if ( mToolTipText.find ('>') >= 0 ) { |
211 | mToolTipText.replace( QRegExp(">") , ">" ); | 248 | mToolTipText.replace( QRegExp(">") , ">" ); |
212 | } | 249 | } |
213 | #endif | 250 | #endif |
214 | //qDebug("TTT: %s ", mToolTipText.latin1()); | 251 | return mToolTipText; |
215 | mToolTip.append( mToolTipText ); | ||
216 | } | ||
217 | mToolTip.sort(); | ||
218 | return "<b>"+KGlobal::locale()->formatDate(days[tmp]) + "</b><br>" + mToolTip.join("<br>"); | ||
219 | } | 252 | } |
220 | void KODayMatrix::setCalendar( Calendar *cal ) | 253 | void KODayMatrix::setCalendar( Calendar *cal ) |
221 | { | 254 | { |
222 | mCalendar = cal; | 255 | mCalendar = cal; |
223 | 256 | ||
224 | setAcceptDrops( mCalendar ); | 257 | setAcceptDrops( mCalendar ); |