Several bugfixes

4 files changed, 39 insertions, 16 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index ba0e6c6..bbed05b 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1936,7 +1936,7 @@ void CalendarView::changeTodoDisplay(Todo *which, int action)
     //mDialogManager->updateSearchDialog();
 
     if (which) {
-        //mViewManager->currentView()->updateView();//LR
+        mViewManager->updateWNview();
         //mTodoList->updateView();
     }
    
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index fc2bc77..ba77b45 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -223,6 +223,12 @@ void KOViewManager::updateView(const QDate &start, const QDate &end)
 }
 
 
+void KOViewManager::updateWNview()
+{
+    if ( mCurrentView == mWhatsNextView && mWhatsNextView )
+        mWhatsNextView->updateView();
+        
+}
 void KOViewManager::showWhatsNextView()
 {
     if (!mWhatsNextView) {
diff --git a/korganizer/koviewmanager.h b/korganizer/koviewmanager.h
index f814c36..26b22be 100644
--- a/korganizer/koviewmanager.h
+++ b/korganizer/koviewmanager.h
@@ -53,7 +53,7 @@ class KOViewManager : public QObject
 
     /** changes the view to be the currently selected view */
     void showView(KOrg::BaseView *, bool fullScreen = false );
-
+    void updateWNview();
     void readSettings(KConfig *config);
     void writeSettings(KConfig *config);
     bool showsNextDays(); 
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index b2001ec..2a8a7c1 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -263,11 +263,12 @@ void KOWhatsNextView::updateView()
                     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++;
@@ -281,24 +282,19 @@ void KOWhatsNextView::updateView()
     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();
         }
     }
@@ -307,7 +303,6 @@ void KOWhatsNextView::updateView()
 
     mText += "</td></tr>\n</table>\n";
 
-    kdDebug() << "KOWhatsNextView::updateView: text: " << mText << endl;
     mView->setText(mText);
     mView->setFocus();
 
@@ -394,12 +389,25 @@ void KOWhatsNextView::changeEventDisplay(Event *, int action)
 
 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;
@@ -418,7 +426,7 @@ void KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed )
                 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 )
@@ -438,15 +446,23 @@ void KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed )
                     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();
@@ -464,6 +480,7 @@ void KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed )
             mTodos.append( ev );
         }
     }
+    }
     mText += "</b></td><td>";
     bool needClose = false;
     if ( ev->cancelled() ) {