-rw-r--r-- | libopie/todoevent.cpp | 19 |
1 files changed, 16 insertions, 3 deletions
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, | |||
23 | const QString &description, | 23 | const QString &description, |
24 | ushort progress, | ||
24 | bool hasDate, QDate date, int uid ) | 25 | bool hasDate, QDate date, int uid ) |
@@ -31,2 +32,3 @@ ToDoEvent::ToDoEvent(bool completed, int priority, | |||
31 | m_sum = summary; | 32 | m_sum = summary; |
33 | m_prog = progress; | ||
32 | m_desc = Qtopia::simplifyMultiLineSpace(description ); | 34 | m_desc = Qtopia::simplifyMultiLineSpace(description ); |
@@ -80,2 +82,6 @@ QString ToDoEvent::summary() const | |||
80 | } | 82 | } |
83 | ushort ToDoEvent::progress() const | ||
84 | { | ||
85 | return m_prog; | ||
86 | } | ||
81 | void ToDoEvent::insertCategory(const QString &str ) | 87 | void ToDoEvent::insertCategory(const QString &str ) |
@@ -141,3 +147,6 @@ bool ToDoEvent::isOverdue( ) | |||
141 | } | 147 | } |
142 | 148 | void ToDoEvent::setProgress(ushort progress ) | |
149 | { | ||
150 | m_prog = progress; | ||
151 | } | ||
143 | /*! | 152 | /*! |
@@ -155,3 +164,3 @@ QString ToDoEvent::richText() const | |||
155 | text += "<b>" + QObject::tr( "Description:" ) + "</b><br>"; | 164 | text += "<b>" + QObject::tr( "Description:" ) + "</b><br>"; |
156 | text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; | 165 | text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "<br>" ) + "<br><br><br>"; |
157 | } | 166 | } |
@@ -159,2 +168,4 @@ QString ToDoEvent::richText() const | |||
159 | + QString::number( priority() ) + "<br>"; | 168 | + QString::number( priority() ) + "<br>"; |
169 | text += "<b>" + QObject::tr( "Progress:") + " </b>" | ||
170 | + QString::number( progress() ) + " %<br>"; | ||
160 | if (hasDate() ){ | 171 | if (hasDate() ){ |
@@ -188,3 +199,3 @@ bool ToDoEvent::operator<( const ToDoEvent &toDoEvent )const{ | |||
188 | if( !hasDate() && !toDoEvent.hasDate() ) return true; | 199 | if( !hasDate() && !toDoEvent.hasDate() ) return true; |
189 | if( !hasDate() && toDoEvent.hasDate() ) return true; | 200 | if( !hasDate() && toDoEvent.hasDate() ) return false; |
190 | if( hasDate() && toDoEvent.hasDate() ){ | 201 | if( hasDate() && toDoEvent.hasDate() ){ |
@@ -240,2 +251,3 @@ bool ToDoEvent::operator==(const ToDoEvent &toDoEvent )const | |||
240 | if( m_priority == toDoEvent.m_priority && | 251 | if( m_priority == toDoEvent.m_priority && |
252 | m_priority == toDoEvent.m_prog && | ||
241 | m_isCompleted == toDoEvent.m_isCompleted && | 253 | m_isCompleted == toDoEvent.m_isCompleted && |
@@ -259,2 +271,3 @@ ToDoEvent &ToDoEvent::operator=(const ToDoEvent &item ) | |||
259 | m_sum = item.m_sum; | 271 | m_sum = item.m_sum; |
272 | m_prog = item.m_prog; | ||
260 | return *this; | 273 | return *this; |