"));
- 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.
@@ -265,23 +297,6 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
} else {
}
-
- /*int PointX = PointXBase;
- int PointY = PointYBase;
- int PointW = PointWBase;
- int PointH = PointHBase;*/
-
- // Bottom Left Method
-
- /*int PointX = wxAtoi(PhotoRectData.GetNextToken());
- int PointY = photo.GetHeight() - wxAtoi(PhotoRectData.GetNextToken()) - 340;
- int PointW = wxAtoi(PhotoRectData.GetNextToken());
- int PointH = wxAtoi(PhotoRectData.GetNextToken());*/
-
- // Bottom Right Method
-
- /*int PointXRemain = photo.GetWidth() - PointX - 140;
- int PointYRemain = photo.GetHeight() - PointY - 140;*/
PhotoRectPoints.SetX(PointX);
PhotoRectPoints.SetY(PointY);
@@ -399,12 +414,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 +429,9 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
if (ContactData.PropCount > 1){
- PageData.append(wxT(""));
+ TypePageData.append(wxT(""));
AddBreak = TRUE;
}
@@ -424,9 +440,9 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
if (ContactData.PropCount >= 1){
- PageData.append(wxT(""));
+ TypePageData.append(wxT(""));
AddBreak = TRUE;
}
@@ -435,9 +451,9 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
if (ContactData.PropCount >= 1){
- PageData.append(wxT(""));
+ TypePageData.append(wxT(""));
AddBreak = TRUE;
}
@@ -446,9 +462,9 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
if (ContactData.PropCount >= 1){
- PageData.append(wxT(""));
+ TypePageData.append(wxT(""));
AddBreak = TRUE;
}
@@ -457,13 +473,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 +532,8 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
}
+ PageData.append("");
+
if (DataDisplay == TRUE){
DataLines.Trim();
@@ -1600,6 +1626,8 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
// Display the HTML document on the screen.
+ PageData.append(" | ");
+
PageData.append(wxT(""));
PageData.append(wxT(""));
@@ -1613,6 +1641,8 @@ void SplitPropertyData(wxString *PropertyLine,
int intSize,
std::map *SplitData){
+ // Split the property data into SplitData.
+
wxString DataStr;
wxStringTokenizer PropertyElement;
wxString PropertyName;
|