X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FAppXestiaAddrBk.cpp;h=3e55af5fc9d6fae879272bb515c1e7ce81b91d37;hb=ef80b7d71f4772d3ab734da6b32a2c3508ce85e8;hp=ba931453e6a7f78df08fd7565f0d498c0648becb;hpb=22af4b5592eaf19b616b5f0a07d25f6f9a00b364;p=xestiaab%2F.git

diff --git a/source/AppXestiaAddrBk.cpp b/source/AppXestiaAddrBk.cpp
index ba93145..3e55af5 100644
--- a/source/AppXestiaAddrBk.cpp
+++ b/source/AppXestiaAddrBk.cpp
@@ -547,19 +547,34 @@ frmPreferencesADT::frmPreferencesADT( wxWindow* parent, wxWindowID id, const wxS
 	
 	NbtPreferences = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 	tabGeneral = new wxPanel( NbtPreferences, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* szrChecks;
-	szrChecks = new wxBoxSizer( wxVERTICAL );
+	wxFlexGridSizer* szrGeneral;
+	szrGeneral = new wxFlexGridSizer( 2, 2, 0, 0 );
+	szrGeneral->AddGrowableCol( 1 );
+	szrGeneral->SetFlexibleDirection( wxBOTH );
+	szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	bmpWindowPosition = new wxStaticBitmap( tabGeneral, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 32,32 ), 0 );
+	bmpWindowPosition->SetMinSize( wxSize( 32,32 ) );
+	bmpWindowPosition->SetMaxSize( wxSize( 32,32 ) );
+	
+	szrGeneral->Add( bmpWindowPosition, 0, wxALL, 5 );
 	
 	chkSaveWindowPosition = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Save window position on exit"), wxDefaultPosition, wxDefaultSize, 0 );
-	szrChecks->Add( chkSaveWindowPosition, 0, wxALL, 5 );
+	szrGeneral->Add( chkSaveWindowPosition, 0, wxALL, 5 );
+	
+	bmpLocalAddressBooks = new wxStaticBitmap( tabGeneral, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 32,32 ), 0 );
+	bmpLocalAddressBooks->SetMinSize( wxSize( 32,32 ) );
+	bmpLocalAddressBooks->SetMaxSize( wxSize( 32,32 ) );
+	
+	szrGeneral->Add( bmpLocalAddressBooks, 0, wxALL, 5 );
 	
 	chkHideLocal = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Hide local address books"), wxDefaultPosition, wxDefaultSize, 0 );
-	szrChecks->Add( chkHideLocal, 0, wxALL, 5 );
+	szrGeneral->Add( chkHideLocal, 0, wxALL, 5 );
 	
 	
-	tabGeneral->SetSizer( szrChecks );
+	tabGeneral->SetSizer( szrGeneral );
 	tabGeneral->Layout();
-	szrChecks->Fit( tabGeneral );
+	szrGeneral->Fit( tabGeneral );
 	NbtPreferences->AddPage( tabGeneral, wxT("General"), true );
 	tabTheme = new wxPanel( NbtPreferences, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	tabTheme->Hide();
@@ -637,6 +652,24 @@ frmPreferencesADT::frmPreferencesADT( wxWindow* parent, wxWindowID id, const wxS
 	tabAccounts->Layout();
 	szrAccounts->Fit( tabAccounts );
 	NbtPreferences->AddPage( tabAccounts, wxT("Accounts"), false );
+	tabContacts = new wxPanel( NbtPreferences, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxFlexGridSizer* szrContacts;
+	szrContacts = new wxFlexGridSizer( 1, 2, 0, 0 );
+	szrContacts->AddGrowableCol( 0 );
+	szrContacts->SetFlexibleDirection( wxBOTH );
+	szrContacts->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	chkUseBackgroundColour = new wxCheckBox( tabContacts, wxID_ANY, wxT("Use different background colour"), wxDefaultPosition, wxDefaultSize, 0 );
+	szrContacts->Add( chkUseBackgroundColour, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	clpContactBackgroundColour = new wxColourPickerCtrl( tabContacts, wxID_ANY, wxColour( 255, 255, 255 ), wxDefaultPosition, wxDefaultSize, wxCLRP_DEFAULT_STYLE );
+	szrContacts->Add( clpContactBackgroundColour, 0, wxALL, 5 );
+	
+	
+	tabContacts->SetSizer( szrContacts );
+	tabContacts->Layout();
+	szrContacts->Fit( tabContacts );
+	NbtPreferences->AddPage( tabContacts, wxT("Contacts"), false );
 	
 	szrTabs->Add( NbtPreferences, 1, wxALL|wxEXPAND, 5 );
 	
@@ -678,11 +711,13 @@ frmPreferencesADT::frmPreferencesADT( wxWindow* parent, wxWindowID id, const wxS
 	btnThemeAdd->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::AddABAccount ), NULL, this );
 	btnThemeModify->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::ModifyABAccount ), NULL, this );
 	btnThemeDelete->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::DeleteABAccount ), NULL, this );
+	lstAccounts->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( frmPreferencesADT::ModifyABAccount ), NULL, this );
 	lstAccounts->Connect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( frmPreferencesADT::DisableABButtons ), NULL, this );
 	lstAccounts->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( frmPreferencesADT::EnableABButtons ), NULL, this );
 	btnAccountAdd->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::AddABAccount ), NULL, this );
 	btnAccountModify->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::ModifyABAccount ), NULL, this );
 	btnAccountDelete->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::DeleteABAccount ), NULL, this );
+	chkUseBackgroundColour->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmPreferencesADT::EnableBackgroundColourPicker ), NULL, this );
 	btnSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::SavePreferences ), NULL, this );
 	btnCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::CloseWindow ), NULL, this );
 }
@@ -696,11 +731,13 @@ frmPreferencesADT::~frmPreferencesADT()
 	btnThemeAdd->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::AddABAccount ), NULL, this );
 	btnThemeModify->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::ModifyABAccount ), NULL, this );
 	btnThemeDelete->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::DeleteABAccount ), NULL, this );
+	lstAccounts->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( frmPreferencesADT::ModifyABAccount ), NULL, this );
 	lstAccounts->Disconnect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( frmPreferencesADT::DisableABButtons ), NULL, this );
 	lstAccounts->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( frmPreferencesADT::EnableABButtons ), NULL, this );
 	btnAccountAdd->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::AddABAccount ), NULL, this );
 	btnAccountModify->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::ModifyABAccount ), NULL, this );
 	btnAccountDelete->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::DeleteABAccount ), NULL, this );
+	chkUseBackgroundColour->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmPreferencesADT::EnableBackgroundColourPicker ), NULL, this );
 	btnSave->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::SavePreferences ), NULL, this );
 	btnCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::CloseWindow ), NULL, this );