Implemented ROLE, ORG and NOTE with ContactDataObject.

diff --git a/source/contacteditor/frmContactEditor-Load.cpp b/source/contacteditor/frmContactEditor-Load.cpp
index 7e35538..02262fe 100644 (file)
--- a/source/contacteditor/frmContactEditor-Load.cpp
+++ b/source/contacteditor/frmContactEditor-Load.cpp
@@ -275,6 +275,47 @@ bool frmContactEditor::LoadContact(wxString Filename){
                &ContactEditorData.BusinessTitleListPref,
                lboBusinessTitles,
                &TitleCount);
+               
+       // Process the roles (ROLE).
+       
+       LoadData(&ContactEditorData.GeneralRoleList,
+               &ContactEditorData.GeneralRoleListPref,
+               lboRoles,
+               &ContactEditorData.HomeRoleList,
+               &ContactEditorData.HomeRoleListPref,
+               lboHomeRoles,
+               &ContactEditorData.BusinessRoleList,
+               &ContactEditorData.BusinessRoleListPref,
+               lboBusinessRoles,
+               &RoleCount);
+
+       // Process the roles (ORG).
+       
+       LoadData(&ContactEditorData.GeneralOrganisationsList,
+               &ContactEditorData.GeneralOrganisationsListPref,
+               lboOrganisations,
+               &ContactEditorData.HomeOrganisationsList,
+               &ContactEditorData.HomeOrganisationsListPref,
+               lboHomeOrganisations,
+               &ContactEditorData.BusinessOrganisationsList,
+               &ContactEditorData.BusinessOrganisationsListPref,
+               lboBusinessOrganisations,
+               &OrgCount);
+               
+       // Process the notes (NOTE).
+               
+       LoadData(&ContactEditorData.GeneralNoteList,
+               &ContactEditorData.GeneralNoteListPref,
+               lboNotes,
+               &ContactEditorData.HomeNoteList,
+               &ContactEditorData.HomeNoteListPref,
+               lboHomeNotes,
+               &ContactEditorData.BusinessNoteList,
+               &ContactEditorData.BusinessNoteListPref,
+               lboBusinessNotes,
+               &NoteCount);
+               
+       // Process the 
 
        for (std::map<int,wxString>::iterator iter = ContactFileLines.begin(); 
         iter != ContactFileLines.end(); ++iter){
@@ -485,7 +526,7 @@ bool frmContactEditor::LoadContact(wxString Filename){
                        
                        LoadTitle(wxSPropertySeg1, wxSPropertySeg2, &TitleCount);
                        
-               }*/ else if (wxSProperty == wxT("ROLE")) {
+               } else if (wxSProperty == wxT("ROLE")) {
 
                        // See frmContactEditor-LoadRole.cpp
                
@@ -503,7 +544,7 @@ bool frmContactEditor::LoadContact(wxString Filename){
 
                        LoadNote(wxSPropertySeg1, wxSPropertySeg2, &NoteCount); 
                        
-               } else if (wxSProperty == wxT("CATEGORIES")) {
+               }*/ else if (wxSProperty == wxT("CATEGORIES")) {
                
                        // See frmContactEditor-LoadCategory.cpp