summaryrefslogtreecommitdiff
authoreilers <eilers>2003-09-25 10:57:55 (UTC)
committer eilers <eilers>2003-09-25 10:57:55 (UTC)
commitfe97b1386099f519826392a5734d2bbe567fb786 (patch) (unidiff)
tree133731278965c30a2c072f1c8e9b2e9a361cb1a1
parent5a81b7fa962aa83a10a01706135250f3aba8e315 (diff)
downloadopie-fe97b1386099f519826392a5734d2bbe567fb786.zip
opie-fe97b1386099f519826392a5734d2bbe567fb786.tar.gz
opie-fe97b1386099f519826392a5734d2bbe567fb786.tar.bz2
Fixed inconsistencies between Description and NoteFixed inconsistencies between Description and Notess
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/pim/otodo.cpp2
-rw-r--r--libopie2/opiepim/otodo.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/libopie/pim/otodo.cpp b/libopie/pim/otodo.cpp
index 5a18c37..189bf94 100644
--- a/libopie/pim/otodo.cpp
+++ b/libopie/pim/otodo.cpp
@@ -266,49 +266,49 @@ void OTodo::setProgress(ushort progress )
266{ 266{
267 changeOrModify(); 267 changeOrModify();
268 data->prog = progress; 268 data->prog = progress;
269} 269}
270QString OTodo::toShortText() const { 270QString OTodo::toShortText() const {
271 return summary(); 271 return summary();
272} 272}
273/*! 273/*!
274 Returns a richt text string 274 Returns a richt text string
275*/ 275*/
276QString OTodo::toRichText() const 276QString OTodo::toRichText() const
277{ 277{
278 QString text; 278 QString text;
279 QStringList catlist; 279 QStringList catlist;
280 280
281 // summary 281 // summary
282 text += "<b><h3><img src=\"todo/TodoList\"> "; 282 text += "<b><h3><img src=\"todo/TodoList\"> ";
283 if ( !summary().isEmpty() ) { 283 if ( !summary().isEmpty() ) {
284 text += Qtopia::escapeString(summary() ).replace(QRegExp( "[\n]"), "" ); 284 text += Qtopia::escapeString(summary() ).replace(QRegExp( "[\n]"), "" );
285 } 285 }
286 text += "</h3></b><br><hr><br>"; 286 text += "</h3></b><br><hr><br>";
287 287
288 // description 288 // description
289 if( !description().isEmpty() ){ 289 if( !description().isEmpty() ){
290 text += "<b>" + QObject::tr( "Notes:" ) + "</b><br>"; 290 text += "<b>" + QObject::tr( "Description:" ) + "</b><br>";
291 text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; 291 text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "<br>" ) + "<br>";
292 } 292 }
293 293
294 // priority 294 // priority
295 int priorityval = priority(); 295 int priorityval = priority();
296 text += "<b>" + QObject::tr( "Priority:") +" </b><img src=\"todo/priority" + 296 text += "<b>" + QObject::tr( "Priority:") +" </b><img src=\"todo/priority" +
297 QString::number( priorityval ) + "\"> "; 297 QString::number( priorityval ) + "\"> ";
298 298
299 switch ( priorityval ) 299 switch ( priorityval )
300 { 300 {
301 case 1 : text += QObject::tr( "Very high" ); 301 case 1 : text += QObject::tr( "Very high" );
302 break; 302 break;
303 case 2 : text += QObject::tr( "High" ); 303 case 2 : text += QObject::tr( "High" );
304 break; 304 break;
305 case 3 : text += QObject::tr( "Normal" ); 305 case 3 : text += QObject::tr( "Normal" );
306 break; 306 break;
307 case 4 : text += QObject::tr( "Low" ); 307 case 4 : text += QObject::tr( "Low" );
308 break; 308 break;
309 case 5 : text += QObject::tr( "Very low" ); 309 case 5 : text += QObject::tr( "Very low" );
310 break; 310 break;
311 }; 311 };
312 text += "<br>"; 312 text += "<br>";
313 313
314 // progress 314 // progress
diff --git a/libopie2/opiepim/otodo.cpp b/libopie2/opiepim/otodo.cpp
index 5a18c37..189bf94 100644
--- a/libopie2/opiepim/otodo.cpp
+++ b/libopie2/opiepim/otodo.cpp
@@ -266,49 +266,49 @@ void OTodo::setProgress(ushort progress )
266{ 266{
267 changeOrModify(); 267 changeOrModify();
268 data->prog = progress; 268 data->prog = progress;
269} 269}
270QString OTodo::toShortText() const { 270QString OTodo::toShortText() const {
271 return summary(); 271 return summary();
272} 272}
273/*! 273/*!
274 Returns a richt text string 274 Returns a richt text string
275*/ 275*/
276QString OTodo::toRichText() const 276QString OTodo::toRichText() const
277{ 277{
278 QString text; 278 QString text;
279 QStringList catlist; 279 QStringList catlist;
280 280
281 // summary 281 // summary
282 text += "<b><h3><img src=\"todo/TodoList\"> "; 282 text += "<b><h3><img src=\"todo/TodoList\"> ";
283 if ( !summary().isEmpty() ) { 283 if ( !summary().isEmpty() ) {
284 text += Qtopia::escapeString(summary() ).replace(QRegExp( "[\n]"), "" ); 284 text += Qtopia::escapeString(summary() ).replace(QRegExp( "[\n]"), "" );
285 } 285 }
286 text += "</h3></b><br><hr><br>"; 286 text += "</h3></b><br><hr><br>";
287 287
288 // description 288 // description
289 if( !description().isEmpty() ){ 289 if( !description().isEmpty() ){
290 text += "<b>" + QObject::tr( "Notes:" ) + "</b><br>"; 290 text += "<b>" + QObject::tr( "Description:" ) + "</b><br>";
291 text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; 291 text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "<br>" ) + "<br>";
292 } 292 }
293 293
294 // priority 294 // priority
295 int priorityval = priority(); 295 int priorityval = priority();
296 text += "<b>" + QObject::tr( "Priority:") +" </b><img src=\"todo/priority" + 296 text += "<b>" + QObject::tr( "Priority:") +" </b><img src=\"todo/priority" +
297 QString::number( priorityval ) + "\"> "; 297 QString::number( priorityval ) + "\"> ";
298 298
299 switch ( priorityval ) 299 switch ( priorityval )
300 { 300 {
301 case 1 : text += QObject::tr( "Very high" ); 301 case 1 : text += QObject::tr( "Very high" );
302 break; 302 break;
303 case 2 : text += QObject::tr( "High" ); 303 case 2 : text += QObject::tr( "High" );
304 break; 304 break;
305 case 3 : text += QObject::tr( "Normal" ); 305 case 3 : text += QObject::tr( "Normal" );
306 break; 306 break;
307 case 4 : text += QObject::tr( "Low" ); 307 case 4 : text += QObject::tr( "Low" );
308 break; 308 break;
309 case 5 : text += QObject::tr( "Very low" ); 309 case 5 : text += QObject::tr( "Very low" );
310 break; 310 break;
311 }; 311 };
312 text += "<br>"; 312 text += "<br>";
313 313
314 // progress 314 // progress