Not Logged In
|
Login
|
Register
Home
|
News
|
Projects
|
Releases
Bugs
|
RFE
|
Repositories
|
Help
projects
/
xestiaab
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i8ln invalid SSL text labels in frmInvalidSSLCertificate
[xestiaab/.git]
/
source
/
common
/
getcontactinfo.cpp
diff --git
a/source/common/getcontactinfo.cpp
b/source/common/getcontactinfo.cpp
index
b783d8b
..
dfd357f
100644
(file)
--- a/
source/common/getcontactinfo.cpp
+++ b/
source/common/getcontactinfo.cpp
@@
-38,6
+38,8
@@
void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
// Show message to user that the contact information is loading.
// Show message to user that the contact information is loading.
+ HTMLObj->SetBorders(0);
+
wxString PageData;
wxFileSystem::AddHandler(new wxMemoryFSHandler);
wxString PageData;
wxFileSystem::AddHandler(new wxMemoryFSHandler);
@@
-122,20
+124,31
@@
void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
PageData.append(wxT("<head>"));
PageData.append(wxT("<title>Contact Information</title>"));
PageData.append(wxT("</head>"));
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("<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("<tr>"));
- PageData.append(wxT("<td>"));
+ PageData.append(wxT("<td
style=\"width:100%\"
>"));
PageData.append(wxT("<h2>"));
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("</h2>"));
PageData.append(wxT("</td>"));
- PageData.append(wxT("<td>"));
+ PageData.append(wxT("<td
style=\"width: 200px;\"
>"));
// Define common variables for ADR.
// Define common variables for ADR.
@@
-417,12
+430,13
@@
void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
ContactData = vCardObj->GetByPartial(wxT("PHOTO"));
bool AddBreak = FALSE;
ContactData = vCardObj->GetByPartial(wxT("PHOTO"));
bool AddBreak = FALSE;
+ wxString TypePageData;
if (ContactData.PropCount > 1){
if (ContactData.PropCount > 1){
- PageData.append(wxT("<img src=\"memory:cipto.png\" alt=\""));
- PageData.append(_("This contact has multiple photos."));
- PageData.append(wxT("\">"));
+
Type
PageData.append(wxT("<img src=\"memory:cipto.png\" alt=\""));
+
Type
PageData.append(_("This contact has multiple photos."));
+
Type
PageData.append(wxT("\">"));
AddBreak = TRUE;
}
AddBreak = TRUE;
}
@@
-431,9
+445,9
@@
void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
if (ContactData.PropCount > 1){
if (ContactData.PropCount > 1){
- PageData.append(wxT("<img src=\"memory:cilog.png\" alt=\""));
- PageData.append(_("This contact has multiple logos."));
- PageData.append(wxT("\">"));
+
Type
PageData.append(wxT("<img src=\"memory:cilog.png\" alt=\""));
+
Type
PageData.append(_("This contact has multiple logos."));
+
Type
PageData.append(wxT("\">"));
AddBreak = TRUE;
}
AddBreak = TRUE;
}
@@
-442,9
+456,9
@@
void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
if (ContactData.PropCount >= 1){
if (ContactData.PropCount >= 1){
- PageData.append(wxT("<img src=\"memory:cisnd.png\" alt=\""));
- PageData.append(_("This contact has audio information."));
- PageData.append(wxT("\">"));
+
Type
PageData.append(wxT("<img src=\"memory:cisnd.png\" alt=\""));
+
Type
PageData.append(_("This contact has audio information."));
+
Type
PageData.append(wxT("\">"));
AddBreak = TRUE;
}
AddBreak = TRUE;
}
@@
-453,9
+467,9
@@
void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
if (ContactData.PropCount >= 1){
if (ContactData.PropCount >= 1){
- PageData.append(wxT("<img src=\"memory:cikey.png\" alt=\""));
- PageData.append(_("This contact has crytographic keys."));
- PageData.append(wxT("\">"));
+
Type
PageData.append(wxT("<img src=\"memory:cikey.png\" alt=\""));
+
Type
PageData.append(_("This contact has crytographic keys."));
+
Type
PageData.append(wxT("\">"));
AddBreak = TRUE;
}
AddBreak = TRUE;
}
@@
-464,9
+478,9
@@
void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
if (ContactData.PropCount >= 1){
if (ContactData.PropCount >= 1){
- PageData.append(wxT("<img src=\"memory:civen.png\" alt=\""));
- PageData.append(_("This contact has vendor-specific information."));
- PageData.append(wxT("\">"));
+
Type
PageData.append(wxT("<img src=\"memory:civen.png\" alt=\""));
+
Type
PageData.append(_("This contact has vendor-specific information."));
+
Type
PageData.append(wxT("\">"));
AddBreak = TRUE;
}
AddBreak = TRUE;
}
@@
-475,13
+489,21
@@
void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
if (ContactData.PropCount >= 1){
if (ContactData.PropCount >= 1){
- PageData.append(wxT("<img src=\"memory:ciext.png\" alt=\""));
- PageData.append(_("This contact has extended information."));
- PageData.append(wxT("\">"));
+
Type
PageData.append(wxT("<img src=\"memory:ciext.png\" alt=\""));
+
Type
PageData.append(_("This contact has extended information."));
+
Type
PageData.append(wxT("\">"));
AddBreak = TRUE;
}
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>"));
if (AddBreak == TRUE){
PageData.append(wxT("<br><br>"));
@@
-526,6
+548,8
@@
void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
}
}
+ PageData.append("<table CELLPADDING=4 style=\"{width: 100%;}\"><tr><td>");
+
if (DataDisplay == TRUE){
DataLines.Trim();
if (DataDisplay == TRUE){
DataLines.Trim();
@@
-1618,6
+1642,8
@@
void LoadContactData(vCard *vCardObj, wxHtmlWindow *HTMLObj, wxString SID,
// Display the HTML document on the screen.
// Display the HTML document on the screen.
+ PageData.append("</td></tr></table>");
+
PageData.append(wxT("</body>"));
PageData.append(wxT("</html>"));
PageData.append(wxT("</body>"));
PageData.append(wxT("</html>"));
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy