1 files changed, 13 insertions, 2 deletions

diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 4111c5d..57623e6 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -383,317 +383,328 @@ void KOWhatsNextView::updateView()
     //   QWidget* test = new QWidget();
     //  test->setBackgroundMode(FixedPixmap  );
     //  test->setBackgroundPixmap ( bPix );
     //  test->resize( 300, 400 );
     //  test->show();
     //   mView->setBackgroundMode(FixedPixmap  );
     //   mView->setBackgroundPixmap ( bPix );
     // qDebug("%s ",mText.latin1());
 }
 
 void  KOWhatsNextView::appendDay( int i, QDate eventDate )
 {
     QString date;
     QString day = KGlobal::locale()->formatDate( eventDate , KOPrefs::instance()->mShortDateInViewer); 
     if ( ! KOPrefs::instance()->mShortDateInViewer && QApplication::desktop()->width() < 320 ) {
         if ( i == 0 ) {
             //mText += "<table>\n";
             return;//date = "<em><font color=\"#008000\"><em>" +  day+"</font></em>";
         }
         else if ( i == 1 )
             date = "<em><font color=\"#000080\">" + day + "</font></em>" ;
         else date = "<em><font color=\"#000080\">" + day + "</font></em>";
         mText += "<h2>" + date + "</h2>\n";
         //mText += "<big><big><strong>" + date + "</strong></big></big>\n";
         mText += "<table>\n";
 
 
 
     } else { 
         if ( i == 0 ) {
             //mText += "<table>\n";
             return;// date = "<font color=\"#008000\"><em>" +i18n("Today: ") +"</em>" + day+"</font>";
         }
 
 #ifdef DESKTOP_VERSION
         else if ( i == 1 ) {
             date = "<h2><em><font color=\"#000080\">" + i18n("Tomorrow: ") + day +"</font></em></h2>" ;
         }
         else date = "<h2><em><font color=\"#000080\">" + i18n("In %1 days: ").arg( i ) +day + "</font></em></h2>";
 #else
         else if ( i == 1 ) {
             date = "<em><font color=\"#000080\">" + i18n("Tomorrow: ") + day +"</font></em>" ;
         }
         else date = "<em><font color=\"#000080\">" + i18n("In %1 days: ").arg( i ) +day + "</font></em>";
 
 #endif
         mText += "<h2>" + date + "</h2>\n";
         //mText += "<big><big><strong>" + date + "</strong></big></big>\n";
         mText += "<table>\n";
     }
 }
 
 
 void KOWhatsNextView::showDates(const QDate &, const QDate &)
 {
     updateView();
 }
 
 void KOWhatsNextView::showEvents(QPtrList<Event>)
 {
 }
 
 void KOWhatsNextView::changeEventDisplay(Event *, int action)
 {
     switch(action) {
     case KOGlobals::EVENTADDED:
         updateView();
         break;
     case KOGlobals::EVENTEDITED:
         updateView();
         break;
     case KOGlobals::EVENTDELETED:
         updateView();
         break;
     default:
         updateView();
         kdDebug() << "KOWhatsNextView::changeEventDisplay(): Illegal action " << action << endl;
     }
 }
 
 bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool appendTable )
 {
     if ( !KOPrefs::instance()->mShowSyncEvents && ev->uid().left(15) == QString("last-syncEvent-") )
         return false;
     QDateTime cdt =  QDateTime::currentDateTime();
     QDateTime noc;
     QString tempText;
     if ( appendTable && !notRed ) {
             tempText = "<table>";
     }
     bool ok = true; 
     if ( reply ) {
         noc = ev->getNextOccurence( cdt, &ok );
         if (! ok && ev->type() == "Event")
             return false;
     }
+    bool bDay = false;
+    if ( ev->categories().contains( i18n("Birthday") ) || ev->categories().contains( i18n("Anniversary") )  )
+        bDay = true;
     tempText += "<tr><td><b>";
     if (ev->type()=="Event") {
         if (reply)  {
             if (!ev->doesFloat())
                 tempText += KGlobal::locale()->formatDateTime( noc , KOPrefs::instance()->mShortDateInViewer) +": ";
             else
                 tempText += 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()  );
                     while ( ! event->recursOn(  recDate ) ) {
                         recDate = recDate.addDays( -1 );
 
                     }
                     st =  QDateTime ( recDate,  event->dtStart().time() );
                     end = QDateTime ( recDate.addDays( days ),  event->dtEnd().time() );
                 }
                 else {
                     st = event->dtStart();
                     end = event->dtEnd();
                 }
       
            
                 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() + "-";
                 if ( end.date() > mEventDate ) 
                     dateText += "++:++";
                 else
                     dateText += event->dtEndTimeStr();
                 if ( notRed ) 
                     tempText += dateText;
                 else {
                     if ( end < cdt  ) {
                         if ( !KOPrefs::instance()->mWNViewShowsPast )
                             return false;
                         tempText += "<font color=\"#F00000\">" + dateText + "</font>";
                     }
                     else if ( st < cdt )
                         tempText += "<font color=\"#008000\">" + dateText + "</font>";
                     else
                         tempText += dateText;
                 
                 }
     
             } else {
-                tempText += i18n("Allday:");
+                if ( bDay ) {
+                    
+                    if ( ev->categories().contains( i18n("Birthday") ))
+                        tempText += "<font color=\"#F00000\">" + i18n("Birthday") +":</font>";
+                    else
+                        tempText += "<font color=\"#F00000\">" + i18n("Anniversary")+":</font>";
+                } else {
+                    tempText += i18n("Allday:");
+                }
 
             }
         }
     } else {
         mTodos.append( ev );
         tempText += i18n("ToDo:"); 
         if (reply)  {
             tempText += " "; 
             if ( noc != cdt ) {
                 tempText += KGlobal::locale()->formatDate( noc.date() , KOPrefs::instance()->mShortDateInViewer) +": ";
             }
         } else {
             if ( ((Todo*)ev)->dtDue().date() < QDate::currentDate() ) {
                 // tempText +="<font color=\"#F00000\">" + i18n("O-due!") + "</font>";
                 QString dfs = KGlobal::locale()->dateFormatShort();
                 KGlobal::locale()->setDateFormatShort("%d.%b");
                 tempText +="<font color=\"#F00000\">" + KGlobal::locale()->formatDate(((Todo*)ev)->dtDue().date(), true, KLocale::Userdefined) + "</font>";
                 KGlobal::locale()->setDateFormatShort(dfs);
             } else {
                 if (!ev->doesFloat() )
                     if( ( (Todo*)ev)->dtDue()  < cdt  ) {
                         tempText +="<font color=\"#F00000\">" + ((Todo*)ev)->dtDueTimeStr() + "</font>";
 
 
                     } else 
                         tempText +=((Todo*)ev)->dtDueTimeStr();
                 mTodos.append( ev );
             }
         }
     }
     tempText += "</b></td><td>";
     bool needClose = false;
     if ( ev->cancelled() ) {
         tempText += "<font color=\"#F00000\">[c";
         needClose =true;
 
     }
     if ( ev->isAlarmEnabled() ) { 
         if ( !needClose)
             tempText +="[";
         tempText += "a";
         needClose =true;
 
     }
     if ( ev->description().length() > 0 ) {
         if ( !needClose)
             tempText +="[";
         tempText += "i";
         needClose =true;
     }
     if ( ev->recurrence()->doesRecur() ) {
         if ( !needClose)
             tempText +="[";
         tempText += "r";
         needClose =true;
     }
     if ( needClose ) {
         tempText += "] ";
     }
     if ( ev->cancelled() ) 
         tempText += "</font>";
     tempText += "<a ";
     if (ev->type()=="Event") tempText += "href=\"event:";
     if (ev->type()=="Todo") tempText += "href=\"todo:";
     tempText += ev->uid() + "\">";
     if ( ev->summary().length() > 0 )
         tempText += ev->summary();
     else
         tempText += i18n("-no summary-"); 
