"));
- PageData.append(wxT(""));
+ PageData.append(wxT(" | "));
PageData.append(wxT(""));
- PageData.append(vCardObj->Get(wxT("FN")));
+
+ if (FNList.PropCount > 0){
+ FNList.PropValues[0].Trim();
+ PageData.append(FNList.PropValues[0]);
+ }
+
PageData.append(wxT(""));
PageData.append(wxT(" | "));
- PageData.append(wxT(""));
+ PageData.append(wxT(" | "));
// Define common variables for ADR.
@@ -399,12 +430,13 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
ContactData = vCardObj->GetByPartial(wxT("PHOTO"));
bool AddBreak = FALSE;
+ wxString TypePageData;
if (ContactData.PropCount > 1){
- PageData.append(wxT(" "));
+ TypePageData.append(wxT(" "));
AddBreak = TRUE;
}
@@ -413,9 +445,9 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
if (ContactData.PropCount > 1){
- PageData.append(wxT(" "));
+ TypePageData.append(wxT(" "));
AddBreak = TRUE;
}
@@ -424,9 +456,9 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
if (ContactData.PropCount >= 1){
- PageData.append(wxT(" "));
+ TypePageData.append(wxT(" "));
AddBreak = TRUE;
}
@@ -435,9 +467,9 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
if (ContactData.PropCount >= 1){
- PageData.append(wxT(" "));
+ TypePageData.append(wxT(" "));
AddBreak = TRUE;
}
@@ -446,9 +478,9 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
if (ContactData.PropCount >= 1){
- PageData.append(wxT(" "));
+ TypePageData.append(wxT(" "));
AddBreak = TRUE;
}
@@ -457,13 +489,21 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
if (ContactData.PropCount >= 1){
- PageData.append(wxT(" "));
+ TypePageData.append(wxT(" "));
AddBreak = TRUE;
}
+ if (!TypePageData.IsEmpty()){
+
+ PageData.append("");
+ PageData.append(TypePageData);
+ PageData.append(" | ");
+
+ }
+
if (AddBreak == TRUE){
PageData.append(wxT("
"));
@@ -508,6 +548,8 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
}
+ PageData.append("");
+
if (DataDisplay == TRUE){
DataLines.Trim();
@@ -1600,6 +1642,8 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
// Display the HTML document on the screen.
+ PageData.append(" | ");
+
PageData.append(wxT(""));
PageData.append(wxT(" |