author | zautrix <zautrix> | 2005-07-26 13:38:06 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-26 13:38:06 (UTC) |
commit | b37d71f782540851846613a70a60daf86816f7ec (patch) (unidiff) | |
tree | cd69f9e9a57903a2d463f9f30d376631b705f279 /korganizer/kowhatsnextview.cpp | |
parent | 346437d384dd780a1f7b75dd9caa3770525edfda (diff) | |
download | kdepimpi-b37d71f782540851846613a70a60daf86816f7ec.zip kdepimpi-b37d71f782540851846613a70a60daf86816f7ec.tar.gz kdepimpi-b37d71f782540851846613a70a60daf86816f7ec.tar.bz2 |
fixxx
Diffstat (limited to 'korganizer/kowhatsnextview.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | korganizer/kowhatsnextview.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp index 221debc..fafcb58 100644 --- a/korganizer/kowhatsnextview.cpp +++ b/korganizer/kowhatsnextview.cpp | |||
@@ -484,131 +484,145 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a | |||
484 | QDateTime noc; | 484 | QDateTime noc; |
485 | QString tempText; | 485 | QString tempText; |
486 | if ( appendTable && !notRed ) { | 486 | if ( appendTable && !notRed ) { |
487 | tempText = "<table>"; | 487 | tempText = "<table>"; |
488 | } | 488 | } |
489 | bool ok = true; | 489 | bool ok = true; |
490 | if ( reply ) { | 490 | if ( reply ) { |
491 | noc = ev->getNextOccurence( cdt, &ok ); | 491 | noc = ev->getNextOccurence( cdt, &ok ); |
492 | if (! ok && ev->typeID() == eventID) | 492 | if (! ok && ev->typeID() == eventID) |
493 | return false; | 493 | return false; |
494 | } | 494 | } |
495 | bool bDay = false; | 495 | bool bDay = false; |
496 | if ( ev->isBirthday() || ev->isAnniversary() ) | 496 | if ( ev->isBirthday() || ev->isAnniversary() ) |
497 | bDay = true; | 497 | bDay = true; |
498 | tempText += "<tr><td><b>"; | 498 | tempText += "<tr><td><b>"; |
499 | if (ev->typeID() == eventID ) { | 499 | if (ev->typeID() == eventID ) { |
500 | if (reply) { | 500 | if (reply) { |
501 | if (!ev->doesFloat()) | 501 | if (!ev->doesFloat()) |
502 | tempText += KGlobal::locale()->formatDateTime( noc , KOPrefs::instance()->mShortDateInViewer) +": "; | 502 | tempText += KGlobal::locale()->formatDateTime( noc , KOPrefs::instance()->mShortDateInViewer) +": "; |
503 | else | 503 | else |
504 | tempText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": "; | 504 | tempText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": "; |
505 | 505 | ||
506 | } else { | 506 | } else { |
507 | if (!ev->doesFloat()) { | 507 | if (!ev->doesFloat()) { |
508 | Event *event = static_cast<Event *>(ev); | 508 | Event *event = static_cast<Event *>(ev); |
509 | QDateTime st,end; | 509 | QDateTime st,end; |
510 | if ( event->recurrence()->doesRecur() ) { | 510 | if ( event->recurrence()->doesRecur() ) { |
511 | QDate recDate= mEventDate; | 511 | QDate recDate= mEventDate; |
512 | int days = event->dtStart().date().daysTo (event->dtEnd().date() ); | 512 | int days = event->dtStart().date().daysTo (event->dtEnd().date() ); |
513 | while ( ! event->recursOn( recDate ) ) { | 513 | while ( ! event->recursOn( recDate ) ) { |
514 | recDate = recDate.addDays( -1 ); | 514 | recDate = recDate.addDays( -1 ); |
515 | 515 | ||
516 | } | 516 | } |
517 | st = QDateTime ( recDate, event->dtStart().time() ); | 517 | st = QDateTime ( recDate, event->dtStart().time() ); |
518 | end = QDateTime ( recDate.addDays( days ), event->dtEnd().time() ); | 518 | end = QDateTime ( recDate.addDays( days ), event->dtEnd().time() ); |
519 | } | 519 | } |
520 | else { | 520 | else { |
521 | st = event->dtStart(); | 521 | st = event->dtStart(); |
522 | end = event->dtEnd(); | 522 | end = event->dtEnd(); |
523 | } | 523 | } |
524 | 524 | ||
525 | 525 | ||
526 | QString dateText; | 526 | QString dateText; |
527 | // qDebug("%s %s %s %s ", mEventDate.toString().latin1(),event->summary().latin1(), st .toString().latin1(),end.toString().latin1() ); | 527 | // qDebug("%s %s %s %s ", mEventDate.toString().latin1(),event->summary().latin1(), st .toString().latin1(),end.toString().latin1() ); |
528 | if ( st.date() < mEventDate ) | 528 | if ( st.date() < mEventDate ) |
529 | dateText = "++:++-"; | 529 | dateText = "++:++-"; |
530 | else | 530 | else |
531 | dateText = event->dtStartTimeStr() + "-"; | 531 | dateText = event->dtStartTimeStr() + "-"; |
532 | if ( KOPrefs::instance()->mWhatsNextTime2Lines ) | ||
533 | dateText += " "; | ||
532 | if ( end.date() > mEventDate ) | 534 | if ( end.date() > mEventDate ) |
533 | dateText += "++:++"; | 535 | dateText += "++:++"; |
534 | else | 536 | else |
535 | dateText += event->dtEndTimeStr(); | 537 | dateText += event->dtEndTimeStr(); |
536 | if ( notRed ) | 538 | if ( notRed ) |
537 | tempText += dateText; | 539 | tempText += dateText; |
538 | else { | 540 | else { |
539 | if ( end < cdt ) { | 541 | if ( end < cdt ) { |
540 | if ( !KOPrefs::instance()->mWNViewShowsPast ) | 542 | if ( !KOPrefs::instance()->mWNViewShowsPast ) |
541 | return false; | 543 | return false; |
542 | tempText += "<font color=\"#F00000\">" + dateText + "</font>"; | 544 | tempText += "<font color=\"#F00000\">" + dateText + "</font>"; |
543 | } | 545 | } |
544 | else if ( st < cdt ) | 546 | else if ( st < cdt ) |
545 | tempText += "<font color=\"#008000\">" + dateText + "</font>"; | 547 | tempText += "<font color=\"#008000\">" + dateText + "</font>"; |
546 | else | 548 | else |
547 | tempText += dateText; | 549 | tempText += dateText; |
548 | 550 | ||
549 | } | 551 | } |
550 | 552 | ||
551 | } else { | 553 | } else { |
552 | if ( bDay ) { | 554 | if ( bDay ) { |
553 | 555 | ||
554 | if ( ev->isBirthday()) | 556 | if ( ev->isBirthday()) |
555 | tempText += "<font color=\"#00B000\">" + i18n("Birthday") +":</font>"; | 557 | tempText += "<font color=\"#00B000\">" + i18n("Birthday") +":</font>"; |
556 | else | 558 | else |
557 | tempText += "<font color=\"#00B0000\">" + i18n("Anniversary")+":</font>"; | 559 | tempText += "<font color=\"#00B0000\">" + i18n("Anniversary")+":</font>"; |
558 | } else { | 560 | } else { |
559 | tempText += i18n("Allday:"); | 561 | if ( ((Event*)ev)->isMultiDay() ) { |
562 | QString dfs = KGlobal::locale()->dateFormatShort(); | ||
563 | KGlobal::locale()->setDateFormatShort("%d.%b"); | ||
564 | tempText +=KGlobal::locale()->formatDate(((Event*)ev)->dtStart().date(), true, KLocale::Userdefined) + "-"; | ||
565 | if ( KOPrefs::instance()->mWhatsNextTime2Lines ) | ||
566 | tempText += " "; | ||
567 | tempText +=KGlobal::locale()->formatDate(((Event*)ev)->dtEnd().date(), true, KLocale::Userdefined); | ||
568 | KGlobal::locale()->setDateFormatShort(dfs); | ||
569 | } else { | ||
570 | tempText += " " ;//i18n("Allday:"); | ||
571 | } | ||
560 | } | 572 | } |
561 | 573 | ||
562 | } | 574 | } |
563 | } | 575 | } |
564 | } else { | 576 | } else { |
565 | mTodos.append( ev ); | 577 | mTodos.append( ev ); |
566 | tempText += i18n("ToDo:"); | 578 | tempText += i18n("ToDo:"); |
579 | if ( KOPrefs::instance()->mWhatsNextTime2Lines ) | ||
580 | tempText += " "; | ||
567 | if (reply) { | 581 | if (reply) { |
568 | tempText += " "; | 582 | tempText += " "; |
569 | if ( noc != cdt ) { | 583 | if ( noc != cdt ) { |
570 | tempText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": "; | 584 | tempText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": "; |
571 | } | 585 | } |
572 | } else { | 586 | } else { |
573 | if ( ((Todo*)ev)->dtDue().date() < QDate::currentDate() ) { | 587 | if ( ((Todo*)ev)->dtDue().date() < QDate::currentDate() ) { |
574 | // tempText +="<font color=\"#F00000\">" + i18n("O-due!") + "</font>"; | 588 | // tempText +="<font color=\"#F00000\">" + i18n("O-due!") + "</font>"; |
575 | QString dfs = KGlobal::locale()->dateFormatShort(); | 589 | QString dfs = KGlobal::locale()->dateFormatShort(); |
576 | KGlobal::locale()->setDateFormatShort("%d.%b"); | 590 | KGlobal::locale()->setDateFormatShort("%d.%b"); |
577 | tempText +="<font color=\"#F00000\">" + KGlobal::locale()->formatDate(((Todo*)ev)->dtDue().date(), true, KLocale::Userdefined) + "</font>"; | 591 | tempText +="<font color=\"#F00000\">" + KGlobal::locale()->formatDate(((Todo*)ev)->dtDue().date(), true, KLocale::Userdefined) + "</font>"; |
578 | KGlobal::locale()->setDateFormatShort(dfs); | 592 | KGlobal::locale()->setDateFormatShort(dfs); |
579 | } else { | 593 | } else { |
580 | if (!ev->doesFloat() ) | 594 | if (!ev->doesFloat() ) |
581 | if( ( (Todo*)ev)->dtDue() < cdt ) { | 595 | if( ( (Todo*)ev)->dtDue() < cdt ) { |
582 | tempText +="<font color=\"#F00000\">" + ((Todo*)ev)->dtDueTimeStr() + "</font>"; | 596 | tempText +="<font color=\"#F00000\">" + ((Todo*)ev)->dtDueTimeStr() + "</font>"; |
583 | 597 | ||
584 | 598 | ||
585 | } else | 599 | } else |
586 | tempText +=((Todo*)ev)->dtDueTimeStr(); | 600 | tempText +=((Todo*)ev)->dtDueTimeStr(); |
587 | mTodos.append( ev ); | 601 | mTodos.append( ev ); |
588 | } | 602 | } |
589 | } | 603 | } |
590 | } | 604 | } |
591 | tempText += "</b></td><td>"; | 605 | tempText += "</b></td><td>"; |
592 | bool needClose = false; | 606 | bool needClose = false; |
593 | if ( ev->cancelled() ) { | 607 | if ( ev->cancelled() ) { |
594 | tempText += "<font color=\"#F00000\">[c"; | 608 | tempText += "<font color=\"#F00000\">[c"; |
595 | needClose =true; | 609 | needClose =true; |
596 | 610 | ||
597 | } | 611 | } |
598 | if ( ev->isAlarmEnabled() && ev->alarmEnabled()) { | 612 | if ( ev->isAlarmEnabled() && ev->alarmEnabled()) { |
599 | if ( !needClose) | 613 | if ( !needClose) |
600 | tempText +="["; | 614 | tempText +="["; |
601 | tempText += "a"; | 615 | tempText += "a"; |
602 | needClose =true; | 616 | needClose =true; |
603 | 617 | ||
604 | } | 618 | } |
605 | if ( ev->description().length() > 0 ) { | 619 | if ( ev->description().length() > 0 ) { |
606 | if ( !needClose) | 620 | if ( !needClose) |
607 | tempText +="["; | 621 | tempText +="["; |
608 | tempText += "i"; | 622 | tempText += "i"; |
609 | needClose =true; | 623 | needClose =true; |
610 | } | 624 | } |
611 | if ( ev->recurrence()->doesRecur() ) { | 625 | if ( ev->recurrence()->doesRecur() ) { |
612 | if ( !needClose) | 626 | if ( !needClose) |
613 | tempText +="["; | 627 | tempText +="["; |
614 | tempText += "r"; | 628 | tempText += "r"; |