-rw-r--r-- | libopie2/opiepim/ocontact.cpp | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/libopie2/opiepim/ocontact.cpp b/libopie2/opiepim/ocontact.cpp index 734f5a2..bf27d0f 100644 --- a/libopie2/opiepim/ocontact.cpp +++ b/libopie2/opiepim/ocontact.cpp | |||
@@ -550,54 +550,54 @@ QString OContact::toRichText() const | |||
550 | str = profession(); | 550 | str = profession(); |
551 | if ( !str.isEmpty() ) | 551 | if ( !str.isEmpty() ) |
552 | text += "<b>" + QObject::tr("Profession: ") + "</b>" | 552 | text += "<b>" + QObject::tr("Profession: ") + "</b>" |
553 | + Qtopia::escapeString(str) + "<br>"; | 553 | + Qtopia::escapeString(str) + "<br>"; |
554 | str = assistant(); | 554 | str = assistant(); |
555 | if ( !str.isEmpty() ) | 555 | if ( !str.isEmpty() ) |
556 | text += "<b>" + QObject::tr("Assistant: ") + "</b>" | 556 | text += "<b>" + QObject::tr("Assistant: ") + "</b>" |
557 | + Qtopia::escapeString(str) + "<br>"; | 557 | + Qtopia::escapeString(str) + "<br>"; |
558 | str = manager(); | 558 | str = manager(); |
559 | if ( !str.isEmpty() ) | 559 | if ( !str.isEmpty() ) |
560 | text += "<b>" + QObject::tr("Manager: ") + "</b>" | 560 | text += "<b>" + QObject::tr("Manager: ") + "</b>" |
561 | + Qtopia::escapeString(str) + "<br>"; | 561 | + Qtopia::escapeString(str) + "<br>"; |
562 | str = gender(); | 562 | str = gender(); |
563 | if ( !str.isEmpty() && str.toInt() != 0 ) { | 563 | if ( !str.isEmpty() && str.toInt() != 0 ) { |
564 | if ( str.toInt() == 1 ) | 564 | if ( str.toInt() == 1 ) |
565 | str = QObject::tr( "Male" ); | 565 | str = QObject::tr( "Male" ); |
566 | else if ( str.toInt() == 2 ) | 566 | else if ( str.toInt() == 2 ) |
567 | str = QObject::tr( "Female" ); | 567 | str = QObject::tr( "Female" ); |
568 | text += "<b>" + QObject::tr("Gender: ") + "</b>" + str + "<br>"; | 568 | text += "<b>" + QObject::tr("Gender: ") + "</b>" + str + "<br>"; |
569 | } | 569 | } |
570 | str = spouse(); | 570 | str = spouse(); |
571 | if ( !str.isEmpty() ) | 571 | if ( !str.isEmpty() ) |
572 | text += "<b>" + QObject::tr("Spouse: ") + "</b>" | 572 | text += "<b>" + QObject::tr("Spouse: ") + "</b>" |
573 | + Qtopia::escapeString(str) + "<br>"; | 573 | + Qtopia::escapeString(str) + "<br>"; |
574 | if ( !birthday().isNull() ){ | 574 | if ( !birthday().isValid() ){ |
575 | str = TimeString::numberDateString( birthday() ); | 575 | str = TimeString::numberDateString( birthday() ); |
576 | text += "<b>" + QObject::tr("Birthday: ") + "</b>" | 576 | text += "<b>" + QObject::tr("Birthday: ") + "</b>" |
577 | + Qtopia::escapeString(str) + "<br>"; | 577 | + Qtopia::escapeString(str) + "<br>"; |
578 | } | 578 | } |
579 | if ( !anniversary().isNull() ){ | 579 | if ( !anniversary().isValid() ){ |
580 | str = TimeString::numberDateString( anniversary() ); | 580 | str = TimeString::numberDateString( anniversary() ); |
581 | text += "<b>" + QObject::tr("Anniversary: ") + "</b>" | 581 | text += "<b>" + QObject::tr("Anniversary: ") + "</b>" |
582 | + Qtopia::escapeString(str) + "<br>"; | 582 | + Qtopia::escapeString(str) + "<br>"; |
583 | } | 583 | } |
584 | str = nickname(); | 584 | str = nickname(); |
585 | if ( !str.isEmpty() ) | 585 | if ( !str.isEmpty() ) |
586 | text += "<b>" + QObject::tr("Nickname: ") + "</b>" | 586 | text += "<b>" + QObject::tr("Nickname: ") + "</b>" |
587 | + Qtopia::escapeString(str) + "<br>"; | 587 | + Qtopia::escapeString(str) + "<br>"; |
588 | 588 | ||
589 | // notes last | 589 | // notes last |
590 | if ( (value = notes()) ) { | 590 | if ( (value = notes()) ) { |
591 | QRegExp reg("\n"); | 591 | QRegExp reg("\n"); |
592 | 592 | ||
593 | //QString tmp = Qtopia::escapeString(value); | 593 | //QString tmp = Qtopia::escapeString(value); |
594 | QString tmp = QStyleSheet::convertFromPlainText(value); | 594 | QString tmp = QStyleSheet::convertFromPlainText(value); |
595 | //tmp.replace( reg, "<br>" ); | 595 | //tmp.replace( reg, "<br>" ); |
596 | text += "<br>" + tmp + "<br>"; | 596 | text += "<br>" + tmp + "<br>"; |
597 | } | 597 | } |
598 | return text; | 598 | return text; |
599 | } | 599 | } |
600 | 600 | ||
601 | /*! | 601 | /*! |
602 | \internal | 602 | \internal |
603 | */ | 603 | */ |
@@ -1102,92 +1102,105 @@ static VObject *createVObject( const OContact &c ) | |||
1102 | work_phone = safeAddPropValue( vcard, VCTelephoneProp, c.businessFax() ); | 1102 | work_phone = safeAddPropValue( vcard, VCTelephoneProp, c.businessFax() ); |
1103 | safeAddProp( work_phone, VCWorkProp ); | 1103 | safeAddProp( work_phone, VCWorkProp ); |
1104 | safeAddProp( work_phone, VCFaxProp ); | 1104 | safeAddProp( work_phone, VCFaxProp ); |
1105 | work_phone = safeAddPropValue( vcard, VCTelephoneProp, c.businessPager() ); | 1105 | work_phone = safeAddPropValue( vcard, VCTelephoneProp, c.businessPager() ); |
1106 | safeAddProp( work_phone, VCWorkProp ); | 1106 | safeAddProp( work_phone, VCWorkProp ); |
1107 | safeAddProp( work_phone, VCPagerProp ); | 1107 | safeAddProp( work_phone, VCPagerProp ); |
1108 | 1108 | ||
1109 | url = safeAddPropValue( vcard, VCURLProp, c.businessWebpage() ); | 1109 | url = safeAddPropValue( vcard, VCURLProp, c.businessWebpage() ); |
1110 | safeAddProp( url, VCWorkProp ); | 1110 | safeAddProp( url, VCWorkProp ); |
1111 | 1111 | ||
1112 | VObject *title = safeAddPropValue( vcard, VCTitleProp, c.jobTitle() ); | 1112 | VObject *title = safeAddPropValue( vcard, VCTitleProp, c.jobTitle() ); |
1113 | safeAddProp( title, VCWorkProp ); | 1113 | safeAddProp( title, VCWorkProp ); |
1114 | 1114 | ||
1115 | 1115 | ||
1116 | QStringList emails = c.emailList(); | 1116 | QStringList emails = c.emailList(); |
1117 | emails.prepend( c.defaultEmail() ); | 1117 | emails.prepend( c.defaultEmail() ); |
1118 | for( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) { | 1118 | for( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) { |
1119 | VObject *email = safeAddPropValue( vcard, VCEmailAddressProp, *it ); | 1119 | VObject *email = safeAddPropValue( vcard, VCEmailAddressProp, *it ); |
1120 | safeAddProp( email, VCInternetProp ); | 1120 | safeAddProp( email, VCInternetProp ); |
1121 | } | 1121 | } |
1122 | 1122 | ||
1123 | safeAddPropValue( vcard, VCNoteProp, c.notes() ); | 1123 | safeAddPropValue( vcard, VCNoteProp, c.notes() ); |
1124 | 1124 | ||
1125 | // Exporting Birthday regarding RFC 2425 (5.8.4) | 1125 | // Exporting Birthday regarding RFC 2425 (5.8.4) |
1126 | if ( !c.birthday().isNull() ){ | 1126 | if ( !c.birthday().isValid() ){ |
1127 | QString birthd_rfc2425 = c.birthday().year() + QString( "-" ) + c.birthday().month() + QString( "-" ) + c.birthday().day(); | 1127 | QString birthd_rfc2425 = QString("%1-%2-%3") |
1128 | .arg( c.birthday().year() ) | ||
1129 | .arg( c.birthday().month(), 2 ) | ||
1130 | .arg( c.birthday().day(), 2 ); | ||
1131 | // Now replace spaces with "0"... | ||
1132 | int pos = 0; | ||
1133 | while ( ( pos = birthd_rfc2425.find (' ') ) > 0 ) | ||
1134 | birthd_rfc2425.replace( pos, 1, "0" ); | ||
1135 | |||
1128 | qWarning("Exporting birthday as: %s", birthd_rfc2425.latin1()); | 1136 | qWarning("Exporting birthday as: %s", birthd_rfc2425.latin1()); |
1129 | safeAddPropValue( vcard, VCBirthDateProp, birthd_rfc2425.latin1() ); | 1137 | safeAddPropValue( vcard, VCBirthDateProp, birthd_rfc2425.latin1() ); |
1130 | } | 1138 | } |
1131 | 1139 | ||
1132 | if ( !c.company().isEmpty() || !c.department().isEmpty() || !c.office().isEmpty() ) { | 1140 | if ( !c.company().isEmpty() || !c.department().isEmpty() || !c.office().isEmpty() ) { |
1133 | VObject *org = safeAddProp( vcard, VCOrgProp ); | 1141 | VObject *org = safeAddProp( vcard, VCOrgProp ); |
1134 | safeAddPropValue( org, VCOrgNameProp, c.company() ); | 1142 | safeAddPropValue( org, VCOrgNameProp, c.company() ); |
1135 | safeAddPropValue( org, VCOrgUnitProp, c.department() ); | 1143 | safeAddPropValue( org, VCOrgUnitProp, c.department() ); |
1136 | safeAddPropValue( org, VCOrgUnit2Prop, c.office() ); | 1144 | safeAddPropValue( org, VCOrgUnit2Prop, c.office() ); |
1137 | } | 1145 | } |
1138 | 1146 | ||
1139 | // some values we have to export as custom fields | 1147 | // some values we have to export as custom fields |
1140 | safeAddPropValue( vcard, "X-Qtopia-Profession", c.profession() ); | 1148 | safeAddPropValue( vcard, "X-Qtopia-Profession", c.profession() ); |
1141 | safeAddPropValue( vcard, "X-Qtopia-Manager", c.manager() ); | 1149 | safeAddPropValue( vcard, "X-Qtopia-Manager", c.manager() ); |
1142 | safeAddPropValue( vcard, "X-Qtopia-Assistant", c.assistant() ); | 1150 | safeAddPropValue( vcard, "X-Qtopia-Assistant", c.assistant() ); |
1143 | 1151 | ||
1144 | safeAddPropValue( vcard, "X-Qtopia-Spouse", c.spouse() ); | 1152 | safeAddPropValue( vcard, "X-Qtopia-Spouse", c.spouse() ); |
1145 | safeAddPropValue( vcard, "X-Qtopia-Gender", c.gender() ); | 1153 | safeAddPropValue( vcard, "X-Qtopia-Gender", c.gender() ); |
1146 | safeAddPropValue( vcard, "X-Qtopia-Anniversary", TimeConversion::toString( c.anniversary() ) ); | 1154 | safeAddPropValue( vcard, "X-Qtopia-Anniversary", TimeConversion::toString( c.anniversary() ) ); |
1147 | safeAddPropValue( vcard, "X-Qtopia-Nickname", c.nickname() ); | 1155 | safeAddPropValue( vcard, "X-Qtopia-Nickname", c.nickname() ); |
1148 | safeAddPropValue( vcard, "X-Qtopia-Children", c.children() ); | 1156 | safeAddPropValue( vcard, "X-Qtopia-Children", c.children() ); |
1149 | 1157 | ||
1150 | return vcard; | 1158 | return vcard; |
1151 | } | 1159 | } |
1152 | 1160 | ||
1153 | 1161 | ||
1154 | /*! | 1162 | /*! |
1155 | \internal | 1163 | \internal |
1156 | */ | 1164 | */ |
1157 | static QDate convVCardDateToDate( const QString& datestr ) | 1165 | static QDate convVCardDateToDate( const QString& datestr ) |
1158 | { | 1166 | { |
1159 | int monthPos = datestr.find('-'); | 1167 | int monthPos = datestr.find('-'); |
1160 | int dayPos = datestr.find('-', monthPos+1 ); | 1168 | int dayPos = datestr.find('-', monthPos+1 ); |
1169 | int sep_ignore = 1; | ||
1161 | if ( monthPos == -1 || dayPos == -1 ) { | 1170 | if ( monthPos == -1 || dayPos == -1 ) { |
1162 | qDebug("fromString didn't find - in str = %s; mpos = %d ypos = %d", datestr.latin1(), monthPos, dayPos ); | 1171 | qDebug("fromString didn't find - in str = %s; mpos = %d ypos = %d", datestr.latin1(), monthPos, dayPos ); |
1163 | return QDate(); | 1172 | // Ok.. Outlook is violating ISO 8601, therefore we will try to read their format ( YYYYMMDD ) |
1173 | monthPos = 4; | ||
1174 | dayPos = 6; | ||
1175 | sep_ignore = 0; | ||
1176 | qDebug("Try with follwing positions str = %s; mpos = %d ypos = %d", datestr.latin1(), monthPos, dayPos ); | ||
1164 | } | 1177 | } |
1165 | int y = datestr.left( monthPos ).toInt(); | 1178 | int y = datestr.left( monthPos ).toInt(); |
1166 | int m = datestr.mid( monthPos+1, dayPos - monthPos - 1 ).toInt(); | 1179 | int m = datestr.mid( monthPos + sep_ignore, dayPos - monthPos - sep_ignore ).toInt(); |
1167 | int d = datestr.mid( dayPos+1 ).toInt(); | 1180 | int d = datestr.mid( dayPos + sep_ignore ).toInt(); |
1168 | QDate date ( y,m,d ); | ||
1169 | qDebug("TimeConversion::fromString ymd = %s => %d %d %d; mpos = %d ypos = %d", datestr.latin1(), y, m, d, monthPos, dayPos); | 1181 | qDebug("TimeConversion::fromString ymd = %s => %d %d %d; mpos = %d ypos = %d", datestr.latin1(), y, m, d, monthPos, dayPos); |
1182 | QDate date ( y,m,d ); | ||
1170 | return date; | 1183 | return date; |
1171 | } | 1184 | } |
1172 | 1185 | ||
1173 | static OContact parseVObject( VObject *obj ) | 1186 | static OContact parseVObject( VObject *obj ) |
1174 | { | 1187 | { |
1175 | OContact c; | 1188 | OContact c; |
1176 | 1189 | ||
1177 | VObjectIterator it; | 1190 | VObjectIterator it; |
1178 | initPropIterator( &it, obj ); | 1191 | initPropIterator( &it, obj ); |
1179 | while( moreIteration( &it ) ) { | 1192 | while( moreIteration( &it ) ) { |
1180 | VObject *o = nextVObject( &it ); | 1193 | VObject *o = nextVObject( &it ); |
1181 | QCString name = vObjectName( o ); | 1194 | QCString name = vObjectName( o ); |
1182 | QCString value = vObjectStringZValue( o ); | 1195 | QCString value = vObjectStringZValue( o ); |
1183 | if ( name == VCNameProp ) { | 1196 | if ( name == VCNameProp ) { |
1184 | VObjectIterator nit; | 1197 | VObjectIterator nit; |
1185 | initPropIterator( &nit, o ); | 1198 | initPropIterator( &nit, o ); |
1186 | while( moreIteration( &nit ) ) { | 1199 | while( moreIteration( &nit ) ) { |
1187 | VObject *o = nextVObject( &nit ); | 1200 | VObject *o = nextVObject( &nit ); |
1188 | QCString name = vObjectTypeInfo( o ); | 1201 | QCString name = vObjectTypeInfo( o ); |
1189 | QString value = vObjectStringZValue( o ); | 1202 | QString value = vObjectStringZValue( o ); |
1190 | if ( name == VCNamePrefixesProp ) | 1203 | if ( name == VCNamePrefixesProp ) |
1191 | c.setTitle( value ); | 1204 | c.setTitle( value ); |
1192 | else if ( name == VCNameSuffixesProp ) | 1205 | else if ( name == VCNameSuffixesProp ) |
1193 | c.setSuffix( value ); | 1206 | c.setSuffix( value ); |