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
XABPriorityCtrl: Priority control implemented
[xestiaab/.git]
/
source
/
frmMain.cpp
diff --git
a/source/frmMain.cpp
b/source/frmMain.cpp
index
ffa99d2
..
63f0015
100644
(file)
--- a/
source/frmMain.cpp
+++ b/
source/frmMain.cpp
@@
-390,17
+390,11
@@
void frmMain::QuitApp()
{
// Function to run when quitting.
{
// Function to run when quitting.
-
- //Go through the windows and close each one (be it search
- //or contact editor). Abort if user wants to cancel.
-
- // Close the contact editor windows.
-
- // Close the contact windows.
-
- // Close the search windows.
-
+
// Write out the ETag databases.
// Write out the ETag databases.
+
+ ETagProcTimer.Stop();
+ ETagProcTimer.Notify();
// Save Preferences: Save the window position if that option is enabled.
// Save Preferences: Save the window position if that option is enabled.
@@
-1109,7
+1103,7
@@
void frmMain::ShowContactInfo( wxListEvent& event )
OldSessionID = SessionID;
SessionID = wxString::Format(wxT("%i"), rand() % 32768);
OldSessionID = SessionID;
SessionID = wxString::Format(wxT("%i"), rand() % 32768);
- LoadContactData(&Person, htmContactData, SessionID, OldSessionID, &MemoryFileList);
+ LoadContactData(&Person, htmContactData, SessionID, OldSessionID, &MemoryFileList
, ContactBackgroundColour.GetAsString(wxC2S_CSS_SYNTAX)
);
ActiveFilename = ContactsFileIndex[ContactSeekNum];
}
ActiveFilename = ContactsFileIndex[ContactSeekNum];
}
@@
-1355,6
+1349,7
@@
void frmMain::OpenContactInfoList( wxListEvent& event )
wxPostEvent(this, addevent);
Contact->SetupPointers(&MemoryFileList);
wxPostEvent(this, addevent);
Contact->SetupPointers(&MemoryFileList);
+ Contact->SetBackgroundColour(ContactBackgroundColour.GetAsString(wxC2S_CSS_SYNTAX));
Contact->SetupContactData(&Person);
Contact->SetIcon(contacticon);
Contact->SetupContactData(&Person);
Contact->SetIcon(contacticon);
@@
-1412,6
+1407,7
@@
void frmMain::OpenContactInfo( wxCommandEvent& event )
wxPostEvent(this, addevent);
Contact->SetupPointers(&MemoryFileList);
wxPostEvent(this, addevent);
Contact->SetupPointers(&MemoryFileList);
+ Contact->SetBackgroundColour(ContactBackgroundColour.GetAsString(wxC2S_CSS_SYNTAX));
Contact->SetupContactData(&Person);
Contact->SetIcon(contacticon);
Contact->SetupContactData(&Person);
Contact->SetIcon(contacticon);
@@
-1441,13
+1437,20
@@
void frmMain::LoadPreferences(){
bool SaveWindowPos = preferences.GetBoolData(wxT("SaveWindowPosition"));
bool HideLocalABs = preferences.GetBoolData(wxT("HideLocalAddressBooks"));
bool SaveWindowPos = preferences.GetBoolData(wxT("SaveWindowPosition"));
bool HideLocalABs = preferences.GetBoolData(wxT("HideLocalAddressBooks"));
+ bool UseBackgroundContactColour = preferences.GetBoolData(wxT("UseBackgroundContactColour"));
- if (SaveWindowPos ==
TRUE
){
+ if (SaveWindowPos ==
true
){
this->SetSize(preferences.GetMainWindowData());
}
this->SetSize(preferences.GetMainWindowData());
}
+ if (UseBackgroundContactColour == true){
+
+ ContactBackgroundColour = preferences.GetBackgroundContactColourData();
+
+ }
+
treAccounts->DeleteAllItems();
wxTreeItemId RootNode = treAccounts->AddRoot(wxT("Root Item"), AccountNoneID);
treAccounts->DeleteAllItems();
wxTreeItemId RootNode = treAccounts->AddRoot(wxT("Root Item"), AccountNoneID);
@@
-1500,7
+1503,7
@@
void frmMain::LoadPreferences(){
for (int i = 0; i < preferences.accounts.GetCount(); i++){
if ((preferences.accounts.GetAccountType(i) == wxT("Local") ||
for (int i = 0; i < preferences.accounts.GetCount(); i++){
if ((preferences.accounts.GetAccountType(i) == wxT("Local") ||
- preferences.accounts.GetAccountType(i) == wxT("local")) && HideLocalABs ==
TRUE
){
+ preferences.accounts.GetAccountType(i) == wxT("local")) && HideLocalABs ==
true
){
continue;
continue;
@@
-1640,7
+1643,7
@@
void frmMain::ConflictResolution(wxCommandEvent& event){
vCardConflictObj *vCardConfObj = (vCardConflictObj*)event.GetClientData();
vCard *ClientDataPtr = vCardConfObj->vCardLocalData;
vCard *ServerDataPtr = vCardConfObj->vCardServerData;
vCardConflictObj *vCardConfObj = (vCardConflictObj*)event.GetClientData();
vCard *ClientDataPtr = vCardConfObj->vCardLocalData;
vCard *ServerDataPtr = vCardConfObj->vCardServerData;
- frameCR->LoadData(ClientDataPtr, ServerDataPtr, &MemoryFileList);
+ frameCR->LoadData(ClientDataPtr, ServerDataPtr, &MemoryFileList
, ContactBackgroundColour.GetAsString(wxC2S_CSS_SYNTAX)
);
frameCR->ShowModal();
int FinalConflictResult = frameCR->GetResult();
frameCR->ShowModal();
int FinalConflictResult = frameCR->GetResult();
@@
-1750,6
+1753,7
@@
void frmMain::UpdateContactList(wxCommandEvent& event){
vCard UpdatedPerson;
UpdatedPerson.LoadFile(ucd->ContactFilename);
vCard UpdatedPerson;
UpdatedPerson.LoadFile(ucd->ContactFilename);
+ frmContactPtr->SetBackgroundColour(ContactBackgroundColour.GetAsString(wxC2S_CSS_SYNTAX));
frmContactPtr->SetupContactData(&UpdatedPerson);
}
frmContactPtr->SetupContactData(&UpdatedPerson);
}
@@
-2713,7
+2717,7
@@
void frmMain::ShowSSLCertificates( wxCommandEvent &event ){
SSLColIter = AccountSSLData.find(i);
SSLCertCollectionString SSLCertInfo = SSLColIter->second;
SSLColIter = AccountSSLData.find(i);
SSLCertCollectionString SSLCertInfo = SSLColIter->second;
-
+
frmSSLCertificate *frameSSLCert = new frmSSLCertificate ( this );
frameSSLCert->StartCertFrom(0);
frameSSLCert->SetupCertsString(SSLCertInfo);
frmSSLCertificate *frameSSLCert = new frmSSLCertificate ( this );
frameSSLCert->StartCertFrom(0);
frameSSLCert->SetupCertsString(SSLCertInfo);
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy