summaryrefslogtreecommitdiff
authorharlekin <harlekin>2003-02-14 21:52:13 (UTC)
committer harlekin <harlekin>2003-02-14 21:52:13 (UTC)
commit643c8058bbd67a8fedfd98cb895419cadde04e78 (patch) (unidiff)
tree3ce591efee390539d170fd98affb8333d62eb0d8
parentfc117979a54fca11e591395b130cfef307deb66f (diff)
downloadopie-643c8058bbd67a8fedfd98cb895419cadde04e78.zip
opie-643c8058bbd67a8fedfd98cb895419cadde04e78.tar.gz
opie-643c8058bbd67a8fedfd98cb895419cadde04e78.tar.bz2
save some space in dayview, for further answers read bug #665
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/datebook/datebookday.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/core/pim/datebook/datebookday.cpp b/core/pim/datebook/datebookday.cpp
index 325b902..aaf3e16 100644
--- a/core/pim/datebook/datebookday.cpp
+++ b/core/pim/datebook/datebookday.cpp
@@ -597,8 +597,10 @@ DateBookDayWidget::DateBookDayWidget( const EffectiveEvent &e,
597 where = strNote.find( "<", where ); 597 where = strNote.find( "<", where );
598 } 598 }
599 599
600 text = "<b>" + strDesc + "</b><br>" + "<i>" 600 text = "<b>" + strDesc + "</b><br>" + "<i>";
601 + strCat + "</i><br>"; 601 if ( !strCat.isEmpty() ) {
602 text += strCat + "</i><br>";
603 }
602 if (ev.event().type() == Event::Normal ) 604 if (ev.event().type() == Event::Normal )
603 setEventText( text ); 605 setEventText( text );
604 else 606 else
@@ -615,8 +617,9 @@ DateBookDayWidget::DateBookDayWidget( const EffectiveEvent &e,
615 int rh = dateBook->dayView()->rowHeight(0); 617 int rh = dateBook->dayView()->rowHeight(0);
616 y = y*rh/60; 618 y = y*rh/60;
617 h = h*rh/60; 619 h = h*rh/60;
618 if ( h < 3 ) 620 if ( h < 3 ) {
619 h = 3; 621 h = 3;
622 }
620 geom.setY( y ); 623 geom.setY( y );
621 geom.setHeight( h ); 624 geom.setHeight( h );
622 geom.setX( 0 ); 625 geom.setX( 0 );
@@ -628,7 +631,7 @@ void DateBookDayWidget::setAllDayText( QString &text ) {
628} 631}
629void DateBookDayWidget::setEventText( QString& text ) { 632void DateBookDayWidget::setEventText( QString& text ) {
630 bool whichClock = dateBook->dayView()->whichClock(); 633 bool whichClock = dateBook->dayView()->whichClock();
631 text += "<b>" + tr("Start") + "</b>: "; 634 text += "<b>" + tr("Time") + "</b>: ";
632 if ( ev.startDate() != ev.date() ) { 635 if ( ev.startDate() != ev.date() ) {
633 // multi-day event. Show start date 636 // multi-day event. Show start date
634 text += TimeString::longDateString( ev.startDate() ); 637 text += TimeString::longDateString( ev.startDate() );
@@ -637,7 +640,7 @@ void DateBookDayWidget::setEventText( QString& text ) {
637 text += TimeString::timeString( ev.start(), whichClock, FALSE ); 640 text += TimeString::timeString( ev.start(), whichClock, FALSE );
638 } 641 }
639 642
640 text += "<br><b>" + tr("End") + "</b>: "; 643 text += "<b>" + tr(" - ") + "</b>";
641 if ( ev.endDate() != ev.date() ) { 644 if ( ev.endDate() != ev.date() ) {
642 // multi-day event. Show end date 645 // multi-day event. Show end date
643 text += TimeString::longDateString( ev.endDate() ); 646 text += TimeString::longDateString( ev.endDate() );