-rw-r--r-- | korganizer/koeventviewer.cpp | 42 | ||||
-rw-r--r-- | korganizer/koeventviewer.h | 1 |
2 files changed, 29 insertions, 14 deletions
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index 44da058..135ca73 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp | |||
@@ -245,5 +245,5 @@ void KOEventViewer::appendEvent(Event *event, int mode ) | |||
245 | topLevelWidget()->setCaption(i18n("Event Viewer")); | 245 | topLevelWidget()->setCaption(i18n("Event Viewer")); |
246 | if ( mode == 0 ) { | 246 | if ( mode == 0 ) { |
247 | addTag("h2",event->summary()); | 247 | addTag("h2",deTag(event->summary())); |
248 | } | 248 | } |
249 | else { | 249 | else { |
@@ -256,7 +256,7 @@ void KOEventViewer::appendEvent(Event *event, int mode ) | |||
256 | // mText +="<font color=\"#F00000\">" + i18n("O-due!") + "</font>"; | 256 | // mText +="<font color=\"#F00000\">" + i18n("O-due!") + "</font>"; |
257 | if ( mode == 1 ) { | 257 | if ( mode == 1 ) { |
258 | addTag("h2",i18n( "Local: " ) +event->summary()); | 258 | addTag("h2",i18n( "Local: " ) +deTag(event->summary())); |
259 | } else { | 259 | } else { |
260 | addTag("h2",i18n( "Remote: " ) +event->summary()); | 260 | addTag("h2",i18n( "Remote: " ) +deTag(event->summary())); |
261 | } | 261 | } |
262 | addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) ); | 262 | addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) ); |
@@ -274,5 +274,5 @@ void KOEventViewer::appendEvent(Event *event, int mode ) | |||
274 | if (!event->location().isEmpty()) { | 274 | if (!event->location().isEmpty()) { |
275 | addTag("b",i18n("Location: ")); | 275 | addTag("b",i18n("Location: ")); |
276 | mText.append(event->location()+"<br>"); | 276 | mText.append(deTag(event->location())+"<br>"); |
277 | mMailSubject += i18n(" at ") + event->location(); | 277 | mMailSubject += i18n(" at ") + event->location(); |
278 | } | 278 | } |
@@ -345,5 +345,5 @@ void KOEventViewer::appendEvent(Event *event, int mode ) | |||
345 | if (!event->description().isEmpty()) { | 345 | if (!event->description().isEmpty()) { |
346 | addTag("p",i18n("<b>Details: </b>")); | 346 | addTag("p",i18n("<b>Details: </b>")); |
347 | addTag("p",event->description()); | 347 | addTag("p",deTag(event->description())); |
348 | } | 348 | } |
349 | } | 349 | } |
@@ -375,5 +375,5 @@ void KOEventViewer::appendTodo(Todo *event, int mode ) | |||
375 | bool shortDate = KOPrefs::instance()->mShortDateInViewer; | 375 | bool shortDate = KOPrefs::instance()->mShortDateInViewer; |
376 | if (mode == 0 ) | 376 | if (mode == 0 ) |
377 | addTag("h2",event->summary()); | 377 | addTag("h2",deTag(event->summary())); |
378 | else { | 378 | else { |
379 | if ( mColorMode == 1 ) { | 379 | if ( mColorMode == 1 ) { |
@@ -384,7 +384,7 @@ void KOEventViewer::appendTodo(Todo *event, int mode ) | |||
384 | } | 384 | } |
385 | if ( mode == 1 ) { | 385 | if ( mode == 1 ) { |
386 | addTag("h2",i18n( "Local: " ) +event->summary()); | 386 | addTag("h2",i18n( "Local: " ) +deTag(event->summary())); |
387 | } else { | 387 | } else { |
388 | addTag("h2",i18n( "Remote: " ) +event->summary()); | 388 | addTag("h2",i18n( "Remote: " ) +deTag(event->summary())); |
389 | } | 389 | } |
390 | addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) ); | 390 | addTag("h3",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(event->lastModified(),shortDate, true ) ); |
@@ -413,5 +413,5 @@ void KOEventViewer::appendTodo(Todo *event, int mode ) | |||
413 | if (!event->location().isEmpty()) { | 413 | if (!event->location().isEmpty()) { |
414 | addTag("b",i18n("Location: ")); | 414 | addTag("b",i18n("Location: ")); |
415 | mText.append(event->location()+"<br>"); | 415 | mText.append(deTag(event->location())+"<br>"); |
416 | mMailSubject += i18n(" at ") + event->location(); | 416 | mMailSubject += i18n(" at ") + event->location(); |
417 | } | 417 | } |
@@ -435,5 +435,5 @@ void KOEventViewer::appendTodo(Todo *event, int mode ) | |||
435 | if (!event->description().isEmpty()) { | 435 | if (!event->description().isEmpty()) { |
436 | addTag("p",i18n("<b>Details: </b>")); | 436 | addTag("p",i18n("<b>Details: </b>")); |
437 | addTag("p",event->description()); | 437 | addTag("p",deTag(event->description())); |
438 | } | 438 | } |
439 | } | 439 | } |
@@ -448,5 +448,5 @@ void KOEventViewer::appendTodo(Todo *event, int mode ) | |||
448 | if ( event->relatedTo() ) { | 448 | if ( event->relatedTo() ) { |
449 | addTag("b",i18n("Parent todo:<br>")); | 449 | addTag("b",i18n("Parent todo:<br>")); |
450 | mText.append(event->relatedTo()->summary()+" [" +QString::number(event->relatedTo()->priority()) + "/" + QString::number(((Todo*)event->relatedTo())->percentComplete())+"%] <br>"); | 450 | mText.append(deTag(event->relatedTo()->summary())+" [" +QString::number(event->relatedTo()->priority()) + "/" + QString::number(((Todo*)event->relatedTo())->percentComplete())+"%] <br>"); |
451 | } | 451 | } |
452 | QPtrList<Incidence> Relations = event->relations(); | 452 | QPtrList<Incidence> Relations = event->relations(); |
@@ -455,5 +455,5 @@ void KOEventViewer::appendTodo(Todo *event, int mode ) | |||
455 | addTag("b",i18n("Sub todos:<br>")); | 455 | addTag("b",i18n("Sub todos:<br>")); |
456 | for (to=Relations.first();to;to=Relations.next()) { | 456 | for (to=Relations.first();to;to=Relations.next()) { |
457 | mText.append( to->summary()+" [" +QString::number(to->priority()) + "/" + QString::number(((Todo*)to)->percentComplete())+"%]<br>"); | 457 | mText.append( deTag(to->summary())+" [" +QString::number(to->priority()) + "/" + QString::number(((Todo*)to)->percentComplete())+"%]<br>"); |
458 | 458 | ||
459 | } | 459 | } |
@@ -624,5 +624,5 @@ void KOEventViewer::appendJournal(Journal *jour, int mode ) | |||
624 | addTag("b",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(jour->lastModified(),shortDate ) ); | 624 | addTag("b",i18n( "Last modified: " ) + KGlobal::locale()->formatDateTime(jour->lastModified(),shortDate ) ); |
625 | if (!jour->description().isEmpty()) { | 625 | if (!jour->description().isEmpty()) { |
626 | addTag("p",jour->description()); | 626 | addTag("p",deTag(jour->description())); |
627 | } | 627 | } |
628 | setText(mText); | 628 | setText(mText); |
@@ -640,5 +640,4 @@ void KOEventViewer::setSyncMode( bool b ) | |||
640 | } | 640 | } |
641 | 641 | ||
642 | |||
643 | void KOEventViewer::setTodo(Todo *event, bool clearV ) | 642 | void KOEventViewer::setTodo(Todo *event, bool clearV ) |
644 | { | 643 | { |
@@ -694,4 +693,19 @@ void KOEventViewer::addText(QString text) | |||
694 | setText(mText); | 693 | setText(mText); |
695 | } | 694 | } |
695 | QString KOEventViewer::deTag(QString text) | ||
696 | { | ||
697 | #if QT_VERSION >= 0x030000 | ||
698 | text.replace( '<' , "<" ); | ||
699 | text.replace( '>' , ">" ); | ||
700 | #else | ||
701 | if ( text.find ('<') > 0 ) { | ||
702 | text.replace( QRegExp("<") , "<" ); | ||
703 | } | ||
704 | if ( text.find ('>') > 0 ) { | ||
705 | text.replace( QRegExp(">") , ">" ); | ||
706 | } | ||
707 | #endif | ||
708 | return text; | ||
709 | } | ||
696 | void KOEventViewer::keyPressEvent ( QKeyEvent * e ) | 710 | void KOEventViewer::keyPressEvent ( QKeyEvent * e ) |
697 | { | 711 | { |
diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h index 2d4a08e..47cc5e9 100644 --- a/korganizer/koeventviewer.h +++ b/korganizer/koeventviewer.h | |||
@@ -66,4 +66,5 @@ class KOEventViewer : public QTextBrowser { | |||
66 | QTextBrowser *mEventTextView; | 66 | QTextBrowser *mEventTextView; |
67 | bool mSyncMode; | 67 | bool mSyncMode; |
68 | QString deTag(QString text); | ||
68 | 69 | ||
69 | QString mText; | 70 | QString mText; |