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

diff --git a/source/frmMain.cpp b/source/frmMain.cpp
index 63f0015..e9ce304 100644
--- a/source/frmMain.cpp
+++ b/source/frmMain.cpp
@@ -65,7 +65,6 @@
 // Define the event types.
 
 DEFINE_EVENT_TYPE(CE_UPDATECONTACTLIST);
-DEFINE_EVENT_TYPE(CE_UPDATEACCOUNTLIST);
 DEFINE_EVENT_TYPE(SE_UPDATECONTACTNOTIF);
 DEFINE_EVENT_TYPE(CE_OPENCONTACT);
 DEFINE_EVENT_TYPE(CE_OPENCONTACTLIST);
@@ -99,7 +98,6 @@ DEFINE_EVENT_TYPE(INVALIDSSLTRUST);
 BEGIN_EVENT_TABLE(frmMain, wxFrame)
 EVT_COMMAND(wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, frmMain::ConflictResolution)
 EVT_COMMAND(wxID_ANY, CE_UPDATECONTACTLIST, frmMain::UpdateContactList)
-EVT_COMMAND(wxID_ANY, CE_UPDATEACCOUNTLIST, frmMain::UpdateAccountList)
 EVT_COMMAND(wxID_ANY, SE_UPDATECONTACTNOTIF, frmMain::UpdateSearchContactLists)
 EVT_COMMAND(wxID_ANY, CE_OPENCONTACT, frmMain::OpenContactInfo)
 EVT_COMMAND(wxID_ANY, CE_OPENCONTACTLIST, frmMain::OpenContactInfoList)
@@ -477,6 +475,13 @@ void frmMain::ShowAboutWindow( wxCommandEvent& event )
 void frmMain::OpenPreferences( wxCommandEvent& event)
 {
 
+	// Close all windows first.
+	
+	if (CloseAllWindows() == false)
+	{
+		return;
+	}
+
 	// Open the preferences window.
     
 	ReloadAccounts = FALSE;
@@ -1449,7 +1454,11 @@ void frmMain::LoadPreferences(){
 		
 		ContactBackgroundColour = preferences.GetBackgroundContactColourData();
 		
-	}
+        } else {
+                
+                ContactBackgroundColour = wxTransparentColour;
+                
+        }
 	
 	treAccounts->DeleteAllItems();
     
@@ -1778,12 +1787,6 @@ void frmMain::UpdateContactList(wxCommandEvent& event){
     
 }
 
-void frmMain::UpdateAccountList(wxCommandEvent& event){
-    
-	// Update the account list (currently unimplemented).
-    
-}
-
 void frmMain::SetupPointers(void *ActMgrPtrInc){
     
 	// Setup the pointers for the main window.
@@ -3172,7 +3175,10 @@ void frmMain::ShowContactMenu( wxMouseEvent& event ){
 
 	bool EnableRefresh = FALSE;
 
-	if (!ActiveAccount.IsEmpty() && (ActiveAccountType == "CardDAV" || ActiveAccountType == "carddav")){
+	if (!ActiveAccount.IsEmpty() && (ActiveAccountType == "CardDAV" ||
+                ActiveAccountType == "carddav" ||
+                ActiveAccountType == "Local" ||
+                ActiveAccountType == "local")){
 
 		EnableRefresh = TRUE;
 	
@@ -3192,4 +3198,29 @@ void frmMain::ResetContactInfo(){
 	htmContactData->SetPage(EmptyPage);
 	AccCtrl->SetValue("");
 	
-}
\ No newline at end of file
+}
+
+bool frmMain::CloseAllWindows()
+{
+	// Attempt to close all windows.
+	
+	if (WindowListPointersMenu.size() == 0)
+	{
+		return true;
+	}
+	
+	if (wxMessageBox(_("Before preforming the action, all windows that are open will need to close. Do you wish to continue?"), _("Close All Windowss"), wxYES_NO) == wxYES)
+	{
+		for(std::map<int, void*>::iterator windowIter = WindowListPointers.begin();
+			windowIter != WindowListPointers.end(); windowIter++)
+		{
+			wxWindow *windowPointer = static_cast<wxWindow*>(windowIter->second);
+			windowPointer->Close();
+		}
+		return true;
+	}
+	else
+	{
+		return false;
+	}
+}