| -rw-r--r-- | libopie/oprocess.h | 2 | ||||
| -rw-r--r-- | libopie/tododb.cpp | 8 | ||||
| -rw-r--r-- | libopie/todoevent.cpp | 21 | ||||
| -rw-r--r-- | libopie/todoevent.h | 11 |
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 @@ -25,5 +25,5 @@ // (C) Christian Czezatke // e9025461@student.tuwien.ac.at -// Ported by Holger Freyther +// Ported by Holger Freyther to the Open Palmtop Integrated Environment // diff --git a/libopie/tododb.cpp b/libopie/tododb.cpp index 6b10ec2..1e40c40 100644 --- a/libopie/tododb.cpp +++ b/libopie/tododb.cpp @@ -25,4 +25,5 @@ public: 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(); @@ -83,4 +84,11 @@ public: 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" ); diff --git a/libopie/todoevent.cpp b/libopie/todoevent.cpp index fb7073c..b35ac9d 100644 --- a/libopie/todoevent.cpp +++ b/libopie/todoevent.cpp @@ -22,4 +22,5 @@ ToDoEvent::ToDoEvent(bool completed, int priority, const QString& summary, const QString &description, + ushort progress, bool hasDate, QDate date, int uid ) { @@ -30,4 +31,5 @@ ToDoEvent::ToDoEvent(bool completed, int priority, m_category = category; m_sum = summary; + m_prog = progress; m_desc = Qtopia::simplifyMultiLineSpace(description ); if (uid == -1 ) { @@ -79,4 +81,8 @@ QString ToDoEvent::summary() const return m_sum; } +ushort ToDoEvent::progress() const +{ + return m_prog; +} void ToDoEvent::insertCategory(const QString &str ) { @@ -140,5 +146,8 @@ bool ToDoEvent::isOverdue( ) return false; } - +void ToDoEvent::setProgress(ushort progress ) +{ + m_prog = progress; +} /*! Returns a richt text string @@ -154,8 +163,10 @@ QString ToDoEvent::richText() const 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>"; @@ -187,5 +198,5 @@ QString ToDoEvent::richText() const 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 @@ -239,4 +250,5 @@ 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 && @@ -258,4 +270,5 @@ ToDoEvent &ToDoEvent::operator=(const ToDoEvent &item ) 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 @@ -27,4 +27,5 @@ class ToDoEvent { 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 @@ -48,4 +49,8 @@ class ToDoEvent { int priority()const ; + /** + * progress as ushort 0, 20, 40, 60, 80 or 100% + */ + ushort progress() const; /* All category numbers as QString in a List @@ -116,4 +121,9 @@ class ToDoEvent { /** + * Set the progress. + */ + void setProgress( ushort progress ); + + /** * set the end date */ @@ -146,4 +156,5 @@ class ToDoEvent { QMap<QString, QString> m_extra; int m_uid; + ushort m_prog; }; |