-rw-r--r-- | libopie/pim/ocontact.cpp | 168 |
1 files changed, 141 insertions, 27 deletions
diff --git a/libopie/pim/ocontact.cpp b/libopie/pim/ocontact.cpp index 6f648ac..21fc088 100644 --- a/libopie/pim/ocontact.cpp +++ b/libopie/pim/ocontact.cpp | |||
@@ -1,8 +1,9 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** Copyright (C) 2002 by Stefan Eilers (eilers.stefan@epost.de) | ||
3 | ** | 4 | ** |
4 | ** This file is part of the Qtopia Environment. | 5 | ** This file is part of the Qtopia Environment. |
5 | ** | 6 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 7 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 8 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 9 | ** Foundation and appearing in the file LICENSE.GPL included in the |
@@ -23,12 +24,13 @@ | |||
23 | #include "ocontact.h" | 24 | #include "ocontact.h" |
24 | #include "../../library/backend/vobject_p.h" | 25 | #include "../../library/backend/vobject_p.h" |
25 | #include "../../library/backend/qfiledirect_p.h" | 26 | #include "../../library/backend/qfiledirect_p.h" |
26 | 27 | ||
27 | #include <qpe/stringutil.h> | 28 | #include <qpe/stringutil.h> |
28 | #include <qpe/timeconversion.h> | 29 | #include <qpe/timeconversion.h> |
30 | #include <qpe/timestring.h> | ||
29 | 31 | ||
30 | #include <qobject.h> | 32 | #include <qobject.h> |
31 | #include <qregexp.h> | 33 | #include <qregexp.h> |
32 | #include <qstylesheet.h> | 34 | #include <qstylesheet.h> |
33 | #include <qfileinfo.h> | 35 | #include <qfileinfo.h> |
34 | #include <qmap.h> | 36 | #include <qmap.h> |
@@ -222,20 +224,12 @@ OContact::~OContact() | |||
222 | */ | 224 | */ |
223 | 225 | ||
224 | /*! \fn void OContact::setGender( const QString &str ) | 226 | /*! \fn void OContact::setGender( const QString &str ) |
225 | Sets the gender of the contact to \a str. | 227 | Sets the gender of the contact to \a str. |
226 | */ | 228 | */ |
227 | 229 | ||
228 | /*! \fn void OContact::setBirthday( const QString &str ) | ||
229 | Sets the birthday for the contact to \a str. | ||
230 | */ | ||
231 | |||
232 | /*! \fn void OContact::setAnniversary( const QString &str ) | ||
233 | Sets the anniversary of the contact to \a str. | ||
234 | */ | ||
235 | |||
236 | /*! \fn void OContact::setNickname( const QString &str ) | 230 | /*! \fn void OContact::setNickname( const QString &str ) |
237 | Sets the nickname of the contact to \a str. | 231 | Sets the nickname of the contact to \a str. |
238 | */ | 232 | */ |
239 | 233 | ||
240 | /*! \fn void OContact::setNotes( const QString &str ) | 234 | /*! \fn void OContact::setNotes( const QString &str ) |
241 | Sets the notes about the contact to \a str. | 235 | Sets the notes about the contact to \a str. |
@@ -383,20 +377,12 @@ OContact::~OContact() | |||
383 | */ | 377 | */ |
384 | 378 | ||
385 | /*! \fn QString OContact::gender() const | 379 | /*! \fn QString OContact::gender() const |
386 | Returns the gender of the contact. | 380 | Returns the gender of the contact. |
387 | */ | 381 | */ |
388 | 382 | ||
389 | /*! \fn QString OContact::birthday() const | ||
390 | Returns the birthday of the contact. | ||
391 | */ | ||
392 | |||
393 | /*! \fn QString OContact::anniversary() const | ||
394 | Returns the anniversary of the contact. | ||
395 | */ | ||
396 | |||
397 | /*! \fn QString OContact::nickname() const | 383 | /*! \fn QString OContact::nickname() const |
398 | Returns the nickname of the contact. | 384 | Returns the nickname of the contact. |
399 | */ | 385 | */ |
400 | 386 | ||
401 | /*! \fn QString OContact::children() const | 387 | /*! \fn QString OContact::children() const |
402 | Returns the children of the contact. | 388 | Returns the children of the contact. |
@@ -582,20 +568,22 @@ QString OContact::toRichText() const | |||
582 | text += "<b>" + QObject::tr("Gender: ") + "</b>" + str + "<br>"; | 568 | text += "<b>" + QObject::tr("Gender: ") + "</b>" + str + "<br>"; |
583 | } | 569 | } |
584 | str = spouse(); | 570 | str = spouse(); |
585 | if ( !str.isEmpty() ) | 571 | if ( !str.isEmpty() ) |
586 | text += "<b>" + QObject::tr("Spouse: ") + "</b>" | 572 | text += "<b>" + QObject::tr("Spouse: ") + "</b>" |
587 | + Qtopia::escapeString(str) + "<br>"; | 573 | + Qtopia::escapeString(str) + "<br>"; |
588 | str = birthday(); | 574 | if ( !birthday().isNull() ){ |
589 | if ( !str.isEmpty() ) | 575 | str = TimeString::numberDateString( birthday() ); |
590 | text += "<b>" + QObject::tr("Birthday: ") + "</b>" | 576 | text += "<b>" + QObject::tr("Birthday: ") + "</b>" |
591 | + Qtopia::escapeString(str) + "<br>"; | 577 | + Qtopia::escapeString(str) + "<br>"; |
592 | str = anniversary(); | 578 | } |
593 | if ( !str.isEmpty() ) | 579 | if ( !anniversary().isNull() ){ |
594 | text += "<b>" + QObject::tr("Anniversary: ") + "</b>" | 580 | str = TimeString::numberDateString( anniversary() ); |
595 | + Qtopia::escapeString(str) + "<br>"; | 581 | text += "<b>" + QObject::tr("Anniversary: ") + "</b>" |
582 | + Qtopia::escapeString(str) + "<br>"; | ||
583 | } | ||
596 | str = nickname(); | 584 | str = nickname(); |
597 | if ( !str.isEmpty() ) | 585 | if ( !str.isEmpty() ) |
598 | text += "<b>" + QObject::tr("Nickname: ") + "</b>" | 586 | text += "<b>" + QObject::tr("Nickname: ") + "</b>" |
599 | + Qtopia::escapeString(str) + "<br>"; | 587 | + Qtopia::escapeString(str) + "<br>"; |
600 | 588 | ||
601 | // notes last | 589 | // notes last |
@@ -1131,13 +1119,13 @@ static VObject *createVObject( const OContact &c ) | |||
1131 | VObject *email = safeAddPropValue( vcard, VCEmailAddressProp, *it ); | 1119 | VObject *email = safeAddPropValue( vcard, VCEmailAddressProp, *it ); |
1132 | safeAddProp( email, VCInternetProp ); | 1120 | safeAddProp( email, VCInternetProp ); |
1133 | } | 1121 | } |
1134 | 1122 | ||
1135 | safeAddPropValue( vcard, VCNoteProp, c.notes() ); | 1123 | safeAddPropValue( vcard, VCNoteProp, c.notes() ); |
1136 | 1124 | ||
1137 | safeAddPropValue( vcard, VCBirthDateProp, c.birthday() ); | 1125 | safeAddPropValue( vcard, VCBirthDateProp, TimeConversion::toString( c.birthday() ) ); |
1138 | 1126 | ||
1139 | if ( !c.company().isEmpty() || !c.department().isEmpty() || !c.office().isEmpty() ) { | 1127 | if ( !c.company().isEmpty() || !c.department().isEmpty() || !c.office().isEmpty() ) { |
1140 | VObject *org = safeAddProp( vcard, VCOrgProp ); | 1128 | VObject *org = safeAddProp( vcard, VCOrgProp ); |
1141 | safeAddPropValue( org, VCOrgNameProp, c.company() ); | 1129 | safeAddPropValue( org, VCOrgNameProp, c.company() ); |
1142 | safeAddPropValue( org, VCOrgUnitProp, c.department() ); | 1130 | safeAddPropValue( org, VCOrgUnitProp, c.department() ); |
1143 | safeAddPropValue( org, VCOrgUnit2Prop, c.office() ); | 1131 | safeAddPropValue( org, VCOrgUnit2Prop, c.office() ); |
@@ -1147,13 +1135,13 @@ static VObject *createVObject( const OContact &c ) | |||
1147 | safeAddPropValue( vcard, "X-Qtopia-Profession", c.profession() ); | 1135 | safeAddPropValue( vcard, "X-Qtopia-Profession", c.profession() ); |
1148 | safeAddPropValue( vcard, "X-Qtopia-Manager", c.manager() ); | 1136 | safeAddPropValue( vcard, "X-Qtopia-Manager", c.manager() ); |
1149 | safeAddPropValue( vcard, "X-Qtopia-Assistant", c.assistant() ); | 1137 | safeAddPropValue( vcard, "X-Qtopia-Assistant", c.assistant() ); |
1150 | 1138 | ||
1151 | safeAddPropValue( vcard, "X-Qtopia-Spouse", c.spouse() ); | 1139 | safeAddPropValue( vcard, "X-Qtopia-Spouse", c.spouse() ); |
1152 | safeAddPropValue( vcard, "X-Qtopia-Gender", c.gender() ); | 1140 | safeAddPropValue( vcard, "X-Qtopia-Gender", c.gender() ); |
1153 | safeAddPropValue( vcard, "X-Qtopia-Anniversary", c.anniversary() ); | 1141 | safeAddPropValue( vcard, "X-Qtopia-Anniversary", TimeConversion::toString( c.anniversary() ) ); |
1154 | safeAddPropValue( vcard, "X-Qtopia-Nickname", c.nickname() ); | 1142 | safeAddPropValue( vcard, "X-Qtopia-Nickname", c.nickname() ); |
1155 | safeAddPropValue( vcard, "X-Qtopia-Children", c.children() ); | 1143 | safeAddPropValue( vcard, "X-Qtopia-Children", c.children() ); |
1156 | 1144 | ||
1157 | return vcard; | 1145 | return vcard; |
1158 | } | 1146 | } |
1159 | 1147 | ||
@@ -1350,13 +1338,13 @@ static OContact parseVObject( VObject *obj ) | |||
1350 | c.setSpouse( value ); | 1338 | c.setSpouse( value ); |
1351 | } | 1339 | } |
1352 | else if ( name == "X-Qtopia-Gender" ) { | 1340 | else if ( name == "X-Qtopia-Gender" ) { |
1353 | c.setGender( value ); | 1341 | c.setGender( value ); |
1354 | } | 1342 | } |
1355 | else if ( name == "X-Qtopia-Anniversary" ) { | 1343 | else if ( name == "X-Qtopia-Anniversary" ) { |
1356 | c.setAnniversary( value ); | 1344 | c.setAnniversary( TimeConversion::fromString( value ) ); |
1357 | } | 1345 | } |
1358 | else if ( name == "X-Qtopia-Nickname" ) { | 1346 | else if ( name == "X-Qtopia-Nickname" ) { |
1359 | c.setNickname( value ); | 1347 | c.setNickname( value ); |
1360 | } | 1348 | } |
1361 | else if ( name == "X-Qtopia-Children" ) { | 1349 | else if ( name == "X-Qtopia-Children" ) { |
1362 | c.setChildren( value ); | 1350 | c.setChildren( value ); |
@@ -1490,6 +1478,132 @@ QMap<QString,QString> OContact::toExtraMap() const | |||
1490 | 1478 | ||
1491 | class QString OContact::recordField( int pos ) const | 1479 | class QString OContact::recordField( int pos ) const |
1492 | { | 1480 | { |
1493 | QStringList SLFIELDS = fields(); // ?? why this ? (se) | 1481 | QStringList SLFIELDS = fields(); // ?? why this ? (se) |
1494 | return SLFIELDS[pos]; | 1482 | return SLFIELDS[pos]; |
1495 | } | 1483 | } |
1484 | |||
1485 | // In future releases, we should store birthday and anniversary | ||
1486 | // internally as QDate instead of QString ! | ||
1487 | // QString is always too complicate to interprete (DD.MM.YY, DD/MM/YY, MM/DD/YY, etc..)(se) | ||
1488 | |||
1489 | /*! \fn void OContact::setBirthday( const QDate& date ) | ||
1490 | Sets the birthday for the contact to \a date. | ||
1491 | */ | ||
1492 | void OContact::setBirthday( const QDate &v ) | ||
1493 | { | ||
1494 | if ( ( !v.isNull() ) && ( v.isValid() ) ) | ||
1495 | replace( Qtopia::Birthday, TimeConversion::toString( v ) ); | ||
1496 | |||
1497 | } | ||
1498 | |||
1499 | |||
1500 | /*! \fn void OContact::setAnniversary( const QDate &date ) | ||
1501 | Sets the anniversary of the contact to \a date. | ||
1502 | */ | ||
1503 | void OContact::setAnniversary( const QDate &v ) | ||
1504 | { | ||
1505 | if ( ( !v.isNull() ) && ( v.isValid() ) ) | ||
1506 | replace( Qtopia::Anniversary, TimeConversion::toString( v ) ); | ||
1507 | } | ||
1508 | |||
1509 | /*! \fn QDate OContact::birthday() const | ||
1510 | Returns the birthday of the contact. | ||
1511 | */ | ||
1512 | QDate OContact::birthday() const | ||
1513 | { | ||
1514 | QDate empty; | ||
1515 | QString str = find( Qtopia::Birthday ); | ||
1516 | qWarning ("Birthday %s", str.latin1() ); | ||
1517 | if ( !str.isEmpty() ) | ||
1518 | return TimeConversion::fromString ( str ); | ||
1519 | else | ||
1520 | return empty; | ||
1521 | } | ||
1522 | |||
1523 | |||
1524 | /*! \fn QDate OContact::anniversary() const | ||
1525 | Returns the anniversary of the contact. | ||
1526 | */ | ||
1527 | QDate OContact::anniversary() const | ||
1528 | { | ||
1529 | QDate empty; | ||
1530 | QString str = find( Qtopia::Anniversary ); | ||
1531 | qWarning ("Anniversary %s", str.latin1() ); | ||
1532 | if ( !str.isEmpty() ) | ||
1533 | return TimeConversion::fromString ( str ); | ||
1534 | else | ||
1535 | return empty; | ||
1536 | } | ||
1537 | |||
1538 | |||
1539 | void OContact::insertEmail( const QString &v ) | ||
1540 | { | ||
1541 | //qDebug("insertEmail %s", v.latin1()); | ||
1542 | QString e = v.simplifyWhiteSpace(); | ||
1543 | QString def = defaultEmail(); | ||
1544 | |||
1545 | // if no default, set it as the default email and don't insert | ||
1546 | if ( def.isEmpty() ) { | ||
1547 | setDefaultEmail( e ); // will insert into the list for us | ||
1548 | return; | ||
1549 | } | ||
1550 | |||
1551 | // otherwise, insert assuming doesn't already exist | ||
1552 | QString emailsStr = find( Qtopia::Emails ); | ||
1553 | if ( emailsStr.contains( e )) | ||
1554 | return; | ||
1555 | if ( !emailsStr.isEmpty() ) | ||
1556 | emailsStr += emailSeparator(); | ||
1557 | emailsStr += e; | ||
1558 | replace( Qtopia::Emails, emailsStr ); | ||
1559 | } | ||
1560 | |||
1561 | void OContact::removeEmail( const QString &v ) | ||
1562 | { | ||
1563 | QString e = v.simplifyWhiteSpace(); | ||
1564 | QString def = defaultEmail(); | ||
1565 | QString emailsStr = find( Qtopia::Emails ); | ||
1566 | QStringList emails = emailList(); | ||
1567 | |||
1568 | // otherwise, must first contain it | ||
1569 | if ( !emailsStr.contains( e ) ) | ||
1570 | return; | ||
1571 | |||
1572 | // remove it | ||
1573 | //qDebug(" removing email from list %s", e.latin1()); | ||
1574 | emails.remove( e ); | ||
1575 | // reset the string | ||
1576 | emailsStr = emails.join(emailSeparator()); // Sharp's brain dead separator | ||
1577 | replace( Qtopia::Emails, emailsStr ); | ||
1578 | |||
1579 | // if default, then replace the default email with the first one | ||
1580 | if ( def == e ) { | ||
1581 | //qDebug("removeEmail is default; setting new default"); | ||
1582 | if ( !emails.count() ) | ||
1583 | clearEmails(); | ||
1584 | else // setDefaultEmail will remove e from the list | ||
1585 | setDefaultEmail( emails.first() ); | ||
1586 | } | ||
1587 | } | ||
1588 | void OContact::clearEmails() | ||
1589 | { | ||
1590 | mMap.remove( Qtopia::DefaultEmail ); | ||
1591 | mMap.remove( Qtopia::Emails ); | ||
1592 | } | ||
1593 | void OContact::setDefaultEmail( const QString &v ) | ||
1594 | { | ||
1595 | QString e = v.simplifyWhiteSpace(); | ||
1596 | |||
1597 | //qDebug("OContact::setDefaultEmail %s", e.latin1()); | ||
1598 | replace( Qtopia::DefaultEmail, e ); | ||
1599 | |||
1600 | if ( !e.isEmpty() ) | ||
1601 | insertEmail( e ); | ||
1602 | |||
1603 | } | ||
1604 | |||
1605 | void OContact::insertEmails( const QStringList &v ) | ||
1606 | { | ||
1607 | for ( QStringList::ConstIterator it = v.begin(); it != v.end(); ++it ) | ||
1608 | insertEmail( *it ); | ||
1609 | } | ||