fixes

3 files changed, 37 insertions, 2 deletions

diff --git a/libkcal/alarm.cpp b/libkcal/alarm.cpp
index 1fc7169..d8f15b5 100644
--- a/libkcal/alarm.cpp
+++ b/libkcal/alarm.cpp
@@ -1,54 +1,55 @@
 /*
     This file is part of libkcal.
     Copyright (c) 1998 Preston Brown
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <kdebug.h>
+#include <klocale.h>
 
 #include "incidence.h"
 #include "todo.h"
 
 #include "alarm.h"
 
 using namespace KCal;
 #include <qwidget.h>
 Alarm::Alarm(Incidence *parent)
  : mParent(parent),
    mType(Audio),
    mDescription(""),    // to make operator==() not fail
    mFile(""),           // to make operator==() not fail
    mMailSubject(""),    // to make operator==() not fail
    mAlarmSnoozeTime(5),
    mAlarmRepeatCount(0),
    mEndOffset(false),
    mHasTime(false),
    mAlarmEnabled(false)
 {
  
 }
 
 Alarm::~Alarm()
 {
 }
 
 bool Alarm::operator==( const Alarm& rhs ) const
 {
 
   if ( mType != rhs.mType ||
        mAlarmSnoozeTime != rhs.mAlarmSnoozeTime ||
@@ -320,64 +321,87 @@ void Alarm::setText(const QString &text)
     mDescription = text;
     mParent->updated();
   }
 }
 
 QString Alarm::text() const
 {
   return (mType == Display) ? mDescription : QString::null;
 }
 
 void Alarm::setTime(const QDateTime &alarmTime)
 {
   mAlarmTime = alarmTime;
   mHasTime = true;
 
   mParent->updated();
 }
 int Alarm::offset() 
 {
     if ( hasTime() ) {
         if (mParent->type()=="Todo") {
             Todo *t = static_cast<Todo*>(mParent);
             return  t->dtDue().secsTo( mAlarmTime ) ;
         } else
             return mParent->dtStart().secsTo( mAlarmTime ) ;
     }
     else
         {
             return mOffset.asSeconds();
         }
     
 }
+QString Alarm::offsetText() 
+{
+    int min = -offset()/60;
+    int hours = min /60;
+    min = min % 60;
+    int days = hours /24;
+    hours = hours % 24;
+    QString message;
+    qDebug("%d %d %d ", days, hours, min  );
+    if ( days > 0 )
+        message += i18n("%1d").arg( days );
+    if ( hours > 0 ) {
+        if ( !message.isEmpty() ) message += "/";
+        message += i18n("%1h").arg( hours );
+    }
+    if ( min > 0 ) {
+        if ( !message.isEmpty() ) message += "/";
+        message += i18n("%1min").arg( min );
+    }
+    if ( message.isEmpty() )
+         message = i18n("%1min").arg( 0 );
+    return message; 
+}
 
 
 QDateTime Alarm::time() const
 {
   if ( hasTime() )
     return mAlarmTime;
   else
   {
     if (mParent->type()=="Todo") {
       Todo *t = static_cast<Todo*>(mParent);
       return mOffset.end( t->dtDue() );
     } else if (mEndOffset) {
       return mOffset.end( mParent->dtEnd() );
     } else {
       return mOffset.end( mParent->dtStart() );
     }
   }
 }
 
 bool Alarm::hasTime() const
 {
   return mHasTime;
 }
 
 void Alarm::setSnoozeTime(int alarmSnoozeTime)
 {
   mAlarmSnoozeTime = alarmSnoozeTime;
   mParent->updated();
 }
 
 int Alarm::snoozeTime() const
 {
diff --git a/libkcal/alarm.h b/libkcal/alarm.h
index 682b626..ac6ea0d 100644
--- a/libkcal/alarm.h
+++ b/libkcal/alarm.h
@@ -30,64 +30,65 @@
 
 namespace KCal {
 
 class Incidence;
 
 /**
   This class represents an alarm notification.
 */
 class Alarm : public CustomProperties
 {
   public:
     enum Type { Invalid, Display, Procedure, Email, Audio };
     typedef QValueList<Alarm *> List;
 
     /** Construct a new alarm with variables initialized to "sane" values. */
     explicit Alarm(Incidence *parent);
     /** Destruct Alarm object. */
     ~Alarm();
 
     /** Compare this alarm with another one. */
     bool operator==(const Alarm &) const;
     bool operator!=(const Alarm &a) const   { return !operator==(a); }
 
     /** Set the type of the alarm.
         If the specified type is different from the current type of the alarm,
         the alarm's type-specific properties are initialised to null.
         @param type type of alarm.
      */
     void setType(Type type);
     /** Return the type of the alarm */
     Type type() const;
     int offset();
+    QString offsetText();
     /** Set the alarm to be a display alarm.
         @param text text to display when the alarm is triggered.
      */
     void setDisplayAlarm(const QString &text);
     /** Set the text to be displayed when the alarm is triggered.
         Ignored if the alarm is not a display alarm.
      */
     void setText(const QString &text);
     /** Return the text string that displays when the alarm is triggered. */
     QString text() const;
 
     /** Set the alarm to be an audio alarm.
         @param audioFile optional file to play when the alarm is triggered.
      */
     void setAudioAlarm(const QString &audioFile = QString::null);
     /** Set the file to play when the audio alarm is triggered.
         Ignored if the alarm is not an audio alarm.
      */
     void setAudioFile(const QString &audioFile);
     /** Return the name of the audio file for the alarm.
         @return The audio file for the alarm, or QString::null if not an audio alarm.
      */
     QString audioFile() const;
 
     /** Set the alarm to be a procedure alarm.
         @param programFile program to execute when the alarm is triggered.
         @param arguments arguments to supply to programFile.
      */
     void setProcedureAlarm(const QString &programFile, const QString &arguments = QString::null);
     /** Set the program file to execute when the alarm is triggered.
         Ignored if the alarm is not a procedure alarm.
      */
diff --git a/libkcal/kincidenceformatter.cpp b/libkcal/kincidenceformatter.cpp
index e506a96..d67ad52 100644
--- a/libkcal/kincidenceformatter.cpp
+++ b/libkcal/kincidenceformatter.cpp
@@ -102,71 +102,72 @@ void KIncidenceFormatter::setEvent(Event *event)
                          .arg(event->dtEndTimeStr()));
         }
     }
 
     if (event->recurrence()->doesRecur()) {
 
         QString recurText = event->recurrence()->recurrenceText();
         addTag("p","<em>" + i18n("This is a %1 recurring event.").arg(recurText ) + "</em>");
 
  bool ok;
         QDate start = QDate::currentDate();
         QDateTime next;
         next = event->getNextOccurence( QDateTime::currentDateTime() , &ok );
         if ( ok ) {
             addTag("p",i18n("<b>Next recurrence is on:</b>")  );
             addTag("p", KGlobal::locale()->formatDate( next.date(), shortDate ));
 
         } else {
             bool last;
             QDate nextd;
             nextd = event->recurrence()->getPreviousDate( QDate::currentDate() , &last );
             if ( last ) {
                 addTag("p",i18n("<b>Last recurrence was on:</b>")  );
                 addTag("p", KGlobal::locale()->formatDate( nextd, shortDate ));
             }
         }
     }
 
 
     if (event->isAlarmEnabled()) {
         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 ));
         //addTag("p",s);
     }
 
