X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2FfrmPreferences.cpp;h=e8e37540acef2289ae9fe9c3823406749676c381;hp=03bcd5ecb2aec2c606b136ee240d3ee56077f88b;hb=76214fdd5e820c60a468a62fa586749102310f21;hpb=176323555ae58da5fec1ac843e0c613a0b9dabba

diff --git a/source/frmPreferences.cpp b/source/frmPreferences.cpp
index 03bcd5e..e8e3754 100644
--- a/source/frmPreferences.cpp
+++ b/source/frmPreferences.cpp
@@ -22,8 +22,7 @@
 #include "frmMain.h"
 #include "common/preferences.h"
 #include "common/dirs.h"
-#include "bitmaps.h"
-#include "bitmaps/preferences.h"
+#include "Bitmaps.h"
 
 #include "import/import.h"
 #include "export/export.h"
@@ -326,19 +325,31 @@ void frmPreferences::LoadPreferences( wxInitDialogEvent& event )
     
 	bool SaveWindowPos = preferences->GetBoolData(wxT("SaveWindowPosition"));
 	bool HideLocalABs = preferences->GetBoolData(wxT("HideLocalAddressBooks"));
+	bool UseBackgroundContactColour = preferences->GetBoolData(wxT("UseBackgroundContactColour"));
     
-	if (SaveWindowPos == TRUE){
+	if (SaveWindowPos == true){
     
-		chkSaveWindowPosition->SetValue(TRUE);
+		chkSaveWindowPosition->SetValue(true);
     
 	}
     
-	if (HideLocalABs == TRUE){
+	if (HideLocalABs == true){
     
-		chkHideLocal->SetValue(TRUE);
+		chkHideLocal->SetValue(true);
     
 	}
     
+	if (UseBackgroundContactColour == true){
+		
+		chkUseBackgroundColour->SetValue(true);
+		clpContactBackgroundColour->SetColour(preferences->GetBackgroundContactColourData());
+		
+	} else {
+		
+		clpContactBackgroundColour->Enable(false);
+		
+	}
+	
 	// Setup the Themes tab.
 
 	wxListItem themecol0;
@@ -475,6 +486,19 @@ void frmPreferences::SavePreferences(wxCommandEvent &event){
 		*ReloadAccountConfig = TRUE;
 	
 	}
+	
+	if (chkUseBackgroundColour->GetValue() == TRUE){
+		
+		cfgfile->Write(wxT("UseBackgroundContactColour"), wxT("true"));
+		cfgfile->Write(wxT("BackgroundContactColour"), clpContactBackgroundColour->GetColour().GetAsString(wxC2S_HTML_SYNTAX));
+		*ReloadAccountConfig = TRUE;
+		
+	} else {
+
+		cfgfile->Write(wxT("UseBackgroundContactColour"), wxT("false"));
+		*ReloadAccountConfig = TRUE;
+		
+	}
 
 	delete cfgfile;
 	cfgfile = NULL;
@@ -483,10 +507,20 @@ void frmPreferences::SavePreferences(wxCommandEvent &event){
 
 }
 
+void frmPreferences::EnableBackgroundColourPicker(wxCommandEvent &event){
+	
+	if (chkUseBackgroundColour->GetValue() == true){
+		clpContactBackgroundColour->Enable(true);
+	} else {
+		clpContactBackgroundColour->Enable(false);
+	}
+	
+}
+
 void frmPreferences::CloseWindow(wxCommandEvent &event){
 
 	// Close the preferences window.
 	
 	this->Close();
 
-}
\ No newline at end of file
+}