summaryrefslogtreecommitdiff
authorzecke <zecke>2002-06-16 16:34:10 (UTC)
committer zecke <zecke>2002-06-16 16:34:10 (UTC)
commit3b8192d0f5a41c40092af48df8abc39aa3d1c355 (patch) (side-by-side diff)
treec1f5e0211a16bb4ceb2d78ec7a76e1bffdae088b
parent23c2d100ed9070d82f956cdcb7364f5627aa0600 (diff)
downloadopie-3b8192d0f5a41c40092af48df8abc39aa3d1c355.zip
opie-3b8192d0f5a41c40092af48df8abc39aa3d1c355.tar.gz
opie-3b8192d0f5a41c40092af48df8abc39aa3d1c355.tar.bz2
implement progress
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
@@ -26,3 +26,3 @@
// 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
@@ -26,2 +26,3 @@ public:
map.insert( "Priority", QString::number( (*it).priority() ) );
+ map.insert( "Progress", QString::number( (*it).progress() ) );
map.insert( "Summary", (*it).summary() );
@@ -84,2 +85,9 @@ public:
if(ok ) event.setCompleted( dumInt == 0 ? false : true );
+ // progress
+ dummy = element->attribute("Progress" );
+ {
+ ushort dumShort = dummy.toUShort(&ok);
+ event.setProgress( dumShort );
+
+ }
// hasDate
diff --git a/libopie/todoevent.cpp b/libopie/todoevent.cpp
index fb7073c..b35ac9d 100644
--- a/libopie/todoevent.cpp
+++ b/libopie/todoevent.cpp
@@ -23,2 +23,3 @@ ToDoEvent::ToDoEvent(bool completed, int priority,
const QString &description,
+ ushort progress,
bool hasDate, QDate date, int uid )
@@ -31,2 +32,3 @@ ToDoEvent::ToDoEvent(bool completed, int priority,
m_sum = summary;
+ m_prog = progress;
m_desc = Qtopia::simplifyMultiLineSpace(description );
@@ -80,2 +82,6 @@ QString ToDoEvent::summary() const
}
+ushort ToDoEvent::progress() const
+{
+ return m_prog;
+}
void ToDoEvent::insertCategory(const QString &str )
@@ -141,3 +147,6 @@ bool ToDoEvent::isOverdue( )
}
-
+void ToDoEvent::setProgress(ushort progress )
+{
+ m_prog = progress;
+}
/*!
@@ -155,6 +164,8 @@ QString ToDoEvent::richText() const
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() ){
@@ -188,3 +199,3 @@ 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() ){
@@ -240,2 +251,3 @@ bool ToDoEvent::operator==(const ToDoEvent &toDoEvent )const
if( m_priority == toDoEvent.m_priority &&
+ m_priority == toDoEvent.m_prog &&
m_isCompleted == toDoEvent.m_isCompleted &&
@@ -259,2 +271,3 @@ ToDoEvent &ToDoEvent::operator=(const ToDoEvent &item )
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
@@ -28,2 +28,3 @@ class ToDoEvent {
const QString &description = QString::null,
+ ushort progress = 0,
bool hasDate = false, QDate date = QDate::currentDate(), int uid = -1 );
@@ -49,2 +50,6 @@ class ToDoEvent {
+ /**
+ * progress as ushort 0, 20, 40, 60, 80 or 100%
+ */
+ ushort progress() const;
/*
@@ -117,2 +122,7 @@ class ToDoEvent {
/**
+ * Set the progress.
+ */
+ void setProgress( ushort progress );
+
+ /**
* set the end date
@@ -147,2 +157,3 @@ class ToDoEvent {
int m_uid;
+ ushort m_prog;
};