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

diff --git a/source/frmMain.cpp b/source/frmMain.cpp
index e9ce304..228c7a6 100644
--- a/source/frmMain.cpp
+++ b/source/frmMain.cpp
@@ -428,7 +428,7 @@ void frmMain::QuitApp()
     
 	if (SaveWindowPos == TRUE){
         
-		wxRect frmMainPos = this->GetRect();
+		wxRect frmMainPos = GetRect();
         
 		cfgfile->Write(wxT("WindowPositionX"), frmMainPos.GetX());
 		cfgfile->Write(wxT("WindowPositionY"), frmMainPos.GetY());
@@ -440,7 +440,7 @@ void frmMain::QuitApp()
 	delete cfgfile;
 	cfgfile = NULL;
     
-	//Everything closed... exit.
+	// Everything closed... exit.
     
 	std::exit(0);
     
@@ -497,7 +497,7 @@ void frmMain::OpenPreferences( wxCommandEvent& event)
 		// Reload the accounts as a change has been made within
 		// the application and clear the current contact information.
         
-		this->LoadPreferences();
+		this->LoadPreferences(true);
 		this->ResetContactInfo();
 	
 	}
@@ -522,7 +522,7 @@ void frmMain::OpenNewABDialog( wxCommandEvent& event)
 		// Reload the accounts as a change has been made within
 		// the application.
         
-		this->LoadPreferences();
+		this->LoadPreferences(true);
 
 	}
     
@@ -737,8 +737,6 @@ void frmMain::LoadContactList( wxTreeEvent& event )
                         
 						// Split the name into sections.
                         
-						vCardDataString = Person.Get(wxT("N"));
-                        
 						vCardName NameData = Person.GetName();
                         
 						vCardDataString = NameData.Forename + wxT(" ") + NameData.Surname;
@@ -1108,7 +1106,7 @@ void frmMain::ShowContactInfo( wxListEvent& event )
     
 	OldSessionID = SessionID;
 	SessionID = wxString::Format(wxT("%i"), rand() % 32768);
-	LoadContactData(&Person, htmContactData, SessionID, OldSessionID, &MemoryFileList, ContactBackgroundColour.GetAsString(wxC2S_CSS_SYNTAX));
+	LoadContactData(&Person, htmContactData, SessionID, OldSessionID, &MemoryFileList, ContactBackgroundColour);
 	ActiveFilename = ContactsFileIndex[ContactSeekNum];
     
 }
@@ -1426,11 +1424,11 @@ void frmMain::LoadPreferences( wxActivateEvent& event)
 
 	// Load the preferences.
 
-	this->LoadPreferences();
+	this->LoadPreferences(true);
 	
 }
 
-void frmMain::LoadPreferences(){
+void frmMain::LoadPreferences(bool skipWindowSizeReload){
     
 	// Load the preferences.
     
@@ -1438,13 +1436,20 @@ void frmMain::LoadPreferences(){
     
 	XABPreferences preferences(preffilename);
     
+	// Clear the active account/filename information and account list.
+
+	ActiveAccount = "";
+	ActiveAccountType = "";
+	ActiveFilename = "";
+	lstContacts->DeleteAllItems();
+
 	// Setup the main window position (if needed).
     
 	bool SaveWindowPos = preferences.GetBoolData(wxT("SaveWindowPosition"));
 	bool HideLocalABs = preferences.GetBoolData(wxT("HideLocalAddressBooks"));
 	bool UseBackgroundContactColour = preferences.GetBoolData(wxT("UseBackgroundContactColour"));
     
-	if (SaveWindowPos == true){
+	if (SaveWindowPos == true && skipWindowSizeReload == false){
         
 		this->SetSize(preferences.GetMainWindowData());
         
@@ -1708,19 +1713,40 @@ void frmMain::UpdateContactList(wxCommandEvent& event){
                     
 					// First Name, Last Name.
                     
-					lstContacts->SetItem(longSelected, 0, ucd->ContactNameArray.Forename + wxT(" ") + ucd->ContactNameArray.Surname);
+					if (ucd->ContactNameArray.Forename == wxT("") && ucd->ContactNameArray.Surname == wxT(""))
+					{
+						lstContacts->SetItem(longSelected, 0, ucd->ContactName);
+					}
+					else
+					{
+						lstContacts->SetItem(longSelected, 0, ucd->ContactNameArray.Forename + wxT(" ") + ucd->ContactNameArray.Surname);
+					}
                     
 				} else if (SortMode == 2){
                     
 					// Last Name, First Name.
-                    
-					lstContacts->SetItem(longSelected, 0, ucd->ContactNameArray.Surname + wxT(", ") + ucd->ContactNameArray.Forename);
+
+					if (ucd->ContactNameArray.Forename == wxT("") && ucd->ContactNameArray.Surname == wxT(""))
+					{
+						lstContacts->SetItem(longSelected, 0, wxT(", ") + ucd->ContactName);
+					}
+					else
+					{
+						lstContacts->SetItem(longSelected, 0, ucd->ContactNameArray.Surname + wxT(", ") + ucd->ContactNameArray.Forename);
+					}
                     
 				} else if (SortMode == 3){
                     
 					// Nickname.
                     
-					lstContacts->SetItem(longSelected, 0, ucd->ContactNickname);
+					if (ucd->ContactNickname == wxT(""))
+					{
+						lstContacts->SetItem(longSelected, 0, _("(no nickname)"));
+					}
+					else
+					{
+						lstContacts->SetItem(longSelected, 0, ucd->ContactNickname);
+					}
                     
 				} else if (SortMode == 4){
                     
@@ -1830,7 +1856,7 @@ void frmMain::SetupForm(){
 	ciicon_png.LoadFile(ciextstream, wxBITMAP_TYPE_PNG);
 	wxMemoryFSHandler::AddFile(wxT("ciext.png"), ciicon_png, wxBITMAP_TYPE_PNG);
     
-	LoadPreferences();
+	LoadPreferences(false);
     
 }
 
@@ -1955,8 +1981,8 @@ void frmMain::RevealContact(wxCommandEvent& event){
                
 		if (uc->ContactAccount == AccountAccDirList[i]){
             
-		treAccounts->SelectItem(nextChild, TRUE);
-		AccCtrl->SetText(treAccounts->GetItemText(nextChild));
+			treAccounts->SelectItem(nextChild, TRUE);
+			AccCtrl->SetText(treAccounts->GetItemText(nextChild));
             
 		}