-rw-r--r-- | libopie/pim/ocontact.cpp | 31 | ||||
-rw-r--r-- | libopie/pim/oevent.cpp | 40 | ||||
-rw-r--r-- | libopie/pim/otodo.cpp | 52 | ||||
-rw-r--r-- | libopie2/opiepim/ocontact.cpp | 31 | ||||
-rw-r--r-- | libopie2/opiepim/oevent.cpp | 40 | ||||
-rw-r--r-- | libopie2/opiepim/otodo.cpp | 52 |
6 files changed, 194 insertions, 52 deletions
diff --git a/libopie/pim/ocontact.cpp b/libopie/pim/ocontact.cpp index a7ca975..a2fb68c 100644 --- a/libopie/pim/ocontact.cpp +++ b/libopie/pim/ocontact.cpp | |||
@@ -437,13 +437,14 @@ QString OContact::toRichText() const | |||
437 | QString value, comp, state; | 437 | QString value, comp, state; |
438 | QString str; | 438 | QString str; |
439 | bool marker = false; | 439 | bool marker = false; |
440 | 440 | ||
441 | // name, jobtitle and company | 441 | // name, jobtitle and company |
442 | if ( !(value = fullName()).isEmpty() ) | 442 | if ( !(value = fullName()).isEmpty() ) |
443 | text += "<b><h3>" + Qtopia::escapeString(value) + "</h3></b><br>"; | 443 | text += "<b><h3><img src=\"addressbook/AddressBook\">" + Qtopia::escapeString(value) + "</h3></b>"; |
444 | |||
444 | if ( !(value = jobTitle()).isEmpty() ) | 445 | if ( !(value = jobTitle()).isEmpty() ) |
445 | text += Qtopia::escapeString(value) + "<br>"; | 446 | text += Qtopia::escapeString(value) + "<br>"; |
446 | 447 | ||
447 | comp = company(); | 448 | comp = company(); |
448 | if ( !(value = department()).isEmpty() ) { | 449 | if ( !(value = department()).isEmpty() ) { |
449 | text += Qtopia::escapeString(value); | 450 | text += Qtopia::escapeString(value); |
@@ -452,23 +453,25 @@ QString OContact::toRichText() const | |||
452 | else | 453 | else |
453 | text += "<br>"; | 454 | text += "<br>"; |
454 | } | 455 | } |
455 | if ( !comp.isEmpty() ) | 456 | if ( !comp.isEmpty() ) |
456 | text += Qtopia::escapeString(comp) + "<br>"; | 457 | text += Qtopia::escapeString(comp) + "<br>"; |
457 | 458 | ||
459 | text += "<hr><br>"; | ||
460 | |||
461 | // defailt email | ||
458 | QString defEmail = defaultEmail(); | 462 | QString defEmail = defaultEmail(); |
459 | if ( !defEmail.isEmpty() ) | 463 | if ( !defEmail.isEmpty() ) |
460 | text += "<b>" + QObject::tr("Default Email: ") + "</b>" | 464 | text += "<b><img src=\"addressbook/email\">" + QObject::tr("Default Email: ") + "</b>" |
461 | + Qtopia::escapeString(defEmail) + "<br>"; | 465 | + Qtopia::escapeString(defEmail) + "<br>"; |
462 | 466 | ||
463 | text += "<hr>"; | 467 | text += "<br>"; |
464 | 468 | ||
465 | // business address | 469 | // business address |
466 | if ( !businessStreet().isEmpty() || !businessCity().isEmpty() || | 470 | if ( !businessStreet().isEmpty() || !businessCity().isEmpty() || |
467 | !businessZip().isEmpty() || !businessCountry().isEmpty() ) { | 471 | !businessZip().isEmpty() || !businessCountry().isEmpty() ) { |
468 | text += "<br>"; | ||
469 | text += QObject::tr( "<b>Work Address:</b>" ); | 472 | text += QObject::tr( "<b>Work Address:</b>" ); |
470 | text += "<br>"; | 473 | text += "<br>"; |
471 | marker = true; | 474 | marker = true; |
472 | } | 475 | } |
473 | 476 | ||
474 | if ( !(value = businessStreet()).isEmpty() ) | 477 | if ( !(value = businessStreet()).isEmpty() ) |
@@ -493,45 +496,46 @@ QString OContact::toRichText() const | |||
493 | text += "<b>" + QObject::tr("Office: ") + "</b>" | 496 | text += "<b>" + QObject::tr("Office: ") + "</b>" |
494 | + Qtopia::escapeString(str) + "<br>"; | 497 | + Qtopia::escapeString(str) + "<br>"; |
495 | marker = true; | 498 | marker = true; |
496 | } | 499 | } |
497 | str = businessWebpage(); | 500 | str = businessWebpage(); |
498 | if ( !str.isEmpty() ){ | 501 | if ( !str.isEmpty() ){ |
499 | text += "<b>" + QObject::tr("Business Web Page: ") + "</b>" | 502 | text += "<b><img src=\"addressbook/webpagework\">" + QObject::tr("Business Web Page: ") + "</b>" |
500 | + Qtopia::escapeString(str) + "<br>"; | 503 | + Qtopia::escapeString(str) + "<br>"; |
501 | marker = true; | 504 | marker = true; |
502 | } | 505 | } |
503 | str = businessPhone(); | 506 | str = businessPhone(); |
504 | if ( !str.isEmpty() ){ | 507 | if ( !str.isEmpty() ){ |
505 | text += "<b>" + QObject::tr("Business Phone: ") + "</b>" | 508 | text += "<b><img src=\"addressbook/phonework\">" + QObject::tr("Business Phone: ") + "</b>" |
506 | + Qtopia::escapeString(str) + "<br>"; | 509 | + Qtopia::escapeString(str) + "<br>"; |
507 | marker = true; | 510 | marker = true; |
508 | } | 511 | } |
509 | str = businessFax(); | 512 | str = businessFax(); |
510 | if ( !str.isEmpty() ){ | 513 | if ( !str.isEmpty() ){ |
511 | text += "<b>" + QObject::tr("Business Fax: ") + "</b>" | 514 | text += "<b><img src=\"addressbook/faxwork\">" + QObject::tr("Business Fax: ") + "</b>" |
512 | + Qtopia::escapeString(str) + "<br>"; | 515 | + Qtopia::escapeString(str) + "<br>"; |
513 | marker = true; | 516 | marker = true; |
514 | } | 517 | } |
515 | str = businessMobile(); | 518 | str = businessMobile(); |
516 | if ( !str.isEmpty() ){ | 519 | if ( !str.isEmpty() ){ |
517 | text += "<b>" + QObject::tr("Business Mobile: ") + "</b>" | 520 | text += "<b><img src=\"addressbook/mobilework\">" + QObject::tr("Business Mobile: ") + "</b>" |
518 | + Qtopia::escapeString(str) + "<br>"; | 521 | + Qtopia::escapeString(str) + "<br>"; |
519 | marker = true; | 522 | marker = true; |
520 | } | 523 | } |
521 | str = businessPager(); | 524 | str = businessPager(); |
522 | if ( !str.isEmpty() ){ | 525 | if ( !str.isEmpty() ){ |
523 | text += "<b>" + QObject::tr("Business Pager: ") + "</b>" | 526 | text += "<b>" + QObject::tr("Business Pager: ") + "</b>" |
524 | + Qtopia::escapeString(str) + "<br>"; | 527 | + Qtopia::escapeString(str) + "<br>"; |
525 | marker = true; | 528 | marker = true; |
526 | } | 529 | } |
527 | 530 | ||
531 | text += "<br>"; | ||
532 | |||
528 | // home address | 533 | // home address |
529 | if ( !homeStreet().isEmpty() || !homeCity().isEmpty() || | 534 | if ( !homeStreet().isEmpty() || !homeCity().isEmpty() || |
530 | !homeZip().isEmpty() || !homeCountry().isEmpty() ) { | 535 | !homeZip().isEmpty() || !homeCountry().isEmpty() ) { |
531 | text += "<br>"; | ||
532 | text += QObject::tr( "<b>Home Address:</b>" ); | 536 | text += QObject::tr( "<b>Home Address:</b>" ); |
533 | text += "<br>"; | 537 | text += "<br>"; |
534 | } | 538 | } |
535 | 539 | ||
536 | if ( !(value = homeStreet()).isEmpty() ) | 540 | if ( !(value = homeStreet()).isEmpty() ) |
537 | text += Qtopia::escapeString(value) + "<br>"; | 541 | text += Qtopia::escapeString(value) + "<br>"; |
@@ -548,31 +552,31 @@ QString OContact::toRichText() const | |||
548 | if ( !(value = homeCountry()).isEmpty() ) | 552 | if ( !(value = homeCountry()).isEmpty() ) |
549 | text += Qtopia::escapeString(value) + "<br>"; | 553 | text += Qtopia::escapeString(value) + "<br>"; |
550 | 554 | ||
551 | // rest of Home data | 555 | // rest of Home data |
552 | str = homeWebpage(); | 556 | str = homeWebpage(); |
553 | if ( !str.isEmpty() ){ | 557 | if ( !str.isEmpty() ){ |
554 | text += "<b>" + QObject::tr("Home Web Page: ") + "</b>" | 558 | text += "<b><img src=\"addressbook/webpagehome\">" + QObject::tr("Home Web Page: ") + "</b>" |
555 | + Qtopia::escapeString(str) + "<br>"; | 559 | + Qtopia::escapeString(str) + "<br>"; |
556 | marker = true; | 560 | marker = true; |
557 | } | 561 | } |
558 | str = homePhone(); | 562 | str = homePhone(); |
559 | if ( !str.isEmpty() ){ | 563 | if ( !str.isEmpty() ){ |
560 | text += "<b>" + QObject::tr("Home Phone: ") + "</b>" | 564 | text += "<b><img src=\"addressbook/phonehome\">" + QObject::tr("Home Phone: ") + "</b>" |
561 | + Qtopia::escapeString(str) + "<br>"; | 565 | + Qtopia::escapeString(str) + "<br>"; |
562 | marker = true; | 566 | marker = true; |
563 | } | 567 | } |
564 | str = homeFax(); | 568 | str = homeFax(); |
565 | if ( !str.isEmpty() ){ | 569 | if ( !str.isEmpty() ){ |
566 | text += "<b>" + QObject::tr("Home Fax: ") + "</b>" | 570 | text += "<b><img src=\"addressbook/faxhome\">" + QObject::tr("Home Fax: ") + "</b>" |
567 | + Qtopia::escapeString(str) + "<br>"; | 571 | + Qtopia::escapeString(str) + "<br>"; |
568 | marker = true; | 572 | marker = true; |
569 | } | 573 | } |
570 | str = homeMobile(); | 574 | str = homeMobile(); |
571 | if ( !str.isEmpty() ){ | 575 | if ( !str.isEmpty() ){ |
572 | text += "<b>" + QObject::tr("Home Mobile: ") + "</b>" | 576 | text += "<b><img src=\"addressbook/mobilehome\">" + QObject::tr("Home Mobile: ") + "</b>" |
573 | + Qtopia::escapeString(str) + "<br>"; | 577 | + Qtopia::escapeString(str) + "<br>"; |
574 | marker = true; | 578 | marker = true; |
575 | } | 579 | } |
576 | 580 | ||
577 | if ( marker ) | 581 | if ( marker ) |
578 | text += "<br><hr><br>"; | 582 | text += "<br><hr><br>"; |
@@ -622,12 +626,13 @@ QString OContact::toRichText() const | |||
622 | 626 | ||
623 | str = nickname(); | 627 | str = nickname(); |
624 | if ( !str.isEmpty() ) | 628 | if ( !str.isEmpty() ) |
625 | text += "<b>" + QObject::tr("Nickname: ") + "</b>" | 629 | text += "<b>" + QObject::tr("Nickname: ") + "</b>" |
626 | + Qtopia::escapeString(str) + "<br>"; | 630 | + Qtopia::escapeString(str) + "<br>"; |
627 | 631 | ||
632 | // categories | ||
628 | if ( categoryNames("Contacts").count() ){ | 633 | if ( categoryNames("Contacts").count() ){ |
629 | text += "<b>" + QObject::tr( "Category:") + "</b> "; | 634 | text += "<b>" + QObject::tr( "Category:") + "</b> "; |
630 | text += categoryNames("Contacts").join(", "); | 635 | text += categoryNames("Contacts").join(", "); |
631 | text += "<br>"; | 636 | text += "<br>"; |
632 | } | 637 | } |
633 | 638 | ||
diff --git a/libopie/pim/oevent.cpp b/libopie/pim/oevent.cpp index 83b191f..e4f5d92 100644 --- a/libopie/pim/oevent.cpp +++ b/libopie/pim/oevent.cpp | |||
@@ -232,28 +232,60 @@ bool OEvent::match( const QRegExp& re )const { | |||
232 | setLastHitField( Qtopia::EndDateTime ); | 232 | setLastHitField( Qtopia::EndDateTime ); |
233 | return true; | 233 | return true; |
234 | } | 234 | } |
235 | return false; | 235 | return false; |
236 | } | 236 | } |
237 | QString OEvent::toRichText()const { | 237 | QString OEvent::toRichText()const { |
238 | QString text; | 238 | QString text, value; |
239 | |||
240 | // description | ||
241 | text += "<b><h3><img src=\"datebook/DateBook\">"; | ||
239 | if ( !description().isEmpty() ) { | 242 | if ( !description().isEmpty() ) { |
240 | text += "<b>" + QObject::tr( "Description:") + "</b><br>"; | 243 | text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "" ); |
241 | text += Qtopia::escapeString(description() ). | 244 | } |
242 | replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; | 245 | text += "</h3></b><br><hr><br>"; |
246 | |||
247 | // location | ||
248 | if ( !(value = location()).isEmpty() ) { | ||
249 | text += "<b>" + QObject::tr( "Location:" ) + "</b> "; | ||
250 | text += Qtopia::escapeString(value) + "<br>"; | ||
251 | } | ||
252 | |||
253 | // all day event | ||
254 | if ( isAllDay() ) { | ||
255 | text += "<b><i>" + QObject::tr( "This is an all day event" ) + "</i></b><br>"; | ||
243 | } | 256 | } |
257 | // multiple day event | ||
258 | else if ( isMultipleDay () ) { | ||
259 | text += "<b><i>" + QObject::tr( "This is a multiple day event" ) + "</i></b><br>"; | ||
260 | } | ||
261 | // start & end times | ||
262 | else { | ||
263 | // start time | ||
244 | if ( startDateTime().isValid() ) { | 264 | if ( startDateTime().isValid() ) { |
245 | text += "<b>" + QObject::tr( "Start:") + "</b> "; | 265 | text += "<b>" + QObject::tr( "Start:") + "</b> "; |
246 | text += Qtopia::escapeString(startDateTime().toString() ). | 266 | text += Qtopia::escapeString(startDateTime().toString() ). |
247 | replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; | 267 | replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; |
248 | } | 268 | } |
269 | |||
270 | // end time | ||
249 | if ( endDateTime().isValid() ) { | 271 | if ( endDateTime().isValid() ) { |
250 | text += "<b>" + QObject::tr( "End:") + "</b> "; | 272 | text += "<b>" + QObject::tr( "End:") + "</b> "; |
251 | text += Qtopia::escapeString(endDateTime().toString() ). | 273 | text += Qtopia::escapeString(endDateTime().toString() ). |
252 | replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; | 274 | replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; |
253 | } | 275 | } |
276 | } | ||
277 | |||
278 | // categories | ||
279 | if ( categoryNames("Calendar").count() ){ | ||
280 | text += "<b>" + QObject::tr( "Category:") + "</b> "; | ||
281 | text += categoryNames("Calendar").join(", "); | ||
282 | text += "<br>"; | ||
283 | } | ||
284 | |||
285 | //notes | ||
254 | if ( !note().isEmpty() ) { | 286 | if ( !note().isEmpty() ) { |
255 | text += "<b>" + QObject::tr( "Note:") + "</b><br>"; | 287 | text += "<b>" + QObject::tr( "Note:") + "</b><br>"; |
256 | text += note(); | 288 | text += note(); |
257 | // text += Qtopia::escapeString(note() ). | 289 | // text += Qtopia::escapeString(note() ). |
258 | // replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; | 290 | // replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; |
259 | } | 291 | } |
diff --git a/libopie/pim/otodo.cpp b/libopie/pim/otodo.cpp index e087a00..c84eeeb 100644 --- a/libopie/pim/otodo.cpp +++ b/libopie/pim/otodo.cpp | |||
@@ -270,33 +270,67 @@ QString OTodo::toShortText() const { | |||
270 | */ | 270 | */ |
271 | QString OTodo::toRichText() const | 271 | QString OTodo::toRichText() const |
272 | { | 272 | { |
273 | QString text; | 273 | QString text; |
274 | QStringList catlist; | 274 | QStringList catlist; |
275 | 275 | ||
276 | // Description of the todo | 276 | // summary |
277 | text += "<b><h3><img src=\"todo/TodoList\">"; | ||
277 | if ( !summary().isEmpty() ) { | 278 | if ( !summary().isEmpty() ) { |
278 | text += "<b>" + QObject::tr( "Summary:") + "</b><br>"; | 279 | text += Qtopia::escapeString(summary() ).replace(QRegExp( "[\n]"), "" ); |
279 | text += Qtopia::escapeString(summary() ).replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; | ||
280 | } | 280 | } |
281 | text += "</h3></b><br><hr><br>"; | ||
282 | |||
283 | // description | ||
281 | if( !description().isEmpty() ){ | 284 | if( !description().isEmpty() ){ |
282 | text += "<b>" + QObject::tr( "Description:" ) + "</b><br>"; | 285 | text += "<b>" + QObject::tr( "Description:" ) + "</b><br>"; |
283 | text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "<br>" ) ; | 286 | text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "<br>" ) ; |
284 | } | 287 | } |
285 | text += "<br><br><br>"; | ||
286 | 288 | ||
287 | text += "<b>" + QObject::tr( "Priority:") +" </b>" | 289 | // priority |
288 | + QString::number( priority() ) + " <br>"; | 290 | int priorityval = priority(); |
291 | text += "<b>" + QObject::tr( "Priority:") +" </b><img src=\"todo/priority" + | ||
292 | QString::number( priorityval ) + "\">"; | ||
293 | // text += "<b>" + QObject::tr( "Priority:") +"</b><img src=\"todo/priority" + | ||
294 | // QString::number( priority() ) + "\"><br>"; | ||
295 | switch ( priorityval ) | ||
296 | { | ||
297 | case 1 : text += QObject::tr( "Very high" ); | ||
298 | break; | ||
299 | case 2 : text += QObject::tr( "High" ); | ||
300 | break; | ||
301 | case 3 : text += QObject::tr( "Normal" ); | ||
302 | break; | ||
303 | case 4 : text += QObject::tr( "Low" ); | ||
304 | break; | ||
305 | case 5 : text += QObject::tr( "Very low" ); | ||
306 | break; | ||
307 | }; | ||
308 | text += "<br>"; | ||
309 | |||
310 | // progress | ||
289 | text += "<b>" + QObject::tr( "Progress:") + " </b>" | 311 | text += "<b>" + QObject::tr( "Progress:") + " </b>" |
290 | + QString::number( progress() ) + " %<br>"; | 312 | + QString::number( progress() ) + " %<br>"; |
313 | |||
314 | // due date | ||
291 | if (hasDueDate() ){ | 315 | if (hasDueDate() ){ |
292 | text += "<b>" + QObject::tr( "Deadline:") + " </b>"; | 316 | QDate dd = dueDate(); |
293 | text += dueDate().toString(); | 317 | int off = QDate::currentDate().daysTo( dd ); |
294 | text += "<br>"; | 318 | |
319 | text += "<b>" + QObject::tr( "Deadline:" ) + " </b><font color=\""; | ||
320 | if ( off < 0 ) | ||
321 | text += "#FF0000"; | ||
322 | else if ( off == 0 ) | ||
323 | text += "#FFFF00"; | ||
324 | else if ( off > 0 ) | ||
325 | text += "#00FF00"; | ||
326 | |||
327 | text += "\">" + dd.toString() + "</font><br>"; | ||
295 | } | 328 | } |
296 | 329 | ||
330 | // categories | ||
297 | text += "<b>" + QObject::tr( "Category:") + "</b> "; | 331 | text += "<b>" + QObject::tr( "Category:") + "</b> "; |
298 | text += categoryNames( "Todo List" ).join(", "); | 332 | text += categoryNames( "Todo List" ).join(", "); |
299 | text += "<br>"; | 333 | text += "<br>"; |
300 | 334 | ||
301 | return text; | 335 | return text; |
302 | } | 336 | } |
diff --git a/libopie2/opiepim/ocontact.cpp b/libopie2/opiepim/ocontact.cpp index a7ca975..a2fb68c 100644 --- a/libopie2/opiepim/ocontact.cpp +++ b/libopie2/opiepim/ocontact.cpp | |||
@@ -437,13 +437,14 @@ QString OContact::toRichText() const | |||
437 | QString value, comp, state; | 437 | QString value, comp, state; |
438 | QString str; | 438 | QString str; |
439 | bool marker = false; | 439 | bool marker = false; |
440 | 440 | ||
441 | // name, jobtitle and company | 441 | // name, jobtitle and company |
442 | if ( !(value = fullName()).isEmpty() ) | 442 | if ( !(value = fullName()).isEmpty() ) |
443 | text += "<b><h3>" + Qtopia::escapeString(value) + "</h3></b><br>"; | 443 | text += "<b><h3><img src=\"addressbook/AddressBook\">" + Qtopia::escapeString(value) + "</h3></b>"; |
444 | |||
444 | if ( !(value = jobTitle()).isEmpty() ) | 445 | if ( !(value = jobTitle()).isEmpty() ) |
445 | text += Qtopia::escapeString(value) + "<br>"; | 446 | text += Qtopia::escapeString(value) + "<br>"; |
446 | 447 | ||
447 | comp = company(); | 448 | comp = company(); |
448 | if ( !(value = department()).isEmpty() ) { | 449 | if ( !(value = department()).isEmpty() ) { |
449 | text += Qtopia::escapeString(value); | 450 | text += Qtopia::escapeString(value); |
@@ -452,23 +453,25 @@ QString OContact::toRichText() const | |||
452 | else | 453 | else |
453 | text += "<br>"; | 454 | text += "<br>"; |
454 | } | 455 | } |
455 | if ( !comp.isEmpty() ) | 456 | if ( !comp.isEmpty() ) |
456 | text += Qtopia::escapeString(comp) + "<br>"; | 457 | text += Qtopia::escapeString(comp) + "<br>"; |
457 | 458 | ||
459 | text += "<hr><br>"; | ||
460 | |||
461 | // defailt email | ||
458 | QString defEmail = defaultEmail(); | 462 | QString defEmail = defaultEmail(); |
459 | if ( !defEmail.isEmpty() ) | 463 | if ( !defEmail.isEmpty() ) |
460 | text += "<b>" + QObject::tr("Default Email: ") + "</b>" | 464 | text += "<b><img src=\"addressbook/email\">" + QObject::tr("Default Email: ") + "</b>" |
461 | + Qtopia::escapeString(defEmail) + "<br>"; | 465 | + Qtopia::escapeString(defEmail) + "<br>"; |
462 | 466 | ||
463 | text += "<hr>"; | 467 | text += "<br>"; |
464 | 468 | ||
465 | // business address | 469 | // business address |
466 | if ( !businessStreet().isEmpty() || !businessCity().isEmpty() || | 470 | if ( !businessStreet().isEmpty() || !businessCity().isEmpty() || |
467 | !businessZip().isEmpty() || !businessCountry().isEmpty() ) { | 471 | !businessZip().isEmpty() || !businessCountry().isEmpty() ) { |
468 | text += "<br>"; | ||
469 | text += QObject::tr( "<b>Work Address:</b>" ); | 472 | text += QObject::tr( "<b>Work Address:</b>" ); |
470 | text += "<br>"; | 473 | text += "<br>"; |
471 | marker = true; | 474 | marker = true; |
472 | } | 475 | } |
473 | 476 | ||
474 | if ( !(value = businessStreet()).isEmpty() ) | 477 | if ( !(value = businessStreet()).isEmpty() ) |
@@ -493,45 +496,46 @@ QString OContact::toRichText() const | |||
493 | text += "<b>" + QObject::tr("Office: ") + "</b>" | 496 | text += "<b>" + QObject::tr("Office: ") + "</b>" |
494 | + Qtopia::escapeString(str) + "<br>"; | 497 | + Qtopia::escapeString(str) + "<br>"; |
495 | marker = true; | 498 | marker = true; |
496 | } | 499 | } |
497 | str = businessWebpage(); | 500 | str = businessWebpage(); |
498 | if ( !str.isEmpty() ){ | 501 | if ( !str.isEmpty() ){ |
499 | text += "<b>" + QObject::tr("Business Web Page: ") + "</b>" | 502 | text += "<b><img src=\"addressbook/webpagework\">" + QObject::tr("Business Web Page: ") + "</b>" |
500 | + Qtopia::escapeString(str) + "<br>"; | 503 | + Qtopia::escapeString(str) + "<br>"; |
501 | marker = true; | 504 | marker = true; |
502 | } | 505 | } |
503 | str = businessPhone(); | 506 | str = businessPhone(); |
504 | if ( !str.isEmpty() ){ | 507 | if ( !str.isEmpty() ){ |
505 | text += "<b>" + QObject::tr("Business Phone: ") + "</b>" | 508 | text += "<b><img src=\"addressbook/phonework\">" + QObject::tr("Business Phone: ") + "</b>" |
506 | + Qtopia::escapeString(str) + "<br>"; | 509 | + Qtopia::escapeString(str) + "<br>"; |
507 | marker = true; | 510 | marker = true; |
508 | } | 511 | } |
509 | str = businessFax(); | 512 | str = businessFax(); |
510 | if ( !str.isEmpty() ){ | 513 | if ( !str.isEmpty() ){ |
511 | text += "<b>" + QObject::tr("Business Fax: ") + "</b>" | 514 | text += "<b><img src=\"addressbook/faxwork\">" + QObject::tr("Business Fax: ") + "</b>" |
512 | + Qtopia::escapeString(str) + "<br>"; | 515 | + Qtopia::escapeString(str) + "<br>"; |
513 | marker = true; | 516 | marker = true; |
514 | } | 517 | } |
515 | str = businessMobile(); | 518 | str = businessMobile(); |
516 | if ( !str.isEmpty() ){ | 519 | if ( !str.isEmpty() ){ |
517 | text += "<b>" + QObject::tr("Business Mobile: ") + "</b>" | 520 | text += "<b><img src=\"addressbook/mobilework\">" + QObject::tr("Business Mobile: ") + "</b>" |
518 | + Qtopia::escapeString(str) + "<br>"; | 521 | + Qtopia::escapeString(str) + "<br>"; |
519 | marker = true; | 522 | marker = true; |
520 | } | 523 | } |
521 | str = businessPager(); | 524 | str = businessPager(); |
522 | if ( !str.isEmpty() ){ | 525 | if ( !str.isEmpty() ){ |
523 | text += "<b>" + QObject::tr("Business Pager: ") + "</b>" | 526 | text += "<b>" + QObject::tr("Business Pager: ") + "</b>" |
524 | + Qtopia::escapeString(str) + "<br>"; | 527 | + Qtopia::escapeString(str) + "<br>"; |
525 | marker = true; | 528 | marker = true; |
526 | } | 529 | } |
527 | 530 | ||
531 | text += "<br>"; | ||
532 | |||
528 | // home address | 533 | // home address |
529 | if ( !homeStreet().isEmpty() || !homeCity().isEmpty() || | 534 | if ( !homeStreet().isEmpty() || !homeCity().isEmpty() || |
530 | !homeZip().isEmpty() || !homeCountry().isEmpty() ) { | 535 | !homeZip().isEmpty() || !homeCountry().isEmpty() ) { |
531 | text += "<br>"; | ||
532 | text += QObject::tr( "<b>Home Address:</b>" ); | 536 | text += QObject::tr( "<b>Home Address:</b>" ); |
533 | text += "<br>"; | 537 | text += "<br>"; |
534 | } | 538 | } |
535 | 539 | ||
536 | if ( !(value = homeStreet()).isEmpty() ) | 540 | if ( !(value = homeStreet()).isEmpty() ) |
537 | text += Qtopia::escapeString(value) + "<br>"; | 541 | text += Qtopia::escapeString(value) + "<br>"; |
@@ -548,31 +552,31 @@ QString OContact::toRichText() const | |||
548 | if ( !(value = homeCountry()).isEmpty() ) | 552 | if ( !(value = homeCountry()).isEmpty() ) |
549 | text += Qtopia::escapeString(value) + "<br>"; | 553 | text += Qtopia::escapeString(value) + "<br>"; |
550 | 554 | ||
551 | // rest of Home data | 555 | // rest of Home data |
552 | str = homeWebpage(); | 556 | str = homeWebpage(); |
553 | if ( !str.isEmpty() ){ | 557 | if ( !str.isEmpty() ){ |
554 | text += "<b>" + QObject::tr("Home Web Page: ") + "</b>" | 558 | text += "<b><img src=\"addressbook/webpagehome\">" + QObject::tr("Home Web Page: ") + "</b>" |
555 | + Qtopia::escapeString(str) + "<br>"; | 559 | + Qtopia::escapeString(str) + "<br>"; |
556 | marker = true; | 560 | marker = true; |
557 | } | 561 | } |
558 | str = homePhone(); | 562 | str = homePhone(); |
559 | if ( !str.isEmpty() ){ | 563 | if ( !str.isEmpty() ){ |
560 | text += "<b>" + QObject::tr("Home Phone: ") + "</b>" | 564 | text += "<b><img src=\"addressbook/phonehome\">" + QObject::tr("Home Phone: ") + "</b>" |
561 | + Qtopia::escapeString(str) + "<br>"; | 565 | + Qtopia::escapeString(str) + "<br>"; |
562 | marker = true; | 566 | marker = true; |
563 | } | 567 | } |
564 | str = homeFax(); | 568 | str = homeFax(); |
565 | if ( !str.isEmpty() ){ | 569 | if ( !str.isEmpty() ){ |
566 | text += "<b>" + QObject::tr("Home Fax: ") + "</b>" | 570 | text += "<b><img src=\"addressbook/faxhome\">" + QObject::tr("Home Fax: ") + "</b>" |
567 | + Qtopia::escapeString(str) + "<br>"; | 571 | + Qtopia::escapeString(str) + "<br>"; |
568 | marker = true; | 572 | marker = true; |
569 | } | 573 | } |
570 | str = homeMobile(); | 574 | str = homeMobile(); |
571 | if ( !str.isEmpty() ){ | 575 | if ( !str.isEmpty() ){ |
572 | text += "<b>" + QObject::tr("Home Mobile: ") + "</b>" | 576 | text += "<b><img src=\"addressbook/mobilehome\">" + QObject::tr("Home Mobile: ") + "</b>" |
573 | + Qtopia::escapeString(str) + "<br>"; | 577 | + Qtopia::escapeString(str) + "<br>"; |
574 | marker = true; | 578 | marker = true; |
575 | } | 579 | } |
576 | 580 | ||
577 | if ( marker ) | 581 | if ( marker ) |
578 | text += "<br><hr><br>"; | 582 | text += "<br><hr><br>"; |
@@ -622,12 +626,13 @@ QString OContact::toRichText() const | |||
622 | 626 | ||
623 | str = nickname(); | 627 | str = nickname(); |
624 | if ( !str.isEmpty() ) | 628 | if ( !str.isEmpty() ) |
625 | text += "<b>" + QObject::tr("Nickname: ") + "</b>" | 629 | text += "<b>" + QObject::tr("Nickname: ") + "</b>" |
626 | + Qtopia::escapeString(str) + "<br>"; | 630 | + Qtopia::escapeString(str) + "<br>"; |
627 | 631 | ||
632 | // categories | ||
628 | if ( categoryNames("Contacts").count() ){ | 633 | if ( categoryNames("Contacts").count() ){ |
629 | text += "<b>" + QObject::tr( "Category:") + "</b> "; | 634 | text += "<b>" + QObject::tr( "Category:") + "</b> "; |
630 | text += categoryNames("Contacts").join(", "); | 635 | text += categoryNames("Contacts").join(", "); |
631 | text += "<br>"; | 636 | text += "<br>"; |
632 | } | 637 | } |
633 | 638 | ||
diff --git a/libopie2/opiepim/oevent.cpp b/libopie2/opiepim/oevent.cpp index 83b191f..e4f5d92 100644 --- a/libopie2/opiepim/oevent.cpp +++ b/libopie2/opiepim/oevent.cpp | |||
@@ -232,28 +232,60 @@ bool OEvent::match( const QRegExp& re )const { | |||
232 | setLastHitField( Qtopia::EndDateTime ); | 232 | setLastHitField( Qtopia::EndDateTime ); |
233 | return true; | 233 | return true; |
234 | } | 234 | } |
235 | return false; | 235 | return false; |
236 | } | 236 | } |
237 | QString OEvent::toRichText()const { | 237 | QString OEvent::toRichText()const { |
238 | QString text; | 238 | QString text, value; |
239 | |||
240 | // description | ||
241 | text += "<b><h3><img src=\"datebook/DateBook\">"; | ||
239 | if ( !description().isEmpty() ) { | 242 | if ( !description().isEmpty() ) { |
240 | text += "<b>" + QObject::tr( "Description:") + "</b><br>"; | 243 | text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "" ); |
241 | text += Qtopia::escapeString(description() ). | 244 | } |
242 | replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; | 245 | text += "</h3></b><br><hr><br>"; |
246 | |||
247 | // location | ||
248 | if ( !(value = location()).isEmpty() ) { | ||
249 | text += "<b>" + QObject::tr( "Location:" ) + "</b> "; | ||
250 | text += Qtopia::escapeString(value) + "<br>"; | ||
251 | } | ||
252 | |||
253 | // all day event | ||
254 | if ( isAllDay() ) { | ||
255 | text += "<b><i>" + QObject::tr( "This is an all day event" ) + "</i></b><br>"; | ||
243 | } | 256 | } |
257 | // multiple day event | ||
258 | else if ( isMultipleDay () ) { | ||
259 | text += "<b><i>" + QObject::tr( "This is a multiple day event" ) + "</i></b><br>"; | ||
260 | } | ||
261 | // start & end times | ||
262 | else { | ||
263 | // start time | ||
244 | if ( startDateTime().isValid() ) { | 264 | if ( startDateTime().isValid() ) { |
245 | text += "<b>" + QObject::tr( "Start:") + "</b> "; | 265 | text += "<b>" + QObject::tr( "Start:") + "</b> "; |
246 | text += Qtopia::escapeString(startDateTime().toString() ). | 266 | text += Qtopia::escapeString(startDateTime().toString() ). |
247 | replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; | 267 | replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; |
248 | } | 268 | } |
269 | |||
270 | // end time | ||
249 | if ( endDateTime().isValid() ) { | 271 | if ( endDateTime().isValid() ) { |
250 | text += "<b>" + QObject::tr( "End:") + "</b> "; | 272 | text += "<b>" + QObject::tr( "End:") + "</b> "; |
251 | text += Qtopia::escapeString(endDateTime().toString() ). | 273 | text += Qtopia::escapeString(endDateTime().toString() ). |
252 | replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; | 274 | replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; |
253 | } | 275 | } |
276 | } | ||
277 | |||
278 | // categories | ||
279 | if ( categoryNames("Calendar").count() ){ | ||
280 | text += "<b>" + QObject::tr( "Category:") + "</b> "; | ||
281 | text += categoryNames("Calendar").join(", "); | ||
282 | text += "<br>"; | ||
283 | } | ||
284 | |||
285 | //notes | ||
254 | if ( !note().isEmpty() ) { | 286 | if ( !note().isEmpty() ) { |
255 | text += "<b>" + QObject::tr( "Note:") + "</b><br>"; | 287 | text += "<b>" + QObject::tr( "Note:") + "</b><br>"; |
256 | text += note(); | 288 | text += note(); |
257 | // text += Qtopia::escapeString(note() ). | 289 | // text += Qtopia::escapeString(note() ). |
258 | // replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; | 290 | // replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; |
259 | } | 291 | } |
diff --git a/libopie2/opiepim/otodo.cpp b/libopie2/opiepim/otodo.cpp index e087a00..c84eeeb 100644 --- a/libopie2/opiepim/otodo.cpp +++ b/libopie2/opiepim/otodo.cpp | |||
@@ -270,33 +270,67 @@ QString OTodo::toShortText() const { | |||
270 | */ | 270 | */ |
271 | QString OTodo::toRichText() const | 271 | QString OTodo::toRichText() const |
272 | { | 272 | { |
273 | QString text; | 273 | QString text; |
274 | QStringList catlist; | 274 | QStringList catlist; |
275 | 275 | ||
276 | // Description of the todo | 276 | // summary |
277 | text += "<b><h3><img src=\"todo/TodoList\">"; | ||
277 | if ( !summary().isEmpty() ) { | 278 | if ( !summary().isEmpty() ) { |
278 | text += "<b>" + QObject::tr( "Summary:") + "</b><br>"; | 279 | text += Qtopia::escapeString(summary() ).replace(QRegExp( "[\n]"), "" ); |
279 | text += Qtopia::escapeString(summary() ).replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; | ||
280 | } | 280 | } |
281 | text += "</h3></b><br><hr><br>"; | ||
282 | |||
283 | // description | ||
281 | if( !description().isEmpty() ){ | 284 | if( !description().isEmpty() ){ |
282 | text += "<b>" + QObject::tr( "Description:" ) + "</b><br>"; | 285 | text += "<b>" + QObject::tr( "Description:" ) + "</b><br>"; |
283 | text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "<br>" ) ; | 286 | text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "<br>" ) ; |
284 | } | 287 | } |
285 | text += "<br><br><br>"; | ||
286 | 288 | ||
287 | text += "<b>" + QObject::tr( "Priority:") +" </b>" | 289 | // priority |
288 | + QString::number( priority() ) + " <br>"; | 290 | int priorityval = priority(); |
291 | text += "<b>" + QObject::tr( "Priority:") +" </b><img src=\"todo/priority" + | ||
292 | QString::number( priorityval ) + "\">"; | ||
293 | // text += "<b>" + QObject::tr( "Priority:") +"</b><img src=\"todo/priority" + | ||
294 | // QString::number( priority() ) + "\"><br>"; | ||
295 | switch ( priorityval ) | ||
296 | { | ||
297 | case 1 : text += QObject::tr( "Very high" ); | ||
298 | break; | ||
299 | case 2 : text += QObject::tr( "High" ); | ||
300 | break; | ||
301 | case 3 : text += QObject::tr( "Normal" ); | ||
302 | break; | ||
303 | case 4 : text += QObject::tr( "Low" ); | ||
304 | break; | ||
305 | case 5 : text += QObject::tr( "Very low" ); | ||
306 | break; | ||
307 | }; | ||
308 | text += "<br>"; | ||
309 | |||
310 | // progress | ||
289 | text += "<b>" + QObject::tr( "Progress:") + " </b>" | 311 | text += "<b>" + QObject::tr( "Progress:") + " </b>" |
290 | + QString::number( progress() ) + " %<br>"; | 312 | + QString::number( progress() ) + " %<br>"; |
313 | |||
314 | // due date | ||
291 | if (hasDueDate() ){ | 315 | if (hasDueDate() ){ |
292 | text += "<b>" + QObject::tr( "Deadline:") + " </b>"; | 316 | QDate dd = dueDate(); |
293 | text += dueDate().toString(); | 317 | int off = QDate::currentDate().daysTo( dd ); |
294 | text += "<br>"; | 318 | |
319 | text += "<b>" + QObject::tr( "Deadline:" ) + " </b><font color=\""; | ||
320 | if ( off < 0 ) | ||
321 | text += "#FF0000"; | ||
322 | else if ( off == 0 ) | ||
323 | text += "#FFFF00"; | ||
324 | else if ( off > 0 ) | ||
325 | text += "#00FF00"; | ||
326 | |||
327 | text += "\">" + dd.toString() + "</font><br>"; | ||
295 | } | 328 | } |
296 | 329 | ||
330 | // categories | ||
297 | text += "<b>" + QObject::tr( "Category:") + "</b> "; | 331 | text += "<b>" + QObject::tr( "Category:") + "</b> "; |
298 | text += categoryNames( "Todo List" ).join(", "); | 332 | text += categoryNames( "Todo List" ).join(", "); |
299 | text += "<br>"; | 333 | text += "<br>"; |
300 | 334 | ||
301 | return text; | 335 | return text; |
302 | } | 336 | } |