summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/datebook/datebookweek.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/core/pim/datebook/datebookweek.cpp b/core/pim/datebook/datebookweek.cpp
index e16f516..ddd41af 100644
--- a/core/pim/datebook/datebookweek.cpp
+++ b/core/pim/datebook/datebookweek.cpp
@@ -504,34 +504,42 @@ void DateBookWeek::slotShowEvent( const EffectiveEvent &ev )
504 } 504 }
505 505
506 QString strCat; 506 QString strCat;
507 // ### FIX later... 507 // ### FIX later...
508// QString strCat = ev.category(); 508// QString strCat = ev.category();
509// where = strCat.find( "<" ); 509// where = strCat.find( "<" );
510// while ( where != -1 ) { 510// while ( where != -1 ) {
511 // strCat.remove( where, 1 ); 511 // strCat.remove( where, 1 );
512 // strCat.insert( where, "&#60;" ); 512 // strCat.insert( where, "&#60;" );
513 // where = strCat.find( "<", where ); 513 // where = strCat.find( "<", where );
514// } 514// }
515 515
516 QString strLocation = ev.location();
517 while ( where != -1 ) {
518 strLocation.remove( where, 1 );
519 strLocation.insert( where, "&#60;" );
520 where = strLocation.find( "<", where );
521 }
522
516 QString strNote = ev.notes(); 523 QString strNote = ev.notes();
517 where = strNote.find( "<" ); 524 where = strNote.find( "<" );
518 while ( where != -1 ) { 525 while ( where != -1 ) {
519 strNote.remove( where, 1 ); 526 strNote.remove( where, 1 );
520 strNote.insert( where, "&#60;" ); 527 strNote.insert( where, "&#60;" );
521 where = strNote.find( "<", where ); 528 where = strNote.find( "<", where );
522 } 529 }
523 530
524 QString str = "<b>" + strDesc + "</b><br>" + "<i>" 531 QString str = "<b>" + strDesc + "</b><br>"
525 + strCat + "</i>" 532 + strLocation + "<br>"
533 + "<i>" + strCat + "</i>"
526 + "<br>" + TimeString::longDateString( ev.date() ) 534 + "<br>" + TimeString::longDateString( ev.date() )
527 + "<br>"; 535 + "<br>";
528 536
529 if (ev.event().type() == Event::Normal ) 537 if (ev.event().type() == Event::Normal )
530 generateNormalTooltext( str, ev ); 538 generateNormalTooltext( str, ev );
531 else 539 else
532 generateAllDayTooltext( str ); 540 generateAllDayTooltext( str );
533 541
534 str += "<br><br>" + strNote; 542 str += "<br><br>" + strNote;
535 543
536 lblDesc->setText( str ); 544 lblDesc->setText( str );
537 lblDesc->resize( lblDesc->sizeHint() ); 545 lblDesc->resize( lblDesc->sizeHint() );