-rw-r--r-- | korganizer/calendarview.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 1d5a57e..257a4dd 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -1523,11 +1523,14 @@ bool CalendarView::addAnniversary( QDate date, QString name, KCal::Attendee* a ev->addAttendee( 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 ); ev->setDtStart( QDateTime(date) ); @@ -2511,6 +2514,7 @@ void CalendarView::showEventEditor() if ( mEventEditor->width() < QApplication::desktop()->width() -60 || mEventEditor->width() > QApplication::desktop()->width() ) { 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(); topLevelWidget()->setCaption( i18n("") ); @@ -2526,6 +2530,7 @@ void CalendarView::showTodoEditor() if ( mTodoEditor->width() < QApplication::desktop()->width() -60|| mTodoEditor->width() > QApplication::desktop()->width() ) { 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(); topLevelWidget()->setCaption( i18n("") ); |