implement progress

4 files changed, 37 insertions, 5 deletions

diff --git a/libopie/oprocess.h b/libopie/oprocess.h
index ce3c87d..fd726b4 100644
--- a/libopie/oprocess.h
+++ b/libopie/oprocess.h
@@ -15,25 +15,25 @@
     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.
 */
 //
 //  KPROCESS -- A class for handling child processes in KDE without
 //  having to take care of Un*x specific implementation details
 //
 //  version 0.3.1, Jan 8th 1998
 //
 //  (C) Christian Czezatke
 //  e9025461@student.tuwien.ac.at
-//  Ported by Holger Freyther
+//  Ported by Holger Freyther to the Open Palmtop Integrated Environment
 //
 
 #ifndef __kprocess_h__
 #define __kprocess_h__
 
 #include <sys/types.h> // for pid_t
 #include <sys/wait.h>
 #include <signal.h>
 #include <unistd.h>
 #include <qvaluelist.h>
 #include <qcstring.h>
 #include <qobject.h>
diff --git a/libopie/tododb.cpp b/libopie/tododb.cpp
index 6b10ec2..1e40c40 100644
--- a/libopie/tododb.cpp
+++ b/libopie/tododb.cpp
@@ -15,24 +15,25 @@ public:
   FileToDoResource() {};
     // FIXME better parsing
   bool save(const QString &name, const QValueList<ToDoEvent> &m_todos ){
     // prepare the XML
     XMLElement *tasks = new XMLElement( );
     tasks->setTagName("Tasks" );
     for( QValueList<ToDoEvent>::ConstIterator it = m_todos.begin(); it != m_todos.end(); ++it ){
 	XMLElement::AttributeMap map;
 	XMLElement *task = new XMLElement();
 	map.insert( "Completed", QString::number((int)(*it).isCompleted() ) );
 	map.insert( "HasDate", QString::number((int)(*it).hasDate() ) );
 	map.insert( "Priority", QString::number( (*it).priority() ) );
+        map.insert( "Progress", QString::number( (*it).progress() ) );
         map.insert( "Summary", (*it).summary() );
 	QArray<int> arrat = (*it).categories();
 	QString attr;
 	for(uint i=0; i < arrat.count(); i++ ){
 	  attr.append(QString::number(arrat[i])+";" );
 	}
 	if(!attr.isEmpty() ) // remove the last ;
 	  attr.remove(attr.length()-1, 1 );
 	map.insert( "Categories", attr );
 	//else
 	//map.insert( "Categories", QString::null );
 	map.insert( "Description", (*it).description() );
@@ -73,24 +74,31 @@ public:
 	  element = element->nextChild();
 	  continue;
 	}
 	qWarning("ToDoDB::load element tagName() : %s", element->tagName().latin1() );
 	QString dummy;
 	ToDoEvent event;
 	bool ok;
 	int dumInt;
 	// completed
 	dummy = element->attribute("Completed" );
 	dumInt = dummy.toInt(&ok );
 	if(ok ) event.setCompleted( dumInt == 0 ? false : true );
+        // progress
+        dummy = element->attribute("Progress" );
+        {
+            ushort dumShort = dummy.toUShort(&ok);
+            event.setProgress( dumShort );
+
+        }
 	// hasDate
 	dummy = element->attribute("HasDate" );
 	dumInt = dummy.toInt(&ok );
 	if(ok ) event.setHasDate( dumInt == 0 ? false: true );
 	// set the date
 	bool hasDa = dumInt;
 	if ( hasDa ) { //parse the date
 	  int year, day, month = 0;
 	  year = day = month;
 	  // year
 	  dummy = element->attribute("DateYear" );
 	  dumInt = dummy.toInt(&ok );
diff --git a/libopie/todoevent.cpp b/libopie/todoevent.cpp
index fb7073c..b35ac9d 100644
--- a/libopie/todoevent.cpp
+++ b/libopie/todoevent.cpp
@@ -12,32 +12,34 @@
 
 #include <qobject.h>
 
 ToDoEvent::ToDoEvent(const ToDoEvent &event )
 {
   *this = event;
 }
 
 ToDoEvent::ToDoEvent(bool completed, int priority,
                      const QStringList &category,
                      const QString& summary,
                      const QString &description,
+                     ushort progress,
                      bool hasDate, QDate date, int uid )
 {
     m_date = date;
     m_isCompleted = completed;
     m_hasDate = hasDate;
     m_priority = priority;
     m_category = category;
     m_sum = summary;
+    m_prog = progress;
     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(";") );
@@ -69,24 +71,28 @@ int ToDoEvent::priority()const
 QStringList ToDoEvent::allCategories()const
 {
     return m_category;
 }
 QString ToDoEvent::extra(const QString& )const
 {
     return QString::null;
 }
 QString ToDoEvent::summary() const
 {
     return m_sum;
 }
+ushort ToDoEvent::progress() const
+{
+    return m_prog;
+}
 void ToDoEvent::insertCategory(const QString &str )
 {
   m_category.append( str );
 }
 void ToDoEvent::clearCategories()
 {
   m_category.clear();
 }
 void ToDoEvent::setCategories(const QStringList &list )
 {
   m_category = list;
 }
@@ -130,42 +136,47 @@ 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;
 }
-
+void ToDoEvent::setProgress(ushort progress )
+{
+    m_prog = progress;
+}
 /*!
   Returns a richt text string
 */
 QString ToDoEvent::richText() const
 {
   QString text;
   QStringList catlist;
 
   // Description of the todo
   if ( !description().isEmpty() ){
     text += "<b>" + QObject::tr( "Summary:") + "</b><br>";
     text += Qtopia::escapeString(summary() ).replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
     text += "<b>" + QObject::tr( "Description:" ) + "</b><br>";
-    text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "<br>" ) + "<br>";
+    text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "<br>" ) + "<br><br><br>";
   }
   text += "<b>" + QObject::tr( "Priority:") +" </b>"
