author | harlekin <harlekin> | 2003-02-14 21:52:13 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-02-14 21:52:13 (UTC) |
commit | 643c8058bbd67a8fedfd98cb895419cadde04e78 (patch) (side-by-side diff) | |
tree | 3ce591efee390539d170fd98affb8333d62eb0d8 /core/pim/datebook | |
parent | fc117979a54fca11e591395b130cfef307deb66f (diff) | |
download | opie-643c8058bbd67a8fedfd98cb895419cadde04e78.zip opie-643c8058bbd67a8fedfd98cb895419cadde04e78.tar.gz opie-643c8058bbd67a8fedfd98cb895419cadde04e78.tar.bz2 |
save some space in dayview, for further answers read bug #665
-rw-r--r-- | core/pim/datebook/datebookday.cpp | 13 |
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 @@ -588,65 +588,68 @@ DateBookDayWidget::DateBookDayWidget( const EffectiveEvent &e, // strCat.insert( where, "<" ); // where = strCat.find( "<", where ); // } QString strNote = ev.notes(); where = strNote.find( "<" ); while ( where != -1 ) { strNote.remove( where, 1 ); strNote.insert( where, "<" ); where = strNote.find( "<", where ); } - text = "<b>" + strDesc + "</b><br>" + "<i>" - + strCat + "</i><br>"; + text = "<b>" + strDesc + "</b><br>" + "<i>"; + if ( !strCat.isEmpty() ) { + text += strCat + "</i><br>"; + } if (ev.event().type() == Event::Normal ) setEventText( text ); else setAllDayText( text ); text += "<br><br>" + strNote; setBackgroundMode( PaletteBase ); QTime start = ev.start(); QTime end = ev.end(); int y = start.hour()*60+start.minute(); int h = end.hour()*60+end.minute()-y; int rh = dateBook->dayView()->rowHeight(0); y = y*rh/60; h = h*rh/60; - if ( h < 3 ) + if ( h < 3 ) { h = 3; + } geom.setY( y ); geom.setHeight( h ); geom.setX( 0 ); geom.setWidth(dateBook->dayView()->columnWidth(0)-1); } void DateBookDayWidget::setAllDayText( QString &text ) { text += "<b>" + tr("This is an all day event.") + "</b><br>"; } void DateBookDayWidget::setEventText( QString& text ) { bool whichClock = dateBook->dayView()->whichClock(); - text += "<b>" + tr("Start") + "</b>: "; + text += "<b>" + tr("Time") + "</b>: "; if ( ev.startDate() != ev.date() ) { // multi-day event. Show start date text += TimeString::longDateString( ev.startDate() ); } else { // Show start time. text += TimeString::timeString( ev.start(), whichClock, FALSE ); } - text += "<br><b>" + tr("End") + "</b>: "; + text += "<b>" + tr(" - ") + "</b>"; if ( ev.endDate() != ev.date() ) { // multi-day event. Show end date text += TimeString::longDateString( ev.endDate() ); } else { // Show end time. text += TimeString::timeString( ev.end(), whichClock, FALSE ); } } DateBookDayWidget::~DateBookDayWidget() { |