frmMain: Close all windows when opening preferences

[xestiaab/.git] / source / frmMain.h

diff --git a/source/frmMain.h b/source/frmMain.h
index 8d3c58d..b9e564b 100644 (file)
--- a/source/frmMain.h
+++ b/source/frmMain.h
@@ -75,6 +75,7 @@ DECLARE_EVENT_TYPE(WINDOW_EDIT, wxID_ANY);
 DECLARE_EVENT_TYPE(WINDOW_CLOSE, wxID_ANY);
 DECLARE_EVENT_TYPE(CONNSTAT_UPDATE, wxID_ANY);
 DECLARE_EVENT_TYPE(INVALIDSSLCERT, wxID_ANY);
+DECLARE_EVENT_TYPE(INVALIDSSLCERTSTRING, wxID_ANY);
 DECLARE_EVENT_TYPE(GETSELECTEDLIST, wxID_ANY);
 DECLARE_EVENT_TYPE(SYNCACCOUNT, wxID_ANY);
 DECLARE_EVENT_TYPE(IMPORT_RESULTSSHOW, wxID_ANY);
@@ -132,7 +133,7 @@ class frmMain : public frmMainADT
 #elif defined(__WIN32__)
                std::map<int, PCCERT_CONTEXT> AccountCertificateData;
 #else
-               std::map<int, SSLCertCollection> AccountSSLData;
+               std::map<int, SSLCertCollectionString> AccountSSLData;
 #endif
                std::map<int, int> AccountSSLResult;
                std::multimap<int, int> AccountGroupList;
@@ -151,7 +152,6 @@ class frmMain : public frmMainADT
                std::map<int,wxMenuItem*> WindowListPointersMenu;
                std::map<int,void*> WindowListPointers;
                std::map<int,int> WindowListType;
-               //std::map<int,int> WindowListType;
                wxMenuItem *mnuContactWindows;
                wxMenuItem *mnuContactEditorWindows;
                wxMenuItem *mnuSearchWindows;
@@ -159,15 +159,11 @@ class frmMain : public frmMainADT
                bool RevealWait = FALSE;
                wxString SessionID;
                wxString OldSessionID;
+               wxColour ContactBackgroundColour;
                wxIcon IconEmp;
-               //wxIcon Emp;
-               //wxComboCtrl* AccControl = new wxGenericComboCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize);
-               //wxComboCtrl* AccControl = new wxComboCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxCB_READONLY|wxEXPAND|wxCC_STD_BUTTON);
-               //wxStaticBitmap* AccIcon = new wxStaticBitmap(this, wxID_ANY, IconEmp, wxDefaultPosition, wxSize(16,16), wxALL|wxEXPAND, wxStaticBitmapNameStr);
                XABAccountView* treAccounts = new XABAccountView();
                wxImageList *AccImgList =  new wxImageList(16,16,true);
                wxImageList *ActMgrImgList = new wxImageList(16,16,true);
-               //wxIcon wxIAccInet;
                int AccountID;
                int AccountNetID;
                int AccountGrpID;
@@ -189,6 +185,12 @@ class frmMain : public frmMainADT
                wxBitmap *imgSSLWarning = NULL;
                wxBitmap *imgOnline = NULL;
                wxBitmap *imgOffline = NULL;
+               wxBitmap *imgAddAddressBook = NULL;
+               wxBitmap *imgPreferences = NULL;
+               wxBitmap *imgSearchContacts = NULL;
+               wxBitmap *imgAddContact = NULL;
+               wxBitmap *imgEditContact = NULL;
+               wxBitmap *imgDeleteContact = NULL;
                int ActivityIconStatus = 0;
                int SearchUID = 0;
                int ContactUID = 0;
@@ -254,6 +256,7 @@ class frmMain : public frmMainADT
                void UpdateConnectionStatus( wxCommandEvent& event );
                void SetupSSLStatus( int AccountID );
                void InvalidSSLCertificate( wxCommandEvent& event );
+               void InvalidSSLCertificateString( wxCommandEvent& event );
                void CheckUpdates( wxCommandEvent& event );
                void OpenImportDialog( wxCommandEvent& event );
                void OpenExportDialog( wxCommandEvent& event );
@@ -282,8 +285,9 @@ class frmMain : public frmMainADT
 #elif defined(__WIN32__)
                void UpdateSSLAccountStatus(int AccountID, int SSLStatus, PCCERT_CONTEXT CertificateContext);
 #else
-               void UpdateSSLAccountStatus(int AccountID, int SSLStatus, SSLCertCollection SSLCertInc);
+               void UpdateSSLAccountStatus(int AccountID, int SSLStatus, SSLCertCollectionString SSLCertInc);
 #endif
+               bool CloseAllWindows();
                DECLARE_EVENT_TABLE()
 
        //// end generated class members