X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditor.h;h=ef4b8f2b36e2e8c43aa359cb70e673089f8e86a7;hb=8fb3ab8465ad5d56a2405ec830e48954e254735c;hp=34d4cf358e4b66c2917f110ab29a193455c7787f;hpb=2b6a6878b89192f2d951511d6936d564fd8baf46;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditor.h b/source/contacteditor/frmContactEditor.h
index 34d4cf3..ef4b8f2 100644
--- a/source/contacteditor/frmContactEditor.h
+++ b/source/contacteditor/frmContactEditor.h
@@ -1,6 +1,6 @@
 // frmContactEditor.h - frmContactEditor form header.
 //
-// (c) 2012-2015 Xestia Software Development.
+// (c) 2012-2016 Xestia Software Development.
 //
 // This file is part of Xestia Address Book.
 //
@@ -603,66 +603,15 @@ class frmContactEditor : public frmContactEditorADT
 		void ResetSaveProcessData();
 		void ContactFileChanged( wxCommandEvent &event );
 		void ClearContact();
-		
-		/* Functions for loading contacts */
-		void LoadKind(wxString KindType);
-		void LoadMember(wxString MemberData, int *GroupCount);
-		void LoadFN(wxString wxSPropertySeg1, wxString wxSPropertySeg2, int *FNCount, 
-			bool *FNProcessed, vCard *ContactData);
-		void LoadN(wxString wxSPropertySeg1, wxString wxSPropertySeg2, bool *NameProcessed, 
-			vCard *ContactData);
-		void LoadNickname(wxString wxSpropertySeg1, wxString wxSPropertySeg2, 
-			int *NicknameCount, vCard *ContactData);
-		void LoadGender(wxString wxSPropertySeg1, wxString wxSPropertySeg2, bool *GenderProcessed, 
-			vCard *ContactData);
-		void LoadBDay(wxString wxSPropertySeg1, wxString wxSPropertySeg2, bool *BirthdayProcessed);
-		void LoadAnniversary(wxString wxSPropertySeg1, wxString wxSPropertySeg2, bool *AnniversaryProcessed);
-		void LoadTimeZone(wxString wxSPropertySeg1, wxString wxSPropertySeg2, int *TZCount);
-		void LoadADR(wxString wxSPropertySeg1, wxString wxSPropertySeg2, int *ADRCount);
-		void LoadEmail(wxString wxSPropertySeg1, wxString wxSPropertySeg2, int *ADRCount);
-		void LoadIM(wxString wxSPropertySeg1, wxString wxSPropertySeg2, int *IMPPCount);
-		void LoadTelephone(wxString wxSPropertySeg1, wxString wxSPropertySeg2, int *TelCount);
-		void LoadLanguage(wxString wxSPropertySeg1, wxString wxSPropertySeg2, int *LangCount);
-		void LoadGeo(wxString wxSProptertySeg1, wxString wxSPropertySeg2, int *GeoCount);
-		void LoadRelated(wxString wxSPropertySeg1, wxString wxSPropertySeg2, int *RelatedCount);
-		void LoadURL(wxString wxSPropertySeg1, wxString wxSPropertySeg2, int *URLCount);
-		void LoadTitle(wxString wxSPropertySeg1, wxString wxSPropertySeg2, int *TitleCount);
-		void LoadRole(wxString wxSPropertySeg1, wxString wxSPropertySeg2, int *RoleCount);
-		void LoadOrg(wxString wxSPropertySeg1, wxString wxSPropertySeg2, int *OrgCount);
-		void LoadNote(wxString wxSPropertySeg1, wxString wxSPropertySeg2, int *NoteCount);
-		void LoadCategory(wxString wxSPropertySeg1, wxString wxSPropertySeg2, int *CategoryCount);
-		void LoadPhoto(wxString wxSPropertySeg1, wxString wxSPropertySeg2, int *PhotoCount);
-		void LoadLogo(wxString wxSPropertySeg1, wxString wxSPropertySeg2, int *PhotoCount);
-		void LoadSound(wxString wxSPropertySeg1, wxString wxSPropertySeg2, int *SoundCount);
-		void LoadCalURI(wxString wxSPropertySeg1, wxString wxSPropertySeg2, int *CalAdrCount);
-		void LoadCalAdrURI(wxString wxSPropertySeg1, wxString wxSPropertySeg2, int *CalReqAdrCount);
-		void LoadCalFreeBusy(wxString wxSPropertySeg1, wxString wxSPropertySeg2, int *FreeBusyCount);
-		void LoadKey(wxString wxSPropertySeg1, wxString wxSPropertySeg2, int *KeyCount);
-		
-		void 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> *BusinessTZPref,
-			wxListCtrl *BusinessListCtrl,
-			int *DataCount);
-			
-		void LoadData(std::map<int,wxString> *ItemList,
-			std::map<int,int> *ItemListPref,
-			wxListCtrl *ItemCtrl,
-			int *DataCount);
-		
-		void LoadGender(wxString *GenderComponent, wxString *GenderIdentity);
+
+		void LoadKind(ContactKindType *KindType);
 		void LoadBirthday(wxString *BirthdayData, bool *BirthdayText);
 		void LoadAnniversary(wxString *AnniversaryData, bool *AnniversaryText);
