#include "common/events.h"
#include "common/dirs.h"
#include "vcard/vcard.h"
-#include "carddav/carddav.h"
#include "contacteditor/frmContactEditor.h"
#include "import/import.h"
#include "export/export.h"
DEFINE_EVENT_TYPE(WINDOW_CLOSE);
DEFINE_EVENT_TYPE(CONNSTAT_UPDATE);
DEFINE_EVENT_TYPE(INVALIDSSLCERT);
+DEFINE_EVENT_TYPE(INVALIDSSLCERTSTRING);
DEFINE_EVENT_TYPE(GETSELECTEDLIST);
DEFINE_EVENT_TYPE(SYNCACCOUNT);
DEFINE_EVENT_TYPE(IMPORT_RESULTSSHOW);
EVT_COMMAND(wxID_ANY, WINDOW_CLOSE, frmMain::WindowDelete)
EVT_COMMAND(wxID_ANY, CONNSTAT_UPDATE, frmMain::UpdateConnectionStatus)
EVT_COMMAND(wxID_ANY, INVALIDSSLCERT, frmMain::InvalidSSLCertificate)
+EVT_COMMAND(wxID_ANY, INVALIDSSLCERTSTRING, frmMain::InvalidSSLCertificateString)
EVT_COMMAND(wxID_ANY, GETSELECTEDLIST, frmMain::GetSelectedList)
EVT_COMMAND(wxID_ANY, SYNCACCOUNT, frmMain::SyncAccount)
EVT_COMMAND(wxID_ANY, IMPORT_RESULTSSHOW, frmMain::ShowImportResults)
wxMemoryInputStream bstream(icons_acclocal_png, sizeof(icons_acclocal_png));
wxMemoryInputStream cstream(icons_accgroup_png, sizeof(icons_accgroup_png));
wxMemoryInputStream dstream(icons_accnone_png, sizeof(icons_accnone_png));
+ wxMemoryInputStream estream(icons_accunsupported_png, sizeof(icons_accunsupported_png));
wxImage icons_accinet_png(astream, wxBITMAP_TYPE_PNG);
wxBitmap AccInet(icons_accinet_png, -1);
wxBitmap AccGrp(icons_accgroup_png, -1);
wxIcon wxIAccGrp;
wxIAccGrp.CopyFromBitmap(AccGrp);
-
+
wxImage icons_accnone_png(dstream, wxBITMAP_TYPE_PNG);
wxBitmap AccNone(icons_accnone_png, -1);
wxIcon wxIAccNone;
wxIAccNone.CopyFromBitmap(AccNone);
+
+ wxImage icons_accunsupported_png(estream, wxBITMAP_TYPE_PNG);
+ wxBitmap AccUnsupported(icons_accunsupported_png, -1);
+ wxIcon wxIAccUnsupported;
+ wxIAccUnsupported.CopyFromBitmap(AccUnsupported);
AccountID = AccImgList->Add(wxIAccNIcon);
AccountNetID = AccImgList->Add(wxIAccInet);
AccountGrpID = AccImgList->Add(wxIAccGrp);
AccountNoneID = AccImgList->Add(wxIAccNone);
+ AccountUnsupportedID = AccImgList->Add(wxIAccUnsupported);
bmpIcon->SetIcon(AccImgList->GetIcon(AccountNoneID));
wxImage icons_nossl_png(nosslstream, wxBITMAP_TYPE_PNG);
imgNoSSL = new wxBitmap(icons_nossl_png, -1);
-
+
+ // Toolbar icons.
+
+ wxMemoryInputStream addaddressbook(toolbar_addaddressbook_png, sizeof(toolbar_addaddressbook_png));
+ wxMemoryInputStream preferences(toolbar_preferences_png, sizeof(toolbar_preferences_png));
+ wxMemoryInputStream searchcontacts(toolbar_searchcontacts_png, sizeof(toolbar_searchcontacts_png));
+ wxMemoryInputStream addcontact(toolbar_addcontact_png, sizeof(toolbar_addcontact_png));
+ wxMemoryInputStream editcontact(toolbar_editcontact_png, sizeof(toolbar_editcontact_png));
+ wxMemoryInputStream deletecontact(toolbar_deletecontact_png, sizeof(toolbar_deletecontact_png));
+
+ wxImage toolbar_addaddressbook_png(addaddressbook, wxBITMAP_TYPE_PNG);
+ imgAddAddressBook = new wxBitmap (toolbar_addaddressbook_png, -1);
+ tblMain->SetToolNormalBitmap(tbtNewAccount->GetId(), *imgAddAddressBook);
+
+ wxImage toolbar_preferences_png(preferences, wxBITMAP_TYPE_PNG);
+ imgPreferences = new wxBitmap (toolbar_preferences_png, -1);
+ tblMain->SetToolNormalBitmap(tbtPreferences->GetId(), *imgPreferences);
+
+ wxImage toolbar_searchcontacts_png(searchcontacts, wxBITMAP_TYPE_PNG);
+ imgSearchContacts = new wxBitmap (toolbar_searchcontacts_png, -1);
+ tblMain->SetToolNormalBitmap(tbtSearch->GetId(), *imgSearchContacts);
+
+ wxImage toolbar_addcontact_png(addcontact, wxBITMAP_TYPE_PNG);
+ imgAddContact = new wxBitmap (toolbar_addcontact_png, -1);
+ tblMain->SetToolNormalBitmap(tbtAddContact->GetId(), *imgAddContact);
+
+ wxImage toolbar_editcontact_png(editcontact, wxBITMAP_TYPE_PNG);
+ imgEditContact = new wxBitmap (toolbar_editcontact_png, -1);
+ tblMain->SetToolNormalBitmap(tbtEditContact->GetId(), *imgEditContact);
+
+ wxImage toolbar_deletecontact_png(deletecontact, wxBITMAP_TYPE_PNG);
+ imgDeleteContact = new wxBitmap (toolbar_deletecontact_png, -1);
+ tblMain->SetToolNormalBitmap(tbtDeleteContact->GetId(), *imgDeleteContact);
+
// Activity Icon.
wxMemoryInputStream act1(icons_act1_png, sizeof(icons_act1_png));
imgSSLStatus->SetBitmap(*imgOffline);
SSLToolTip->SetTip(wxT("SSL status is not applicable for this account"));
AccountTypeFinal.Append(wxT("local"));
+ } else {
+ imgSSLStatus->SetBitmap(*imgOffline);
+ SSLToolTip->SetTip(wxT("SSL status is not applicable for this account"));
+ AccountTypeFinal.Append(AccountType.Lower());
}
AccountIndex = i;
} else if (AccountType == wxT("Local")){
SSLToolTip->SetTip(wxT("SSL status is not applicable for this account"));
AccountTypeFinal.Append(wxT("local"));
+ } else {
+ AccountTypeFinal.Append(AccountType.Lower());
}
AccountIndex = i;
long ContactSeekPoint = 0;
wxDir vcardaccdir(AccountDirFinal);
-
+
// Get the wxTreeItemId and image icon and compare it to the list.
if (ActiveItemIcon == AccountGrpID){
return;
}
+
+ // Check if the account type is a valid account type, otherwise
+ // display an error message.
+
+ if (ActiveAccountType != "CardDAV" && ActiveAccountType != "carddav" &&
+ ActiveAccountType != "Local" && ActiveAccountType != "local"){
+
+ wxMessageBox(_("Cannot add a new contact as the account type is unsupported."), _("Unsupported account type"), wxICON_ERROR);
+ return;
+
+ }
// Add Pointer to SetupPointers for the ETagDB.
return;
}
-
+
wxMemoryInputStream istream(bigimgs_contactpersonicon48_png, sizeof(bigimgs_contactpersonicon48_png));
wxImage bigimgs_contactpersonicon48i(istream, wxBITMAP_TYPE_PNG);
wxBitmap contacticonbmp(bigimgs_contactpersonicon48i, -1);
ContactEditor->SetupPointers(frameActMgr, &ETagProcTimer, this);
ContactEditor->SetupHeaders();
+
+ if (ActiveAccountType != "CardDAV" && ActiveAccountType != "carddav" &&
+ ActiveAccountType != "Local" && ActiveAccountType != "local"){
+
+ ContactEditor->SetupAccountData(true);
+
+ }
// Check if pointer is NULL (not from the search forms) or not.
if (!ActiveAccount.IsEmpty()){
- if (ActiveAccountType != wxT("Local")){
+ if (ActiveAccountType == wxT("CardDAV") || ActiveAccountType == wxT("carddav")){
// Account type is not local.
} else {
- wxMessageBox(_("The refresh address book command is not supported with this type of account."), wxT("Not supported for this type of account"));
+ wxMessageBox(_("The refresh address book command is not supported with this type of account."), wxT("Not supported"), wxICON_ERROR);
}
ETagProcTimer.ReloadAccounts();
for (int i = 0; i < preferences.accounts.GetCount(); i++){
-
+
if ((preferences.accounts.GetAccountType(i) == wxT("Local") ||
preferences.accounts.GetAccountType(i) == wxT("local")) && HideLocalABs == TRUE){
AccName = preferences.accounts.GetAccountName(i);
AccName.Trim();
AccountAccDirList.insert(std::make_pair(i, AccDirFull));
-
+
if (preferences.accounts.GetAccountType(i) == wxT("CardDAV") ||
preferences.accounts.GetAccountType(i) == wxT("carddav")){
AccountTreeId = treAccounts->AppendItem(RootNode, preferences.accounts.GetAccountName(i), AccountNetID, -1);
- } else {
+ } else if (preferences.accounts.GetAccountType(i) == wxT("Local") ||
+ preferences.accounts.GetAccountType(i) == wxT("local")) {
AccountTreeId = treAccounts->AppendItem(RootNode, preferences.accounts.GetAccountName(i), AccountID, -1);
+ } else {
+
+ AccountTreeId = treAccounts->AppendItem(RootNode, preferences.accounts.GetAccountName(i), AccountUnsupportedID, -1);
+
}
// Go through the account directory and find contact files with
wxString vCardFilename;
wxString vCardDataString;
wxString vCardFilenameFull;
-
+
bool ProcFiles = vcardaccdir.GetFirst(&vCardFilename, wxEmptyString, wxDIR_FILES);
while(ProcFiles){
void frmMain::DeleteContact(wxCommandEvent& event){
// Delete a contact from the main window.
-
+
// Check if a contact is selected.
long intSelected = -1;
if (intSelected == -1){
return;
}
+
+ // Check if the account type is a valid account type, otherwise
+ // display an error message.
+
+ if (ActiveAccountType != "CardDAV" && ActiveAccountType != "carddav" &&
+ ActiveAccountType != "Local" && ActiveAccountType != "local"){
+
+ wxMessageBox(_("Cannot delete contact as the account type is unsupported."), _("Unsupported account type"), wxICON_ERROR);
+ return;
+
+ }
frmActivityMgr *frameActMgr = static_cast<frmActivityMgr*>(ActMgrPtr);
if (nextChild == selectedChild){
wxSDataURL = prefaccounts.GetAccountDirPrefix(i) + wxT("/") + wxSplitFilename;
+ break;
}
}
// Add task to the activity monitor to delete the contact.
-
+
frameActMgr->AddTask(2, wxSContactName, ActiveAccount, wxSDataURL, wxSplitFilename, ContactsFileIndex[intContactSeekNum], wxT(""));
}
#else
- std::map<int, SSLCertCollection>::iterator SSLColIter;
+ std::map<int, SSLCertCollectionString>::iterator SSLColIter;
for (int i = 0; i < prefaccounts.GetCount(); i++){
SSLColIter = AccountSSLData.find(i);
- SSLCertCollection SSLCertInfo = SSLColIter->second;
-
+ SSLCertCollectionString SSLCertInfo = SSLColIter->second;
+
frmSSLCertificate *frameSSLCert = new frmSSLCertificate ( this );
frameSSLCert->StartCertFrom(0);
- frameSSLCert->SetupCerts(SSLCertInfo);
+ frameSSLCert->SetupCertsString(SSLCertInfo);
frameSSLCert->ShowModal();
delete frameSSLCert;
}
+void frmMain::InvalidSSLCertificateString( wxCommandEvent &event ){
+
+ // Display the form for showing an invalid SSL certificate.
+
+ frmInvalidSSLCertificate *frameISC = new frmInvalidSSLCertificate ( this );
+ SSLInvalidCertNotifObjString *SSLICNObj = (SSLInvalidCertNotifObjString*)event.GetClientData();
+ SSLCertCollectionString SSLCCData = SSLICNObj->CertCollection;
+ wxString AccountName = SSLICNObj->AccountName;
+ frameISC->LoadData(SSLCCData, AccountName);
+ frameISC->ShowModal();
+
+ int FinalConflictResult = frameISC->GetResult();
+
+ wxCommandEvent event2(ACTMGR_RESUMEPROC);
+ event2.SetClientData(SSLICNObj->QRNotifData);
+ event2.SetInt(FinalConflictResult);
+
+ delete frameISC;
+ frameISC = NULL;
+
+ frmActivityMgr *frameActMgr = static_cast<frmActivityMgr*>(ActMgrPtr);
+ wxPostEvent(frameActMgr, event2);
+
+}
+
void frmMain::PauseAllTimers(){
// Pause all the account timers.
#else
-void frmMain::UpdateSSLAccountStatus(int AccountID, int SSLStatus, SSLCertCollection SSLCertInc){
+void frmMain::UpdateSSLAccountStatus(int AccountID, int SSLStatus, SSLCertCollectionString SSLCertInc){
// Delete existing data.
}
+ // Check the account type is a supported account type.
+
+ if (AccType != "CardDAV" && AccType != "carddav" &&
+ AccType != "Local" && AccType != "local"){
+
+ SSLToolTip->SetTip(wxT("SSL is not enabled for this account"));
+ imgSSLStatus->SetBitmap(*imgNoSSL);
+ return;
+
+ }
+
// Check if the account has SSL enabled.
bool SSLInUse = prefaccounts.GetAccountSSL(AccountID);
std::map<int,int>::iterator SSLResultIter = AccountSSLResult.find(AccountID);
+ // Check if a result value has been set.
+
+ if (SSLResultIter == AccountSSLResult.end()){
+
+ imgSSLStatus->SetBitmap(*imgSSLWarning);
+ SSLToolTip->SetTip(wxT("Unable to determine SSL information for the '") + prefaccounts.GetAccountName(AccountID) + wxT("' account."));
+ return;
+
+ }
+
if (SSLResultIter->second == 1){
imgSSLStatus->SetBitmap(*imgSSLWarning);
bool EnableRefresh = FALSE;
- if (!ActiveAccount.IsEmpty()){
+ if (!ActiveAccount.IsEmpty() && (ActiveAccountType == "CardDAV" || ActiveAccountType == "carddav")){
EnableRefresh = TRUE;
Home |
News |
Projects |
Releases
Bugs |
RFE |
Repositories |
Help