+
+
     addTag("p",i18n("<b>Access: </b>") +event->secrecyStr() );
     // mText.append(event->secrecyStr()+"<br>");
     formatCategories(event);
     if ( mDetails  ) {
         if (!event->description().isEmpty()) {
             addTag("p",i18n("<b>Details: </b>"));
             addTag("p",deTag(event->description()));
         }
     }
 
     formatReadOnly(event);
     formatAttendees(event);
 
     if ( mCreated ) {
         addTag("p",i18n("<b>Created: ")  +" </b>");
         addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate ));
         
     }
     if ( mModified ) {
         addTag("p",i18n("<b>Last modified: ")  +" </b>");
         addTag("p", KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ));
         
     }
  
 }
 
 void KIncidenceFormatter::setTodo(Todo *event )
 {
     int mode = 0;
     mCurrentIncidence = event;
     bool shortDate = true;
     if (mode == 0 )
@@ -195,64 +196,73 @@ void KIncidenceFormatter::setTodo(Todo *event )
         mText.append(i18n("<p><i>%1 % completed</i></p>")
                      .arg(event->percentComplete()));
     }
     if (event->cancelled ()) {
         mText +="<font color=\"#B00000\">";
         addTag("i",i18n("This todo has been cancelled!"));
         mText.append("<br>");
         mText += "</font>";
     }
    
     if (!event->location().isEmpty()) {
         addTag("b",i18n("Location: "));
         mText.append(deTag(event->location())+"<br>");
     }
 
     if (event->recurrence()->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(shortDate)));
     }
         
 
     if (event->hasDueDate()) {
         mText.append(i18n("<p><b>Due on:</b> %1</p>").arg(event->dtDueStr(shortDate)));
     }
     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() );
+        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);
     if ( mDetails  ) {
         if (!event->description().isEmpty()) {
             addTag("p",i18n("<b>Details: </b>"));
             addTag("p",deTag(event->description()));
         }
     }
     formatReadOnly(event);
     formatAttendees(event);
     if ( mCreated ) {
         addTag("p",i18n("<b>Created: ")  +" </b>");
         addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate ));
         
     }
     if ( mModified ) {
         addTag("p",i18n("<b>Last modified: ")  +" </b>");
         addTag("p", KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ));
         
     }
 }
 
 void KIncidenceFormatter::setJournal(Journal*  )
 {
 
 }
 
 void KIncidenceFormatter::formatCategories(Incidence *event)
 {
  if (!event->categoriesStr().isEmpty()) {
      addTag("p",i18n("<b>Categories: </b>")+event->categoriesStr() );
      //mText.append(event->categoriesStr());