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
Removed unused code from vcard/vcard.cpp
[xestiaab/.git]
/
source
/
frmContact.cpp
diff --git
a/source/frmContact.cpp
b/source/frmContact.cpp
index
da88511
..
5df8728
100644
(file)
--- a/
source/frmContact.cpp
+++ b/
source/frmContact.cpp
@@
-39,6
+39,8
@@
void frmContact::CloseWindowProcessing(){
void frmContact::CloseWindow( wxCommandEvent& event ){
void frmContact::CloseWindow( wxCommandEvent& event ){
+ // Close this window.
+
this->Close();
}
this->Close();
}
@@
-50,49
+52,56
@@
void frmContact::CloseWindow( wxCloseEvent& event ){
wxFileSystem::AddHandler(new wxMemoryFSHandler);
wxFileSystem::AddHandler(new wxMemoryFSHandler);
- if (MemoryFSListPtr->find(SessionID) == MemoryFSListPtr->end()){
+ // Check if frmContact is the main window, if not
+ // then do some clear up.
+
+ if (StartupMode == false){
+
+ if (MemoryFSListPtr->find(SessionID) == MemoryFSListPtr->end()){
- } else {
+
} else {
- std::map<wxString, wxString>::iterator striter;
+
std::map<wxString, wxString>::iterator striter;
- for (striter = MemoryFSListPtr->begin(); striter != MemoryFSListPtr->end(); striter++){
+
for (striter = MemoryFSListPtr->begin(); striter != MemoryFSListPtr->end(); striter++){
- if (SessionID == striter->second){
+
if (SessionID == striter->second){
- // Delete the references from the wxMemoryFSHandler
- // and the entry from the map.
+
// Delete the references from the wxMemoryFSHandler
+
// and the entry from the map.
- wxMemoryFSHandler::RemoveFile(striter->first);
+
wxMemoryFSHandler::RemoveFile(striter->first);
- break;
+
break;
- }
+
}
- }
+
}
- MemoryFSListPtr->erase(striter);
+
MemoryFSListPtr->erase(striter);
- }
+
}
- WindowData *WData = new WindowData;
+
WindowData *WData = new WindowData;
- WData->DataType = 0;
- WData->WindowPointer = this;
- WData->WindowID = ContactUID;
+
WData->DataType = 0;
+
WData->WindowPointer = this;
+
WData->WindowID = ContactUID;
- wxCommandEvent delevent(WINDOW_CLOSE);
- delevent.SetClientData(WData);
- wxPostEvent(GetParent(), delevent);
+
wxCommandEvent delevent(WINDOW_CLOSE);
+
delevent.SetClientData(WData);
+
wxPostEvent(GetParent(), delevent);
+ }
+
Destroy();
}
Destroy();
}
-
-
bool frmContact::SetupContactData(vCard *vCardObj){
bool frmContact::SetupContactData(vCard *vCardObj){
+ // Setup the contact information.
+
wxFileSystem::AddHandler(new wxMemoryFSHandler);
for (std::map<wxString, wxString>::iterator striter = MemoryFSListPtr->begin();
wxFileSystem::AddHandler(new wxMemoryFSHandler);
for (std::map<wxString, wxString>::iterator striter = MemoryFSListPtr->begin();
@@
-113,37
+122,61
@@
bool frmContact::SetupContactData(vCard *vCardObj){
OldSessionID = SessionID;
SessionID = wxString::Format(wxT("%i"), rand() % 32768);
LoadContactData(vCardObj, htmContactData, SessionID, OldSessionID, MemoryFSListPtr);
OldSessionID = SessionID;
SessionID = wxString::Format(wxT("%i"), rand() % 32768);
LoadContactData(vCardObj, htmContactData, SessionID, OldSessionID, MemoryFSListPtr);
- SetTitle(vCardObj->Get(wxT("FN")));
+ ArrayvCardOutData FNList;
+ FNList = vCardObj->GetByPartial(wxT("FN"));
+
+ if (FNList.PropCount > 0){
+ FNList.PropValues[0].Trim();
+ SetTitle(FNList.PropValues[0]);
+ }
+
+ if (StartupMode == false){
+
+ WindowData *WData = new WindowData;
-
WindowData *WData = new WindowData
;
+
vCardFilename = vCardObj->GetFilename()
;
- vCardFilename = vCardObj->GetFilename();
+ WData->DataType = 0;
+ WData->WindowPointer = this;
+ WData->WindowID = ContactUID;
+
+ wxCommandEvent editevent(WINDOW_EDIT);
+ editevent.SetClientData(WData);
+ wxPostEvent(GetParent(), editevent);
+
+ }
- WData->DataType = 0;
- WData->WindowPointer = this;
- WData->WindowID = ContactUID;
+ return TRUE;
+}
- wxCommandEvent editevent(WINDOW_EDIT);
- editevent.SetClientData(WData);
- wxPostEvent(GetParent(), editevent);
+void frmContact::SetMode(bool StartupModeIn){
- return TRUE;
+ // Set the mode which frmContact will be operating.
+
+ StartupMode = StartupModeIn;
+
}
void frmContact::SetupPointers(std::map<wxString,wxString> *MemoryFSListIncPtr){
}
void frmContact::SetupPointers(std::map<wxString,wxString> *MemoryFSListIncPtr){
+ // Set the pointer for the Memory Filesystem map.
+
MemoryFSListPtr = MemoryFSListIncPtr;
}
void frmContact::SetUID(int UID){
MemoryFSListPtr = MemoryFSListIncPtr;
}
void frmContact::SetUID(int UID){
+ // Set the UID of the contact window.
+
ContactUID = UID;
}
wxString frmContact::GetFilename(){
ContactUID = UID;
}
wxString frmContact::GetFilename(){
+ // Get the filename of the contact being displayed.
+
return vCardFilename;
}
\ No newline at end of file
return vCardFilename;
}
\ 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