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
Code cleanup and move of XABPreferences object creation to outside of the for loop...
[xestiaab/.git]
/
source
/
actmgr
/
frmActivityMgr.cpp
diff --git
a/source/actmgr/frmActivityMgr.cpp
b/source/actmgr/frmActivityMgr.cpp
index
e9c4469
..
546795a
100644
(file)
--- a/
source/actmgr/frmActivityMgr.cpp
+++ b/
source/actmgr/frmActivityMgr.cpp
@@
-45,6
+45,7
@@
DEFINE_EVENT_TYPE(ACTMGR_STOPTIMER);
DEFINE_EVENT_TYPE(ACTMGR_STARTPROCESSTIMER);
DEFINE_EVENT_TYPE(ACTMGR_STOPPROCESSTIMER);
DEFINE_EVENT_TYPE(ACTMGR_UPDATESTATUSLABEL);
DEFINE_EVENT_TYPE(ACTMGR_STARTPROCESSTIMER);
DEFINE_EVENT_TYPE(ACTMGR_STOPPROCESSTIMER);
DEFINE_EVENT_TYPE(ACTMGR_UPDATESTATUSLABEL);
+DEFINE_EVENT_TYPE(ACTMGR_STARTANIMATIONTIMER);
BEGIN_EVENT_TABLE(frmActivityMgr, wxWindow)
EVT_COMMAND(wxID_ANY, ACTMGR_RESUMEPROC, frmActivityMgr::ResumeProcessing)
BEGIN_EVENT_TABLE(frmActivityMgr, wxWindow)
EVT_COMMAND(wxID_ANY, ACTMGR_RESUMEPROC, frmActivityMgr::ResumeProcessing)
@@
-54,6
+55,7
@@
BEGIN_EVENT_TABLE(frmActivityMgr, wxWindow)
EVT_COMMAND(wxID_ANY, ACTMGR_STARTPROCESSTIMER, frmActivityMgr::StartProcessTimer)
EVT_COMMAND(wxID_ANY, ACTMGR_STOPPROCESSTIMER, frmActivityMgr::StopProcessTimer)
EVT_COMMAND(wxID_ANY, ACTMGR_UPDATESTATUSLABEL, frmActivityMgr::UpdateStatusLabel)
EVT_COMMAND(wxID_ANY, ACTMGR_STARTPROCESSTIMER, frmActivityMgr::StartProcessTimer)
EVT_COMMAND(wxID_ANY, ACTMGR_STOPPROCESSTIMER, frmActivityMgr::StopProcessTimer)
EVT_COMMAND(wxID_ANY, ACTMGR_UPDATESTATUSLABEL, frmActivityMgr::UpdateStatusLabel)
+ EVT_COMMAND(wxID_ANY, ACTMGR_STARTANIMATIONTIMER, frmActivityMgr::StartAnimationTimer)
END_EVENT_TABLE()
frmActivityMgr::frmActivityMgr( wxWindow* parent )
END_EVENT_TABLE()
frmActivityMgr::frmActivityMgr( wxWindow* parent )
@@
-194,6
+196,12
@@
void frmActivityMgr::ProcessTasksThread()
}
}
+ if (ApplicationSleepMode == TRUE){
+
+ return;
+
+ }
+
std::map<int,int>::iterator TypeIter;
std::map<int,wxString>::iterator StringIter;
std::map<int,wxString>::iterator StringDataIter;
std::map<int,int>::iterator TypeIter;
std::map<int,wxString>::iterator StringIter;
std::map<int,wxString>::iterator StringDataIter;
@@
-210,6
+218,7
@@
void frmActivityMgr::ProcessTasksThread()
std::map<int,long>::iterator LongIter;
bool TasksFoundProc = FALSE;
wxString TaskDetail;
std::map<int,long>::iterator LongIter;
bool TasksFoundProc = FALSE;
wxString TaskDetail;
+ XABPreferences PrefData(GetUserPrefDir());
for (std::map<int,int>::iterator iter = ActivityList.begin();
iter != ActivityList.end(); ++iter){
for (std::map<int,int>::iterator iter = ActivityList.begin();
iter != ActivityList.end(); ++iter){
@@
-220,6
+229,12
@@
void frmActivityMgr::ProcessTasksThread()
continue;
}
continue;
}
+ wxCommandEvent StartAnimationEvent(ACTMGR_STARTANIMATIONTIMER);
+
+ wxPostEvent(this, StartAnimationEvent);
+
+ // Start the animation timer if it hasn't started.
+
CardDAVIter = ActivityListConn.find(iter->first);
TypeIter = ActivityListType.find(iter->first);
StringETagIter = ActivityListETag.find(iter->first);
CardDAVIter = ActivityListConn.find(iter->first);
TypeIter = ActivityListType.find(iter->first);
StringETagIter = ActivityListETag.find(iter->first);
@@
-254,7
+269,6
@@
void frmActivityMgr::ProcessTasksThread()
// 8 = Completed. (UI Updated).
frmMain *frmMainPtrGet = static_cast<frmMain*>(frmMainPtr);
// 8 = Completed. (UI Updated).
frmMain *frmMainPtrGet = static_cast<frmMain*>(frmMainPtr);
- XABPreferences PrefData(GetUserPrefDir());
if (iter->second == 0){
if (iter->second == 0){
@@
-390,7
+404,7
@@
void frmActivityMgr::ProcessTasksThread()
SSLInvalidCertNotifObj SSLICNProcData;
SSLInvalidCertNotifObj SSLICNProcData;
- SSLCertCollection certcol = ConnHandle.Get
CertificateData
();
+ SSLCertCollection certcol = ConnHandle.Get
SSLVerifyResults
();
bool *PauseMode = new bool;
QRNotif qrn;
bool *PauseMode = new bool;
QRNotif qrn;
@@
-614,7
+628,7
@@
void frmActivityMgr::ProcessTasksThread()
SSLInvalidCertNotifObj SSLICNProcData;
SSLInvalidCertNotifObj SSLICNProcData;
- SSLCertCollection certcol = ConnHandle.Get
CertificateData
();
+ SSLCertCollection certcol = ConnHandle.Get
SSLVerifyResults
();
bool *PauseMode = new bool;
QRNotif qrn;
bool *PauseMode = new bool;
QRNotif qrn;
@@
-643,14
+657,14
@@
void frmActivityMgr::ProcessTasksThread()
// Accept the certificate. Write the certificate into the account
// directory (as server.crt) - will overwrite old certificate.
// Accept the certificate. Write the certificate into the account
// directory (as server.crt) - will overwrite old certificate.
- frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.Get
CertificateData
());
- WriteServerCertificate(AccountDir, ConnHandle.Get
CertificateData
());
+ frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.Get
SSLVerifyResults
());
+ WriteServerCertificate(AccountDir, ConnHandle.Get
SSLVerifyResults
());
} else if (SSLResult == 2){
// Reject the certificate, abort the task and mark as failed.
} else if (SSLResult == 2){
// Reject the certificate, abort the task and mark as failed.
- frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnHandle.Get
CertificateData
());
+ frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnHandle.Get
SSLVerifyResults
());
iter->second = 2;
break;
iter->second = 2;
break;
@@
-692,7
+706,7
@@
void frmActivityMgr::ProcessTasksThread()
#else
#else
- frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.Get
CertificateData
());
+ frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.Get
SSLVerifyResults
());
#endif
#endif
@@
-918,6
+932,8
@@
void frmActivityMgr::ProcessTasksThread()
SSLInvalidCertNotifObj SSLICNProcData;
SSLInvalidCertNotifObj SSLICNProcData;
+ SSLCertCollection certcol = ConnHandle.GetSSLVerifyResults();
+
bool *PauseMode = new bool;
QRNotif qrn;
bool *PauseMode = new bool;
QRNotif qrn;
@@
-952,14
+968,14
@@
void frmActivityMgr::ProcessTasksThread()
// Accept the certificate. Write the certificate into the account
// directory (as server.crt) - will overwrite old certificate.
// Accept the certificate. Write the certificate into the account
// directory (as server.crt) - will overwrite old certificate.
- frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.Get
CertificateData
());
- WriteServerCertificate(AccountDir, ConnHandle.Get
CertificateData
());
+ frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.Get
SSLVerifyResults
());
+ WriteServerCertificate(AccountDir, ConnHandle.Get
SSLVerifyResults
());
} else if (SSLResult == 2){
// Reject the certificate, abort the task and mark as failed.
} else if (SSLResult == 2){
// Reject the certificate, abort the task and mark as failed.
- frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnHandle.Get
CertificateData
());
+ frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnHandle.Get
SSLVerifyResults
());
iter->second = 2;
break;
iter->second = 2;
break;
@@
-1001,13
+1017,14
@@
void frmActivityMgr::ProcessTasksThread()
#else
#else
- frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.Get
CertificateData
());
+ frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.Get
SSLVerifyResults
());
#endif
ConnHandle.SetUploadMode(FALSE);
ConnHandle.SetupData(wxT("DELETE"), ContactFilename, wxT(""));
ConnHandle.ProcessData();
#endif
ConnHandle.SetUploadMode(FALSE);
ConnHandle.SetupData(wxT("DELETE"), ContactFilename, wxT(""));
ConnHandle.ProcessData();
+
SSLCertCollection certcol = ConnHandle.GetCertificateData();
// Check if any errors have occured whilst getting the data.
SSLCertCollection certcol = ConnHandle.GetCertificateData();
// Check if any errors have occured whilst getting the data.
@@
-1187,6
+1204,8
@@
void frmActivityMgr::ProcessTasksThread()
SSLInvalidCertNotifObj SSLICNProcData;
SSLInvalidCertNotifObj SSLICNProcData;
+ SSLCertCollection certcol = ConnHandle.GetSSLVerifyResults();
+
bool *PauseMode = new bool;
QRNotif qrn;
bool *PauseMode = new bool;
QRNotif qrn;
@@
-1202,13
+1221,6
@@
void frmActivityMgr::ProcessTasksThread()
event.SetClientData(&SSLICNProcData);
wxPostEvent(frmMainPtrGet, event);
event.SetClientData(&SSLICNProcData);
wxPostEvent(frmMainPtrGet, event);
- /*timespec n1, n2;
-
- // Fall asleep until we get an response.
-
- n1.tv_sec = 0;
- n1.tv_nsec = 250000000L;*/
-
while (*PauseMode == TRUE){
//nanosleep(&n1, &n2);
SleepFor(250000000);
while (*PauseMode == TRUE){
//nanosleep(&n1, &n2);
SleepFor(250000000);
@@
-1221,14
+1233,14
@@
void frmActivityMgr::ProcessTasksThread()
// Accept the certificate. Write the certificate into the account
// directory (as server.crt) - will overwrite old certificate.
// Accept the certificate. Write the certificate into the account
// directory (as server.crt) - will overwrite old certificate.
- frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.Get
CertificateData
());
- WriteServerCertificate(AccountDir, ConnHandle.Get
CertificateData
());
+ frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.Get
SSLVerifyResults
());
+ WriteServerCertificate(AccountDir, ConnHandle.Get
SSLVerifyResults
());
} else if (SSLResult == 2){
// Reject the certificate, abort the task and mark as failed.
} else if (SSLResult == 2){
// Reject the certificate, abort the task and mark as failed.
- frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnHandle.Get
CertificateData
());
+ frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnHandle.Get
SSLVerifyResults
());
iter->second = 2;
break;
iter->second = 2;
break;
@@
-1270,7
+1282,7
@@
void frmActivityMgr::ProcessTasksThread()
#else
#else
- frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.Get
CertificateData
());
+ frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.Get
SSLVerifyResults
());
#endif
#endif
@@
-1447,11
+1459,6
@@
void frmActivityMgr::ProcessTasksThread()
event.SetClientData(&vCardProcData);
wxPostEvent(frmMainPtrGet, event);
event.SetClientData(&vCardProcData);
wxPostEvent(frmMainPtrGet, event);
- /*timespec n1, n2;
-
- n1.tv_sec = 0;
- n1.tv_nsec = 250000000L;*/
-
while (*PauseMode == TRUE){
//nanosleep(&n1, &n2);
SleepFor(250000000);
while (*PauseMode == TRUE){
//nanosleep(&n1, &n2);
SleepFor(250000000);
@@
-1716,11
+1723,6
@@
void frmActivityMgr::ProcessTasksThread()
event.SetClientData(&vCardProcData);
wxPostEvent(frmMainPtrGet, event);
event.SetClientData(&vCardProcData);
wxPostEvent(frmMainPtrGet, event);
- /*timespec n1, n2;
-
- n1.tv_sec = 0;
- n1.tv_nsec = 250000000L;*/
-
while (*PauseMode == TRUE){
//nanosleep(&n1, &n2);
SleepFor(250000000);
while (*PauseMode == TRUE){
//nanosleep(&n1, &n2);
SleepFor(250000000);
@@
-1853,11
+1855,6
@@
void frmActivityMgr::ProcessTasksThread()
event.SetClientData(&vCardProcData);
wxPostEvent(frmMainPtrGet, event);
event.SetClientData(&vCardProcData);
wxPostEvent(frmMainPtrGet, event);
- /*timespec n1, n2;
-
- n1.tv_sec = 0;
- n1.tv_nsec = 250000000L;*/
-
while (*PauseMode == TRUE){
//nanosleep(&n1, &n2);
SleepFor(250000000);
while (*PauseMode == TRUE){
//nanosleep(&n1, &n2);
SleepFor(250000000);
@@
-2022,11
+2019,11
@@
void frmActivityMgr::ProcessTasksThread()
KeepUpdating = FALSE;
}
KeepUpdating = FALSE;
}
-
+
}
}
-
+
// Mark as completed.
// Mark as completed.
-
+
wxString AccountNameFinal;
AccountNameFinal = PrefData.accounts.GetAccountDirectory(AccountID);
AccountNameFinal.Append(wxT(".carddav"));
wxString AccountNameFinal;
AccountNameFinal = PrefData.accounts.GetAccountDirectory(AccountID);
AccountNameFinal.Append(wxT(".carddav"));
@@
-2034,7
+2031,7
@@
void frmActivityMgr::ProcessTasksThread()
wxCommandEvent reloadevent(RELOADCONTACTLIST);
reloadevent.SetString(AccountNameFinal);
wxPostEvent(this->GetParent(), reloadevent);
wxCommandEvent reloadevent(RELOADCONTACTLIST);
reloadevent.SetString(AccountNameFinal);
wxPostEvent(this->GetParent(), reloadevent);
-
+
iter->second = 4;
continue;
iter->second = 4;
continue;
@@
-2104,7
+2101,7
@@
void frmActivityMgr::ProcessTasksThread()
//ActListProcTimer.Start();
}
//ActListProcTimer.Start();
}
-
+
wxCommandEvent event(ACTMGR_STARTPROCESSTIMER);
wxPostEvent(this, event);
wxCommandEvent event(ACTMGR_STARTPROCESSTIMER);
wxPostEvent(this, event);
@@
-2114,7
+2111,7
@@
void frmActivityMgr::ProcessTasksThread()
void frmActivityMgr::ProcessTasks()
{
void frmActivityMgr::ProcessTasks()
{
-
+
std::thread ProcessThread(&frmActivityMgr::ProcessTasksThread, this);
ProcessThread.detach();
std::thread ProcessThread(&frmActivityMgr::ProcessTasksThread, this);
ProcessThread.detach();
@@
-2145,15
+2142,23
@@
void frmActivityMgr::ToggleConnectionStatus( wxCommandEvent &event ){
wxCommandEvent connevent(CONNSTAT_UPDATE);
wxCommandEvent connevent(CONNSTAT_UPDATE);
- if (SleepMode == FALSE){
+ if (
Application
SleepMode == FALSE){
connevent.SetInt(1);
connevent.SetInt(1);
- SleepMode = TRUE;
+ ApplicationSleepMode = TRUE;
+ mnuSleepMode->Check(true);
} else {
connevent.SetInt(0);
} else {
connevent.SetInt(0);
- SleepMode = FALSE;
+ ApplicationSleepMode = FALSE;
+ mnuSleepMode->Check(false);
+
+ wxCommandEvent event(ACTMGR_STARTTIMER);
+ wxPostEvent(this, event);
+
+ wxCommandEvent eventp(ACTMGR_STARTPROCESSTIMER);
+ wxPostEvent(this, eventp);
}
}
@@
-2161,6
+2166,14
@@
void frmActivityMgr::ToggleConnectionStatus( wxCommandEvent &event ){
}
}
+void frmActivityMgr::SleepMode( wxCommandEvent &event ){
+
+ wxCommandEvent connevent(ACTMGR_TOGGLECONN);
+
+ wxPostEvent(this, connevent);
+
+}
+
void frmActivityMgr::WriteServerCertificate(wxString AccountName, SSLCertCollection SSLCertInc){
wxString ServerCertFinal;
void frmActivityMgr::WriteServerCertificate(wxString AccountName, SSLCertCollection SSLCertInc){
wxString ServerCertFinal;
@@
-2205,6
+2218,12
@@
void frmActivityMgr::StopProcessTimer(wxCommandEvent& event){
}
}
+void frmActivityMgr::StartAnimationTimer(wxCommandEvent& event){
+
+ AnimationTimer.StartAnimation();
+
+}
+
void frmActivityMgr::UpdateStatusLabel(wxCommandEvent& event){
ActivityMgrLabelUpdate *actmgrudata = (ActivityMgrLabelUpdate*)event.GetClientData();
void frmActivityMgr::UpdateStatusLabel(wxCommandEvent& event){
ActivityMgrLabelUpdate *actmgrudata = (ActivityMgrLabelUpdate*)event.GetClientData();
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy