X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FfrmMain.cpp;h=b5dae8a3d93c1c88f3d70ac8b032c054901ced51;hb=e966fc4469f3a62433227a20a7fd17d5ff32a169;hp=f7026d8452768e9b0c5a3e7f6a2e11ab87368931;hpb=eca779d6c7d0b6e6836f725159b2269231a6dd4f;p=xestiaab%2F.git diff --git a/source/frmMain.cpp b/source/frmMain.cpp index f7026d8..b5dae8a 100644 --- a/source/frmMain.cpp +++ b/source/frmMain.cpp @@ -63,11 +63,6 @@ #include "version.h" -//extern const wxEventType MyHaremEvent = wxNewEventType(); - -//#define CE_UPDATECONTACTLIST 7700 -//#define CE_UPDATEACCOUNTLIST 7701 - DEFINE_EVENT_TYPE(CE_UPDATECONTACTLIST); DEFINE_EVENT_TYPE(CE_UPDATEACCOUNTLIST); DEFINE_EVENT_TYPE(SE_UPDATECONTACTNOTIF); @@ -464,9 +459,10 @@ void frmMain::OpenPreferences( wxCommandEvent& event) if (ReloadAccounts == TRUE){ // Reload the accounts as a change has been made within - // the application. + // the application and clear the current contact information. this->LoadPreferences(); + this->ResetContactInfo(); } @@ -488,14 +484,14 @@ void frmMain::OpenNewABDialog( wxCommandEvent& event) frameNewAccount->ShowModal(); delete frameNewAccount; frameNewAccount = NULL; - + if (ReloadAccounts == TRUE){ - + // Reload the accounts as a change has been made within // the application. this->LoadPreferences(); - + } } @@ -2820,4 +2816,12 @@ void frmMain::ShowContactMenu( wxMouseEvent& event ){ this->PopupMenu(ContactMenu->MenuPointer(), wxDefaultPosition); +} + +void frmMain::ResetContactInfo(){ + + wxString EmptyPage = wxT(""); + htmContactData->SetPage(EmptyPage); + AccCtrl->SetValue(""); + } \ No newline at end of file