X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FAppXestiaAddrBk.h;h=a901d8575fac2deaa58c5c475f2ad26e61d561a8;hb=66582143bc7b3e31b38abcb86da63fd8f2f61415;hp=6bd643d02af86765e3309dd4ad9ac221a7ba19bb;hpb=25c2c8c7fed1898939175dfe2871015b6099c106;p=xestiaab%2F.git

diff --git a/source/AppXestiaAddrBk.h b/source/AppXestiaAddrBk.h
index 6bd643d..a901d85 100644
--- a/source/AppXestiaAddrBk.h
+++ b/source/AppXestiaAddrBk.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Feb 24 2016)
+// C++ code generated with wxFormBuilder (version Dec 21 2016)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -27,6 +27,7 @@
 #include <wx/html/htmlwin.h>
 #include <wx/splitter.h>
 #include <wx/statusbr.h>
+#include <wx/toolbar.h>
 #include <wx/frame.h>
 #include <wx/stattext.h>
 #include <wx/statline.h>
@@ -35,6 +36,7 @@
 #include <wx/scrolwin.h>
 #include <wx/notebook.h>
 #include <wx/checkbox.h>
+#include <wx/clrpicker.h>
 #include <wx/choice.h>
 #include <wx/textctrl.h>
 #include <wx/combobox.h>
@@ -52,23 +54,25 @@
 #define ID_MANAGE_NEWAB 1000
 #define ID_IMPORT 1001
 #define ID_EXPORT 1002
-#define ID_CONTACT_EDIT 1003
-#define ID_CONTACT_DELETE 1004
-#define ID_VIEW_FNLN 1005
-#define ID_VIEW_LNFN 1006
-#define ID_VIEW_NICK 1007
-#define ID_VIEW_ASC 1008
-#define ID_VIEW_DESC 1009
-#define ID_VIEW_STATUSBAR 1010
-#define ID_MANAGE_CUT 1011
-#define ID_MANAGE_COPY 1012
-#define ID_MANAGE_PASTE 1013
-#define ID_HELP_SHOW 1014
-#define ID_MANAGE_UPDATE 1015
-#define ID_CONTACT_CLOSE 1016
-#define CONTACT_SAVE 1017
-#define CONTACT_SAVECLOSE 1018
-#define CONTACT_CLOSE 1019
+#define ID_CONTACT_ADD 1003
+#define ID_CONTACT_EDIT 1004
+#define ID_CONTACT_DELETE 1005
+#define ID_CONTACT_FIND 1006
+#define ID_VIEW_FNLN 1007
+#define ID_VIEW_LNFN 1008
+#define ID_VIEW_NICK 1009
+#define ID_VIEW_ASC 1010
+#define ID_VIEW_DESC 1011
+#define ID_VIEW_STATUSBAR 1012
+#define ID_MANAGE_CUT 1013
+#define ID_MANAGE_COPY 1014
+#define ID_MANAGE_PASTE 1015
+#define ID_HELP_SHOW 1016
+#define ID_MANAGE_UPDATE 1017
+#define ID_CONTACT_CLOSE 1018
+#define CONTACT_SAVE 1019
+#define CONTACT_SAVECLOSE 1020
+#define CONTACT_CLOSE 1021
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class frmMainADT
@@ -101,6 +105,13 @@ class frmMainADT : public wxFrame
 		wxPanel* m_panel20;
 		wxHtmlWindow* htmContactData;
 		wxStatusBar* stbBottom;
+		wxToolBar* tblMain;
+		wxToolBarToolBase* tbtNewAccount; 
+		wxToolBarToolBase* tbtPreferences; 
+		wxToolBarToolBase* tbtSearch; 
+		wxToolBarToolBase* tbtAddContact; 
+		wxToolBarToolBase* tbtEditContact; 
+		wxToolBarToolBase* tbtDeleteContact; 
 		
 		// Virtual event handlers, overide them in your derived class
 		virtual void QuitApp( wxCloseEvent& event ) { event.Skip(); }
@@ -244,7 +255,9 @@ class frmPreferencesADT : public wxDialog
 	protected:
 		wxNotebook* NbtPreferences;
 		wxPanel* tabGeneral;
+		wxStaticBitmap* bmpWindowPosition;
 		wxCheckBox* chkSaveWindowPosition;
+		wxStaticBitmap* bmpLocalAddressBooks;
 		wxCheckBox* chkHideLocal;
 		wxPanel* tabTheme;
 		wxListCtrl* lstThemes;
@@ -256,6 +269,9 @@ class frmPreferencesADT : public wxDialog
 		wxButton* btnAccountAdd;
 		wxButton* btnAccountModify;
 		wxButton* btnAccountDelete;