-		void LoadKind(ContactKindType *KindType);
+		void LoadGender(wxString *GenderComponent, wxString *GenderIdentity);
 		void LoadName(wxString *NameTitle, wxString *NameForename,
 			wxString *NameSurname, wxString *NameOtherNames, 
 			wxString *NameSuffix);
-		void LoadMember(std::map<int,wxString> *GroupsList);
+		void LoadMember(std::map<int,wxString> *GroupList);
 		void LoadAddress(std::map<int, wxString> *GeneralAddressList,
 			std::map<int, wxString> *GeneralAddressListTown,
 			std::map<int, wxString> *GeneralAddressListCounty,
@@ -677,22 +626,77 @@ class frmContactEditor : public frmContactEditorADT
 			std::map<int, wxString> *BusinessAddressListTown,
 			std::map<int, wxString> *BusinessAddressListCounty,
 			std::map<int, wxString> *BusinessAddressListPostCode,
-			std::map<int, int> *BusinessAddressListPref,
+			std::map<int, int> *BusinessAddressListPref, 
 			int *AddressCount);
-		void LoadTimeZone(std::map<int, wxString> *GeneralTZListPtr,
-			std::map<int, int> *GeneralTZListPrefPtr,
-			std::map<int, wxString> *HomeTZListPtr,
-			std::map<int, int> *HomeTZListPrefPtr,
-			std::map<int, wxString> *BusinessTZListPtr,
-			std::map<int, int> *BusinessTZListPrefPtr,
-			int *TZCount);
-		void LoadEmail(std::map<int, wxString> *GeneralEmailListPtr,
-			std::map<int, int> *GeneralEmailListPrefPtr,
-			std::map<int, wxString> *HomeEmailListPtr,
-			std::map<int, int> *HomeEmailListPrefPtr,
-			std::map<int, wxString> *BusinessEmailListPtr,
-			std::map<int, int> *BusinessEmailListPrefPtr,
-			int *EmailCount);
+		
+		void 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> *BusinessTZPref,
+			wxListCtrl *BusinessListCtrl,
+			int *DataCount);
+		
+		void LoadData(std::map<int, wxString> *GeneralList,
+			std::map<int, int> *GeneralListPref,
+			std::map<int, wxString> *GeneralListType,
+			wxListCtrl *GeneralListCtrl,
+			std::map<int, wxString> *HomeList,
+			std::map<int, int> *HomeListPref,
+			std::map<int, wxString> *HomeListType,
+			wxListCtrl *HomeListCtrl,
+			std::map<int, wxString> *BusinessList,
+			std::map<int, int> *BusinessListPref,
+			std::map<int, wxString> *BusinessListType,
+			wxListCtrl *BusinessListCtrl,
+			int *DataCount);
+		
+		void LoadData(std::map<int,wxString> *ItemList,
+			std::map<int,int> *ItemListPref,
+			wxListCtrl *ItemCtrl,
+			int *DataCount);
+
+		void LoadData(std::map<int,wxString> *ItemList,
+			std::map<int,int> *ItemListPref,
+			std::map<int,wxString> *ItemListType,
+			wxListCtrl *ItemCtrl,
+			int *DataCount);
+	
+		void LoadData(wxString ItemName,
+			std::map<int,wxString> *ItemList,
+			std::map<int,int> *ItemListPref,
+			std::map<int,wxString> *ItemListType,
+			std::map<int,wxString> *ItemListDataType,
+			wxListCtrl *ItemCtrl,
+			int *DataCount);
+			
+		void LoadPictureData(wxString ItemName, 
+			std::map<int,std::string> *ItemList,
+			std::map<int,int> *ItemListPref,
+			std::map<int,wxString> *ItemListType,
+			wxListCtrl *ItemCtrl,
+			int *DataCount);
+			
+		void LoadVendorData(std::map<int,wxString> *ItemListPEN,
+			std::map<int,wxString> *ItemListElement,
+			wxListCtrl *ItemCtrl,
+			int *DataCount);
+
+		void LoadXTokenData(std::map<int,wxString> *ItemListTokens,
+			wxListCtrl *ItemCtrl,
+			int *DataCount);
+			
+		void LoadData(std::map<int,wxString> *ItemList,
+			wxComboBox *ItemCtrl);
+			
+		void LoadRelatedData(std::map<int,wxString> *ItemList,
+			std::map<int,int> *ItemListPref,
+			std::map<int,wxString> *ItemListType,
+			wxListCtrl *ItemCtrl,
+			int *DataCount);
 	
 		int intValueSeek = 1;
 		bool IsGroup = FALSE;