birthday fixes

2 files changed, 20 insertions, 4 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 1d5a57e..257a4dd 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1524,9 +1524,12 @@ bool  CalendarView::addAnniversary(  QDate date, QString name, KCal::Attendee* a
     }
     QString kind;
-    if ( birthday )
+    if ( birthday ) {
         kind = i18n( "Birthday" );
-    else
+        ev->setSummary( name + " (" + QString::number(date.year()) +")"); 
+    }
+    else {
         kind = i18n( "Anniversary" );
-    ev->setSummary( name + " - " + kind ); 
+        ev->setSummary( name + " (" + QString::number(date.year()) +") " + kind ); 
+    }
     ev->setOrganizer(a->email());
     ev->setCategories( kind );
@@ -2512,4 +2515,5 @@ void CalendarView::showEventEditor()
         topLevelWidget()->setCaption( i18n("Recreating edit dialog. Please wait...") );
         qDebug("KO: CalendarView: recreate mEventEditor %d %d",  mEventEditor->width(), QApplication::desktop()->width() );
+        qApp->processEvents();
         delete mEventEditor;
         mEventEditor = mDialogManager->getEventEditor(); 
@@ -2527,4 +2531,5 @@ void CalendarView::showTodoEditor()
         topLevelWidget()->setCaption( i18n("Recreating edit dialog. Please wait...") );
         qDebug("KO: CalendarView: recreate mTodoEditor %d %d ",  mTodoEditor->width() ,QApplication::desktop()->width()     );
+        qApp->processEvents();
         delete mTodoEditor;  
         mTodoEditor = mDialogManager->getTodoEditor(); 
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 7166a01..4111c5d 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -601,4 +601,12 @@ bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool a
     else
         tempText += i18n("-no summary-"); 
+    if ( ev->categories().contains( i18n("Birthday") ) || ev->categories().contains( i18n("Anniversary") )  ) {
+        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 )
@@ -656,5 +664,8 @@ bool KOWhatsNextView::appendTodo(Incidence *ev, QString ind , bool isSub )
         mText += "</font>";
     mText += "<a href=\"todo:" + ev->uid() + "\">";
-    mText += ev->summary();
+    if ( ev->summary().length() > 0 )
+        mText += ev->summary();
+    else
+        mText += i18n("-no summary-"); 
     mText += "</a>"; 
     if ( ((Todo*)ev)->hasDueDate () ) {