-rw-r--r-- | libopie/todoevent.cpp | 5 |
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 | |||
@@ -137,29 +137,34 @@ QString ToDoEvent::richText() const | |||
137 | + QString::number( priority() ) + "<br>"; | 137 | + QString::number( priority() ) + "<br>"; |
138 | if (hasDate() ){ | 138 | if (hasDate() ){ |
139 | text += "<b>" + QObject::tr( "Deadline:") + " </b>"; | 139 | text += "<b>" + QObject::tr( "Deadline:") + " </b>"; |
140 | text += date().toString(); | 140 | text += date().toString(); |
141 | text += "<br>"; | 141 | text += "<br>"; |
142 | } | 142 | } |
143 | 143 | ||
144 | // Open database of all categories and get the list of | 144 | // Open database of all categories and get the list of |
145 | // the categories this todoevent belongs to. | 145 | // the categories this todoevent belongs to. |
146 | // Then print them... | 146 | // Then print them... |
147 | // I am not sure whether there is no better way doing this !? | 147 | // I am not sure whether there is no better way doing this !? |
148 | Categories catdb; | 148 | Categories catdb; |
149 | bool firstloop = true; | ||
149 | catdb.load( categoryFileName() ); | 150 | catdb.load( categoryFileName() ); |
150 | catlist = allCategories(); | 151 | catlist = allCategories(); |
151 | 152 | ||
152 | text += "<b>" + QObject::tr( "Category:") + "</b> "; | 153 | text += "<b>" + QObject::tr( "Category:") + "</b> "; |
153 | for ( QStringList::Iterator it = catlist.begin(); it != catlist.end(); ++it ) { | 154 | for ( QStringList::Iterator it = catlist.begin(); it != catlist.end(); ++it ) { |
155 | if (!firstloop){ | ||
156 | text += ", "; | ||
157 | } | ||
158 | firstloop = false; | ||
154 | text += catdb.label ("todo", (*it).toInt()); | 159 | text += catdb.label ("todo", (*it).toInt()); |
155 | } | 160 | } |
156 | text += "<br>"; | 161 | text += "<br>"; |
157 | return text; | 162 | return text; |
158 | } | 163 | } |
159 | 164 | ||
160 | bool ToDoEvent::operator<( const ToDoEvent &toDoEvent )const{ | 165 | bool ToDoEvent::operator<( const ToDoEvent &toDoEvent )const{ |
161 | if( !hasDate() && !toDoEvent.hasDate() ) return true; | 166 | if( !hasDate() && !toDoEvent.hasDate() ) return true; |
162 | if( !hasDate() && toDoEvent.hasDate() ) return true; | 167 | if( !hasDate() && toDoEvent.hasDate() ) return true; |
163 | if( hasDate() && toDoEvent.hasDate() ){ | 168 | if( hasDate() && toDoEvent.hasDate() ){ |
164 | if( date() == toDoEvent.date() ){ // let's the priority decide | 169 | if( date() == toDoEvent.date() ){ // let's the priority decide |
165 | return priority() < toDoEvent.priority(); | 170 | return priority() < toDoEvent.priority(); |