From: Steve Brokenshire Date: Sat, 9 Jul 2016 10:01:49 +0000 (+0100) Subject: Merge branch 'master' of ssh://gelforn.xestia.co.uk/scmrepos/xestiaab X-Git-Tag: release-0.14~2^2~2 X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=commitdiff_plain;h=77c692f2d711f7140eab5bc12ae445d307b961cc;hp=2b8ca7c8528a738a40d099e2cce5b974bc741699 Merge branch 'master' of ssh://gelforn.xestia.co.uk/scmrepos/xestiaab --- diff --git a/projects/msw/xestiaab.rc b/projects/msw/xestiaab.rc index cd32b0b..91010c6 100644 --- a/projects/msw/xestiaab.rc +++ b/projects/msw/xestiaab.rc @@ -23,8 +23,8 @@ XAB_MAINICON ICON "xestiaab_win32icon.ico" // LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL 1 VERSIONINFO - FILEVERSION 0,13,0,0 - PRODUCTVERSION 0,13,0,0 + FILEVERSION 0,14,0,0 + PRODUCTVERSION 0,14,0,0 FILEOS VOS__WINDOWS32 FILETYPE VFT_APP FILESUBTYPE VFT2_UNKNOWN @@ -38,14 +38,14 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL VALUE "Comments", "For more information, visit http://xestia.co.uk/addressbook" VALUE "CompanyName", "Xestia Software Development" VALUE "FileDescription", "Application executable" - VALUE "FileVersion", "0.13" + VALUE "FileVersion", "0.14" VALUE "InternalName", "xestiaab.exe" VALUE "LegalCopyright", "(c) 2016 Xestia Software Development" VALUE "LegalTrademarks", "" VALUE "OriginalFilename", "xestiaab.exe" VALUE "PrivateBuild", "" VALUE "ProductName", "Xestia Address Book" - VALUE "ProductVersion", "0.13" + VALUE "ProductVersion", "0.14" VALUE "SpecialBuild", "" } } diff --git a/projects/msw/xestiaab.vcxproj b/projects/msw/xestiaab.vcxproj index cfd8129..575e6b7 100644 --- a/projects/msw/xestiaab.vcxproj +++ b/projects/msw/xestiaab.vcxproj @@ -44,6 +44,7 @@ + @@ -349,8 +350,8 @@ Sync MultiThreadedDLL true - vc_mswudll_x64\minimal\ - vc_mswudll_x64\minimal.pdb + $(IntDir) + vc_mswudll_x64\xestiaab.pdb Level4 true ProgramDatabase diff --git a/projects/msw/xestiaab.vcxproj.filters b/projects/msw/xestiaab.vcxproj.filters index d196cc4..2ef4f40 100644 --- a/projects/msw/xestiaab.vcxproj.filters +++ b/projects/msw/xestiaab.vcxproj.filters @@ -302,6 +302,9 @@ Resource Files\Source Files + + Resource Files\Source Files + diff --git a/source/actmgr/frmActivityMgr.cpp b/source/actmgr/frmActivityMgr.cpp index 63755f8..546795a 100644 --- a/source/actmgr/frmActivityMgr.cpp +++ b/source/actmgr/frmActivityMgr.cpp @@ -218,6 +218,7 @@ void frmActivityMgr::ProcessTasksThread() std::map::iterator LongIter; bool TasksFoundProc = FALSE; wxString TaskDetail; + XABPreferences PrefData(GetUserPrefDir()); for (std::map::iterator iter = ActivityList.begin(); iter != ActivityList.end(); ++iter){ @@ -268,7 +269,6 @@ void frmActivityMgr::ProcessTasksThread() // 8 = Completed. (UI Updated). frmMain *frmMainPtrGet = static_cast(frmMainPtr); - XABPreferences PrefData(GetUserPrefDir()); if (iter->second == 0){ @@ -1221,13 +1221,6 @@ void frmActivityMgr::ProcessTasksThread() 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); @@ -1466,11 +1459,6 @@ void frmActivityMgr::ProcessTasksThread() 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); @@ -1735,11 +1723,6 @@ void frmActivityMgr::ProcessTasksThread() 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); @@ -1872,11 +1855,6 @@ void frmActivityMgr::ProcessTasksThread() 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); @@ -2041,11 +2019,11 @@ void frmActivityMgr::ProcessTasksThread() KeepUpdating = FALSE; } - + } - + // Mark as completed. - + wxString AccountNameFinal; AccountNameFinal = PrefData.accounts.GetAccountDirectory(AccountID); AccountNameFinal.Append(wxT(".carddav")); @@ -2053,7 +2031,7 @@ void frmActivityMgr::ProcessTasksThread() wxCommandEvent reloadevent(RELOADCONTACTLIST); reloadevent.SetString(AccountNameFinal); wxPostEvent(this->GetParent(), reloadevent); - + iter->second = 4; continue; diff --git a/source/frmMain.cpp b/source/frmMain.cpp index b8a80cf..99784a6 100644 --- a/source/frmMain.cpp +++ b/source/frmMain.cpp @@ -252,7 +252,7 @@ frmMainADT( parent ) #elif defined(__WIN32__) - int stbBottomData [4] = { -1, 8, 8, 8 }; + int stbBottomData [4] = { -1, 16, 16, 16 }; #else @@ -271,8 +271,10 @@ frmMainADT( parent ) stbBottom->GetFieldRect(3, rectActivity); SSLToolTip = new wxToolTip(wxT("")); - - imgConnStatus = new wxStaticBitmap(stbBottom, wxID_ANY, wxNullBitmap, wxPoint((rectOnline.GetX()),(rectOnline.GetY())), wxDefaultSize, 0 ); + +#if defined(__WIN32__) + + imgConnStatus = new wxStaticBitmap(stbBottom, wxID_ANY, wxNullBitmap, wxPoint(rectOnline.GetX(),rectOnline.GetY()), wxDefaultSize, 0 ); imgConnStatus->SetBitmap(*imgOnline); imgConnStatus->Connect( wxEVT_LEFT_DCLICK, wxCommandEventHandler( frmMain::ToggleConnectionStatus ), NULL, this ); @@ -285,6 +287,23 @@ frmMainADT( parent ) imgActivityStatus->SetBitmap(*imgActIconSleep); imgActivityStatus->Connect( wxEVT_LEFT_DCLICK, wxCommandEventHandler( frmMain::ShowActivityWindow ), NULL, this ); +#else + + imgConnStatus = new wxStaticBitmap(stbBottom, wxID_ANY, wxNullBitmap, wxPoint((rectOnline.GetX()), (rectOnline.GetY())), wxDefaultSize, 0); + imgConnStatus->SetBitmap(*imgOnline); + imgConnStatus->Connect(wxEVT_LEFT_DCLICK, wxCommandEventHandler(frmMain::ToggleConnectionStatus), NULL, this); + + imgSSLStatus = new wxStaticBitmap(stbBottom, wxID_ANY, wxNullBitmap, wxPoint((rectSSL.GetX()), (rectSSL.GetY())), wxDefaultSize, 0); + imgSSLStatus->SetBitmap(*imgNoSSL); + imgSSLStatus->SetToolTip(SSLToolTip); + imgSSLStatus->Connect(wxEVT_LEFT_DCLICK, wxCommandEventHandler(frmMain::ShowSSLCertificates), NULL, this); + + imgActivityStatus = new wxStaticBitmap(stbBottom, wxID_ANY, wxNullBitmap, wxPoint((rectActivity.GetX()), (rectActivity.GetY())), wxDefaultSize, 0); + imgActivityStatus->SetBitmap(*imgActIconSleep); + imgActivityStatus->Connect(wxEVT_LEFT_DCLICK, wxCommandEventHandler(frmMain::ShowActivityWindow), NULL, this); + +#endif + // Setup the window menu. // By default should be: @@ -2623,7 +2642,7 @@ void frmMain::ShowSSLCertificates( wxCommandEvent &event ){ // Setup and display the form. - if (SSLCertificateIter->second->pCertInfo == NULL){ + if (SSLCertificateIter == AccountCertificateData.end() || SSLCertificateIter->second->pCertInfo == NULL){ wxMessageBox("No certificate information is available due to invalid connection details, connection being in progress or invalid certificate data received.");