From 00782471e1ec43f316e725e4008f1dc93dbd8cd2 Mon Sep 17 00:00:00 2001
From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Mon, 28 Dec 2015 18:48:20 +0000
Subject: [PATCH] Introduced simplified LoadGender.

---
 .../contacteditor/frmContactEditor-Load.cpp   |  9 +++-
 .../frmContactEditor-LoadGender.cpp           | 42 +++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/source/contacteditor/frmContactEditor-Load.cpp b/source/contacteditor/frmContactEditor-Load.cpp
index 6b97937..6d63680 100644
--- a/source/contacteditor/frmContactEditor-Load.cpp
+++ b/source/contacteditor/frmContactEditor-Load.cpp
@@ -30,6 +30,7 @@
 #include "../vcard/vcard.h"
 #include "../common/textprocessing.h"
 #include "../common/dirs.h"
+#include "cdo/ContactDataObject.h"
 
 bool frmContactEditor::LoadContact(wxString Filename){
 
@@ -61,6 +62,8 @@ bool frmContactEditor::LoadContact(wxString Filename){
 	
 	}
 	
+	ContactEditorData.LoadFile(Filename);
+	
 	ContactFile.ReadAll(&wxSContactString, wxConvAuto());
 	
 	// Split the lines.
@@ -133,6 +136,10 @@ bool frmContactEditor::LoadContact(wxString Filename){
 	int XTokenCount = 0;
 	//int intValueSeek = 1;
 
+	// Process the Gender (GENDER).
+	
+	LoadGender(&ContactEditorData.Gender, &ContactEditorData.GenderDetails);
+
 	for (std::map<int,wxString>::iterator iter = ContactFileLines.begin(); 
 	 iter != ContactFileLines.end(); ++iter){
 	
@@ -268,7 +275,7 @@ bool frmContactEditor::LoadContact(wxString Filename){
 		
 			// See frmContactEditor-LoadGender.cpp
 		
-			LoadGender(wxSPropertySeg1, wxSPropertySeg2, &GenderProcessed, &ContactData);
+			//LoadGender(wxSPropertySeg1, wxSPropertySeg2, &GenderProcessed, &ContactData);
 		
 		} else if (wxSProperty == wxT("BDAY") && BirthdayProcessed == FALSE){
 
diff --git a/source/contacteditor/frmContactEditor-LoadGender.cpp b/source/contacteditor/frmContactEditor-LoadGender.cpp
index b4159fe..1b0e98a 100644
--- a/source/contacteditor/frmContactEditor-LoadGender.cpp
+++ b/source/contacteditor/frmContactEditor-LoadGender.cpp
@@ -18,6 +18,48 @@
 
 #include "frmContactEditor.h"
 
+void frmContactEditor::LoadGender(wxString *GenderComponent, wxString *GenderIdentity){
+
+	// Deal with the Gender Component.
+	
+	if (*GenderComponent == wxT("M")){
+		
+		// Gender is Male.
+			
+		cmbGender->SetSelection(1);
+		
+	} else if (*GenderComponent == wxT("F")){
+		
+		// Gender is Female.
+			
+		cmbGender->SetSelection(2);					
+		
+	} else if (*GenderComponent == wxT("O")){
+		
+		// Gender is Other.
+			
+		cmbGender->SetSelection(3);
+		
+	} else if (*GenderComponent == wxT("N")){
+		
+		// Gender is None/Not Applicable.
+		
+		cmbGender->SetSelection(4);					
+		
+	} else if (*GenderComponent == wxT("U")){
+		
+		// Gender is Unknown.
+			
+		cmbGender->SetSelection(5);					
+		
+	}
+	
+	// Deal with the Gender Identity.
+
+	txtGenderDescription->SetValue(*GenderIdentity);
+
+}
+
 void frmContactEditor::LoadGender(wxString wxSPropertySeg1, wxString wxSPropertySeg2, bool *GenderProcessed, vCard *ContactData){
 
 	std::map<int, int> SplitPoints;
-- 
2.39.5