-rw-r--r-- | korganizer/calendarview.cpp | 2 | ||||
-rw-r--r-- | korganizer/koviewmanager.cpp | 6 | ||||
-rw-r--r-- | korganizer/koviewmanager.h | 2 | ||||
-rw-r--r-- | korganizer/kowhatsnextview.cpp | 45 | ||||
-rw-r--r-- | libkcal/incidence.cpp | 4 | ||||
-rw-r--r-- | libkcal/incidencebase.cpp | 4 |
6 files changed, 45 insertions, 18 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index ba0e6c6..bbed05b 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1938,3 +1938,3 @@ void CalendarView::changeTodoDisplay(Todo *which, int action) | |||
1938 | if (which) { | 1938 | if (which) { |
1939 | //mViewManager->currentView()->updateView();//LR | 1939 | mViewManager->updateWNview(); |
1940 | //mTodoList->updateView(); | 1940 | //mTodoList->updateView(); |
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index fc2bc77..ba77b45 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp | |||
@@ -225,2 +225,8 @@ void KOViewManager::updateView(const QDate &start, const QDate &end) | |||
225 | 225 | ||
226 | void KOViewManager::updateWNview() | ||
227 | { | ||
228 | if ( mCurrentView == mWhatsNextView && mWhatsNextView ) | ||
229 | mWhatsNextView->updateView(); | ||
230 | |||
231 | } | ||
226 | void KOViewManager::showWhatsNextView() | 232 | void KOViewManager::showWhatsNextView() |
diff --git a/korganizer/koviewmanager.h b/korganizer/koviewmanager.h index f814c36..26b22be 100644 --- a/korganizer/koviewmanager.h +++ b/korganizer/koviewmanager.h | |||
@@ -55,3 +55,3 @@ class KOViewManager : public QObject | |||
55 | void showView(KOrg::BaseView *, bool fullScreen = false ); | 55 | void showView(KOrg::BaseView *, bool fullScreen = false ); |
56 | 56 | void updateWNview(); | |
57 | void readSettings(KConfig *config); | 57 | void readSettings(KConfig *config); |
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp index b2001ec..2a8a7c1 100644 --- a/korganizer/kowhatsnextview.cpp +++ b/korganizer/kowhatsnextview.cpp | |||
@@ -265,3 +265,3 @@ void KOWhatsNextView::updateView() | |||
265 | // kil.loadIcon("reply",KIcon::NoGroup,22,KIcon::DefaultState,&ipath); | 265 | // kil.loadIcon("reply",KIcon::NoGroup,22,KIcon::DefaultState,&ipath); |
266 | mText += "<h2>"; | 266 | //mText += "<h2>"; |
267 | //<img src=\""; | 267 | //<img src=\""; |
@@ -269,3 +269,4 @@ void KOWhatsNextView::updateView() | |||
269 | // mText += "\">"; | 269 | // mText += "\">"; |
270 | mText += i18n("Events and To-Dos that need a reply:") + "</h2>\n"; | 270 | //mText += i18n("Events and To-Dos that need a reply:") + "</h2>\n"; |
271 | mText +="<big><big><strong><em><font color=\"#000080\">" + i18n("Events and To-Dos that need a reply:") + "</font></em></strong></big></big>\n"; | ||
271 | mText += "<table>\n"; | 272 | mText += "<table>\n"; |
@@ -283,2 +284,3 @@ void KOWhatsNextView::updateView() | |||
283 | while(to) { | 284 | while(to) { |
285 | if ( !to->isCompleted() ){ | ||
284 | Attendee *me = to->attendeeByMails(KOPrefs::instance()->mAdditionalMails,KOPrefs::instance()->email()); | 286 | Attendee *me = to->attendeeByMails(KOPrefs::instance()->mAdditionalMails,KOPrefs::instance()->email()); |
@@ -287,9 +289,3 @@ void KOWhatsNextView::updateView() | |||
287 | if (replys == 0) { | 289 | if (replys == 0) { |
288 | mText += "<p></p>"; | 290 | mText +="<big><big><strong><em><font color=\"#000080\">" + i18n("Events and To-Dos that need a reply:") + "</font></em></strong></big></big>\n"; |
289 | // kil.loadIcon("reply",KIcon::NoGroup,22,KIcon::DefaultState,&ipath); | ||
290 | mText += "<h2>"; | ||
291 | //<img src=\""; | ||
292 | // mText += ipath; | ||
293 | // mText += "\">"; | ||
294 | mText += i18n("Events and To-Dos that need a reply:") + "</h2>\n"; | ||
295 | mText += "<table>\n"; | 291 | mText += "<table>\n"; |
@@ -297,6 +293,6 @@ void KOWhatsNextView::updateView() | |||
297 | replys++; | 293 | replys++; |
298 | appendEvent(to); | 294 | appendEvent(to, true); |
295 | } | ||
299 | } | 296 | } |
300 | } | 297 | } |
301 | kdDebug () << "check for todo-replys..." << endl; | ||
302 | to = todos.next(); | 298 | to = todos.next(); |
@@ -309,3 +305,2 @@ void KOWhatsNextView::updateView() | |||
309 | 305 | ||
310 | kdDebug() << "KOWhatsNextView::updateView: text: " << mText << endl; | ||
311 | mView->setText(mText); | 306 | mView->setText(mText); |
@@ -396,8 +391,21 @@ void KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed ) | |||
396 | { | 391 | { |
397 | if ( !KOPrefs::instance()->mShowSyncEvents && ev->uid().left(21) == QString("last-syncEvent-device") ) | 392 | if ( !KOPrefs::instance()->mShowSyncEvents && ev->uid().left(15) == QString("last-syncEvent-") ) |
398 | return; | 393 | return; |
399 | QDateTime cdt = QDateTime::currentDateTime(); | 394 | QDateTime cdt = QDateTime::currentDateTime(); |
395 | QDateTime noc; | ||
396 | bool ok = true; | ||
397 | if ( reply ) { | ||
398 | noc = ev->getNextOccurence( cdt, &ok ); | ||
399 | if (! ok && ev->type() == "Event") | ||
400 | return; | ||
401 | } | ||
400 | mText += "<tr><td><b>"; | 402 | mText += "<tr><td><b>"; |
401 | if (ev->type()=="Event") { | 403 | if (ev->type()=="Event") { |
404 | if (reply) { | ||
405 | if (!ev->doesFloat()) | ||
406 | mText += KGlobal::locale()->formatDateTime( noc , KOPrefs::instance()->mShortDateInViewer) +": "; | ||
407 | else | ||
408 | mText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": "; | ||
402 | 409 | ||
410 | } else { | ||
403 | if (!ev->doesFloat()) { | 411 | if (!ev->doesFloat()) { |
@@ -420,3 +428,3 @@ void KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed ) | |||
420 | 428 | ||
421 | if (reply) mText += "on " + event->dtStartDateStr() + ": "; | 429 | |
422 | QString dateText; | 430 | QString dateText; |
@@ -440,2 +448,3 @@ void KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed ) | |||
440 | mText += dateText; | 448 | mText += dateText; |
449 | |||
441 | } | 450 | } |
@@ -446,2 +455,3 @@ void KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed ) | |||
446 | } | 455 | } |
456 | } | ||
447 | } else { | 457 | } else { |
@@ -449,2 +459,8 @@ void KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed ) | |||
449 | mText += i18n("ToDo:"); | 459 | mText += i18n("ToDo:"); |
460 | if (reply) { | ||
461 | mText += " "; | ||
462 | if ( noc != cdt ) { | ||
463 | mText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": "; | ||
464 | } | ||
465 | } else { | ||
450 | if ( ((Todo*)ev)->dtDue().date() < QDate::currentDate() ) { | 466 | if ( ((Todo*)ev)->dtDue().date() < QDate::currentDate() ) { |
@@ -466,2 +482,3 @@ void KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed ) | |||
466 | } | 482 | } |
483 | } | ||
467 | mText += "</b></td><td>"; | 484 | mText += "</b></td><td>"; |
diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp index 56c9801..55ac6d4 100644 --- a/libkcal/incidence.cpp +++ b/libkcal/incidence.cpp | |||
@@ -592,2 +592,6 @@ QDateTime Incidence::getNextOccurence( const QDateTime& dt, bool* ok ) const | |||
592 | incidenceStart = dtStart(); | 592 | incidenceStart = dtStart(); |
593 | } | ||
594 | if ( type() =="Todo" ) { | ||
595 | if ( ((Todo*)this)->hasDueDate() ) | ||
596 | incidenceStart = ((Todo*)this)->dtDue(); | ||
593 | 597 | ||
diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp index 64a343c..b36dc1a 100644 --- a/libkcal/incidencebase.cpp +++ b/libkcal/incidencebase.cpp | |||
@@ -273,3 +273,3 @@ Attendee *IncidenceBase::attendeeByMail(const QString &email) | |||
273 | while (qli) { | 273 | while (qli) { |
274 | if (qli.current()->email() == email) | 274 | if (qli.current()->email().lower() == email.lower()) |
275 | return qli.current(); | 275 | return qli.current(); |
@@ -291,3 +291,3 @@ Attendee *IncidenceBase::attendeeByMails(const QStringList &emails, const QStrin | |||
291 | for ( QStringList::Iterator it = mails.begin(); it != mails.end(); ++it ) { | 291 | for ( QStringList::Iterator it = mails.begin(); it != mails.end(); ++it ) { |
292 | if (qli.current()->email() == *it) | 292 | if (qli.current()->email().lower() == (*it).lower()) |
293 | return qli.current(); | 293 | return qli.current(); |