summaryrefslogtreecommitdiffabout
path: root/korganizer/kowhatsnextview.cpp
Unidiff
Diffstat (limited to 'korganizer/kowhatsnextview.cpp') (more/less context) (show whitespace changes)
-rw-r--r--korganizer/kowhatsnextview.cpp79
1 files changed, 42 insertions, 37 deletions
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 0f0bf11..aa33588 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -348,25 +348,25 @@ void KOWhatsNextView::updateView()
348 mView->setText(mText); 348 mView->setText(mText);
349 mView->setFocus(); 349 mView->setFocus();
350 350
351 // QPixmap bPix = SmallIcon( "back" ); 351 // QPixmap bPix = SmallIcon( "back" );
352 // qDebug("xxxxxxxxxxxxxxxxxxxxx "); 352 // qDebug("xxxxxxxxxxxxxxxxxxxxx ");
353 // QWidget* test = new QWidget(); 353 // QWidget* test = new QWidget();
354 // test->setBackgroundMode(FixedPixmap ); 354 // test->setBackgroundMode(FixedPixmap );
355 // test->setBackgroundPixmap ( bPix ); 355 // test->setBackgroundPixmap ( bPix );
356 // test->resize( 300, 400 ); 356 // test->resize( 300, 400 );
357 // test->show(); 357 // test->show();
358 // mView->setBackgroundMode(FixedPixmap ); 358 // mView->setBackgroundMode(FixedPixmap );
359 // mView->setBackgroundPixmap ( bPix ); 359 // mView->setBackgroundPixmap ( bPix );
360 qDebug("%s ",mText.latin1()); 360 // qDebug("%s ",mText.latin1());
361} 361}
362 362
363void KOWhatsNextView::appendDay( int i, QDate eventDate ) 363void KOWhatsNextView::appendDay( int i, QDate eventDate )
364{ 364{
365 QString date; 365 QString date;
366 QString day = KGlobal::locale()->formatDate( eventDate , KOPrefs::instance()->mShortDateInViewer); 366 QString day = KGlobal::locale()->formatDate( eventDate , KOPrefs::instance()->mShortDateInViewer);
367 if ( ! KOPrefs::instance()->mShortDateInViewer && QApplication::desktop()->width() < 320 ) { 367 if ( ! KOPrefs::instance()->mShortDateInViewer && QApplication::desktop()->width() < 320 ) {
368 if ( i == 0 ) { 368 if ( i == 0 ) {
369 mText += "<table>\n"; 369 mText += "<table>\n";
370 return;//date = "<em><font color=\"#008000\"><em>" + day+"</font></em>"; 370 return;//date = "<em><font color=\"#008000\"><em>" + day+"</font></em>";
371 } 371 }
372 else if ( i == 1 ) 372 else if ( i == 1 )
@@ -427,37 +427,38 @@ void KOWhatsNextView::changeEventDisplay(Event *, int action)
427 default: 427 default:
428 updateView(); 428 updateView();
429 kdDebug() << "KOWhatsNextView::changeEventDisplay(): Illegal action " << action << endl; 429 kdDebug() << "KOWhatsNextView::changeEventDisplay(): Illegal action " << action << endl;
430 } 430 }
431} 431}
432 432
433void KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed ) 433void KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed )
434{ 434{
435 if ( !KOPrefs::instance()->mShowSyncEvents && ev->uid().left(15) == QString("last-syncEvent-") ) 435 if ( !KOPrefs::instance()->mShowSyncEvents && ev->uid().left(15) == QString("last-syncEvent-") )
436 return; 436 return;
437 QDateTime cdt = QDateTime::currentDateTime(); 437 QDateTime cdt = QDateTime::currentDateTime();
438 QDateTime noc; 438 QDateTime noc;
439 QString tempText;
439 bool ok = true; 440 bool ok = true;
440 if ( reply ) { 441 if ( reply ) {
441 noc = ev->getNextOccurence( cdt, &ok ); 442 noc = ev->getNextOccurence( cdt, &ok );
442 if (! ok && ev->type() == "Event") 443 if (! ok && ev->type() == "Event")
443 return; 444 return;
444 } 445 }
445 mText += "<tr><td><b>"; 446 tempText += "<tr><td><b>";
446 if (ev->type()=="Event") { 447 if (ev->type()=="Event") {
447 if (reply) { 448 if (reply) {
448 if (!ev->doesFloat()) 449 if (!ev->doesFloat())
449 mText += KGlobal::locale()->formatDateTime( noc , KOPrefs::instance()->mShortDateInViewer) +": "; 450 tempText += KGlobal::locale()->formatDateTime( noc , KOPrefs::instance()->mShortDateInViewer) +": ";
450 else 451 else
451 mText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": "; 452 tempText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": ";
452 453
453 } else { 454 } else {
454 if (!ev->doesFloat()) { 455 if (!ev->doesFloat()) {
455 Event *event = static_cast<Event *>(ev); 456 Event *event = static_cast<Event *>(ev);
456 QDateTime st,end; 457 QDateTime st,end;
457 if ( event->recurrence()->doesRecur() ) { 458 if ( event->recurrence()->doesRecur() ) {
458 QDate recDate= mEventDate; 459 QDate recDate= mEventDate;
459 int days = event->dtStart().date().daysTo (event->dtEnd().date() ); 460 int days = event->dtStart().date().daysTo (event->dtEnd().date() );
460 while ( ! event->recursOn( recDate ) ) { 461 while ( ! event->recursOn( recDate ) ) {
461 recDate = recDate.addDays( -1 ); 462 recDate = recDate.addDays( -1 );
462 463
463 } 464 }
@@ -472,113 +473,117 @@ void KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed )
472 473
473 QString dateText; 474 QString dateText;
474 // qDebug("%s %s %s %s ", mEventDate.toString().latin1(),event->summary().latin1(), st .toString().latin1(),end.toString().latin1() ); 475 // qDebug("%s %s %s %s ", mEventDate.toString().latin1(),event->summary().latin1(), st .toString().latin1(),end.toString().latin1() );
475 if ( st.date() < mEventDate ) 476 if ( st.date() < mEventDate )
476 dateText = "++:++-"; 477 dateText = "++:++-";
477 else 478 else
478 dateText = event->dtStartTimeStr() + "-"; 479 dateText = event->dtStartTimeStr() + "-";
479 if ( end.date() > mEventDate ) 480 if ( end.date() > mEventDate )
480 dateText += "++:++"; 481 dateText += "++:++";
481 else 482 else
482 dateText += event->dtEndTimeStr(); 483 dateText += event->dtEndTimeStr();
483 if ( notRed ) 484 if ( notRed )
484 mText += dateText; 485 tempText += dateText;
485 else { 486 else {
486 if ( end < cdt ) 487 if ( end < cdt ) {
487 mText += "<font color=\"#F00000\">" + dateText + "</font>"; 488 if ( !KOPrefs::instance()->mWNViewShowsPast )
489 return;
490 tempText += "<font color=\"#F00000\">" + dateText + "</font>";
491 }
488 else if ( st < cdt ) 492 else if ( st < cdt )
489 mText += "<font color=\"#008000\">" + dateText + "</font>"; 493 tempText += "<font color=\"#008000\">" + dateText + "</font>";
490 else 494 else
491 mText += dateText; 495 tempText += dateText;
492 496
493 } 497 }
494 498
495 } else { 499 } else {
496 mText += i18n("Allday:"); 500 tempText += i18n("Allday:");
497 501
498 } 502 }
499 } 503 }
500 } else { 504 } else {
501 mTodos.append( ev ); 505 mTodos.append( ev );
502 mText += i18n("ToDo:"); 506 tempText += i18n("ToDo:");
503 if (reply) { 507 if (reply) {
504 mText += " "; 508 tempText += " ";
505 if ( noc != cdt ) { 509 if ( noc != cdt ) {
506 mText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": "; 510 tempText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": ";
507 } 511 }
508 } else { 512 } else {
509 if ( ((Todo*)ev)->dtDue().date() < QDate::currentDate() ) { 513 if ( ((Todo*)ev)->dtDue().date() < QDate::currentDate() ) {
510 // mText +="<font color=\"#F00000\">" + i18n("O-due!") + "</font>"; 514 // tempText +="<font color=\"#F00000\">" + i18n("O-due!") + "</font>";
511 QString dfs = KGlobal::locale()->dateFormatShort(); 515 QString dfs = KGlobal::locale()->dateFormatShort();
512 KGlobal::locale()->setDateFormatShort("%d.%b"); 516 KGlobal::locale()->setDateFormatShort("%d.%b");
513 mText +="<font color=\"#F00000\">" + KGlobal::locale()->formatDate(((Todo*)ev)->dtDue().date(), true, KLocale::Userdefined) + "</font>"; 517 tempText +="<font color=\"#F00000\">" + KGlobal::locale()->formatDate(((Todo*)ev)->dtDue().date(), true, KLocale::Userdefined) + "</font>";
514 KGlobal::locale()->setDateFormatShort(dfs); 518 KGlobal::locale()->setDateFormatShort(dfs);
515 } else { 519 } else {
516 if (!ev->doesFloat() ) 520 if (!ev->doesFloat() )
517 if( ( (Todo*)ev)->dtDue() < cdt ) { 521 if( ( (Todo*)ev)->dtDue() < cdt ) {
518 mText +="<font color=\"#F00000\">" + ((Todo*)ev)->dtDueTimeStr() + "</font>"; 522 tempText +="<font color=\"#F00000\">" + ((Todo*)ev)->dtDueTimeStr() + "</font>";
519 523
520 524
521 } else 525 } else
522 mText +=((Todo*)ev)->dtDueTimeStr(); 526 tempText +=((Todo*)ev)->dtDueTimeStr();
523 mTodos.append( ev ); 527 mTodos.append( ev );
524 } 528 }
525 } 529 }
526 } 530 }
527 mText += "</b></td><td>"; 531 tempText += "</b></td><td>";
528 bool needClose = false; 532 bool needClose = false;
529 if ( ev->cancelled() ) { 533 if ( ev->cancelled() ) {
530 mText += "<font color=\"#F00000\">[c"; 534 tempText += "<font color=\"#F00000\">[c";
531 needClose =true; 535 needClose =true;
532 536
533 } 537 }
534 if ( ev->isAlarmEnabled() ) { 538 if ( ev->isAlarmEnabled() ) {
535 if ( !needClose) 539 if ( !needClose)
536 mText +="["; 540 tempText +="[";
537 mText += "a"; 541 tempText += "a";
538 needClose =true; 542 needClose =true;
539 543
540 } 544 }
541 if ( ev->description().length() > 0 ) { 545 if ( ev->description().length() > 0 ) {
542 if ( !needClose) 546 if ( !needClose)
543 mText +="["; 547 tempText +="[";
544 mText += "i"; 548 tempText += "i";
545 needClose =true; 549 needClose =true;
546 } 550 }
547 if ( ev->recurrence()->doesRecur() ) { 551 if ( ev->recurrence()->doesRecur() ) {
548 if ( !needClose) 552 if ( !needClose)
549 mText +="["; 553 tempText +="[";
550 mText += "r"; 554 tempText += "r";
551 needClose =true; 555 needClose =true;
552 } 556 }
553 if ( needClose ) { 557 if ( needClose ) {
554 mText += "] "; 558 tempText += "] ";
555 } 559 }
556 if ( ev->cancelled() ) 560 if ( ev->cancelled() )
557 mText += "</font>"; 561 tempText += "</font>";
558 mText += "<a "; 562 tempText += "<a ";
559 if (ev->type()=="Event") mText += "href=\"event:"; 563 if (ev->type()=="Event") tempText += "href=\"event:";
560 if (ev->type()=="Todo") mText += "href=\"todo:"; 564 if (ev->type()=="Todo") tempText += "href=\"todo:";
561 mText += ev->uid() + "\">"; 565 tempText += ev->uid() + "\">";
562 if ( ev->summary().length() > 0 ) 566 if ( ev->summary().length() > 0 )
563 mText += ev->summary(); 567 tempText += ev->summary();
564 else 568 else
565 mText += i18n("-no summary-"); 569 tempText += i18n("-no summary-");
566 mText += "</a>"; 570 tempText += "</a>";
567 if ( KOPrefs::instance()->mWNViewShowLocation ) 571 if ( KOPrefs::instance()->mWNViewShowLocation )
568 if ( !ev->location().isEmpty() ) 572 if ( !ev->location().isEmpty() )
569 mText += " ("+ev->location() +")"; 573 tempText += " ("+ev->location() +")";
570 if ( ev->relatedTo() && KOPrefs::instance()->mWNViewShowsParents) 574 if ( ev->relatedTo() && KOPrefs::instance()->mWNViewShowsParents)
571 mText += " ["+ev->relatedTo()->summary() +"]"; 575 tempText += " ["+ev->relatedTo()->summary() +"]";
572 mText += "</td></tr>\n"; 576 tempText += "</td></tr>\n";
577 mText += tempText;
573} 578}
574 579
575bool KOWhatsNextView::appendTodo(Incidence *ev, QString ind , bool isSub ) 580bool KOWhatsNextView::appendTodo(Incidence *ev, QString ind , bool isSub )
576{ 581{
577 if ( mTodos.find( ev ) != mTodos.end() ) return false; 582 if ( mTodos.find( ev ) != mTodos.end() ) return false;
578 583
579 mTodos.append( ev ); 584 mTodos.append( ev );
580 if ( !isSub ) 585 if ( !isSub )
581 mText += "<p>"; 586 mText += "<p>";
582 else 587 else
583 mText += "<li>"; 588 mText += "<li>";
584 mText += "[" +QString::number(ev->priority()) + "/" + QString::number(((Todo*)ev)->percentComplete())+"%] "; 589 mText += "[" +QString::number(ev->priority()) + "/" + QString::number(((Todo*)ev)->percentComplete())+"%] ";