Updates to ocontact, oevent & otodo's toRichText() implementations

6 files changed, 212 insertions, 70 deletions

diff --git a/libopie/pim/ocontact.cpp b/libopie/pim/ocontact.cpp
index a7ca975..a2fb68c 100644
--- a/libopie/pim/ocontact.cpp
+++ b/libopie/pim/ocontact.cpp
@@ -347,377 +347,382 @@ OContact::~OContact()
 */
 
 /*! \fn QString OContact::businessCountry() const
   Returns the business country of the contact.
 */
 
 /*! \fn QString OContact::businessPhone() const
   Returns the business phone number of the contact.
 */
 
 /*! \fn QString OContact::businessFax() const
   Returns the business fax number of the contact.
 */
 
 /*! \fn QString OContact::businessMobile() const
   Returns the business mobile number of the contact.
 */
 
 /*! \fn QString OContact::businessPager() const
   Returns the business pager number of the contact.
 */
 
 /*! \fn QString OContact::businessWebpage() const
   Returns the business webpage of the contact.
 */
 
 /*! \fn QString OContact::spouse() const
   Returns the spouse of the contact.
 */
 
 /*! \fn QString OContact::gender() const
   Returns the gender of the contact.
 */
 
 /*! \fn QString OContact::nickname() const
   Returns the nickname of the contact.
 */
 
 /*! \fn QString OContact::children() const
   Returns the children of the contact.
 */
 
 /*! \fn QString OContact::notes() const
   Returns the notes relating to the the contact.
 */
 
 /*! \fn QString OContact::groups() const
   \internal
   Returns the groups for the contact.
 */
 
 /*! \fn QStringList OContact::groupList() const
   \internal
 */
 
 /*! \fn QString OContact::field(int) const
   \internal
 */
 
 /*! \fn void OContact::saveJournal( journal_action, const QString & = QString::null )
   \internal
 */
 
 /*! \fn void OContact::setUid( int id )
   \internal
   Sets the uid for this record to \a id.
 */
 
 /*! \enum OContact::journal_action
   \internal
 */
 
 /*!
   \internal
 */
 QMap<int, QString> OContact::toMap() const
 {
     QMap<int, QString> map = mMap;
     QString cats = idsToString( categories() );
     if ( !cats.isEmpty() )
         map.insert( Qtopia::AddressCategory, cats );
     return map;
 }
 
 /*!
   Returns a rich text formatted QString representing the contents the contact.
 */
 QString OContact::toRichText() const
 {
     QString text;
     QString value, comp, state;
     QString str;
     bool marker = false;
 
     // name, jobtitle and company
     if ( !(value = fullName()).isEmpty() )
-        text += "<b><h3>" + Qtopia::escapeString(value) + "</h3></b><br>";
+        text += "<b><h3><img src=\"addressbook/AddressBook\">" + Qtopia::escapeString(value) + "</h3></b>";
+    
     if ( !(value = jobTitle()).isEmpty() )
         text += Qtopia::escapeString(value) + "<br>";
 
     comp = company();
     if ( !(value = department()).isEmpty() ) {
         text += Qtopia::escapeString(value);
         if ( comp )
             text += ", ";
         else
             text += "<br>";
     }
     if ( !comp.isEmpty() )
         text += Qtopia::escapeString(comp) + "<br>";
 
+    text += "<hr><br>";
+
+    // defailt email
     QString defEmail = defaultEmail();
     if ( !defEmail.isEmpty() )
-        text += "<b>" + QObject::tr("Default Email: ") + "</b>"
+        text += "<b><img src=\"addressbook/email\">" + QObject::tr("Default Email: ") + "</b>"
                 + Qtopia::escapeString(defEmail) + "<br>";
 
-    text += "<hr>";
+    text += "<br>";
 
     // business address
     if ( !businessStreet().isEmpty() || !businessCity().isEmpty() ||
          !businessZip().isEmpty() || !businessCountry().isEmpty() ) {
-        text += "<br>";
         text += QObject::tr( "<b>Work Address:</b>" );
         text +=  "<br>";
         marker = true;
     }
 
     if ( !(value = businessStreet()).isEmpty() )
         text += Qtopia::escapeString(value) + "<br>";
     state =  businessState();
     if ( !(value = businessZip()).isEmpty() )
         text += Qtopia::escapeString(value) + " ";
     if ( !(value = businessCity()).isEmpty() ) {
         text += Qtopia::escapeString(value);
         if ( state )
             text += ", " + Qtopia::escapeString(state);
         text += "<br>";
     } else if ( !state.isEmpty() )
         text += Qtopia::escapeString(state) + "<br>";
 
     if ( !(value = businessCountry()).isEmpty() )
         text += Qtopia::escapeString(value) + "<br>";
 
     // rest of Business data
     str = office();
     if ( !str.isEmpty() ){
         text += "<b>" + QObject::tr("Office: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
         marker = true;
     }
     str = businessWebpage();
     if ( !str.isEmpty() ){
-        text += "<b>" + QObject::tr("Business Web Page: ") + "</b>"
+        text += "<b><img src=\"addressbook/webpagework\">" + QObject::tr("Business Web Page: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
         marker = true;
     }
     str = businessPhone();
     if ( !str.isEmpty() ){
-        text += "<b>" + QObject::tr("Business Phone: ") + "</b>"
+        text += "<b><img src=\"addressbook/phonework\">" + QObject::tr("Business Phone: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
         marker = true;
     }
     str = businessFax();
     if ( !str.isEmpty() ){
-        text += "<b>" + QObject::tr("Business Fax: ") + "</b>"
+        text += "<b><img src=\"addressbook/faxwork\">" + QObject::tr("Business Fax: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
         marker = true;
     }
     str = businessMobile();
     if ( !str.isEmpty() ){
-        text += "<b>" + QObject::tr("Business Mobile: ") + "</b>"
+        text += "<b><img src=\"addressbook/mobilework\">" + QObject::tr("Business Mobile: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
         marker = true;
     }
     str = businessPager();
     if ( !str.isEmpty() ){
         text += "<b>" + QObject::tr("Business Pager: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
         marker = true;
     }
 
+    text += "<br>";
+
     // home address
     if ( !homeStreet().isEmpty() || !homeCity().isEmpty() ||
          !homeZip().isEmpty() || !homeCountry().isEmpty() ) {
-        text += "<br>";
         text += QObject::tr( "<b>Home Address:</b>" );
         text +=  "<br>";
     }
 
     if ( !(value = homeStreet()).isEmpty() )
         text += Qtopia::escapeString(value) + "<br>";
     state =  homeState();
     if ( !(value = homeZip()).isEmpty() )
         text += Qtopia::escapeString(value) + " ";
     if ( !(value = homeCity()).isEmpty() ) {
         text += Qtopia::escapeString(value);
         if ( !state.isEmpty() )
             text += ", " + Qtopia::escapeString(state);
         text += "<br>";
     } else if (!state.isEmpty())
         text += Qtopia::escapeString(state) + "<br>";
     if ( !(value = homeCountry()).isEmpty() )
         text += Qtopia::escapeString(value) + "<br>";
 
     // rest of Home data
     str = homeWebpage();
     if ( !str.isEmpty() ){
-        text += "<b>" + QObject::tr("Home Web Page: ") + "</b>"
+        text += "<b><img src=\"addressbook/webpagehome\">" + QObject::tr("Home Web Page: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
         marker = true;
     }
     str = homePhone();
     if ( !str.isEmpty() ){
-        text += "<b>" + QObject::tr("Home Phone: ") + "</b>"
+        text += "<b><img src=\"addressbook/phonehome\">" + QObject::tr("Home Phone: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
         marker = true;
     }
     str = homeFax();
     if ( !str.isEmpty() ){
-        text += "<b>" + QObject::tr("Home Fax: ") + "</b>"
+        text += "<b><img src=\"addressbook/faxhome\">" + QObject::tr("Home Fax: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
         marker = true;
     }
     str = homeMobile();
     if ( !str.isEmpty() ){
-        text += "<b>" + QObject::tr("Home Mobile: ") + "</b>"
+        text += "<b><img src=\"addressbook/mobilehome\">" + QObject::tr("Home Mobile: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
         marker = true;
     }
 
     if ( marker )
             text += "<br><hr><br>";
     // the others...
     str = emails();
     if ( !str.isEmpty() && ( str != defEmail ) )
         text += "<b>" + QObject::tr("All Emails: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
     str = profession();
     if ( !str.isEmpty() )
         text += "<b>" + QObject::tr("Profession: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
     str = assistant();
     if ( !str.isEmpty() )
         text += "<b>" + QObject::tr("Assistant: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
     str = manager();
     if ( !str.isEmpty() )
         text += "<b>" + QObject::tr("Manager: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
     str = gender();
     if ( !str.isEmpty() && str.toInt() != 0 ) {
         if ( str.toInt() == 1 )
             str = QObject::tr( "Male" );
         else if ( str.toInt() == 2 )
             str = QObject::tr( "Female" );
         text += "<b>" + QObject::tr("Gender: ") + "</b>" + str + "<br>";
     }
     str = spouse();
     if ( !str.isEmpty() )
         text += "<b>" + QObject::tr("Spouse: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
     if ( birthday().isValid() ){
             str = TimeString::numberDateString( birthday() );
             text += "<b>" + QObject::tr("Birthday: ") + "</b>"
                     + Qtopia::escapeString(str) + "<br>";
     }
     if ( anniversary().isValid() ){
             str = TimeString::numberDateString( anniversary() );
             text += "<b>" + QObject::tr("Anniversary: ") + "</b>"
                     + Qtopia::escapeString(str) + "<br>";
     }
     str = children();
     if ( !str.isEmpty() )
         text += "<b>" + QObject::tr("Children: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
 
     str = nickname();
     if ( !str.isEmpty() )
         text += "<b>" + QObject::tr("Nickname: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
 
+    // categories
     if ( categoryNames("Contacts").count() ){
             text += "<b>" + QObject::tr( "Category:") + "</b> ";
             text += categoryNames("Contacts").join(", ");
             text += "<br>";
     }
 
     // notes last
     if ( !(value = notes()).isEmpty() ) {
             text += "<br><hr><b>" + QObject::tr( "Notes:") + "</b> ";
             QRegExp reg("\n");
 
             //QString tmp = Qtopia::escapeString(value);
             QString tmp = QStyleSheet::convertFromPlainText(value);
             //tmp.replace( reg, "<br>" );
             text += "<br>" + tmp + "<br>";
     }
     return text;
 }
 
 /*!
   \internal
 */
 void OContact::insert( int key, const QString &v )
 {
     QString value = v.stripWhiteSpace();
     if ( value.isEmpty() )
         mMap.remove( key );
     else
         mMap.insert( key, value );
 }
 
 /*!
   \internal
 */
 void OContact::replace( int key, const QString & v )
 {
     QString value = v.stripWhiteSpace();
     if ( value.isEmpty() )
         mMap.remove( key );
     else
         mMap.replace( key, value );
 }
 
 /*!
   \internal
 */
 QString OContact::find( int key ) const
 {
     return mMap[key];
 }
 
 /*!
   \internal
 */
 QString OContact::displayAddress( const QString &street,
                                  const QString &city,
                                  const QString &state,
                                  const QString &zip,
                                  const QString &country ) const
 {
     QString s = street;
     if ( !street.isEmpty() )
         s+= "\n";
     s += city;
     if ( !city.isEmpty() && !state.isEmpty() )
         s += ", ";
     s += state;
     if ( !state.isEmpty() && !zip.isEmpty() )
         s += "  ";
     s += zip;
     if ( !country.isEmpty() && !s.isEmpty() )
         s += "\n";
     s += country;
     return s;
 }
 
 /*!
   \internal
 */
 QString OContact::displayBusinessAddress() const
 {
     return displayAddress( businessStreet(), businessCity(),
                            businessState(), businessZip(),
                            businessCountry() );
 }
 
 /*!
   \internal
 */
 QString OContact::displayHomeAddress() const
 {
     return displayAddress( homeStreet(), homeCity(),
                            homeState(), homeZip(),
                            homeCountry() );
 }
 
diff --git a/libopie/pim/oevent.cpp b/libopie/pim/oevent.cpp
index 83b191f..e4f5d92 100644
--- a/libopie/pim/oevent.cpp
+++ b/libopie/pim/oevent.cpp
@@ -142,208 +142,240 @@ bool OEvent::hasRecurrence()const {
     if (!data->recur ) return false;
     return data->recur->doesRecur();
 }
 QString OEvent::note()const {
     return data->note;
 }
 void OEvent::setNote( const QString& note ) {
     changeOrModify();
     data->note = note;
 }
 QDateTime OEvent::createdDateTime()const {
     return data->created;
 }
 void OEvent::setCreatedDateTime( const QDateTime& time ) {
     changeOrModify();
     data->created = time;
 }
 QDateTime OEvent::startDateTime()const {
     if ( data->isAllDay )
         return QDateTime( data->start.date(), QTime(0, 0, 0 ) );
     return data->start;
 }
 QDateTime OEvent::startDateTimeInZone()const {
     /* if no timezone, or all day event or if the current and this timeZone match... */
     if (data->timezone.isEmpty() || data->isAllDay || data->timezone == OTimeZone::current().timeZone() ) return startDateTime();
 
     OTimeZone zone(data->timezone  );
     return zone.toDateTime( data->start, OTimeZone::current() );
 }
 void OEvent::setStartDateTime( const QDateTime& dt ) {
     changeOrModify();
     data->start = dt;
 }
 QDateTime OEvent::endDateTime()const {
     /*
      * if all Day event the end time needs
      * to be on the same day as the start
      */
     if ( data->isAllDay )
         return QDateTime( data->start.date(), QTime(23, 59, 59 ) );
     return data->end;
 }
 QDateTime OEvent::endDateTimeInZone()const {
     /* if no timezone, or all day event or if the current and this timeZone match... */
     if (data->timezone.isEmpty() || data->isAllDay || data->timezone == OTimeZone::current().timeZone() ) return endDateTime();
 
     OTimeZone zone(data->timezone  );
     return zone.toDateTime( data->end, OTimeZone::current() );
 }
 void OEvent::setEndDateTime( const QDateTime& dt ) {
     changeOrModify();
     data->end =    dt;
 }
 bool OEvent::isMultipleDay()const {
     return data->end.date().day() - data->start.date().day();
 }
 bool OEvent::isAllDay()const {
     return data->isAllDay;
 }
 void OEvent::setAllDay( bool allDay ) {
     changeOrModify();
     data->isAllDay = allDay;
     if (allDay ) data->timezone = "UTC";
 }
 void OEvent::setTimeZone( const QString& tz ) {
     changeOrModify();
     data->timezone = tz;
 }
 QString OEvent::timeZone()const {
     if (data->isAllDay ) return QString::fromLatin1("UTC");
     return data->timezone;
 }
 bool OEvent::match( const QRegExp& re )const {
     if ( re.match( data->description ) != -1 ){
         setLastHitField( Qtopia::DatebookDescription );
         return true;
     }
     if ( re.match( data->note ) != -1 ){
         setLastHitField( Qtopia::Note );
         return true;
     }
     if ( re.match( data->location ) != -1 ){
         setLastHitField( Qtopia::Location );
         return true;
     }
     if ( re.match( data->start.toString() ) != -1 ){
         setLastHitField( Qtopia::StartDateTime );
         return true;
     }
     if ( re.match( data->end.toString() ) != -1 ){
         setLastHitField( Qtopia::EndDateTime );
         return true;
     }
     return false;
 }
 QString OEvent::toRichText()const {
-    QString text;
+    QString text, value;
+    
+    // description
+    text += "<b><h3><img src=\"datebook/DateBook\">";
     if ( !description().isEmpty() ) {
-        text += "<b>" + QObject::tr( "Description:") + "</b><br>";
-        text += Qtopia::escapeString(description() ).
-                replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
+        text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"),  "" );
+    }
+    text += "</h3></b><br><hr><br>";
+    
+    // location
+    if ( !(value = location()).isEmpty() ) {
+        text += "<b>" + QObject::tr( "Location:" ) + "</b> ";
+        text += Qtopia::escapeString(value) + "<br>";
+    }
+
+    // all day event
+    if ( isAllDay() ) {
+        text += "<b><i>" + QObject::tr( "This is an all day event" ) + "</i></b><br>";
     }
-    if ( startDateTime().isValid() ) {
-        text += "<b>" + QObject::tr( "Start:") + "</b> ";
-        text += Qtopia::escapeString(startDateTime().toString() ).
-                replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
+    // multiple day event
+    else if ( isMultipleDay () ) {
+        text += "<b><i>" + QObject::tr( "This is a multiple day event" ) + "</i></b><br>";
+    }
+    // start & end times
+    else {
+        // start time
+        if ( startDateTime().isValid() ) {
+            text += "<b>" + QObject::tr( "Start:") + "</b> ";
+            text += Qtopia::escapeString(startDateTime().toString() ).
+                    replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
+        }
+
+        // end time
+        if ( endDateTime().isValid() ) {
+            text += "<b>" + QObject::tr( "End:") + "</b> ";
+            text += Qtopia::escapeString(endDateTime().toString() ).
+                    replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
+        }
     }
-    if ( endDateTime().isValid() ) {
-        text += "<b>" + QObject::tr( "End:") + "</b> ";
-        text += Qtopia::escapeString(endDateTime().toString() ).
-                replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
+    
+    // categories
+    if ( categoryNames("Calendar").count() ){
+            text += "<b>" + QObject::tr( "Category:") + "</b> ";
+            text += categoryNames("Calendar").join(", ");
+            text += "<br>";
     }
+    
+    //notes
     if ( !note().isEmpty() ) {
         text += "<b>" + QObject::tr( "Note:") + "</b><br>";
         text += note();
 //         text += Qtopia::escapeString(note() ).
 //                 replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
     }
     return text;
 }
 QString OEvent::toShortText()const {
     QString text;
     text += QString::number( startDateTime().date().day() );
     text += ".";
     text += QString::number( startDateTime().date().month() );
     text += ".";
     text += QString::number( startDateTime().date().year() );
     text += " ";
     text += QString::number( startDateTime().time().hour() );
     text += ":";
     text += QString::number( startDateTime().time().minute() );
     text += " - ";
     text += description();
     return text;
 }
 QString OEvent::type()const {
     return QString::fromLatin1("OEvent");
 }
 QString OEvent::recordField( int /*id */ )const {
     return QString::null;
 }
 int OEvent::rtti() {
     return OPimResolver::DateBook;
 }
 bool OEvent::loadFromStream( QDataStream& ) {
     return true;
 }
 bool OEvent::saveToStream( QDataStream& )const {
     return true;
 }
 void OEvent::changeOrModify() {
     if ( data->count != 1 ) {
         data->deref();
         Data* d2 = new Data;
         d2->description = data->description;
         d2->location = data->location;
 
         if (data->manager )
             d2->manager = new OPimNotifyManager( *data->manager );
 
         if ( data->recur )
             d2->recur = new ORecur( *data->recur );
 
         d2->note = data->note;
         d2->created = data->created;
         d2->start = data->start;
         d2->end = data->end;
         d2->isAllDay = data->isAllDay;
         d2->timezone = data->timezone;
         d2->parent = data->parent;
 
         if ( data->child ) {
             d2->child = new QArray<int>( *data->child );
             d2->child->detach();
         }
 
         data = d2;
     }
 }
 void OEvent::deref() {
     if ( data->deref() ) {
         delete data;
         data = 0;
     }
 }
 // FIXME
 QMap<int, QString> OEvent::toMap()const {
     return QMap<int, QString>();
 }
 QMap<QString, QString> OEvent::toExtraMap()const {
     return QMap<QString, QString>();
 }
 int OEvent::parent()const {
     return data->parent;
 }
 void OEvent::setParent( int uid ) {
     changeOrModify();
     data->parent = uid;
 }
 QArray<int> OEvent::children() const{
     if (!data->child) return QArray<int>();
     else
         return data->child->copy();
 }
 void OEvent::setChildren( const QArray<int>& arr ) {
     changeOrModify();
     if (data->child) delete data->child;
 
diff --git a/libopie/pim/otodo.cpp b/libopie/pim/otodo.cpp
index e087a00..c84eeeb 100644
--- a/libopie/pim/otodo.cpp
+++ b/libopie/pim/otodo.cpp
@@ -180,213 +180,247 @@ ORecur OTodo::recurrence()const {
 
     return (*data->recur);
 }
 bool OTodo::hasMaintainer()const {
     if (!data->maintainer) return false;
 
     return (data->maintainer->mode() != OPimMaintainer::Undefined );
 }
 OPimMaintainer OTodo::maintainer()const {
     if (!data->maintainer) return OPimMaintainer();
 
     return (*data->maintainer);
 }
 void OTodo::setCompleted( bool completed )
 {
     changeOrModify();
     data->isCompleted = completed;
 }
 void OTodo::setHasDueDate( bool hasDate )
 {
     changeOrModify();
     data->hasDate = hasDate;
 }
 void OTodo::setDescription(const QString &desc )
 {
 //    qWarning( "desc " + desc );
     changeOrModify();
     data->desc = Qtopia::simplifyMultiLineSpace(desc );
 }
 void OTodo::setSummary( const QString& sum )
 {
     changeOrModify();
     data->sum = sum;
 }
 void OTodo::setPriority(int prio )
 {
     changeOrModify();
     data->priority = prio;
 }
 void OTodo::setDueDate( const QDate& date )
 {
     changeOrModify();
     data->date = date;
 }
 void OTodo::setStartDate( const QDate& date ) {
     changeOrModify();
     data->start = date;
 }
 void OTodo::setCompletedDate( const QDate& date ) {
     changeOrModify();
     data->completed = date;
 }
 void OTodo::setState( const OPimState& state ) {
     changeOrModify();
     if (data->state )
         (*data->state) = state;
     else
         data->state = new OPimState( state );
 }
 void OTodo::setRecurrence( const ORecur& rec) {
     changeOrModify();
     if (data->recur )
         (*data->recur) = rec;
     else
         data->recur = new ORecur( rec );
 }
 void OTodo::setMaintainer( const OPimMaintainer& pim ) {
     changeOrModify();
 
     if (data->maintainer )
         (*data->maintainer) = pim;
     else
         data->maintainer = new OPimMaintainer( pim );
 }
 bool OTodo::isOverdue( )
 {
     if( data->hasDate && !data->isCompleted)
         return QDate::currentDate() > data->date;
     return false;
 }
 void OTodo::setProgress(ushort progress )
 {
     changeOrModify();
     data->prog = progress;
 }
 QString OTodo::toShortText() const {
  return summary();
 }
 /*!
   Returns a richt text string
 */
 QString OTodo::toRichText() const
 {
   QString text;
   QStringList catlist;
 
-  // Description of the todo
+  // summary
+  text += "<b><h3><img src=\"todo/TodoList\">";
   if ( !summary().isEmpty() ) {
-    text += "<b>" + QObject::tr( "Summary:") + "</b><br>";
-    text += Qtopia::escapeString(summary() ).replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
+      text += Qtopia::escapeString(summary() ).replace(QRegExp( "[\n]"),  "" );
   }
+  text += "</h3></b><br><hr><br>";
+    
+  // description
   if( !description().isEmpty() ){
     text += "<b>" + QObject::tr( "Description:" ) + "</b><br>";
     text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "<br>" ) ;
   }
-  text += "<br><br><br>";
 
-  text += "<b>" + QObject::tr( "Priority:") +" </b>"
-    +  QString::number( priority() ) + " <br>";
+  // priority
+  int priorityval = priority();
+  text += "<b>" + QObject::tr( "Priority:") +" </b><img src=\"todo/priority" +
+          QString::number( priorityval ) + "\">";
+//  text += "<b>" + QObject::tr( "Priority:") +"</b><img src=\"todo/priority" +
+//          QString::number( priority() ) + "\"><br>";
+  switch ( priorityval )
+  {
+    case 1 : text += QObject::tr( "Very high" );
+        break;
+    case 2 : text += QObject::tr( "High" );
+        break;
+    case 3 : text += QObject::tr( "Normal" );
+        break;
+    case 4 : text += QObject::tr( "Low" );
+        break;
+    case 5 : text += QObject::tr( "Very low" );
+        break;
+  };
+  text += "<br>";
+    
+  // progress
   text += "<b>" + QObject::tr( "Progress:") + " </b>"
           + QString::number( progress() ) + " %<br>";
+          
+  // due date
   if (hasDueDate() ){
-    text += "<b>" + QObject::tr( "Deadline:") + " </b>";
-    text += dueDate().toString();
-    text += "<br>";
+    QDate dd = dueDate();
+    int off = QDate::currentDate().daysTo( dd );
+    
+    text += "<b>" + QObject::tr( "Deadline:" ) + " </b><font color=\"";
+    if ( off < 0 )
+      text += "#FF0000";
+    else if ( off == 0 )
+      text += "#FFFF00";
+    else if ( off > 0 )
+      text += "#00FF00";
+
+    text += "\">" + dd.toString() + "</font><br>";
   }
-
+  
+  // categories
   text += "<b>" + QObject::tr( "Category:") + "</b> ";
   text += categoryNames( "Todo List" ).join(", ");
   text += "<br>";
 
   return text;
 }
 bool OTodo::hasNotifiers()const {
     if (!data->notifiers) return false;
     return !data->notifiers->isEmpty();
 }
 OPimNotifyManager& OTodo::notifiers() {
     if (!data->notifiers )
         data->notifiers = new OPimNotifyManager;
     return (*data->notifiers);
 }
 const OPimNotifyManager& OTodo::notifiers()const{
     if (!data->notifiers )
         data->notifiers = new OPimNotifyManager;
 
     return (*data->notifiers);
 }
 
 bool OTodo::operator<( const OTodo &toDoEvent )const{
     if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true;
     if( !hasDueDate() && toDoEvent.hasDueDate() ) return false;
     if( hasDueDate() && toDoEvent.hasDueDate() ){
         if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide
             return priority() < toDoEvent.priority();
         }else{
             return dueDate() < toDoEvent.dueDate();
         }
     }
     return false;
 }
 bool OTodo::operator<=(const OTodo &toDoEvent )const
 {
     if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true;
     if( !hasDueDate() && toDoEvent.hasDueDate() ) return true;
     if( hasDueDate() && toDoEvent.hasDueDate() ){
         if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide
             return priority() <= toDoEvent.priority();
         }else{
             return dueDate() <= toDoEvent.dueDate();
         }
     }
     return true;
 }
 bool OTodo::operator>(const OTodo &toDoEvent )const
 {
     if( !hasDueDate() && !toDoEvent.hasDueDate() ) return false;
     if( !hasDueDate() &&  toDoEvent.hasDueDate() ) return false;
     if( hasDueDate()  &&  toDoEvent.hasDueDate() ){
         if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide
             return priority() > toDoEvent.priority();
         }else{
             return dueDate() > toDoEvent.dueDate();
         }
     }
     return false;
 }
 bool OTodo::operator>=(const OTodo &toDoEvent )const
 {
     if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true;
     if( !hasDueDate() &&  toDoEvent.hasDueDate() ) return false;
     if( hasDueDate() && toDoEvent.hasDueDate() ){
         if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide
             return priority() > toDoEvent.priority();
         }else{
             return dueDate() > toDoEvent.dueDate();
         }
     }
     return true;
 }
 bool OTodo::operator==(const OTodo &toDoEvent )const
 {
     if ( data->priority != toDoEvent.data->priority ) return false;
     if ( data->priority != toDoEvent.data->prog ) return false;
     if ( data->isCompleted != toDoEvent.data->isCompleted ) return false;
     if ( data->hasDate != toDoEvent.data->hasDate ) return false;
     if ( data->date != toDoEvent.data->date ) return false;
     if ( data->sum != toDoEvent.data->sum ) return false;
     if ( data->desc != toDoEvent.data->desc ) return false;
     if ( data->maintainer    != toDoEvent.data->maintainer )
         return false;
 
     return OPimRecord::operator==( toDoEvent );
 }
 void OTodo::deref() {
 
 //    qWarning("deref in ToDoEvent");
     if ( data->deref() ) {
 //        qWarning("deleting");
         delete data;
         data= 0;
     }
 }
diff --git a/libopie2/opiepim/ocontact.cpp b/libopie2/opiepim/ocontact.cpp
index a7ca975..a2fb68c 100644
--- a/libopie2/opiepim/ocontact.cpp
+++ b/libopie2/opiepim/ocontact.cpp
@@ -347,377 +347,382 @@ OContact::~OContact()
 */
 
 /*! \fn QString OContact::businessCountry() const
   Returns the business country of the contact.
 */
 
 /*! \fn QString OContact::businessPhone() const
   Returns the business phone number of the contact.
 */
 
 /*! \fn QString OContact::businessFax() const
   Returns the business fax number of the contact.
 */
 
 /*! \fn QString OContact::businessMobile() const
   Returns the business mobile number of the contact.
 */
 
 /*! \fn QString OContact::businessPager() const
   Returns the business pager number of the contact.
 */
 
 /*! \fn QString OContact::businessWebpage() const
   Returns the business webpage of the contact.
 */
 
 /*! \fn QString OContact::spouse() const
   Returns the spouse of the contact.
 */
 
 /*! \fn QString OContact::gender() const
   Returns the gender of the contact.
 */
 
 /*! \fn QString OContact::nickname() const
   Returns the nickname of the contact.
 */
 
 /*! \fn QString OContact::children() const
   Returns the children of the contact.
 */
 
 /*! \fn QString OContact::notes() const
   Returns the notes relating to the the contact.
 */
 
 /*! \fn QString OContact::groups() const
   \internal
   Returns the groups for the contact.
 */
 
 /*! \fn QStringList OContact::groupList() const
   \internal
 */
 
 /*! \fn QString OContact::field(int) const
   \internal
 */
 
 /*! \fn void OContact::saveJournal( journal_action, const QString & = QString::null )
   \internal
 */
 
 /*! \fn void OContact::setUid( int id )
   \internal
   Sets the uid for this record to \a id.
 */
 
 /*! \enum OContact::journal_action
   \internal
 */
 
 /*!
   \internal
 */
 QMap<int, QString> OContact::toMap() const
 {
     QMap<int, QString> map = mMap;
     QString cats = idsToString( categories() );
     if ( !cats.isEmpty() )
         map.insert( Qtopia::AddressCategory, cats );
     return map;
 }
 
 /*!
   Returns a rich text formatted QString representing the contents the contact.
 */
 QString OContact::toRichText() const
 {
     QString text;
     QString value, comp, state;
     QString str;
     bool marker = false;
 
     // name, jobtitle and company
     if ( !(value = fullName()).isEmpty() )
-        text += "<b><h3>" + Qtopia::escapeString(value) + "</h3></b><br>";
+        text += "<b><h3><img src=\"addressbook/AddressBook\">" + Qtopia::escapeString(value) + "</h3></b>";
+    
     if ( !(value = jobTitle()).isEmpty() )
         text += Qtopia::escapeString(value) + "<br>";
 
     comp = company();
     if ( !(value = department()).isEmpty() ) {
         text += Qtopia::escapeString(value);
         if ( comp )
             text += ", ";
         else
             text += "<br>";
     }
     if ( !comp.isEmpty() )
         text += Qtopia::escapeString(comp) + "<br>";
 
+    text += "<hr><br>";
+
+    // defailt email
     QString defEmail = defaultEmail();
     if ( !defEmail.isEmpty() )
-        text += "<b>" + QObject::tr("Default Email: ") + "</b>"
+        text += "<b><img src=\"addressbook/email\">" + QObject::tr("Default Email: ") + "</b>"
                 + Qtopia::escapeString(defEmail) + "<br>";
 
-    text += "<hr>";
+    text += "<br>";
 
     // business address
     if ( !businessStreet().isEmpty() || !businessCity().isEmpty() ||
          !businessZip().isEmpty() || !businessCountry().isEmpty() ) {
-        text += "<br>";
         text += QObject::tr( "<b>Work Address:</b>" );
         text +=  "<br>";
         marker = true;
     }
 
     if ( !(value = businessStreet()).isEmpty() )
         text += Qtopia::escapeString(value) + "<br>";
     state =  businessState();
     if ( !(value = businessZip()).isEmpty() )
         text += Qtopia::escapeString(value) + " ";
     if ( !(value = businessCity()).isEmpty() ) {
         text += Qtopia::escapeString(value);
         if ( state )
             text += ", " + Qtopia::escapeString(state);
         text += "<br>";
     } else if ( !state.isEmpty() )
         text += Qtopia::escapeString(state) + "<br>";
 
     if ( !(value = businessCountry()).isEmpty() )
         text += Qtopia::escapeString(value) + "<br>";
 
     // rest of Business data
     str = office();
     if ( !str.isEmpty() ){
         text += "<b>" + QObject::tr("Office: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
         marker = true;
     }
     str = businessWebpage();
     if ( !str.isEmpty() ){
-        text += "<b>" + QObject::tr("Business Web Page: ") + "</b>"
+        text += "<b><img src=\"addressbook/webpagework\">" + QObject::tr("Business Web Page: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
         marker = true;
     }
     str = businessPhone();
     if ( !str.isEmpty() ){
-        text += "<b>" + QObject::tr("Business Phone: ") + "</b>"
+        text += "<b><img src=\"addressbook/phonework\">" + QObject::tr("Business Phone: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
         marker = true;
     }
     str = businessFax();
     if ( !str.isEmpty() ){
-        text += "<b>" + QObject::tr("Business Fax: ") + "</b>"
+        text += "<b><img src=\"addressbook/faxwork\">" + QObject::tr("Business Fax: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
         marker = true;
     }
     str = businessMobile();
     if ( !str.isEmpty() ){
-        text += "<b>" + QObject::tr("Business Mobile: ") + "</b>"
+        text += "<b><img src=\"addressbook/mobilework\">" + QObject::tr("Business Mobile: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
         marker = true;
     }
     str = businessPager();
     if ( !str.isEmpty() ){
         text += "<b>" + QObject::tr("Business Pager: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
         marker = true;
     }
 
+    text += "<br>";
+
     // home address
     if ( !homeStreet().isEmpty() || !homeCity().isEmpty() ||
          !homeZip().isEmpty() || !homeCountry().isEmpty() ) {
-        text += "<br>";
         text += QObject::tr( "<b>Home Address:</b>" );
         text +=  "<br>";
     }
 
     if ( !(value = homeStreet()).isEmpty() )
         text += Qtopia::escapeString(value) + "<br>";
     state =  homeState();
     if ( !(value = homeZip()).isEmpty() )
         text += Qtopia::escapeString(value) + " ";
     if ( !(value = homeCity()).isEmpty() ) {
         text += Qtopia::escapeString(value);
         if ( !state.isEmpty() )
             text += ", " + Qtopia::escapeString(state);
         text += "<br>";
     } else if (!state.isEmpty())
         text += Qtopia::escapeString(state) + "<br>";
     if ( !(value = homeCountry()).isEmpty() )
         text += Qtopia::escapeString(value) + "<br>";
 
     // rest of Home data
     str = homeWebpage();
     if ( !str.isEmpty() ){
-        text += "<b>" + QObject::tr("Home Web Page: ") + "</b>"
+        text += "<b><img src=\"addressbook/webpagehome\">" + QObject::tr("Home Web Page: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
         marker = true;
     }
     str = homePhone();
     if ( !str.isEmpty() ){
-        text += "<b>" + QObject::tr("Home Phone: ") + "</b>"
+        text += "<b><img src=\"addressbook/phonehome\">" + QObject::tr("Home Phone: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
         marker = true;
     }
     str = homeFax();
     if ( !str.isEmpty() ){
-        text += "<b>" + QObject::tr("Home Fax: ") + "</b>"
+        text += "<b><img src=\"addressbook/faxhome\">" + QObject::tr("Home Fax: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
         marker = true;
     }
     str = homeMobile();
     if ( !str.isEmpty() ){
-        text += "<b>" + QObject::tr("Home Mobile: ") + "</b>"
+        text += "<b><img src=\"addressbook/mobilehome\">" + QObject::tr("Home Mobile: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
         marker = true;
     }
 
     if ( marker )
             text += "<br><hr><br>";
     // the others...
     str = emails();
     if ( !str.isEmpty() && ( str != defEmail ) )
         text += "<b>" + QObject::tr("All Emails: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
     str = profession();
     if ( !str.isEmpty() )
         text += "<b>" + QObject::tr("Profession: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
     str = assistant();
     if ( !str.isEmpty() )
         text += "<b>" + QObject::tr("Assistant: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
     str = manager();
     if ( !str.isEmpty() )
         text += "<b>" + QObject::tr("Manager: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
     str = gender();
     if ( !str.isEmpty() && str.toInt() != 0 ) {
         if ( str.toInt() == 1 )
             str = QObject::tr( "Male" );
         else if ( str.toInt() == 2 )
             str = QObject::tr( "Female" );
         text += "<b>" + QObject::tr("Gender: ") + "</b>" + str + "<br>";
     }
     str = spouse();
     if ( !str.isEmpty() )
         text += "<b>" + QObject::tr("Spouse: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
     if ( birthday().isValid() ){
             str = TimeString::numberDateString( birthday() );
             text += "<b>" + QObject::tr("Birthday: ") + "</b>"
                     + Qtopia::escapeString(str) + "<br>";
     }
     if ( anniversary().isValid() ){
             str = TimeString::numberDateString( anniversary() );
             text += "<b>" + QObject::tr("Anniversary: ") + "</b>"
                     + Qtopia::escapeString(str) + "<br>";
     }
     str = children();
     if ( !str.isEmpty() )
         text += "<b>" + QObject::tr("Children: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
 
     str = nickname();
     if ( !str.isEmpty() )
         text += "<b>" + QObject::tr("Nickname: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
 
+    // categories
     if ( categoryNames("Contacts").count() ){
             text += "<b>" + QObject::tr( "Category:") + "</b> ";
             text += categoryNames("Contacts").join(", ");
             text += "<br>";
     }
 
     // notes last
     if ( !(value = notes()).isEmpty() ) {
             text += "<br><hr><b>" + QObject::tr( "Notes:") + "</b> ";
             QRegExp reg("\n");
 
             //QString tmp = Qtopia::escapeString(value);
             QString tmp = QStyleSheet::convertFromPlainText(value);
             //tmp.replace( reg, "<br>" );
             text += "<br>" + tmp + "<br>";
     }
     return text;
 }
 
 /*!
   \internal
 */
 void OContact::insert( int key, const QString &v )
 {
     QString value = v.stripWhiteSpace();
     if ( value.isEmpty() )
         mMap.remove( key );
     else
         mMap.insert( key, value );
 }
 
 /*!
   \internal
 */
 void OContact::replace( int key, const QString & v )
 {
     QString value = v.stripWhiteSpace();
     if ( value.isEmpty() )
         mMap.remove( key );
     else
         mMap.replace( key, value );
 }
 
 /*!
   \internal
 */
 QString OContact::find( int key ) const
 {
     return mMap[key];
 }
 
 /*!
   \internal
 */
 QString OContact::displayAddress( const QString &street,
                                  const QString &city,
                                  const QString &state,
                                  const QString &zip,
                                  const QString &country ) const
 {
     QString s = street;
     if ( !street.isEmpty() )
         s+= "\n";
     s += city;
     if ( !city.isEmpty() && !state.isEmpty() )
         s += ", ";
     s += state;
     if ( !state.isEmpty() && !zip.isEmpty() )
         s += "  ";
     s += zip;
     if ( !country.isEmpty() && !s.isEmpty() )
         s += "\n";
     s += country;
     return s;
 }
 
 /*!
   \internal
 */
 QString OContact::displayBusinessAddress() const
 {
     return displayAddress( businessStreet(), businessCity(),
                            businessState(), businessZip(),
                            businessCountry() );
 }
 
 /*!
   \internal
 */
 QString OContact::displayHomeAddress() const
 {
     return displayAddress( homeStreet(), homeCity(),
                            homeState(), homeZip(),
                            homeCountry() );
 }
 
diff --git a/libopie2/opiepim/oevent.cpp b/libopie2/opiepim/oevent.cpp
index 83b191f..e4f5d92 100644
--- a/libopie2/opiepim/oevent.cpp
+++ b/libopie2/opiepim/oevent.cpp
@@ -142,208 +142,240 @@ bool OEvent::hasRecurrence()const {
     if (!data->recur ) return false;
     return data->recur->doesRecur();
 }
 QString OEvent::note()const {
     return data->note;
 }
 void OEvent::setNote( const QString& note ) {
     changeOrModify();
     data->note = note;
 }
 QDateTime OEvent::createdDateTime()const {
     return data->created;
 }
 void OEvent::setCreatedDateTime( const QDateTime& time ) {
     changeOrModify();
     data->created = time;
 }
 QDateTime OEvent::startDateTime()const {
     if ( data->isAllDay )
         return QDateTime( data->start.date(), QTime(0, 0, 0 ) );
     return data->start;
 }
 QDateTime OEvent::startDateTimeInZone()const {
     /* if no timezone, or all day event or if the current and this timeZone match... */
     if (data->timezone.isEmpty() || data->isAllDay || data->timezone == OTimeZone::current().timeZone() ) return startDateTime();
 
     OTimeZone zone(data->timezone  );
     return zone.toDateTime( data->start, OTimeZone::current() );
 }
 void OEvent::setStartDateTime( const QDateTime& dt ) {
     changeOrModify();
     data->start = dt;
 }
 QDateTime OEvent::endDateTime()const {
     /*
      * if all Day event the end time needs
      * to be on the same day as the start
      */
     if ( data->isAllDay )
         return QDateTime( data->start.date(), QTime(23, 59, 59 ) );
     return data->end;
 }
 QDateTime OEvent::endDateTimeInZone()const {
     /* if no timezone, or all day event or if the current and this timeZone match... */
     if (data->timezone.isEmpty() || data->isAllDay || data->timezone == OTimeZone::current().timeZone() ) return endDateTime();
 
     OTimeZone zone(data->timezone  );
     return zone.toDateTime( data->end, OTimeZone::current() );
 }
 void OEvent::setEndDateTime( const QDateTime& dt ) {
     changeOrModify();
     data->end =    dt;
 }
 bool OEvent::isMultipleDay()const {
     return data->end.date().day() - data->start.date().day();
 }
 bool OEvent::isAllDay()const {
     return data->isAllDay;
 }
 void OEvent::setAllDay( bool allDay ) {
     changeOrModify();
     data->isAllDay = allDay;
     if (allDay ) data->timezone = "UTC";
 }
 void OEvent::setTimeZone( const QString& tz ) {
     changeOrModify();
     data->timezone = tz;
 }
 QString OEvent::timeZone()const {
     if (data->isAllDay ) return QString::fromLatin1("UTC");
     return data->timezone;
 }
 bool OEvent::match( const QRegExp& re )const {
     if ( re.match( data->description ) != -1 ){
         setLastHitField( Qtopia::DatebookDescription );
         return true;
     }
     if ( re.match( data->note ) != -1 ){
         setLastHitField( Qtopia::Note );
         return true;
     }
     if ( re.match( data->location ) != -1 ){
         setLastHitField( Qtopia::Location );
         return true;
     }
     if ( re.match( data->start.toString() ) != -1 ){
         setLastHitField( Qtopia::StartDateTime );
         return true;
     }
     if ( re.match( data->end.toString() ) != -1 ){
         setLastHitField( Qtopia::EndDateTime );
         return true;
     }
     return false;
 }
 QString OEvent::toRichText()const {
-    QString text;
+    QString text, value;
+    
+    // description
+    text += "<b><h3><img src=\"datebook/DateBook\">";
     if ( !description().isEmpty() ) {
-        text += "<b>" + QObject::tr( "Description:") + "</b><br>";
-        text += Qtopia::escapeString(description() ).
-                replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
+        text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"),  "" );
+    }
+    text += "</h3></b><br><hr><br>";
+    
+    // location
+    if ( !(value = location()).isEmpty() ) {
+        text += "<b>" + QObject::tr( "Location:" ) + "</b> ";
+        text += Qtopia::escapeString(value) + "<br>";
+    }
+
+    // all day event
+    if ( isAllDay() ) {
+        text += "<b><i>" + QObject::tr( "This is an all day event" ) + "</i></b><br>";
     }
-    if ( startDateTime().isValid() ) {
-        text += "<b>" + QObject::tr( "Start:") + "</b> ";
-        text += Qtopia::escapeString(startDateTime().toString() ).
-                replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
+    // multiple day event
+    else if ( isMultipleDay () ) {
+        text += "<b><i>" + QObject::tr( "This is a multiple day event" ) + "</i></b><br>";
+    }
+    // start & end times
+    else {
+        // start time
+        if ( startDateTime().isValid() ) {
+            text += "<b>" + QObject::tr( "Start:") + "</b> ";
+            text += Qtopia::escapeString(startDateTime().toString() ).
+                    replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
+        }
+
+        // end time
+        if ( endDateTime().isValid() ) {
+            text += "<b>" + QObject::tr( "End:") + "</b> ";
+            text += Qtopia::escapeString(endDateTime().toString() ).
+                    replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
+        }
     }
-    if ( endDateTime().isValid() ) {
-        text += "<b>" + QObject::tr( "End:") + "</b> ";
-        text += Qtopia::escapeString(endDateTime().toString() ).
-                replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
+    
+    // categories
+    if ( categoryNames("Calendar").count() ){
+            text += "<b>" + QObject::tr( "Category:") + "</b> ";
+            text += categoryNames("Calendar").join(", ");
+            text += "<br>";
     }
+    
+    //notes
     if ( !note().isEmpty() ) {
         text += "<b>" + QObject::tr( "Note:") + "</b><br>";
         text += note();
 //         text += Qtopia::escapeString(note() ).
 //                 replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
     }
     return text;
 }
 QString OEvent::toShortText()const {
     QString text;
     text += QString::number( startDateTime().date().day() );
     text += ".";
     text += QString::number( startDateTime().date().month() );
     text += ".";
     text += QString::number( startDateTime().date().year() );
     text += " ";
     text += QString::number( startDateTime().time().hour() );
     text += ":";
     text += QString::number( startDateTime().time().minute() );
     text += " - ";
     text += description();
     return text;
 }
 QString OEvent::type()const {
     return QString::fromLatin1("OEvent");
 }
 QString OEvent::recordField( int /*id */ )const {
     return QString::null;
 }
 int OEvent::rtti() {
     return OPimResolver::DateBook;
 }
 bool OEvent::loadFromStream( QDataStream& ) {
     return true;
 }
 bool OEvent::saveToStream( QDataStream& )const {
     return true;
 }
 void OEvent::changeOrModify() {
     if ( data->count != 1 ) {
         data->deref();
         Data* d2 = new Data;
         d2->description = data->description;
         d2->location = data->location;
 
         if (data->manager )
             d2->manager = new OPimNotifyManager( *data->manager );
 
         if ( data->recur )
             d2->recur = new ORecur( *data->recur );
 
         d2->note = data->note;
         d2->created = data->created;
         d2->start = data->start;
         d2->end = data->end;
         d2->isAllDay = data->isAllDay;
         d2->timezone = data->timezone;
         d2->parent = data->parent;
 
         if ( data->child ) {
             d2->child = new QArray<int>( *data->child );
             d2->child->detach();
         }
 
         data = d2;
     }
 }
 void OEvent::deref() {
     if ( data->deref() ) {
         delete data;
         data = 0;
     }
 }
 // FIXME
 QMap<int, QString> OEvent::toMap()const {
     return QMap<int, QString>();
 }
 QMap<QString, QString> OEvent::toExtraMap()const {
     return QMap<QString, QString>();
 }
 int OEvent::parent()const {
     return data->parent;
 }
 void OEvent::setParent( int uid ) {
     changeOrModify();
     data->parent = uid;
 }
 QArray<int> OEvent::children() const{
     if (!data->child) return QArray<int>();
     else
         return data->child->copy();
 }
 void OEvent::setChildren( const QArray<int>& arr ) {
     changeOrModify();
     if (data->child) delete data->child;
 
diff --git a/libopie2/opiepim/otodo.cpp b/libopie2/opiepim/otodo.cpp
index e087a00..c84eeeb 100644
--- a/libopie2/opiepim/otodo.cpp
+++ b/libopie2/opiepim/otodo.cpp
@@ -180,213 +180,247 @@ ORecur OTodo::recurrence()const {
 
     return (*data->recur);
 }
 bool OTodo::hasMaintainer()const {
     if (!data->maintainer) return false;
 
     return (data->maintainer->mode() != OPimMaintainer::Undefined );
 }
 OPimMaintainer OTodo::maintainer()const {
     if (!data->maintainer) return OPimMaintainer();
 
     return (*data->maintainer);
 }
 void OTodo::setCompleted( bool completed )
 {
     changeOrModify();
     data->isCompleted = completed;
 }
 void OTodo::setHasDueDate( bool hasDate )
 {
     changeOrModify();
     data->hasDate = hasDate;
 }
 void OTodo::setDescription(const QString &desc )
 {
 //    qWarning( "desc " + desc );
     changeOrModify();
     data->desc = Qtopia::simplifyMultiLineSpace(desc );
 }
 void OTodo::setSummary( const QString& sum )
 {
     changeOrModify();
     data->sum = sum;
 }
 void OTodo::setPriority(int prio )
 {
     changeOrModify();
     data->priority = prio;
 }
 void OTodo::setDueDate( const QDate& date )
 {
     changeOrModify();
     data->date = date;
 }
 void OTodo::setStartDate( const QDate& date ) {
     changeOrModify();
     data->start = date;
 }
 void OTodo::setCompletedDate( const QDate& date ) {
     changeOrModify();
     data->completed = date;
 }
 void OTodo::setState( const OPimState& state ) {
     changeOrModify();
     if (data->state )
         (*data->state) = state;
     else
         data->state = new OPimState( state );
 }
 void OTodo::setRecurrence( const ORecur& rec) {
     changeOrModify();
     if (data->recur )
         (*data->recur) = rec;
     else
         data->recur = new ORecur( rec );
 }
 void OTodo::setMaintainer( const OPimMaintainer& pim ) {
     changeOrModify();
 
     if (data->maintainer )
         (*data->maintainer) = pim;
     else
         data->maintainer = new OPimMaintainer( pim );
 }
 bool OTodo::isOverdue( )
 {
     if( data->hasDate && !data->isCompleted)
         return QDate::currentDate() > data->date;
     return false;
 }
 void OTodo::setProgress(ushort progress )
 {
     changeOrModify();
     data->prog = progress;
 }
 QString OTodo::toShortText() const {
  return summary();
 }
 /*!
   Returns a richt text string
 */
 QString OTodo::toRichText() const
 {
   QString text;
   QStringList catlist;
 
-  // Description of the todo
+  // summary
+  text += "<b><h3><img src=\"todo/TodoList\">";
   if ( !summary().isEmpty() ) {
-    text += "<b>" + QObject::tr( "Summary:") + "</b><br>";
-    text += Qtopia::escapeString(summary() ).replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
+      text += Qtopia::escapeString(summary() ).replace(QRegExp( "[\n]"),  "" );
   }
+  text += "</h3></b><br><hr><br>";
+    
+  // description
   if( !description().isEmpty() ){
     text += "<b>" + QObject::tr( "Description:" ) + "</b><br>";
     text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "<br>" ) ;
   }
-  text += "<br><br><br>";
 
-  text += "<b>" + QObject::tr( "Priority:") +" </b>"
-    +  QString::number( priority() ) + " <br>";
+  // priority
+  int priorityval = priority();
+  text += "<b>" + QObject::tr( "Priority:") +" </b><img src=\"todo/priority" +
+          QString::number( priorityval ) + "\">";
+//  text += "<b>" + QObject::tr( "Priority:") +"</b><img src=\"todo/priority" +
+//          QString::number( priority() ) + "\"><br>";
+  switch ( priorityval )
+  {
+    case 1 : text += QObject::tr( "Very high" );
+        break;
+    case 2 : text += QObject::tr( "High" );
+        break;
+    case 3 : text += QObject::tr( "Normal" );
+        break;
+    case 4 : text += QObject::tr( "Low" );
+        break;
+    case 5 : text += QObject::tr( "Very low" );
+        break;
+  };
+  text += "<br>";
+    
+  // progress
   text += "<b>" + QObject::tr( "Progress:") + " </b>"
           + QString::number( progress() ) + " %<br>";
+          
+  // due date
   if (hasDueDate() ){
-    text += "<b>" + QObject::tr( "Deadline:") + " </b>";
-    text += dueDate().toString();
-    text += "<br>";
+    QDate dd = dueDate();
+    int off = QDate::currentDate().daysTo( dd );
+    
+    text += "<b>" + QObject::tr( "Deadline:" ) + " </b><font color=\"";
+    if ( off < 0 )
+      text += "#FF0000";
+    else if ( off == 0 )
+      text += "#FFFF00";
+    else if ( off > 0 )
+      text += "#00FF00";
+
+    text += "\">" + dd.toString() + "</font><br>";
   }
-
+  
+  // categories
   text += "<b>" + QObject::tr( "Category:") + "</b> ";
   text += categoryNames( "Todo List" ).join(", ");
   text += "<br>";
 
   return text;
 }
 bool OTodo::hasNotifiers()const {
     if (!data->notifiers) return false;
     return !data->notifiers->isEmpty();
 }
 OPimNotifyManager& OTodo::notifiers() {
     if (!data->notifiers )
         data->notifiers = new OPimNotifyManager;
     return (*data->notifiers);
 }
 const OPimNotifyManager& OTodo::notifiers()const{
     if (!data->notifiers )
         data->notifiers = new OPimNotifyManager;
 
     return (*data->notifiers);
 }
 
 bool OTodo::operator<( const OTodo &toDoEvent )const{
     if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true;
     if( !hasDueDate() && toDoEvent.hasDueDate() ) return false;
     if( hasDueDate() && toDoEvent.hasDueDate() ){
         if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide
             return priority() < toDoEvent.priority();
         }else{
             return dueDate() < toDoEvent.dueDate();
         }
     }
     return false;
 }
 bool OTodo::operator<=(const OTodo &toDoEvent )const
 {
     if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true;
     if( !hasDueDate() && toDoEvent.hasDueDate() ) return true;
     if( hasDueDate() && toDoEvent.hasDueDate() ){
         if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide
             return priority() <= toDoEvent.priority();
         }else{
             return dueDate() <= toDoEvent.dueDate();
         }
     }
     return true;
 }
 bool OTodo::operator>(const OTodo &toDoEvent )const
 {
     if( !hasDueDate() && !toDoEvent.hasDueDate() ) return false;
     if( !hasDueDate() &&  toDoEvent.hasDueDate() ) return false;
     if( hasDueDate()  &&  toDoEvent.hasDueDate() ){
         if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide
             return priority() > toDoEvent.priority();
         }else{
             return dueDate() > toDoEvent.dueDate();
         }
     }
     return false;
 }
 bool OTodo::operator>=(const OTodo &toDoEvent )const
 {
     if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true;
     if( !hasDueDate() &&  toDoEvent.hasDueDate() ) return false;
     if( hasDueDate() && toDoEvent.hasDueDate() ){
         if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide
             return priority() > toDoEvent.priority();
         }else{
             return dueDate() > toDoEvent.dueDate();
         }
     }
     return true;
 }
 bool OTodo::operator==(const OTodo &toDoEvent )const
 {
     if ( data->priority != toDoEvent.data->priority ) return false;
     if ( data->priority != toDoEvent.data->prog ) return false;
     if ( data->isCompleted != toDoEvent.data->isCompleted ) return false;
     if ( data->hasDate != toDoEvent.data->hasDate ) return false;
     if ( data->date != toDoEvent.data->date ) return false;
     if ( data->sum != toDoEvent.data->sum ) return false;
     if ( data->desc != toDoEvent.data->desc ) return false;
     if ( data->maintainer    != toDoEvent.data->maintainer )
         return false;
 
     return OPimRecord::operator==( toDoEvent );
 }
 void OTodo::deref() {
 
 //    qWarning("deref in ToDoEvent");
     if ( data->deref() ) {
 //        qWarning("deleting");
         delete data;
         data= 0;
     }
 }