author | zautrix <zautrix> | 2004-09-20 15:25:04 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-20 15:25:04 (UTC) |
commit | 6b6a28919908134ccbb3badcb24c2dcae0d426a5 (patch) (side-by-side diff) | |
tree | 72b3f69fa1f40bd4cfbd945d9f41699229604ae6 /korganizer/kowhatsnextview.cpp | |
parent | f222bd1339ac8323e3c99af84a6f83c21cacb8f8 (diff) | |
download | kdepimpi-6b6a28919908134ccbb3badcb24c2dcae0d426a5.zip kdepimpi-6b6a28919908134ccbb3badcb24c2dcae0d426a5.tar.gz kdepimpi-6b6a28919908134ccbb3badcb24c2dcae0d426a5.tar.bz2 |
Several bugfixes
Diffstat (limited to 'korganizer/kowhatsnextview.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | korganizer/kowhatsnextview.cpp | 45 |
1 files changed, 31 insertions, 14 deletions
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp index b2001ec..2a8a7c1 100644 --- a/korganizer/kowhatsnextview.cpp +++ b/korganizer/kowhatsnextview.cpp @@ -260,17 +260,18 @@ void KOWhatsNextView::updateView() Attendee *me = ev->attendeeByMails(KOPrefs::instance()->mAdditionalMails,KOPrefs::instance()->email()); if (me!=0) { if (me->status()==Attendee::NeedsAction && me->RSVP()) { if (replys == 0) { mText += "<p></p>"; // kil.loadIcon("reply",KIcon::NoGroup,22,KIcon::DefaultState,&ipath); - mText += "<h2>"; + //mText += "<h2>"; //<img src=\""; // mText += ipath; // mText += "\">"; - mText += i18n("Events and To-Dos that need a reply:") + "</h2>\n"; + //mText += i18n("Events and To-Dos that need a reply:") + "</h2>\n"; + mText +="<big><big><strong><em><font color=\"#000080\">" + i18n("Events and To-Dos that need a reply:") + "</font></em></strong></big></big>\n"; mText += "<table>\n"; } replys++; appendEvent(ev,true); } } @@ -278,39 +279,33 @@ void KOWhatsNextView::updateView() } } todos = calendar()->todos(); if (todos.count() > 0) { Todo *to = todos.first(); while(to) { + if ( !to->isCompleted() ){ Attendee *me = to->attendeeByMails(KOPrefs::instance()->mAdditionalMails,KOPrefs::instance()->email()); if (me!=0) { if (me->status()==Attendee::NeedsAction && me->RSVP()) { if (replys == 0) { - mText += "<p></p>"; - // kil.loadIcon("reply",KIcon::NoGroup,22,KIcon::DefaultState,&ipath); - mText += "<h2>"; - //<img src=\""; - // mText += ipath; - // mText += "\">"; - mText += i18n("Events and To-Dos that need a reply:") + "</h2>\n"; + mText +="<big><big><strong><em><font color=\"#000080\">" + i18n("Events and To-Dos that need a reply:") + "</font></em></strong></big></big>\n"; mText += "<table>\n"; } replys++; - appendEvent(to); + appendEvent(to, true); + } } } - kdDebug () << "check for todo-replys..." << endl; to = todos.next(); } } if (replys > 0 ) mText += "</table>\n"; mText += "</td></tr>\n</table>\n"; - kdDebug() << "KOWhatsNextView::updateView: text: " << mText << endl; mView->setText(mText); mView->setFocus(); // QPixmap bPix = SmallIcon( "back" ); // qDebug("xxxxxxxxxxxxxxxxxxxxx "); // QWidget* test = new QWidget(); @@ -391,18 +386,31 @@ void KOWhatsNextView::changeEventDisplay(Event *, int action) kdDebug() << "KOWhatsNextView::changeEventDisplay(): Illegal action " << action << endl; } } void KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed ) { - if ( !KOPrefs::instance()->mShowSyncEvents && ev->uid().left(21) == QString("last-syncEvent-device") ) + if ( !KOPrefs::instance()->mShowSyncEvents && ev->uid().left(15) == QString("last-syncEvent-") ) return; QDateTime cdt = QDateTime::currentDateTime(); + QDateTime noc; + bool ok = true; + if ( reply ) { + noc = ev->getNextOccurence( cdt, &ok ); + if (! ok && ev->type() == "Event") + return; + } mText += "<tr><td><b>"; if (ev->type()=="Event") { + if (reply) { + if (!ev->doesFloat()) + mText += KGlobal::locale()->formatDateTime( noc , KOPrefs::instance()->mShortDateInViewer) +": "; + else + mText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": "; + } else { if (!ev->doesFloat()) { Event *event = static_cast<Event *>(ev); QDateTime st,end; if ( event->recurrence()->doesRecur() ) { QDate recDate= mEventDate; int days = event->dtStart().date().daysTo (event->dtEnd().date() ); @@ -415,13 +423,13 @@ void KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed ) } else { st = event->dtStart(); end = event->dtEnd(); } - if (reply) mText += "on " + event->dtStartDateStr() + ": "; + QString dateText; // qDebug("%s %s %s %s ", mEventDate.toString().latin1(),event->summary().latin1(), st .toString().latin1(),end.toString().latin1() ); if ( st.date() < mEventDate ) dateText = "++:++-"; else dateText = event->dtStartTimeStr() + "-"; @@ -435,21 +443,29 @@ void KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed ) if ( end < cdt ) mText += "<font color=\"#F00000\">" + dateText + "</font>"; else if ( st < cdt ) mText += "<font color=\"#008000\">" + dateText + "</font>"; else mText += dateText; + } } else { mText += i18n("Allday:"); } + } } else { mTodos.append( ev ); mText += i18n("ToDo:"); + if (reply) { + mText += " "; + if ( noc != cdt ) { + mText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": "; + } + } else { if ( ((Todo*)ev)->dtDue().date() < QDate::currentDate() ) { // mText +="<font color=\"#F00000\">" + i18n("O-due!") + "</font>"; QString dfs = KGlobal::locale()->dateFormatShort(); KGlobal::locale()->setDateFormatShort("%d.%b"); mText +="<font color=\"#F00000\">" + KGlobal::locale()->formatDate(((Todo*)ev)->dtDue().date(), true, KLocale::Userdefined) + "</font>"; KGlobal::locale()->setDateFormatShort(dfs); @@ -461,12 +477,13 @@ void KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed ) } else mText +=((Todo*)ev)->dtDueTimeStr(); mTodos.append( ev ); } } + } mText += "</b></td><td>"; bool needClose = false; if ( ev->cancelled() ) { mText += "<font color=\"#F00000\">[c"; needClose =true; |