Not Logged In | Login | Register
Home | News | Projects | Releases
Bugs | RFE | Repositories | Help
projects / xestiaab / .git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Added comments to functions in common/textprocessing.cpp
[xestiaab/.git] / source / common / getcontactinfo.cpp
diff --git a/source/common/getcontactinfo.cpp b/source/common/getcontactinfo.cpp
index b783d8b..61531df 100644 (file)
--- a/source/common/getcontactinfo.cpp
+++ b/source/common/getcontactinfo.cpp
@@ -36,12 +36,15 @@
 void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID, 
        wxString OldSID, std::map<wxString, wxString> *MemoryFSList){
 
+       // Load the vCard contact data into the wxHTMLWindow given.
+
        // Show message to user that the contact information is loading.
 
+       HTMLObj->SetBorders(0);
+               
        wxString PageData;
        
        wxFileSystem::AddHandler(new wxMemoryFSHandler);
-       //wxMemoryFSHandler::AddFile();
        
        PageData.append(wxT("<html>"));
        PageData.append(wxT("<head>"));
@@ -122,20 +125,31 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
        PageData.append(wxT("<head>"));
        PageData.append(wxT("<title>Contact Information</title>"));     
        PageData.append(wxT("</head>"));
+       
+       // Process the CSS section.
+       
        PageData.append(wxT("<body>"));
 
        // Process the data in the vCard object.
        
        // Name (Display As)
        
-       PageData.append(wxT("<table>"));
+       ArrayvCardOutData FNList;
+       FNList = vCardObj->GetByPartial(wxT("FN"));
+       
+       PageData.append(wxT("<table style=\"background: #cccccc; width: 100%\">"));
        PageData.append(wxT("<tr>"));
-       PageData.append(wxT("<td>"));
+       PageData.append(wxT("<td style=\"width:100%\">"));
        PageData.append(wxT("<h2>"));
-       PageData.append(vCardObj->Get(wxT("FN")));
+       
+       if (FNList.PropCount > 0){
+               FNList.PropValues[0].Trim();
+               PageData.append(FNList.PropValues[0]);
+       }
+       
        PageData.append(wxT("</h2>"));
        PageData.append(wxT("</td>"));
-       PageData.append(wxT("<td>"));
+       PageData.append(wxT("<td style=\"width: 200px;\">"));
        
        // Define common variables for ADR.
        
@@ -283,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);
@@ -417,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("<img src=\"memory:cipto.png\" alt=\""));
-               PageData.append(_("This contact has multiple photos."));
-               PageData.append(wxT("\">"));
+               TypePageData.append(wxT("<img src=\"memory:cipto.png\" alt=\""));
+               TypePageData.append(_("This contact has multiple photos."));
+               TypePageData.append(wxT("\">"));
                AddBreak = TRUE;
        
        }
@@ -431,9 +429,9 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
        
        if (ContactData.PropCount > 1){
        
-               PageData.append(wxT("<img src=\"memory:cilog.png\" alt=\""));
-               PageData.append(_("This contact has multiple logos."));
-               PageData.append(wxT("\">"));
+               TypePageData.append(wxT("<img src=\"memory:cilog.png\" alt=\""));
+               TypePageData.append(_("This contact has multiple logos."));
+               TypePageData.append(wxT("\">"));
                AddBreak = TRUE;
        
        }
@@ -442,9 +440,9 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
        
        if (ContactData.PropCount >= 1){
        
-               PageData.append(wxT("<img src=\"memory:cisnd.png\" alt=\""));
-               PageData.append(_("This contact has audio information."));
-               PageData.append(wxT("\">"));
+               TypePageData.append(wxT("<img src=\"memory:cisnd.png\" alt=\""));
+               TypePageData.append(_("This contact has audio information."));
+               TypePageData.append(wxT("\">"));
                AddBreak = TRUE;
        
        }
@@ -453,9 +451,9 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
 
        if (ContactData.PropCount >= 1){
        
-               PageData.append(wxT("<img src=\"memory:cikey.png\" alt=\""));
-               PageData.append(_("This contact has crytographic keys."));
-               PageData.append(wxT("\">"));
+               TypePageData.append(wxT("<img src=\"memory:cikey.png\" alt=\""));
+               TypePageData.append(_("This contact has crytographic keys."));
+               TypePageData.append(wxT("\">"));
                AddBreak = TRUE;
        
        }
@@ -464,9 +462,9 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
        
        if (ContactData.PropCount >= 1){
        
-               PageData.append(wxT("<img src=\"memory:civen.png\" alt=\""));
-               PageData.append(_("This contact has vendor-specific information."));
-               PageData.append(wxT("\">"));
+               TypePageData.append(wxT("<img src=\"memory:civen.png\" alt=\""));
+               TypePageData.append(_("This contact has vendor-specific information."));
+               TypePageData.append(wxT("\">"));
                AddBreak = TRUE;
        
        }
@@ -475,13 +473,21 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
        
        if (ContactData.PropCount >= 1){
        
-               PageData.append(wxT("<img src=\"memory:ciext.png\" alt=\""));
-               PageData.append(_("This contact has extended information."));
-               PageData.append(wxT("\">"));
+               TypePageData.append(wxT("<img src=\"memory:ciext.png\" alt=\""));
+               TypePageData.append(_("This contact has extended information."));
+               TypePageData.append(wxT("\">"));
                AddBreak = TRUE;
 
        }
        
+       if (!TypePageData.IsEmpty()){
+               
+               PageData.append("<table style=\"{background: #dddddd; width:100%}\"><tr><td>");
+               PageData.append(TypePageData);
+               PageData.append("</tr></td></table>");
+               
+       }
+       
        if (AddBreak == TRUE){
        
                PageData.append(wxT("<br><br>"));
@@ -526,6 +532,8 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
                
        }
        
+       PageData.append("<table CELLPADDING=4 style=\"{width: 100%;}\"><tr><td>");
+       
        if (DataDisplay == TRUE){
        
                DataLines.Trim();
@@ -1618,6 +1626,8 @@ void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
 
        // Display the HTML document on the screen.
 
+       PageData.append("</td></tr></table>");
+       
        PageData.append(wxT("</body>"));
        PageData.append(wxT("</html>"));
 
@@ -1631,6 +1641,8 @@ void SplitPropertyData(wxString *PropertyLine,
        int intSize,
        std::map<wxString,wxString> *SplitData){
        
+       // Split the property data into SplitData.
+       
        wxString DataStr;
        wxStringTokenizer PropertyElement;
        wxString PropertyName;
Xestia Address Book
Xestia Software Development
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software

Xestia Address Book
Xestia Calendar
Development

Xestia Gelforn
Everything else

About
News
Privacy Policy