macOS: ODTHelpBrowser now running

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

diff --git a/source/frmMain.h b/source/frmMain.h
index 8a5ac21..dcc18bb 100644 (file)
--- a/source/frmMain.h
+++ b/source/frmMain.h
@@ -47,6 +47,7 @@ Subclass of frmMainADT, which is generated by wxFormBuilder.
 #include "common/timers.h"
 #include "common/events.h"
 #include "common/etag.h"
+#include "common/structs.h"
 #include "bitmaps.h"
 #include "common/sslcertstructs.h"
 #include "widgets/XABContactMenu.h"
@@ -55,7 +56,6 @@ Subclass of frmMainADT, which is generated by wxFormBuilder.
 //// end generated include
 
 DECLARE_EVENT_TYPE(CE_UPDATECONTACTLIST, wxID_ANY)
-DECLARE_EVENT_TYPE(CE_UPDATEACCOUNTLIST, wxID_ANY)
 DECLARE_EVENT_TYPE(SE_UPDATECONTACTNOTIF, wxID_ANY)
 DECLARE_EVENT_TYPE(CE_OPENCONTACT, wxID_ANY)
 DECLARE_EVENT_TYPE(CE_OPENCONTACTLIST, wxID_ANY)
@@ -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);
@@ -98,11 +99,6 @@ struct SWCloseNotif{
        void *SCHWinPtr;
 };
 
-struct QRNotif{
-       int *QResponse;
-       bool *PausePtr;
-};
-
 struct XABViewMode{
 
        int SortMode;
@@ -129,10 +125,11 @@ class frmMain : public frmMainADT
                std::map<int, wxString> AccountAccDirList;
 #if defined(__APPLE__)
                std::map<int, SecTrustRef> AccountTrustData;
+               NSRunningApplication *helpBrowserProcess;
 #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 +148,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,18 +155,15 @@ 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;
+               int AccountUnsupportedID;
                int AccountNoneID;
                bool ReloadAccounts = FALSE;
                bool AscendingMode = FALSE;
@@ -188,6 +181,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;
@@ -198,6 +197,8 @@ class frmMain : public frmMainADT
 #if defined(__APPLE__)
                void DisplayCertificate(SecTrustRef SecurityTrustObject);
                void DisplayTrustPanel( wxCommandEvent& event );
+               void DisplayHelpBrowser();
+               void TerminateHelpBrowserProcess();
 #endif
        protected:
                // Handlers for frmMainADT events.
@@ -208,7 +209,7 @@ class frmMain : public frmMainADT
                void OpenPreferences( wxCommandEvent& event );
                void OpenNewABDialog( wxCommandEvent& event );
                void LoadPreferences( wxActivateEvent& event );
-               void LoadPreferences();
+               void LoadPreferences(bool skipWindowSizeReload);
                void ShowContactInfo( wxListEvent& event );
                void OpenContactInfoList( wxListEvent& event );
                void OpenContactInfoList( wxCommandEvent& event );
@@ -222,7 +223,6 @@ class frmMain : public frmMainADT
                              const std::wstring &name);
                void ConflictResolution( wxCommandEvent& event );
                void UpdateContactList( wxCommandEvent& event );
-               void UpdateAccountList( wxCommandEvent& event );
                void UpdateSearchContactLists( wxCommandEvent& event );
                void OpenFindContactsWindow(wxCommandEvent& event);
                void RevealContact( wxCommandEvent& event );
@@ -253,6 +253,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 );
@@ -281,8 +282,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