summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/oprocess.h2
-rw-r--r--libopie/tododb.cpp8
-rw-r--r--libopie/todoevent.cpp21
-rw-r--r--libopie/todoevent.h11
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
@@ -24,7 +24,7 @@
//
// (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__
diff --git a/libopie/tododb.cpp b/libopie/tododb.cpp
index 6b10ec2..1e40c40 100644
--- a/libopie/tododb.cpp
+++ b/libopie/tododb.cpp
@@ -24,6 +24,7 @@ public:
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;
@@ -82,6 +83,13 @@ public:
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 );
diff --git a/libopie/todoevent.cpp b/libopie/todoevent.cpp
index fb7073c..b35ac9d 100644
--- a/libopie/todoevent.cpp
+++ b/libopie/todoevent.cpp
@@ -21,6 +21,7 @@ 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;
@@ -29,6 +30,7 @@ ToDoEvent::ToDoEvent(bool completed, int priority,
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();
@@ -78,6 +80,10 @@ QString ToDoEvent::summary() const
{
return m_sum;
}
+ushort ToDoEvent::progress() const
+{
+ return m_prog;
+}
void ToDoEvent::insertCategory(const QString &str )
{
m_category.append( str );
@@ -139,7 +145,10 @@ bool ToDoEvent::isOverdue( )
return QDate::currentDate() > m_date;
return false;
}
-
+void ToDoEvent::setProgress(ushort progress )
+{
+ m_prog = progress;
+}
/*!
Returns a richt text string
*/
@@ -153,10 +162,12 @@ QString ToDoEvent::richText() const
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();
@@ -186,7 +197,7 @@ 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
return priority() < toDoEvent.priority();
@@ -238,6 +249,7 @@ bool ToDoEvent::operator>=(const ToDoEvent &toDoEvent )const
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 &&
@@ -257,6 +269,7 @@ ToDoEvent &ToDoEvent::operator=(const ToDoEvent &item )
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
@@ -26,6 +26,7 @@ class ToDoEvent {
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
@@ -47,6 +48,10 @@ 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
**/
@@ -115,6 +120,11 @@ class ToDoEvent {
void setPriority(int priority );
/**
+ * Set the progress.
+ */
+ void setProgress( ushort progress );
+
+ /**
* set the end date
*/
void setDate( QDate date );
@@ -145,6 +155,7 @@ class ToDoEvent {
QString m_sum;
QMap<QString, QString> m_extra;
int m_uid;
+ ushort m_prog;
};