author | zecke <zecke> | 2002-06-25 19:55:53 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-06-25 19:55:53 (UTC) |
commit | af4a3940dd672423da28b54e5d955cc5d33cecda (patch) (unidiff) | |
tree | cb5fcfe4835c86353e9d54b1050c7dfb23898bf1 /core/pim/datebook/datebookweek.cpp | |
parent | 8635f264c15b05152fc1a44f798c154472a4b227 (diff) | |
download | opie-af4a3940dd672423da28b54e5d955cc5d33cecda.zip opie-af4a3940dd672423da28b54e5d955cc5d33cecda.tar.gz opie-af4a3940dd672423da28b54e5d955cc5d33cecda.tar.bz2 |
All day events are not from 00:00 to 23:59 they're all day now.
Diffstat (limited to 'core/pim/datebook/datebookweek.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/datebook/datebookweek.cpp | 52 |
1 files changed, 34 insertions, 18 deletions
diff --git a/core/pim/datebook/datebookweek.cpp b/core/pim/datebook/datebookweek.cpp index 6532ba4..e16f516 100644 --- a/core/pim/datebook/datebookweek.cpp +++ b/core/pim/datebook/datebookweek.cpp | |||
@@ -458,12 +458,39 @@ void DateBookWeek::getEvents() | |||
458 | QValueList<EffectiveEvent> eventList = db->getEffectiveEvents(startWeek, | 458 | QValueList<EffectiveEvent> eventList = db->getEffectiveEvents(startWeek, |
459 | endWeek); | 459 | endWeek); |
460 | view->showEvents( eventList ); | 460 | view->showEvents( eventList ); |
461 | view->moveToHour( startTime ); | 461 | view->moveToHour( startTime ); |
462 | } | 462 | } |
463 | 463 | ||
464 | void DateBookWeek::generateAllDayTooltext( QString& text ) { | ||
465 | text += "<b>" + tr("This is an all day event.") + "</b><br>"; | ||
466 | } | ||
467 | |||
468 | void DateBookWeek::generateNormalTooltext( QString& str, | ||
469 | const EffectiveEvent &ev ) { | ||
470 | str += "<b>" + QObject::tr("Start") + "</b>: "; | ||
471 | |||
472 | if ( ev.startDate() != ev.date() ) { | ||
473 | // multi-day event. Show start date | ||
474 | str += TimeString::longDateString( ev.startDate() ); | ||
475 | } else { | ||
476 | // Show start time. | ||
477 | str += TimeString::timeString(ev.start(), ampm, FALSE ); | ||
478 | } | ||
479 | |||
480 | |||
481 | str += "<br><b>" + QObject::tr("End") + "</b>: "; | ||
482 | if ( ev.endDate() != ev.date() ) { | ||
483 | // multi-day event. Show end date | ||
484 | str += TimeString::longDateString( ev.endDate() ); | ||
485 | } else { | ||
486 | // Show end time. | ||
487 | str += TimeString::timeString( ev.end(), ampm, FALSE ); | ||
488 | } | ||
489 | } | ||
490 | |||
464 | void DateBookWeek::slotShowEvent( const EffectiveEvent &ev ) | 491 | void DateBookWeek::slotShowEvent( const EffectiveEvent &ev ) |
465 | { | 492 | { |
466 | if ( tHide->isActive() ) | 493 | if ( tHide->isActive() ) |
467 | tHide->stop(); | 494 | tHide->stop(); |
468 | 495 | ||
469 | // why would someone use "<"? Oh well, fix it up... | 496 | // why would someone use "<"? Oh well, fix it up... |
@@ -492,32 +519,21 @@ void DateBookWeek::slotShowEvent( const EffectiveEvent &ev ) | |||
492 | strNote.remove( where, 1 ); | 519 | strNote.remove( where, 1 ); |
493 | strNote.insert( where, "<" ); | 520 | strNote.insert( where, "<" ); |
494 | where = strNote.find( "<", where ); | 521 | where = strNote.find( "<", where ); |
495 | } | 522 | } |
496 | 523 | ||
497 | QString str = "<b>" + strDesc + "</b><br>" + "<i>" | 524 | QString str = "<b>" + strDesc + "</b><br>" + "<i>" |
498 | + strCat + "</i>" | 525 | + strCat + "</i>" |
499 | + "<br>" + TimeString::longDateString( ev.date() ) | 526 | + "<br>" + TimeString::longDateString( ev.date() ) |
500 | + "<br><b>" + QObject::tr("Start") + "</b>: "; | 527 | + "<br>"; |
501 | 528 | ||
502 | if ( ev.startDate() != ev.date() ) { | 529 | if (ev.event().type() == Event::Normal ) |
503 | // multi-day event. Show start date | 530 | generateNormalTooltext( str, ev ); |
504 | str += TimeString::longDateString( ev.startDate() ); | 531 | else |
505 | } else { | 532 | generateAllDayTooltext( str ); |
506 | // Show start time. | ||
507 | str += TimeString::timeString(ev.start(), ampm, FALSE ); | ||
508 | } | ||
509 | 533 | ||
510 | str += "<br><b>" + QObject::tr("End") + "</b>: "; | ||
511 | if ( ev.endDate() != ev.date() ) { | ||
512 | // multi-day event. Show end date | ||
513 | str += TimeString::longDateString( ev.endDate() ); | ||
514 | } else { | ||
515 | // Show end time. | ||
516 | str += TimeString::timeString( ev.end(), ampm, FALSE ); | ||
517 | } | ||
518 | str += "<br><br>" + strNote; | 534 | str += "<br><br>" + strNote; |
519 | 535 | ||
520 | lblDesc->setText( str ); | 536 | lblDesc->setText( str ); |
521 | lblDesc->resize( lblDesc->sizeHint() ); | 537 | lblDesc->resize( lblDesc->sizeHint() ); |
522 | // move the label so it is "centerd" horizontally... | 538 | // move the label so it is "centerd" horizontally... |
523 | lblDesc->move( QMAX(0,(width() - lblDesc->width()) / 2), 0 ); | 539 | lblDesc->move( QMAX(0,(width() - lblDesc->width()) / 2), 0 ); |