Implemented TITLE for ContactDataObject.

[xestiaab/.git] / source / contacteditor / frmContactEditor-Load.cpp

diff --git a/source/contacteditor/frmContactEditor-Load.cpp b/source/contacteditor/frmContactEditor-Load.cpp
index a48d0a3..7e35538 100644 (file)
--- a/source/contacteditor/frmContactEditor-Load.cpp
+++ b/source/contacteditor/frmContactEditor-Load.cpp
@@ -185,7 +185,7 @@ bool frmContactEditor::LoadContact(wxString Filename){
                &ContactEditorData.BusinessAddressListPref,
                &ADRCount);
 
-       // Process the timezones (TZ) (frmContactEditor-LoadTimeZone.cpp)
+       // Process the timezones (TZ).
        
        LoadData(&ContactEditorData.GeneralTZList,
                &ContactEditorData.GeneralTZListPref,
@@ -198,7 +198,7 @@ bool frmContactEditor::LoadContact(wxString Filename){
                lboBusinessTimezones,
                &TZCount);
                
-       // Process the emails (EMAIL) (frmContactEditor-LoadEmail.cpp)
+       // Process the emails (EMAIL).
        
        LoadData(&ContactEditorData.GeneralEmailList,
                &ContactEditorData.GeneralEmailListPref,
@@ -211,7 +211,7 @@ bool frmContactEditor::LoadContact(wxString Filename){
                lboBusinessEmail,
                &EmailCount);
 
-       // Process the nicknames (NICKNAME) (frmContactEditor-LoadNickname.cpp)
+       // Process the nicknames (NICKNAME).
        
        LoadData(&ContactEditorData.GeneralNicknamesList,
                &ContactEditorData.GeneralNicknamesListPref,
@@ -223,6 +223,58 @@ bool frmContactEditor::LoadContact(wxString Filename){
                &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 geopositiosn (GEO).
+       
+       LoadData(&ContactEditorData.GeneralGeographyList,
+               &ContactEditorData.GeneralGeographyListPref,
+               lboGeoposition,
+               &ContactEditorData.HomeGeographyList,
+               &ContactEditorData.HomeGeographyListPref,
+               lboHomeGeoposition,
+               &ContactEditorData.BusinessGeographyList,
+               &ContactEditorData.BusinessGeographyListPref,
+               lboBusinessGeoposition,
+               &GeoCount);
+               
+       // Process the websites (URL).
+       
+       LoadData(&ContactEditorData.GeneralWebsiteList,
+               &ContactEditorData.GeneralWebsiteListPref,
+               lboWebsites,
+               &ContactEditorData.HomeWebsiteList,
+               &ContactEditorData.HomeWebsiteListPref,
+               lboHomeWebsites,
+               &ContactEditorData.BusinessWebsiteList,
+               &ContactEditorData.BusinessWebsiteListPref,
+               lboBusinessWebsites,
+               &URLCount);
+
+       // Process the titles (TITLE).
+       
+       LoadData(&ContactEditorData.GeneralTitleList,
+               &ContactEditorData.GeneralTitleListPref,
+               lboTitles,
+               &ContactEditorData.HomeTitleList,
+               &ContactEditorData.HomeTitleListPref,
+               lboHomeTitles,
+               &ContactEditorData.BusinessTitleList,
+               &ContactEditorData.BusinessTitleListPref,
+               lboBusinessTitles,
+               &TitleCount);
 
        for (std::map<int,wxString>::iterator iter = ContactFileLines.begin(); 
         iter != ContactFileLines.end(); ++iter){
@@ -403,7 +455,7 @@ bool frmContactEditor::LoadContact(wxString Filename){
                
                        LoadTelephone(wxSPropertySeg1, wxSPropertySeg2, &TelCount);
                
-               } else if (wxSProperty == wxT("LANG")){
+               }/* else if (wxSProperty == wxT("LANG")){
                
                        // See frmContactEditor-LoadLanguage.cpp
                        
@@ -415,13 +467,13 @@ bool frmContactEditor::LoadContact(wxString Filename){
                        
                        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
                
@@ -433,7 +485,7 @@ bool frmContactEditor::LoadContact(wxString Filename){
                        
                        LoadTitle(wxSPropertySeg1, wxSPropertySeg2, &TitleCount);
                        
-               } else if (wxSProperty == wxT("ROLE")) {
+               }*/ else if (wxSProperty == wxT("ROLE")) {
 
                        // See frmContactEditor-LoadRole.cpp