X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcommon%2Ftimers.cpp;h=4ba3e94874008a724e97654d3bc67343a50ca534;hb=2c8998278759b5bf6fc3bcf75afd289c214b6c84;hp=a0f62c70d60d8a175843856316576094b419d029;hpb=2dfce8aaaa0422af09521f65a1d77667e2cb59f9;p=xestiaab%2F.git diff --git a/source/common/timers.cpp b/source/common/timers.cpp index a0f62c7..4ba3e94 100644 --- a/source/common/timers.cpp +++ b/source/common/timers.cpp @@ -32,6 +32,8 @@ void wxActTimer::Notify(){ + // Notify function for wxActTimer. + frmMain *frmMainPtrProc = static_cast(frmMainPtr); wxCommandEvent shuffleevent(ACTMGR_SHUFFLE); @@ -153,6 +155,8 @@ void wxActTimer::Notify(){ void wxActTimer::SetBitmap(wxStaticBitmap *bitmap) { + // Set the bitmap for wxActTimer. + bmpActivity = bitmap; } @@ -160,6 +164,8 @@ void wxActTimer::SetBitmap(wxStaticBitmap *bitmap) void wxActTimer::SetSleepBitmap(wxBitmap *SleepBitmap) { + // Set the sleep bitmap for wxActTimer. + SleepBitmapPtr = SleepBitmap; } @@ -173,7 +179,6 @@ void wxActTimer::StopAnimation() wxCommandEvent actstop(ACTMGR_STOP); wxPostEvent(frmMainPtrProc, actstop); - //frmMainPtrProc->ActivityIconStop(); this->Stop(); bmpActivity->SetBitmap(*SleepBitmapPtr); @@ -186,7 +191,6 @@ void wxActTimer::StartAnimation() frmMain *frmMainPtrProc = static_cast(frmMainPtr); wxCommandEvent actstart(ACTMGR_START); wxPostEvent(frmMainPtrProc, actstart); - //frmMainPtrProc->ActivityIconStart(); this->ResetBitmap(); this->Start(50, FALSE); @@ -196,6 +200,8 @@ void wxActTimer::StartAnimation() void wxActTimer::ResetBitmap() { + // Reset the bitmap for wxActTimer. + intActivityProgress = 0; } @@ -203,6 +209,8 @@ void wxActTimer::ResetBitmap() void wxActTimer::SetupPointer(void *frmMainPtrIn) { + // Setup the pointer for wxActTimer. + frmMainPtr = frmMainPtrIn; } @@ -210,6 +218,8 @@ void wxActTimer::SetupPointer(void *frmMainPtrIn) void wxActProcessTimer::Notify() { + // Notify function for wxActProcessTimer. + // Pause the timer whilst processing to avoid problems. this->Stop(); @@ -223,12 +233,16 @@ void wxActProcessTimer::Notify() void wxActProcessTimer::SetupPointers(void *ActMgr){ + // Setup pointers for the wxActProcessTimer. + ActMgrPtr = ActMgr; } void wxActListProcTimer::Notify(){ + // Notify function for wxActListProcTimer. + // Setup Label and get task data (update SetupPointers subroutine). this->Stop(); @@ -236,17 +250,17 @@ void wxActListProcTimer::Notify(){ for (std::map::iterator iter = ActListPtr->begin(); iter != ActListPtr->end(); ++iter){ - // Check for any queued tasks and start one. + // Check for any queued tasks and start one. - // 0 = Queued. - // 1 = Processing. - // 2 = Failed. - // 3 = Stopped. - // 4 = Completed. - // 5 = Failed (UI Updated). - // 6 = Stopped (UI Updated). - // 7 = (Reserved) (UI Updated). - // 8 = Completed. (UI Updated). + // 0 = Queued. + // 1 = Processing. + // 2 = Failed. + // 3 = Stopped. + // 4 = Completed. + // 5 = Failed (UI Updated). + // 6 = Stopped (UI Updated). + // 7 = (Reserved) (UI Updated). + // 8 = Completed. (UI Updated). std::map::iterator LongIter = ActListUIPtr->find(iter->first); @@ -266,14 +280,8 @@ void wxActListProcTimer::Notify(){ ueventdata->ItemIndex = LongIter->second; ueventdata->ItemLabel = _("Processing..."); - //ueventdata->ItemDes = _("Adding Contact '") + DetailIter->second + _("'..."); wxPostEvent(static_cast(ActMgrPtr), uevent); - - /*lstActivityPtr->SetItem(LongIter->second, 2, _("Processing...")); - if (ActListDetailPtr->find(iter->first) != ActListDetailPtr->end()){ - lblDetailsPtr->SetLabel(_("Adding Contact '") + DetailIter->second + _("'...")); - }*/ } else if (iter->second == 2){ @@ -283,18 +291,13 @@ void wxActListProcTimer::Notify(){ wxPostEvent(static_cast(ActMgrPtr), uevent); iter->second = 5; - //lstActivityPtr->SetItem(LongIter->second, 2, _("Failed")); - } else if (iter->second == 3){ ueventdata->ItemIndex = LongIter->second; ueventdata->ItemLabel = _("Stopped"); wxPostEvent(static_cast(ActMgrPtr), uevent); - iter->second = 5; - - //lstActivityPtr->SetItem(LongIter->second, 2, _("Stopped")); - //iter->second = 6; + iter->second = 6; } else if (iter->second == 4){ @@ -303,25 +306,27 @@ void wxActListProcTimer::Notify(){ wxPostEvent(static_cast(ActMgrPtr), uevent); iter->second = 8; - - //lstActivityPtr->SetItem(LongIter->second, 2, _("Completed")); - //iter->second = 8; } + // Delete the connection object if finished. + + if (iter->second > 4){ + + std::map::iterator ConnObjectIter = ActListConnObjectsPtr->find(iter->first); + + delete ConnObjectIter->second; + ConnObjectIter->second = nullptr; + + } + // Insert a finish date. wxDateTime adt; adt = adt.Now(); ActListFinDTPtr->insert(std::make_pair(iter->first, adt)); - - // Delete the connection object. - - std::map::iterator ConnObject = ActListConnPtr->find(iter->first); - delete ConnObject->second; - ConnObject->second = NULL; - + } if (ClearupProcessed == TRUE){ @@ -351,7 +356,9 @@ void wxActListProcTimer::SetupPointers(std::map *ActList, std::map *ActListDetail, bool *TasksActive, wxListCtrl *lstActivity, wxStaticText *lblDetails, wxGauge *GauProgress, void *ActMgr, wxActTimer *ActTimer, wxActProcessTimer *ActProcessTimer, - std::map *ActListFinDT, std::map *ActListConn){ + std::map *ActListFinDT, std::map *ActListConnObjects){ + + // Setup the pointers for wxActListProcTimer. ActListPtr = ActList; ActListUIPtr = ActListUI; @@ -364,22 +371,23 @@ void wxActListProcTimer::SetupPointers(std::map *ActList, std::map::iterator ETagIter; @@ -426,13 +434,13 @@ void wxETagProcessTimer::ReloadAccounts(){ AccountDir = PrefData.accounts.GetAccountDirectory(i); AccountType = PrefData.accounts.GetAccountType(i); - + if (AccountDir.IsEmpty()){ continue; } - if (AccountType == wxT("Local") || AccountType == wxT("local")){ - continue; + if (AccountType != wxT("CardDAV") && AccountType != wxT("carddav")){ + continue; } AccountDir.Trim(); @@ -447,46 +455,6 @@ void wxETagProcessTimer::ReloadAccounts(){ } - //raise(SIGABRT); - - /*for (int i = 0; i < PrefData.accounts.GetCount(); i++){ - - AccountDir = PrefData.accounts.GetAccountDirectory(i); - - AccountDir.Trim(); - AccountDir.Append(wxT(".carddav")); - - //AccountPrefix = PrefData.accounts.GetAccountDirPrefix(i); - - //ETagDB NewETagDB (AccountDir); - - ETagDB AccountDB; - AccountDB.SetupDB(AccountDir); - - //ETagDBList.insert(std::make_pair(AccountDir, Moo)); - - //std::pair Moo2; - - //ETagDB2 Meep; - - //ETagDBListv3.insert(std::make_pair(0,Meep)); - - //ETagDBListv2.insert(std::make_pair(0, Moo)); - - //ETagDBList.insert(Moo2); - - ETagDBList.insert(std::make_pair(AccountDir, AccountDB)); - - //Moo55.insert(std::make_pair(wxT("Meep"), wxT("Meep"))); - - //ETagDBList[AccountDir] = new ETagDB (AccountDir); - - }*/ - - //ETagDB Test (AccountDir); - - //ETagDBList.insert(std::make_pair(AccountDir, Test)); - ReloadLock.unlock(); this->Start(15000); @@ -494,6 +462,8 @@ void wxETagProcessTimer::ReloadAccounts(){ ETagDB* wxETagProcessTimer::GetPointer(wxString AccountName){ + // Get the pointer of the ETag Database. + ETagDB *ETagDBPtr = NULL; std::map::iterator ETagIter; @@ -512,6 +482,8 @@ ETagDB* wxETagProcessTimer::GetPointer(wxString AccountName){ void wxContactFileMonitorTimer::Notify(){ + // Notify function for wxContactFileMonitorTimer. + if (Filename.IsEmpty()){ return; @@ -537,6 +509,8 @@ void wxContactFileMonitorTimer::Notify(){ void wxContactFileMonitorTimer::SetFilename(wxString FilenameInc){ + // Set the filename for the wxContactFileMonitorTimer object. + Filename = FilenameInc; wxFileName FileCheck(Filename); @@ -546,12 +520,16 @@ void wxContactFileMonitorTimer::SetFilename(wxString FilenameInc){ void wxContactFileMonitorTimer::SetupPointers(frmContactEditor *frmCEPtrInc){ + // Setup the pointers for the wxContactFileMonitorTimer object. + frmCEPtr = frmCEPtrInc; } void wxContactFileMonitorTimer::UpdateTimestamp(){ + // Update the timestamp for the wxContactFileMonitorTimer object. + wxFileName FileCheck(Filename); FileDateTime = FileCheck.GetModificationTime(); @@ -559,35 +537,22 @@ void wxContactFileMonitorTimer::UpdateTimestamp(){ void wxContactWindowMonitor::Notify(){ - // Look through the list of windows and see if any have - // closed. IF they have closed then delete and free the - // memory (also delete from the map). - - /*for(std::map::iterator iter = ContactWindowListPtr->begin(); - iter != ContactWindowListPtr->end(); iter++){ - - frmContact *ContactPtr = (frmContact*)iter->second; - - // Check if open. - - if ( - - // Delete the form. - - // Delete the data from the map. - - }*/ + // Notify function for the wxContactWindowMonitor object. } void wxContactWindowMonitor::SetupPointers(std::map *ContactWindowListPtrInc){ + // Setup pointers for the wxContactWindowMonitor. + ContactWindowListPtr = ContactWindowListPtrInc; } void wxAccountSyncTimer::Notify(){ + // Notify function for the wxAccountSyncTimer. + frmActivityMgr *ActMgrPtrProc = static_cast(frmActMgrPtr); // Disable the timer. (Don't go updating unless needed). @@ -617,6 +582,8 @@ void wxAccountSyncTimer::Notify(){ void wxAccountSyncTimer::SetupData(wxString AccNameInc, wxString AccNameFullInc){ + // Setup the data for the wxAccountSyncTimer object. + // Set the account name. AccName = AccNameInc; @@ -627,7 +594,7 @@ void wxAccountSyncTimer::SetupData(wxString AccNameInc, void wxAccountSyncTimer::SetupPointers(void *frmMainPtrInc, void *frmActMgrPtrInc, ETagDB *ETagDBPtrInc){ - // Set the pointers. + // Setup the pointers for the wxAccountSyncTimer object. frmMainPtr = frmMainPtrInc; frmActMgrPtr = frmActMgrPtrInc; @@ -637,6 +604,8 @@ void wxAccountSyncTimer::SetupPointers(void *frmMainPtrInc, void SleepFor(unsigned long longSleepNanoSecs){ + // Sleep for specified nano seconds. + #ifdef __WIN32__ ::Sleep((longSleepNanoSecs / 1000000)); #elif __HAIKU__