1 files changed, 46 insertions, 0 deletions

diff --git a/libopie/todoevent.cpp b/libopie/todoevent.cpp
index a5dba4f..5537b77 100644
--- a/libopie/todoevent.cpp
+++ b/libopie/todoevent.cpp
@@ -1,54 +1,62 @@
 
 #include <opie/todoevent.h>
+
+
 #include <qpe/palmtopuidgen.h>
 #include <qpe/stringutil.h>
 #include <qpe/palmtoprecord.h>
 
+#include <qpe/stringutil.h>
+#include <qpe/categories.h>
+#include <qpe/categoryselect.h>
+
+#include <qobject.h>
+
 ToDoEvent::ToDoEvent(const ToDoEvent &event )
 {
   *this = event;
 }
 
 ToDoEvent::ToDoEvent(bool completed, int priority, const QStringList &category, 
                const QString &description, bool hasDate, QDate date, int uid )
 {
     m_date = date;
     m_isCompleted = completed;
     m_hasDate = hasDate;
     m_priority = priority;
     m_category = category;
     m_desc = Qtopia::simplifyMultiLineSpace(description );
     if (uid == -1 ) {
         Qtopia::UidGen *uidgen = new Qtopia::UidGen();
         uid = uidgen->generate();
         delete uidgen;
     }// generate the ids
     m_uid = uid; 
 }
 QArray<int> ToDoEvent::categories()const
 {
   QArray<int> array(m_category.count() ); // currently the datebook can be only in one category
     array = Qtopia::Record::idsFromString( m_category.join(";") );
   return array;
 }
 bool ToDoEvent::match( const QRegExp &regExp )const
 {
   if( QString::number( m_priority ).find( regExp ) != -1 ){
     return true;
   }else if( m_hasDate && m_date.toString().find( regExp) != -1 ){
     return true;
   }else if(m_desc.find( regExp ) != -1 ){
     return true;
   }
   return false;
 }
 bool ToDoEvent::isCompleted() const
 {
     return m_isCompleted;
 }
 bool ToDoEvent::hasDate() const
 {
     return m_hasDate;
 }
 int ToDoEvent::priority()const
 {
@@ -66,96 +74,134 @@ void ToDoEvent::clearCategories()
 {
   m_category.clear();
 }
 void ToDoEvent::setCategories(const QStringList &list )
 {
   m_category = list;
 }
 QDate ToDoEvent::date()const
 {
     return m_date;
 }
 
 QString ToDoEvent::description()const
 {
     return m_desc;
 }
 void ToDoEvent::setCompleted( bool completed )
 {
     m_isCompleted = completed;
 }
 void ToDoEvent::setHasDate( bool hasDate )
 {
     m_hasDate = hasDate;
 }
 void ToDoEvent::setDescription(const QString &desc )
 {
     m_desc = Qtopia::simplifyMultiLineSpace(desc );
 }
 void ToDoEvent::setCategory( const QString &cat )
 {
   qWarning("setCategory %s", cat.latin1() );
   m_category.clear();
   m_category << cat;
 }
 void ToDoEvent::setPriority(int prio )
 {
     m_priority = prio;
 }
 void ToDoEvent::setDate( QDate date )
 {
     m_date = date;
 }
 bool ToDoEvent::isOverdue( )
 {
     if( m_hasDate )
         return QDate::currentDate() > m_date;
     return false;
 }
+
+/*!
+  Returns a richt text string
+*/
+QString ToDoEvent::richText() const
+{
+  QString text;
+  QStringList catlist;
+  
+  // Description of the todo
+  if ( !description().isEmpty() ){
+    text += "<b>" + QObject::tr( "Description:" ) + "</b><br>";
+    text += Qtopia::escapeString(description() ) + "<br>";
+  }
+  text += "<b>" + QObject::tr( "Priority:") +" </b>"
+    +  QString::number( priority() ) + "<br>";
+  if (hasDate() ){
+    text += "<b>" + QObject::tr( "Deadline:") + " </b>";
+    text += date().toString();
+    text += "<br>";
+  }
+  
+  // Open database of all categories and get the list of
+  // the categories this todoevent belongs to.
+  // Then print them...
+  // I am not sure whether there is no better way doing this !?
+  Categories catdb;
+  catdb.load( categoryFileName() );
+  catlist = allCategories();
+  
+  text += "<b>" + QObject::tr( "Category:") + "</b> ";
+  for ( QStringList::Iterator it = catlist.begin(); it != catlist.end(); ++it ) {
+    text += catdb.label ("todo", (*it).toInt());
+  }
+  text += "<br>";
+  return text;
+}
+
 bool ToDoEvent::operator<( const ToDoEvent &toDoEvent )const{
     if( !hasDate() && !toDoEvent.hasDate() ) return true;
     if( !hasDate() && toDoEvent.hasDate() ) return true;
     if( hasDate() && toDoEvent.hasDate() ){
         if( date() == toDoEvent.date() ){ // let's the priority decide
             return priority() < toDoEvent.priority();
         }else{
             return date() < toDoEvent.date();
         }
     }
     return false;
 }
 bool ToDoEvent::operator<=(const ToDoEvent &toDoEvent )const
 {
     if( !hasDate() && !toDoEvent.hasDate() ) return true;
     if( !hasDate() && toDoEvent.hasDate() ) return true;
     if( hasDate() && toDoEvent.hasDate() ){
         if( date() == toDoEvent.date() ){ // let's the priority decide
             return priority() <= toDoEvent.priority();
         }else{
             return date() <= toDoEvent.date();
         }
     }
     return true;
 }
 bool ToDoEvent::operator>(const ToDoEvent &toDoEvent )const
 {
     if( !hasDate() && !toDoEvent.hasDate() ) return false;
     if( !hasDate() && toDoEvent.hasDate() ) return false;
     if( hasDate() && toDoEvent.hasDate() ){
         if( date() == toDoEvent.date() ){ // let's the priority decide
             return priority() > toDoEvent.priority();
         }else{
             return date() > toDoEvent.date();
         }
     }
     return false;
 }
 bool ToDoEvent::operator>=(const ToDoEvent &toDoEvent )const
 {
     if( !hasDate() && !toDoEvent.hasDate() ) return true;
     if( !hasDate() && toDoEvent.hasDate() ) return false;
     if( hasDate() && toDoEvent.hasDate() ){
         if( date() == toDoEvent.date() ){ // let's the priority decide
             return priority() > toDoEvent.priority();
         }else{
             return date() > toDoEvent.date();
         }