+		wxPanel* tabContacts;
+		wxCheckBox* chkUseBackgroundColour;
+		wxColourPickerCtrl* clpContactBackgroundColour;
 		wxButton* btnSave;
 		wxButton* btnCancel;
 		
@@ -266,6 +282,8 @@ class frmPreferencesADT : public wxDialog
 		virtual void AddABAccount( wxCommandEvent& event ) { event.Skip(); }
 		virtual void ModifyABAccount( wxCommandEvent& event ) { event.Skip(); }
 		virtual void DeleteABAccount( wxCommandEvent& event ) { event.Skip(); }
+		virtual void ModifyABAccount( wxMouseEvent& event ) { event.Skip(); }
+		virtual void EnableBackgroundColourPicker( wxCommandEvent& event ) { event.Skip(); }
 		virtual void SavePreferences( wxCommandEvent& event ) { event.Skip(); }
 		virtual void CloseWindow( wxCommandEvent& event ) { event.Skip(); }
 		
@@ -993,7 +1011,7 @@ class frmActivityMgrADT : public wxFrame
 	
 	public:
 		
-		frmActivityMgrADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Activity Manager"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 400,300 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
+		frmActivityMgrADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Activity Manager"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 400,425 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
 		
 		~frmActivityMgrADT();
 	
@@ -1009,13 +1027,10 @@ class frmContactEditorNicknameADT : public wxDialog
 	protected:
 		wxNotebook* nbkAddress;
 		wxPanel* tabGeneral;
+		wxFlexGridSizer* szrGeneral;
 		wxStaticText* lblNickname;
 		wxTextCtrl* txtNickname;
 		wxStaticText* lblPriority;
-		wxCheckBox* chkUsePref;
-		wxSlider* sliPriority;
-		wxStaticText* lblHigh;
-		wxStaticText* lblLow;
 		wxPanel* tabOther;
 		wxStaticText* lblLanguage;
 		wxComboBox* cmbLanguage;
@@ -1024,7 +1039,6 @@ class frmContactEditorNicknameADT : public wxDialog
 		
 		// Virtual event handlers, overide them in your derived class
 		virtual void InitAddressEditor( wxInitDialogEvent& event ) { event.Skip(); }
-		virtual void EnablePriority( wxCommandEvent& event ) { event.Skip(); }
 		virtual void ProcessData( wxCommandEvent& event ) { event.Skip(); }
 		virtual void CloseWindow( wxCommandEvent& event ) { event.Skip(); }
 		
@@ -1074,25 +1088,21 @@ class frmContactEditorRolesADT : public wxDialog
 	protected:
 		wxNotebook* nbkRole;
 		wxPanel* tabGeneral;
+		wxFlexGridSizer* szrGeneral;
 		wxStaticText* lblRole;
 		wxTextCtrl* txtRole;
 		wxStaticText* lblPriority;
-		wxCheckBox* chkUsePref;
-		wxSlider* sliPriority;
-		wxStaticText* lblHigh;
-		wxStaticText* lblLow;
 		wxButton* btnAction;
 		wxButton* btnClose;
 		
 		// Virtual event handlers, overide them in your derived class
-		virtual void EnablePriority( wxCommandEvent& event ) { event.Skip(); }
 		virtual void ProcessAction( wxCommandEvent& event ) { event.Skip(); }
 		virtual void CloseWindow( wxCommandEvent& event ) { event.Skip(); }
 		
 	
 	public:
 		
-		frmContactEditorRolesADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Role Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 350,210 ), long style = wxDEFAULT_DIALOG_STYLE ); 
+		frmContactEditorRolesADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Role Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 386,231 ), long style = wxDEFAULT_DIALOG_STYLE ); 
 		~frmContactEditorRolesADT();
 	
 };
@@ -1107,21 +1117,17 @@ class frmContactEditorOrganisationsADT : public wxDialog
 	protected:
 		wxNotebook* nbkOrganisation;
 		wxPanel* tabGeneral;
+		wxFlexGridSizer* szrGeneral;
 		wxStaticText* lblOrganisation;
 		wxTextCtrl* txtOrganisation;
 		wxStaticText* lblSortAs;
 		wxComboBox* cmbSortAs;
 		wxStaticText* lblPriority;
-		wxCheckBox* chkUsePref;
-		wxSlider* sliPriority;
-		wxStaticText* lblHigh;
-		wxStaticText* lblLow;
 		wxButton* btnAction;
 		wxButton* btnClose;
 		
 		// Virtual event handlers, overide them in your derived class
 		virtual void UpdateSortAs( wxCommandEvent& event ) { event.Skip(); }
-		virtual void EnablePriority( wxCommandEvent& event ) { event.Skip(); }
 		virtual void ProcessAction( wxCommandEvent& event ) { event.Skip(); }
 		virtual void CloseWindow( wxCommandEvent& event ) { event.Skip(); }