X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2FfrmMain.cpp;h=63f0015035476b7526ca342c36a5a41497394e21;hp=4dc43f6d90f1837155cf24e5886edaece88f4da9;hb=d1663f3d3931bb05c791ef2c86926a22932c6014;hpb=56ae8d824bd9183aa8658dccda528fba2548d834

diff --git a/source/frmMain.cpp b/source/frmMain.cpp
index 4dc43f6..63f0015 100644
--- a/source/frmMain.cpp
+++ b/source/frmMain.cpp
@@ -1103,7 +1103,7 @@ void frmMain::ShowContactInfo( wxListEvent& event )
     
 	OldSessionID = SessionID;
 	SessionID = wxString::Format(wxT("%i"), rand() % 32768);
-	LoadContactData(&Person, htmContactData, SessionID, OldSessionID, &MemoryFileList);
+	LoadContactData(&Person, htmContactData, SessionID, OldSessionID, &MemoryFileList, ContactBackgroundColour.GetAsString(wxC2S_CSS_SYNTAX));
 	ActiveFilename = ContactsFileIndex[ContactSeekNum];
     
 }
@@ -1349,6 +1349,7 @@ void frmMain::OpenContactInfoList( wxListEvent& event )
 	wxPostEvent(this, addevent);
     
 	Contact->SetupPointers(&MemoryFileList);
+	Contact->SetBackgroundColour(ContactBackgroundColour.GetAsString(wxC2S_CSS_SYNTAX));
 	Contact->SetupContactData(&Person);
     
 	Contact->SetIcon(contacticon);
@@ -1406,6 +1407,7 @@ void frmMain::OpenContactInfo( wxCommandEvent& event )
 	wxPostEvent(this, addevent);
     
 	Contact->SetupPointers(&MemoryFileList);
+	Contact->SetBackgroundColour(ContactBackgroundColour.GetAsString(wxC2S_CSS_SYNTAX));
 	Contact->SetupContactData(&Person);
     
 	Contact->SetIcon(contacticon);
@@ -1435,13 +1437,20 @@ void frmMain::LoadPreferences(){
     
 	bool SaveWindowPos = preferences.GetBoolData(wxT("SaveWindowPosition"));
 	bool HideLocalABs = preferences.GetBoolData(wxT("HideLocalAddressBooks"));
+	bool UseBackgroundContactColour = preferences.GetBoolData(wxT("UseBackgroundContactColour"));
     
-	if (SaveWindowPos == TRUE){
+	if (SaveWindowPos == true){
         
 		this->SetSize(preferences.GetMainWindowData());
         
 	}
     
+	if (UseBackgroundContactColour == true){
+		
+		ContactBackgroundColour = preferences.GetBackgroundContactColourData();
+		
+	}
+	
 	treAccounts->DeleteAllItems();
     
 	wxTreeItemId RootNode = treAccounts->AddRoot(wxT("Root Item"), AccountNoneID);
@@ -1494,7 +1503,7 @@ void frmMain::LoadPreferences(){
 	for (int i = 0; i < preferences.accounts.GetCount(); i++){
 		
 		if ((preferences.accounts.GetAccountType(i) == wxT("Local") ||
-			preferences.accounts.GetAccountType(i) == wxT("local")) && HideLocalABs == TRUE){
+			preferences.accounts.GetAccountType(i) == wxT("local")) && HideLocalABs == true){
             
 			continue;
             
@@ -1634,7 +1643,7 @@ void frmMain::ConflictResolution(wxCommandEvent& event){
 	vCardConflictObj *vCardConfObj = (vCardConflictObj*)event.GetClientData();
 	vCard *ClientDataPtr = vCardConfObj->vCardLocalData;
 	vCard *ServerDataPtr = vCardConfObj->vCardServerData;
-	frameCR->LoadData(ClientDataPtr, ServerDataPtr, &MemoryFileList);
+	frameCR->LoadData(ClientDataPtr, ServerDataPtr, &MemoryFileList, ContactBackgroundColour.GetAsString(wxC2S_CSS_SYNTAX));
 	frameCR->ShowModal();
     
 	int FinalConflictResult = frameCR->GetResult();
@@ -1744,6 +1753,7 @@ void frmMain::UpdateContactList(wxCommandEvent& event){
             
 			vCard UpdatedPerson;
 			UpdatedPerson.LoadFile(ucd->ContactFilename);
+			frmContactPtr->SetBackgroundColour(ContactBackgroundColour.GetAsString(wxC2S_CSS_SYNTAX));
 			frmContactPtr->SetupContactData(&UpdatedPerson);
             
 		}