bool FNProcessed = FALSE;
bool GenderProcessed = FALSE;
bool NameProcessed = FALSE;
- bool UIDProcessed = FALSE;
+ //bool UIDProcessed = FALSE;
//bool KindProcessed = FALSE;
bool ETagFound = FALSE;
bool ETagOrigFound = FALSE;
// Process the Gender (GENDER) (frmContactEditor-LoadGender.cpp)
LoadGender(&ContactEditorData.Gender, &ContactEditorData.GenderDetails);
+
+ // Process the Name (N) (frmContactEditor-LoadName.cpp)
+
+ LoadName(&ContactEditorData.NameTitle, &ContactEditorData.NameForename,
+ &ContactEditorData.NameSurname, &ContactEditorData.NameOtherNames,
+ &ContactEditorData.NameSuffix);
+
+ // Process the group members (MEMBER) (frmContactEditor-LoadGroup.cpp)
+
+ LoadMember(&ContactEditorData.GroupsList);
+
+ // Process the addresses (ADR) (frmContactEditor-LoadAddress.cpp)
+
+ LoadAddress(&ContactEditorData.GeneralAddressList,
+ &ContactEditorData.GeneralAddressListTown,
+ &ContactEditorData.GeneralAddressListCounty,
+ &ContactEditorData.GeneralAddressListPostCode,
+ &ContactEditorData.GeneralAddressListPref,
+ &ContactEditorData.HomeAddressList,
+ &ContactEditorData.HomeAddressListTown,
+ &ContactEditorData.HomeAddressListCounty,
+ &ContactEditorData.HomeAddressListPostCode,
+ &ContactEditorData.HomeAddressListPref,
+ &ContactEditorData.BusinessAddressList,
+ &ContactEditorData.BusinessAddressListTown,
+ &ContactEditorData.BusinessAddressListCounty,
+ &ContactEditorData.BusinessAddressListPostCode,
+ &ContactEditorData.BusinessAddressListPref,
+ &ADRCount);
+
+ // Process the timezones (TZ).
+
+ LoadData(&ContactEditorData.GeneralTZList,
+ &ContactEditorData.GeneralTZListPref,
+ lboTimezones,
+ &ContactEditorData.HomeTZList,
+ &ContactEditorData.HomeTZListPref,
+ lboHomeTimezones,
+ &ContactEditorData.BusinessTZList,
+ &ContactEditorData.BusinessTZListPref,
+ lboBusinessTimezones,
+ &TZCount);
+
+ // Process the emails (EMAIL).
+
+ LoadData(&ContactEditorData.GeneralEmailList,
+ &ContactEditorData.GeneralEmailListPref,
+ lboEmails,
+ &ContactEditorData.HomeEmailList,
+ &ContactEditorData.HomeEmailListPref,
+ lboHomeEmails,
+ &ContactEditorData.BusinessEmailList,
+ &ContactEditorData.BusinessEmailListPref,
+ lboBusinessEmail,
+ &EmailCount);
+
+ // Process the nicknames (NICKNAME).
+
+ LoadData(&ContactEditorData.GeneralNicknamesList,
+ &ContactEditorData.GeneralNicknamesListPref,
+ lboNicknames,
+ &ContactEditorData.HomeNicknamesList,
+ &ContactEditorData.HomeNicknamesListPref,
+ lboHomeNicknames,
+ &ContactEditorData.BusinessNicknamesList,
+ &ContactEditorData.BusinessNicknamesListPref,
+ lboBusinessNicknames,
+ &NicknameCount);
+
+ // Process the languages (LANG).
+
+ LoadData(&ContactEditorData.GeneralLanguageList,
+ &ContactEditorData.GeneralLanguageListPref,
+ lboLanguages,
+ &ContactEditorData.HomeLanguageList,
+ &ContactEditorData.HomeLanguageListPref,
+ lboHomeLanguages,
+ &ContactEditorData.BusinessLanguageList,
+ &ContactEditorData.BusinessLanguageListPref,
+ lboBusinessLanguages,
+ &LangCount);
+
+ // Process the geoposition (GEO).
+
+ LoadData(&ContactEditorData.GeneralGeographyList,
+ &ContactEditorData.GeneralGeographyListPref,
+ lboGeoposition,
+ &ContactEditorData.HomeGeographyList,
+ &ContactEditorData.HomeGeographyListPref,
+ lboHomeGeoposition,
+ &ContactEditorData.BusinessGeographyList,
+ &ContactEditorData.BusinessGeographyListPref,
+ lboBusinessGeoposition,
+ &GeoCount);
+
+ // Process the website (URL).
+
+ LoadData(&ContactEditorData.GeneralWebsiteList,
+ &ContactEditorData.GeneralWebsiteListPref,
+ lboWebsites,
+ &ContactEditorData.HomeWebsiteList,
+ &ContactEditorData.HomeWebsiteListPref,
+ lboHomeWebsites,
+ &ContactEditorData.BusinessWebsiteList,
+ &ContactEditorData.BusinessWebsiteListPref,
+ lboBusinessWebsites,
+ &URLCount);
for (std::map<int,wxString>::iterator iter = ContactFileLines.begin();
iter != ContactFileLines.end(); ++iter){
LoadKind(wxSPropertySeg2);
- }*/ else if (wxSProperty == wxT("MEMBER")){
+ }/* else if (wxSProperty == wxT("MEMBER")){
// See frmContactEditor-LoadGroup.cpp
LoadMember(wxSPropertySeg2, &GroupCount);
- } else if (wxSProperty == wxT("FN")){
+ }*/ else if (wxSProperty == wxT("FN")){
// See frmContactEditor-LoadName.cpp
LoadFN(wxSPropertySeg1, wxSPropertySeg2, &FNCount, &FNProcessed, &ContactData);
- } else if (wxSProperty == wxT("N") && NameProcessed == FALSE){
+ }/* else if (wxSProperty == wxT("N") && NameProcessed == FALSE){
// See frmContactEditor-LoadName.cpp
LoadNickname(wxSPropertySeg1, wxSPropertySeg2, &NicknameCount, &ContactData);
- }/* else if (wxSProperty == wxT("GENDER") && GenderProcessed == FALSE){
+ } else if (wxSProperty == wxT("GENDER") && GenderProcessed == FALSE){
// See frmContactEditor-LoadGender.cpp
LoadAnniversary(wxSPropertySeg1, wxSPropertySeg2, &AnniversaryProcessed);
- }*/ else if (wxSProperty == wxT("TZ")){
+ } else if (wxSProperty == wxT("TZ")){
// See frmContactEditor-LoadTimeZone.cpp
LoadTimeZone(wxSPropertySeg1, wxSPropertySeg2, &TZCount);
- } else if (wxSProperty == wxT("ADR")){
+ } else if (wxSProperty == wxT("ADR")){
// See frmContactEditor-LoadAddress.cpp
LoadEmail(wxSPropertySeg1, wxSPropertySeg2, &EmailCount);
- } else if (wxSProperty == wxT("IMPP")){
+ }*/ else if (wxSProperty == wxT("IMPP")){
// See frmContactEditor-LoadIM.cpp
LoadTelephone(wxSPropertySeg1, wxSPropertySeg2, &TelCount);
- } else if (wxSProperty == wxT("LANG")){
+ }/* else if (wxSProperty == wxT("LANG")){
// See frmContactEditor-LoadLanguage.cpp
LoadGeo(wxSPropertySeg1, wxSPropertySeg2, &GeoCount);
- } else if (wxSProperty == wxT("RELATED")){
+ }*/ else if (wxSProperty == wxT("RELATED")){
// See fromContactEditor-LoadRelated.cpp
LoadRelated(wxSPropertySeg1, wxSPropertySeg2, &RelatedCount);
- } else if (wxSProperty == wxT("URL")){
+ }/* else if (wxSProperty == wxT("URL")){
// See frmContactEditor-LoadURL.cpp
LoadURL(wxSPropertySeg1, wxSPropertySeg2, &URLCount);
- } else if (wxSProperty == wxT("TITLE")) {
+ }*/ else if (wxSProperty == wxT("TITLE")) {
// See frmContactEditor-LoadTitle.cpp
}
+}
+
+void frmContactEditor::LoadData(std::map<int, wxString> *GeneralList,
+ std::map<int, int> *GeneralListPref,
+ wxListCtrl *GeneralListCtrl,
+ std::map<int, wxString> *HomeList,
+ std::map<int, int> *HomeListPref,
+ wxListCtrl *HomeListCtrl,
+ std::map<int, wxString> *BusinessList,
+ std::map<int, int> *BusinessListPref,
+ wxListCtrl *BusinessListCtrl,
+ int *DataCount){
+
+ long ListCtrlIndex = -1;
+
+ // Deal with the general addresses.
+
+ for (std::map<int,wxString>::iterator Iter = GeneralList->begin();
+ Iter != GeneralList->end();
+ Iter++){
+
+ wxListItem coldata;
+
+ coldata.SetId(*DataCount);
+ coldata.SetData(*DataCount);
+ coldata.SetText(Iter->second);
+
+ ListCtrlIndex = GeneralListCtrl->InsertItem(coldata);
+
+ if (MapDataExists(DataCount, GeneralListPref)){
+
+ GeneralListCtrl->SetItem(ListCtrlIndex, 1, wxString::Format("%i", GeneralListPref->find(*DataCount)->second));
+
+ }
+
+ (*DataCount)++;
+
+ }
+
+ // Deal with the home addresses.
+
+ for (std::map<int,wxString>::iterator Iter = HomeList->begin();
+ Iter != HomeList->end();
+ Iter++){
+
+ wxListItem coldata;
+
+ coldata.SetId(*DataCount);
+ coldata.SetData(*DataCount);
+ coldata.SetText(Iter->second);
+
+ ListCtrlIndex = HomeListCtrl->InsertItem(coldata);
+
+ if (MapDataExists(DataCount, HomeListPref)){
+
+ HomeListCtrl->SetItem(ListCtrlIndex, 1, wxString::Format("%i", HomeListPref->find(*DataCount)->second));
+
+ }
+
+ (*DataCount)++;
+
+ }
+
+ // Deal with the work addresses.
+
+ for (std::map<int,wxString>::iterator Iter = BusinessList->begin();
+ Iter != BusinessList->end();
+ Iter++){
+
+ wxListItem coldata;
+
+ coldata.SetId(*DataCount);
+ coldata.SetData(*DataCount);
+ coldata.SetText(Iter->second);
+
+ ListCtrlIndex = BusinessListCtrl->InsertItem(coldata);
+
+ if (MapDataExists(DataCount, BusinessListPref)){
+
+ BusinessListCtrl->SetItem(ListCtrlIndex, 1, wxString::Format("%i", BusinessListPref->find(*DataCount)->second));
+
+ }
+
+ (*DataCount)++;
+
+ }
+
}
\ No newline at end of file