X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2FfrmMain.h;h=dcc18bbda9f84b87349ad3ac9493d214abb366a2;hp=ae5c3d076a261399ddfa6d909a9931dbc34ca7af;hb=32b56fabfeac4fea69986ebf183d5e9564bec040;hpb=d1663f3d3931bb05c791ef2c86926a22932c6014

diff --git a/source/frmMain.h b/source/frmMain.h
index ae5c3d0..dcc18bb 100644
--- 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)
@@ -99,11 +99,6 @@ struct SWCloseNotif{
 	void *SCHWinPtr;
 };
 
-struct QRNotif{
-	int *QResponse;
-	bool *PausePtr;
-};
-
 struct XABViewMode{
 
 	int SortMode;
@@ -130,6 +125,7 @@ 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
@@ -201,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.
@@ -211,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 );
@@ -225,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 );
@@ -287,6 +284,7 @@ class frmMain : public frmMainADT
 #else
 		void UpdateSSLAccountStatus(int AccountID, int SSLStatus, SSLCertCollectionString SSLCertInc);
 #endif
+		bool CloseAllWindows();
 		DECLARE_EVENT_TABLE()
 
 	//// end generated class members