-    if ( ev->categories().contains( i18n("Birthday") ) || ev->categories().contains( i18n("Anniversary") )  ) {
+    if ( bDay  ) {
         noc = ev->getNextOccurence( cdt, &ok );
         if ( ok ) {
             int years = noc.date().year() - ev->dtStart().date().year();
             tempText += i18n(" (%1 y.)"). arg( years );
         }
     } 
     
     tempText += "</a>";
     if ( KOPrefs::instance()->mWNViewShowLocation )
         if ( !ev->location().isEmpty() )
             tempText += " ("+ev->location() +")";
     if ( ev->relatedTo() && KOPrefs::instance()->mWNViewShowsParents)
             tempText += " ["+ev->relatedTo()->summary() +"]";
     tempText += "</td></tr>\n";
     mText += tempText;
     return true;
 }
 
 bool KOWhatsNextView::appendTodo(Incidence *ev, QString ind , bool isSub )
 {
     if ( mTodos.find( ev ) != mTodos.end() ) return false;
 
     mTodos.append( ev );
     if ( !isSub )
         mText += "<p>";
     else
         mText += "<li>";
     mText += "[" +QString::number(ev->priority()) + "/" + QString::number(((Todo*)ev)->percentComplete())+"%] ";
 
 
     mText += ind;
     bool needClose = false;
     if ( ev->cancelled() ) {
         mText += "<font color=\"#F00000\">[c";
         needClose =true;
 
     }
     if ( ev->isAlarmEnabled() ) { 
         if ( !needClose)
             mText +="[";
         mText += "a";
         needClose =true;
 
     }
    
     if ( ev->description().length() > 0 ) {
         if ( !needClose)
             mText +="[";
         mText += "i";
         needClose =true;
     }
     //  if ( ev->recurrence()->doesRecur() ) {
     //       if ( !needClose)
     //           mText +="(";
     //       mText += "r";
     //       needClose =true;
     //   }
     if ( needClose )
         mText += "] ";
     if ( ev->cancelled() ) 
         mText += "</font>";
     mText += "<a href=\"todo:" + ev->uid() + "\">";
     if ( ev->summary().length() > 0 )
         mText += ev->summary();
     else
         mText += i18n("-no summary-"); 
     mText += "</a>"; 
     if ( ((Todo*)ev)->hasDueDate () ) {
         QString year = "";
         int ye = ((Todo*)ev)->dtDue().date().year();
         if ( QDateTime::currentDateTime().date().year() != ye )
             year = QString::number( ye );
         QString dfs = KGlobal::locale()->dateFormatShort();
         KGlobal::locale()->setDateFormatShort("%d.%b");
         mText +="<font color=\"#00A000\"> [" + KGlobal::locale()->formatDate(((Todo*)ev)->dtDue().date(), true, KLocale::Userdefined) + "."+ year +"]</font>";
         KGlobal::locale()->setDateFormatShort(dfs);
     }
     if ( KOPrefs::instance()->mWNViewShowLocation )
         if ( !ev->location().isEmpty() )
             mText += " ("+ev->location() +")";
     if ( !isSub ) {
         if ( ((Todo*)ev)->relatedTo()&& KOPrefs::instance()->mWNViewShowsParents)
             mText += " ["+ev->relatedTo()->summary() +"]";
         mText += "</p>\n";
     }
     else {
         ind += "-";
         mText += "</li>\n";
     }
     QPtrList<Incidence> Relations = ev->relations();
     Incidence *to;
     for (to=Relations.first();to;to=Relations.next()) {
         if (!((Todo*)to)->isCompleted())
             appendTodo( to, ind , true );
     }