author | drw <drw> | 2003-05-18 23:20:25 (UTC) |
---|---|---|
committer | drw <drw> | 2003-05-18 23:20:25 (UTC) |
commit | 586dea6e61c766da49ba6cb55dd71851c0fafad3 (patch) (side-by-side diff) | |
tree | 6122bd75b327c4a29157a66e273bae9632ac22a0 /libopie/pim/ocontact.cpp | |
parent | 34c5b88459bcf5e02deae6b04e8bc17ee0de74c0 (diff) | |
download | opie-586dea6e61c766da49ba6cb55dd71851c0fafad3.zip opie-586dea6e61c766da49ba6cb55dd71851c0fafad3.tar.gz opie-586dea6e61c766da49ba6cb55dd71851c0fafad3.tar.bz2 |
Updates to ocontact, oevent & otodo's toRichText() implementations
-rw-r--r-- | libopie/pim/ocontact.cpp | 31 |
1 files changed, 18 insertions, 13 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 @@ -439,9 +439,10 @@ QString OContact::toRichText() const bool marker = false; // name, jobtitle and company if ( !(value = fullName()).isEmpty() ) - text += "<b><h3>" + Qtopia::escapeString(value) + "</h3></b><br>"; + text += "<b><h3><img src=\"addressbook/AddressBook\">" + Qtopia::escapeString(value) + "</h3></b>"; + if ( !(value = jobTitle()).isEmpty() ) text += Qtopia::escapeString(value) + "<br>"; comp = company(); @@ -454,19 +455,21 @@ QString OContact::toRichText() const } if ( !comp.isEmpty() ) text += Qtopia::escapeString(comp) + "<br>"; + text += "<hr><br>"; + + // defailt email QString defEmail = defaultEmail(); if ( !defEmail.isEmpty() ) - text += "<b>" + QObject::tr("Default Email: ") + "</b>" + text += "<b><img src=\"addressbook/email\">" + QObject::tr("Default Email: ") + "</b>" + Qtopia::escapeString(defEmail) + "<br>"; - text += "<hr>"; + text += "<br>"; // business address if ( !businessStreet().isEmpty() || !businessCity().isEmpty() || !businessZip().isEmpty() || !businessCountry().isEmpty() ) { - text += "<br>"; text += QObject::tr( "<b>Work Address:</b>" ); text += "<br>"; marker = true; } @@ -495,27 +498,27 @@ QString OContact::toRichText() const marker = true; } str = businessWebpage(); if ( !str.isEmpty() ){ - text += "<b>" + QObject::tr("Business Web Page: ") + "</b>" + text += "<b><img src=\"addressbook/webpagework\">" + QObject::tr("Business Web Page: ") + "</b>" + Qtopia::escapeString(str) + "<br>"; marker = true; } str = businessPhone(); if ( !str.isEmpty() ){ - text += "<b>" + QObject::tr("Business Phone: ") + "</b>" + text += "<b><img src=\"addressbook/phonework\">" + QObject::tr("Business Phone: ") + "</b>" + Qtopia::escapeString(str) + "<br>"; marker = true; } str = businessFax(); if ( !str.isEmpty() ){ - text += "<b>" + QObject::tr("Business Fax: ") + "</b>" + text += "<b><img src=\"addressbook/faxwork\">" + QObject::tr("Business Fax: ") + "</b>" + Qtopia::escapeString(str) + "<br>"; marker = true; } str = businessMobile(); if ( !str.isEmpty() ){ - text += "<b>" + QObject::tr("Business Mobile: ") + "</b>" + text += "<b><img src=\"addressbook/mobilework\">" + QObject::tr("Business Mobile: ") + "</b>" + Qtopia::escapeString(str) + "<br>"; marker = true; } str = businessPager(); @@ -524,12 +527,13 @@ QString OContact::toRichText() const + Qtopia::escapeString(str) + "<br>"; marker = true; } + text += "<br>"; + // home address if ( !homeStreet().isEmpty() || !homeCity().isEmpty() || !homeZip().isEmpty() || !homeCountry().isEmpty() ) { - text += "<br>"; text += QObject::tr( "<b>Home Address:</b>" ); text += "<br>"; } @@ -550,27 +554,27 @@ QString OContact::toRichText() const // rest of Home data str = homeWebpage(); if ( !str.isEmpty() ){ - text += "<b>" + QObject::tr("Home Web Page: ") + "</b>" + text += "<b><img src=\"addressbook/webpagehome\">" + QObject::tr("Home Web Page: ") + "</b>" + Qtopia::escapeString(str) + "<br>"; marker = true; } str = homePhone(); if ( !str.isEmpty() ){ - text += "<b>" + QObject::tr("Home Phone: ") + "</b>" + text += "<b><img src=\"addressbook/phonehome\">" + QObject::tr("Home Phone: ") + "</b>" + Qtopia::escapeString(str) + "<br>"; marker = true; } str = homeFax(); if ( !str.isEmpty() ){ - text += "<b>" + QObject::tr("Home Fax: ") + "</b>" + text += "<b><img src=\"addressbook/faxhome\">" + QObject::tr("Home Fax: ") + "</b>" + Qtopia::escapeString(str) + "<br>"; marker = true; } str = homeMobile(); if ( !str.isEmpty() ){ - text += "<b>" + QObject::tr("Home Mobile: ") + "</b>" + text += "<b><img src=\"addressbook/mobilehome\">" + QObject::tr("Home Mobile: ") + "</b>" + Qtopia::escapeString(str) + "<br>"; marker = true; } @@ -624,8 +628,9 @@ QString OContact::toRichText() const if ( !str.isEmpty() ) text += "<b>" + QObject::tr("Nickname: ") + "</b>" + Qtopia::escapeString(str) + "<br>"; + // categories if ( categoryNames("Contacts").count() ){ text += "<b>" + QObject::tr( "Category:") + "</b> "; text += categoryNames("Contacts").join(", "); text += "<br>"; |