1 files changed, 19 insertions, 1 deletions

diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index 607e549..92d2a80 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -367,64 +367,74 @@ void KOEventViewer::appendEvent(Event *event, int mode )
         next = event->getNextOccurence( QDateTime::currentDateTime() , &ok );
         if ( ok ) {
             if ( wideScreen ){
                 addTag("p",i18n("<b>Next recurrence is on:</b>") +" " + KGlobal::locale()->formatDate( next.date(), shortDate ) );
             } else {
                 addTag("p",i18n("<b>Next recurrence is on:</b>")  );
                 addTag("p", KGlobal::locale()->formatDate( next.date(), shortDate ));
             }
             mMailSubject += i18n(" - " )+ KGlobal::locale()->formatDateTime( next, true );
 
         } else {
             bool last;
             QDate nextd;
             nextd = event->recurrence()->getPreviousDate( QDate::currentDate() , &last );
             if ( last ) {
                 if ( wideScreen ){
                     addTag("p",i18n("<b>Last recurrence was on:</b>") +" " + KGlobal::locale()->formatDate( nextd, shortDate ));
                 } else{
                     addTag("p",i18n("<b>Last recurrence was on:</b>")  );
                     addTag("p", KGlobal::locale()->formatDate( nextd, shortDate ));
                 }
             }
         }
     } else {
         mMailSubject += i18n(" - " )+event->dtStartStr( true );
 
     }
 
 
     if (event->isAlarmEnabled()) {
         Alarm *alarm =event->alarms().first() ;
         QDateTime t = alarm->time();
+
+        if (event->doesRecur()) {
+          bool ok = false;
+          int offset = 0;
+          QDateTime next = event->getNextAlarmDateTime(& ok, &offset, QDateTime::currentDateTime() ) ;
+          if ( ok ) {
+            t = next;
+          }
+        }
+
         QString s =i18n("( %1 before )").arg( alarm->offsetText() );
         if(wideScreen ){
             addTag("p",i18n("<b>Alarm on: ") + s  +" </b>"+ KGlobal::locale()->formatDateTime( t, shortDate ));
         }else{
             addTag("p",i18n("<b>Alarm on: ") + s  +" </b>");
             addTag("p", KGlobal::locale()->formatDateTime( t, shortDate ));
         }
         //addTag("p",s);
         if ( !(event->alarmEnabled() ) ) {
             addTag("p", "<em>("+i18n("Enable alarm in resource settings") + ")</em>");
 
         }
     }
 
     addTag("p","<b>"+i18n("Access: ") + "</b>" + event->secrecyStr());
   
     formatCategories(event);
 
     formatAttendees(event);
   
     if ( KOPrefs::instance()->mEVshowCreated ) {
         if(wideScreen ){
             addTag("p",i18n("<b>Created: ")  +" </b>"+KGlobal::locale()->formatDateTime( event->created(), shortDate ));
         }else{
             addTag("p",i18n("<b>Created: ")  +" </b>");
             addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate ));
         }
 
         
     }
     if ( KOPrefs::instance()->mEVshowChanged ) {
         if(wideScreen ){
@@ -489,65 +499,73 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
         mText +="<font color=\"#B00000\">";
         addTag("i",i18n("This todo has been cancelled!"));
         mText.append("<br>");
         mText += "</font>";
         mMailSubject += i18n("(cancelled)");
     }
    
    
 
     if (event->doesRecur()) {
 
         QString recurText = event->recurrence()->recurrenceText();
         addTag("p","<em>" + i18n("This is a %1 recurring todo.").arg(recurText ) + "</em>");
             
     }
     if (event->hasStartDate()) {
         mText.append(i18n("<p><b>Start on:</b> %1</p>").arg(event->dtStartStr(KOPrefs::instance()->mShortDateInViewer)));
     }
     if (event->hasDueDate()) {
         mText.append(i18n("<p><b>Due on:</b> %1</p>").arg(event->dtDueStr(KOPrefs::instance()->mShortDateInViewer)));
         mMailSubject += i18n(" - " )+event->dtDueStr(  true );
     }
     if (!event->location().isEmpty()) { 
         addTag("p","<b>"+i18n("Location: ")+"</b>"+  deTag(event->location() ) );
         mMailSubject += i18n(" at ") + event->location();
     }
     mText.append(i18n("<p><b>Priority:</b> %2</p>")
                  .arg(QString::number(event->priority())));
 
     if (event->isAlarmEnabled()) {
         Alarm *alarm =event->alarms().first() ;
         QDateTime t = alarm->time();
-        QString s =i18n("( %1 before )").arg( alarm->offsetText() ); 
+        if (event->doesRecur()) {
+          bool ok = false;
+          int offset = 0;
+          QDateTime next = event->getNextAlarmDateTime(& ok, &offset, QDateTime::currentDateTime() ) ;
+          if ( ok ) {
+            t = next;
+          }
+        }
+        QString s =i18n("( %1 before )").arg( alarm->offsetText() ); 
         if ( wideScreen ) {
             addTag("p",i18n("<b>Alarm on: ") + s  +" </b>"+ KGlobal::locale()->formatDateTime( t, shortDate ));
         } else {
             addTag("p",i18n("<b>Alarm on: ") + s  +" </b>");
             addTag("p", KGlobal::locale()->formatDateTime( t, shortDate ));
         }
         if ( !(event->alarmEnabled() ) ) {
             addTag("p", "<em>("+i18n("Enable alarm in resource settings") + ")</em>");
 
         }
     }
 
     addTag("p","<b>"+i18n("Access: ") + "</b>" + event->secrecyStr());
 
     formatCategories(event);
 
     formatAttendees(event);
     
     if ( KOPrefs::instance()->mEVshowCreated ) {
         if(wideScreen ){
 
             addTag("p",i18n("<b>Created: ")  +" </b>"+KGlobal::locale()->formatDateTime( event->created(), shortDate ));
 
         } else {
             addTag("p",i18n("<b>Created: ")  +" </b>");
             addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate ));
         }  
     }
     if ( KOPrefs::instance()->mEVshowChanged ) {
         if(wideScreen ){
             addTag("p",i18n("<b>Last modified: ")  +" </b>" +KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ) );