Capitalise Bitmaps and Tools directories

[xestiaab/.git] / source / frmPreferences.cpp

diff --git a/source/frmPreferences.cpp b/source/frmPreferences.cpp
index 03bcd5e..e8e3754 100644 (file)
--- 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
+}