-    +  QString::number( priority() ) + "<br>";
+    +  QString::number( priority() ) + " <br>";
+  text += "<b>" + QObject::tr( "Progress:") + " </b>"
+          + QString::number( progress() ) + " %<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;
   bool firstloop = true;
@@ -177,25 +188,25 @@ QString ToDoEvent::richText() const
     if (!firstloop){
       text += ", ";
     }
     firstloop = false;
     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() ) 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;
@@ -229,41 +240,43 @@ bool ToDoEvent::operator>=(const ToDoEvent &toDoEvent )const
     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( m_priority == toDoEvent.m_priority &&
+        m_priority == toDoEvent.m_prog &&
         m_isCompleted == toDoEvent.m_isCompleted &&
         m_hasDate == toDoEvent.m_hasDate &&
         m_date == toDoEvent.m_date &&
         m_category == toDoEvent.m_category &&
         m_sum == toDoEvent.m_sum &&
         m_desc == toDoEvent.m_desc )
 	return true;
     return false;
 }
 ToDoEvent &ToDoEvent::operator=(const ToDoEvent &item )
 {
     m_date = item.m_date;
     m_isCompleted = item.m_isCompleted;
     m_hasDate = item.m_hasDate;
     m_priority = item.m_priority;
     m_category = item.m_category;
     m_desc = item.m_desc;
     m_uid = item.m_uid;
     m_sum = item.m_sum;
+    m_prog = item.m_prog;
     return *this;
 }
 
 
 
 
 
 
 
 
diff --git a/libopie/todoevent.h b/libopie/todoevent.h
index 7454241..de4623f 100644
--- a/libopie/todoevent.h
+++ b/libopie/todoevent.h
@@ -17,45 +17,50 @@ class ToDoEvent {
        @param priority What is the priority of this ToDoEvent
        @param category Which category does it belong( uid )
        @param summary A small summary of the todo
        @param description What is this ToDoEvent about
        @param hasDate Does this Event got a deadline
        @param date what is the deadline?
        @param uid what is the UUID of this Event
     **/
     ToDoEvent( bool completed = false, int priority = NORMAL,
 	       const QStringList &category = QStringList(),
 	       const QString &summary = QString::null ,
                const QString &description = QString::null,
+               ushort progress = 0,
 	       bool hasDate = false, QDate date = QDate::currentDate(), int uid = -1 );
     /* Copy c'tor
 
     **/
     ToDoEvent(const ToDoEvent & );
 
     /*
        Is this event completed?
     **/
     bool isCompleted() const;
 
     /*
        Does this Event have a deadline
     **/
     bool hasDate() const;
 
     /*
       What is the priority?
     **/
     int priority()const ;
 
+    /**
+     * progress as ushort 0, 20, 40, 60, 80 or 100%
+     */
+    ushort progress() const;
     /*
       All category numbers as QString in a List
     **/
     QStringList allCategories()const;
 
     /*
       * Same as above but with QArray<int>
       */
     QArray<int> categories() const;
 
     /**
      * The end Date
@@ -106,24 +111,29 @@ class ToDoEvent {
 
     /**
      * This todo belongs to xxx categories
      */
     void setCategories(const QStringList& );
 
     /**
      * Set the priority of the Todo
      */
     void setPriority(int priority );
 
     /**
+     * Set the progress.
+     */
+    void setProgress( ushort progress );
+
+    /**
      * set the end date
      */
     void setDate( QDate date );
     void setDescription(const QString& );
     void setSummary(const QString& );
     void setExtra( const QString&,  const QString& );
     bool isOverdue();
 
     bool match( const QRegExp &r )const;
 
     void setUid(int id) {m_uid = id; };
     bool operator<(const ToDoEvent &toDoEvent )const;
@@ -136,16 +146,17 @@ class ToDoEvent {
  private:
     class ToDoEventPrivate;
     ToDoEventPrivate *d;
     QDate m_date;
     bool m_isCompleted:1;
     bool m_hasDate:1;
     int m_priority;
     QStringList m_category;
     QString m_desc;
     QString m_sum;
     QMap<QString, QString> m_extra;
     int m_uid;
+    ushort m_prog;
 };
 
 
 #endif