1 files changed, 12 insertions, 2 deletions

diff --git a/libkcal/kincidenceformatter.cpp b/libkcal/kincidenceformatter.cpp
index e506a96..d67ad52 100644
--- a/libkcal/kincidenceformatter.cpp
+++ b/libkcal/kincidenceformatter.cpp
@@ -132,6 +132,5 @@ void KIncidenceFormatter::setEvent(Event *event)
         Alarm *alarm =event->alarms().first() ;
         QDateTime t = alarm->time();
-        int min = t.secsTo( event->dtStart() )/60;
-        QString s =i18n("(%1 min before)").arg( min );
+        QString s =i18n("( %1 before )").arg( alarm->offsetText() );
         addTag("p",i18n("<b>Alarm on:  </b>")  + s  + ": "+KGlobal::locale()->formatDateTime( t, shortDate ));
         //addTag("p", KGlobal::locale()->formatDateTime( t, shortDate ));
@@ -139,4 +138,6 @@ void KIncidenceFormatter::setEvent(Event *event)
     }
 
+
+
     addTag("p",i18n("<b>Access: </b>") +event->secrecyStr() );
     // mText.append(event->secrecyStr()+"<br>");
@@ -225,4 +226,13 @@ void KIncidenceFormatter::setTodo(Todo *event )
                  .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() );
+        addTag("p",i18n("<b>Alarm on: ") + s  +" </b>");
+        addTag("p", KGlobal::locale()->formatDateTime( t, shortDate ));
+        //addTag("p",s);
+    }
+
     addTag("p",i18n("<b>Access: </b>") +event->secrecyStr() );
     formatCategories(event);