summaryrefslogtreecommitdiff
authorzecke <zecke>2002-05-09 15:39:38 (UTC)
committer zecke <zecke>2002-05-09 15:39:38 (UTC)
commit7999411de407eaaf57cae9e2d0cb3767c714d161 (patch) (side-by-side diff)
treea29d0744a5aa698c8eb329721d1df651096eeb10
parent543122f38cc6e2b711d4afa321f7fed469b76621 (diff)
downloadopie-7999411de407eaaf57cae9e2d0cb3767c714d161.zip
opie-7999411de407eaaf57cae9e2d0cb3767c714d161.tar.gz
opie-7999411de407eaaf57cae9e2d0cb3767c714d161.tar.bz2
Patch from Stefan Eilers to separate multiple categories by a ,
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/todoevent.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/libopie/todoevent.cpp b/libopie/todoevent.cpp
index b820150..aa348a2 100644
--- a/libopie/todoevent.cpp
+++ b/libopie/todoevent.cpp
@@ -125,53 +125,58 @@ bool ToDoEvent::isOverdue( )
*/
QString ToDoEvent::richText() const
{
QString text;
QStringList catlist;
// Description of the todo
if ( !description().isEmpty() ){
text += "<b>" + QObject::tr( "Description:" ) + "</b><br>";
text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "<br>" ) + "<br>";
}
text += "<b>" + QObject::tr( "Priority:") +" </b>"
+ QString::number( priority() ) + "<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;
catdb.load( categoryFileName() );
catlist = allCategories();
text += "<b>" + QObject::tr( "Category:") + "</b> ";
for ( QStringList::Iterator it = catlist.begin(); it != catlist.end(); ++it ) {
+ 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() ){
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;
if( !hasDate() && toDoEvent.hasDate() ) return true;
if( hasDate() && toDoEvent.hasDate() ){
if( date() == toDoEvent.date() ){ // let's the priority decide