Not Logged In
|
Login
|
Register
Home
|
News
|
Projects
|
Releases
Bugs
|
RFE
|
Repositories
|
Help
projects
/
xestiaab
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove commented out code in frmMain
[xestiaab/.git]
/
source
/
frmMain.cpp
diff --git
a/source/frmMain.cpp
b/source/frmMain.cpp
index
f7026d8
..
b5dae8a
100644
(file)
--- a/
source/frmMain.cpp
+++ b/
source/frmMain.cpp
@@
-63,11
+63,6
@@
#include "version.h"
#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);
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
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->LoadPreferences();
+ this->ResetContactInfo();
}
}
@@
-488,14
+484,14
@@
void frmMain::OpenNewABDialog( wxCommandEvent& event)
frameNewAccount->ShowModal();
delete frameNewAccount;
frameNewAccount = NULL;
frameNewAccount->ShowModal();
delete frameNewAccount;
frameNewAccount = NULL;
-
+
if (ReloadAccounts == TRUE){
if (ReloadAccounts == TRUE){
-
+
// Reload the accounts as a change has been made within
// the application.
this->LoadPreferences();
// 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);
this->PopupMenu(ContactMenu->MenuPointer(), wxDefaultPosition);
+}
+
+void frmMain::ResetContactInfo(){
+
+ wxString EmptyPage = wxT("");
+ htmContactData->SetPage(EmptyPage);
+ AccCtrl->SetValue("");
+
}
\ No newline at end of file
}
\ No newline at end of file
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy