frmContactEditorIM: Implemented priority control

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

diff --git a/source/AppXestiaAddrBk.h b/source/AppXestiaAddrBk.h
index 5de2092..b816af7 100644 (file)
--- a/source/AppXestiaAddrBk.h
+++ b/source/AppXestiaAddrBk.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Feb 26 2014)
+// 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>
@@ -50,29 +52,27 @@
 ///////////////////////////////////////////////////////////////////////////
 
 #define ID_MANAGE_NEWAB 1000
-#define ID_MANAGE_IMPORT 1001
-#define ID_MANAGE_EXPORT 1002
-#define ID_MANAGE_PREFERENCES 1003
-#define ID_MANAGE_EXIT 1004
-#define ID_CONTACT_EDIT 1005
-#define ID_CONTACT_DELETE 1006
-#define ID_SET_CONTACT_AS_MYSELF 1007
-#define ID_VIEW_FNLN 1008
-#define ID_VIEW_LNFN 1009
-#define ID_VIEW_NICK 1010
-#define ID_VIEW_ASC 1011
-#define ID_VIEW_DESC 1012
-#define ID_VIEW_STATUSBAR 1013
-#define ID_MANAGE_CUT 1014
-#define ID_MANAGE_COPY 1015
-#define ID_MANAGE_PASTE 1016
-#define ID_HELP_SHOW 1017
-#define ID_MANAGE_UPDATE 1018
-#define ID_HELP_ABOUT 1019
-#define ID_CONTACT_CLOSE 1020
-#define CONTACT_SAVE 1021
-#define CONTACT_SAVECLOSE 1022
-#define CONTACT_CLOSE 1023
+#define ID_IMPORT 1001
+#define ID_EXPORT 1002
+#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
@@ -84,9 +84,9 @@ class frmMainADT : public wxFrame
        protected:
                wxMenuBar* mnuMain;
                wxMenu* mnuManage;
+               wxMenuItem* mnuPrefSep;
+               wxMenuItem* mnuExitSep;
                wxMenu* mnuContact;
-               wxMenuItem* setContactAsMyself;
-               wxMenuItem* m_separator5;
                wxMenu* mnuView;
                wxMenu* mnuShowContactsAs;
                wxMenu* mnuViewSortBy;
@@ -94,19 +94,27 @@ class frmMainADT : public wxFrame
                wxMenu* mnuEdit;
                wxMenu* mnuWindow;
                wxMenu* mnuHelp;
+               wxMenuItem* mnuHelpAboutSep;
                wxBoxSizer* szrMain;
                wxStaticBitmap* bmpIcon;
                wxComboCtrl* AccCtrl;
                wxSplitterWindow* m_splitter13;
                wxPanel* m_panel19;
-               wxFlexGridSizer* szrContactList;
-               wxFlexGridSizer* szrAccList;
+               wxBoxSizer* szrContactList;
                wxListCtrl* lstContacts;
                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(); }
                virtual void OpenNewABDialog( wxCommandEvent& event ) { event.Skip(); }
                virtual void RefreshAddressBook( wxCommandEvent& event ) { event.Skip(); }
                virtual void OpenImportDialog( wxCommandEvent& event ) { event.Skip(); }
@@ -116,7 +124,6 @@ class frmMainADT : public wxFrame
                virtual void ShowContactEditorNew( wxCommandEvent& event ) { event.Skip(); }
                virtual void ShowContactEditorEdit( wxCommandEvent& event ) { event.Skip(); }
                virtual void DeleteContact( wxCommandEvent& event ) { event.Skip(); }
-               virtual void SetContactAsSelf( wxCommandEvent& event ) { event.Skip(); }
                virtual void OpenFindContactsWindow( wxCommandEvent& event ) { event.Skip(); }
                virtual void SortFNLN( wxCommandEvent& event ) { event.Skip(); }
                virtual void SortLNFN( wxCommandEvent& event ) { event.Skip(); }
@@ -132,21 +139,22 @@ class frmMainADT : public wxFrame
                virtual void ShowHelp( wxCommandEvent& event ) { event.Skip(); }
                virtual void CheckUpdates( wxCommandEvent& event ) { event.Skip(); }
                virtual void ShowAboutWindow( wxCommandEvent& event ) { event.Skip(); }
-               virtual void OpenContactInfo( wxListEvent& event ) { event.Skip(); }
+               virtual void OpenContactInfoList( wxListEvent& event ) { event.Skip(); }
                virtual void ShowContactInfo( wxListEvent& event ) { event.Skip(); }
+               virtual void ShowContactMenu( wxMouseEvent& event ) { event.Skip(); }
                virtual void ShowContactSubmenu( wxMouseEvent& event ) { event.Skip(); }
                virtual void UpdateSBIconPlacement( wxSizeEvent& event ) { event.Skip(); }
                
        
        public:
                
-               frmMainADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Xestia Address Book"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,300 ), long style = wxDEFAULT_FRAME_STYLE );
+               frmMainADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Xestia Address Book"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 745,476 ), long style = wxDEFAULT_FRAME_STYLE );
                
                ~frmMainADT();
                
                void m_splitter13OnIdle( wxIdleEvent& )
                {
-                       m_splitter13->SetSashPosition( 184 );
+                       m_splitter13->SetSashPosition( 201 );
                        m_splitter13->Disconnect( wxEVT_IDLE, wxIdleEventHandler( frmMainADT::m_splitter13OnIdle ), NULL, this );
                }
        
@@ -208,12 +216,15 @@ class frmSearchADT : public wxFrame
                wxListCtrl* lstResults;
                wxMenuBar* m_menubar5;
                wxMenu* mnuContact;
+               wxMenuItem* mnuContactEdit;
+               wxMenuItem* mnuContactReveal;
                
                // Virtual event handlers, overide them in your derived class
                virtual void CloseWindow( wxCloseEvent& event ) { event.Skip(); }
                virtual void SelectAccounts( wxCommandEvent& event ) { event.Skip(); }
                virtual void SearchContacts( wxCommandEvent& event ) { event.Skip(); }
                virtual void ResetContacts( wxCommandEvent& event ) { event.Skip(); }
+               virtual void ShowContactMenu( wxMouseEvent& event ) { event.Skip(); }
                virtual void OpenContact( wxCommandEvent& event ) { event.Skip(); }
                virtual void EditContact( wxCommandEvent& event ) { event.Skip(); }
                virtual void RevealContact( wxCommandEvent& 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(); }
                
@@ -640,17 +658,20 @@ class frmContactEditorADT : public wxFrame
                wxButton* btnAddPicture;
                wxButton* btnModifyPicture;
                wxButton* btnDeletePicture;
+               wxButton* btnSavePicture;
                wxScrolledWindow* tabLogo;
                wxStaticBitmap* imgLogo;
                wxListCtrl* lboLogos;
                wxButton* btnAddLogo;
                wxButton* btnModifyLogo;
                wxButton* btnDeleteLogo;
+               wxButton* btnSaveLogo;
                wxScrolledWindow* tabSounds;
                wxListCtrl* lboSounds;
                wxButton* btnAddSound;
                wxButton* btnModifySound;
                wxButton* btnDeleteSound;
+               wxButton* btnSaveSound;
                wxStaticLine* m_staticline1;
                wxBitmapButton* btnPlay;
                wxBitmapButton* btnStop;
@@ -825,13 +846,16 @@ class frmContactEditorADT : public wxFrame
                virtual void AddPicture( wxCommandEvent& event ) { event.Skip(); }
                virtual void ModifyPicture( wxCommandEvent& event ) { event.Skip(); }
                virtual void DeletePicture( wxCommandEvent& event ) { event.Skip(); }
+               virtual void SavePicture( wxCommandEvent& event ) { event.Skip(); }
                virtual void LoadLogo( wxListEvent& event ) { event.Skip(); }
                virtual void AddLogo( wxCommandEvent& event ) { event.Skip(); }
                virtual void ModifyLogo( wxCommandEvent& event ) { event.Skip(); }
                virtual void DeleteLogo( wxCommandEvent& event ) { event.Skip(); }
+               virtual void SaveLogo( wxCommandEvent& event ) { event.Skip(); }
                virtual void AddSound( wxCommandEvent& event ) { event.Skip(); }
                virtual void ModifySound( wxCommandEvent& event ) { event.Skip(); }
                virtual void DeleteSound( wxCommandEvent& event ) { event.Skip(); }
+               virtual void SaveSound( wxCommandEvent& event ) { event.Skip(); }
                virtual void PlaySound( wxCommandEvent& event ) { event.Skip(); }
                virtual void StopSound( wxCommandEvent& event ) { event.Skip(); }
                virtual void AddCalendarAddress( wxCommandEvent& event ) { event.Skip(); }
@@ -861,7 +885,7 @@ class frmContactEditorADT : public wxFrame
        
        public:
                
-               frmContactEditorADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Contact Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 769,517 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
+               frmContactEditorADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Contact Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 800,517 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
                
                ~frmContactEditorADT();
        
@@ -915,7 +939,7 @@ class frmContactEditorAddressADT : public wxDialog
        
        public:
                
-               frmContactEditorAddressADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Address Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 426,317 ), long style = wxDEFAULT_DIALOG_STYLE ); 
+               frmContactEditorAddressADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Address Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 426,362 ), long style = wxDEFAULT_DIALOG_STYLE ); 
                ~frmContactEditorAddressADT();
        
 };
@@ -967,6 +991,7 @@ class frmActivityMgrADT : public wxFrame
        protected:
                wxMenuBar* mnuMenuBar;
                wxMenu* mnuWindow;
+               wxMenuItem* mnuSleepMode;
                wxPanel* m_panel43;
                wxStaticBitmap* bmpActivity;
                wxPanel* m_panel46;
@@ -986,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();
        
@@ -1002,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;
@@ -1017,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(); }
                
@@ -1067,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,184 ), 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();
        
 };
@@ -1100,28 +1117,24 @@ 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(); }
                
        
        public:
                
-               frmContactEditorOrganisationsADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Organisation Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 349,224 ), long style = wxDEFAULT_DIALOG_STYLE ); 
+               frmContactEditorOrganisationsADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Organisation Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 349,264 ), long style = wxDEFAULT_DIALOG_STYLE ); 
                ~frmContactEditorOrganisationsADT();
        
 };
@@ -1138,11 +1151,7 @@ class frmContactEditorNotesADT : public wxDialog
                wxPanel* tabGeneral;
                wxTextCtrl* txtNote;
                wxPanel* tabPriority;
-               wxStaticText* lblPriority;
-               wxCheckBox* chkUsePref;
-               wxSlider* sliPriority;
-               wxStaticText* lblHigh;
-               wxStaticText* lblLow;
+               wxFlexGridSizer* szrPriority;
                wxPanel* tabLanguage;
                wxStaticText* lblLanguage;
                wxComboBox* cmbLanguage;
@@ -1150,7 +1159,6 @@ class frmContactEditorNotesADT : public wxDialog
                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(); }
                
@@ -1172,25 +1180,21 @@ class frmContactEditorTitlesADT : public wxDialog
        protected:
                wxNotebook* nbkTitles;
                wxPanel* tabGeneral;
+               wxFlexGridSizer* szrGeneral;
                wxStaticText* lblTitle;
                wxTextCtrl* txtTitle;
                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:
                
-               frmContactEditorTitlesADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Title Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 350,184 ), long style = wxDEFAULT_DIALOG_STYLE ); 
+               frmContactEditorTitlesADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Title Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 386,231 ), long style = wxDEFAULT_DIALOG_STYLE ); 
                ~frmContactEditorTitlesADT();
        
 };
@@ -1205,27 +1209,23 @@ class frmContactEditorRelatedADT : public wxDialog
        protected:
                wxNotebook* nbkRelated;
                wxPanel* tabGeneral;
+               wxFlexGridSizer* szrGeneral;
                wxStaticText* lblRelation;
                wxTextCtrl* txtRelated;
                wxStaticText* lblType;
                wxComboBox* cmbType;
                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 ProcessData( wxCommandEvent& event ) { event.Skip(); }
                virtual void CloseWindow( wxCommandEvent& event ) { event.Skip(); }
                
        
        public:
                
-               frmContactEditorRelatedADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Related Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 350,226 ), long style = wxDEFAULT_DIALOG_STYLE ); 
+               frmContactEditorRelatedADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Related Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 350,270 ), long style = wxDEFAULT_DIALOG_STYLE ); 
                ~frmContactEditorRelatedADT();
        
 };
@@ -1240,27 +1240,23 @@ class frmContactEditorSoundADT : public wxDialog
        protected:
                wxNotebook* nbkRelated;
                wxPanel* tabGeneral;
+               wxFlexGridSizer* szrGeneral;
                wxStaticText* lblSoundFile;
                wxFilePickerCtrl* fipSound;
                wxStaticText* lblType;
                wxChoice* cmbType;
                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 ProcessData( wxCommandEvent& event ) { event.Skip(); }
                virtual void CloseWindow( wxCommandEvent& event ) { event.Skip(); }
                
        
        public:
                
-               frmContactEditorSoundADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Sound Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 350,226 ), long style = wxDEFAULT_DIALOG_STYLE ); 
+               frmContactEditorSoundADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Sound Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 350,283 ), long style = wxDEFAULT_DIALOG_STYLE ); 
                ~frmContactEditorSoundADT();
        
 };
@@ -1275,27 +1271,23 @@ class frmContactEditorPictureADT : public wxDialog
        protected:
                wxNotebook* nbkRelated;
                wxPanel* tabGeneral;
+               wxFlexGridSizer* szrGeneral;
                wxStaticText* lblPictureFile;
                wxFilePickerCtrl* fipPicture;
                wxStaticText* lblType;
                wxChoice* cmbType;
                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 ProcessData( wxCommandEvent& event ) { event.Skip(); }
                virtual void CloseWindow( wxCommandEvent& event ) { event.Skip(); }
                
        
        public:
                
-               frmContactEditorPictureADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Picture Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 350,226 ), long style = wxDEFAULT_DIALOG_STYLE ); 
+               frmContactEditorPictureADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Picture Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 381,264 ), long style = wxDEFAULT_DIALOG_STYLE ); 
                ~frmContactEditorPictureADT();
        
 };
@@ -1310,25 +1302,21 @@ class frmContactEditorWebsitesADT : public wxDialog
        protected:
                wxNotebook* nbkWebsite;
                wxPanel* tabGeneral;
+               wxFlexGridSizer* szrGeneral;
                wxStaticText* lblWebsite;
                wxTextCtrl* txtWebsite;
                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:
                
-               frmContactEditorWebsitesADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Website Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 350,184 ), long style = wxDEFAULT_DIALOG_STYLE ); 
+               frmContactEditorWebsitesADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Website Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 381,233 ), long style = wxDEFAULT_DIALOG_STYLE ); 
                ~frmContactEditorWebsitesADT();
        
 };
@@ -1343,25 +1331,21 @@ class frmContactEditorGeopositionADT : public wxDialog
        protected:
                wxNotebook* nbkWebsite;
                wxPanel* tabGeneral;
+               wxFlexGridSizer* szrGeneral;
                wxStaticText* lblGeoposition;
                wxTextCtrl* txtGeoposition;
                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:
                
-               frmContactEditorGeopositionADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Geoposition Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 350,184 ), long style = wxDEFAULT_DIALOG_STYLE ); 
+               frmContactEditorGeopositionADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Geoposition Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 350,201 ), long style = wxDEFAULT_DIALOG_STYLE ); 
                ~frmContactEditorGeopositionADT();
        
 };
@@ -1376,20 +1360,16 @@ class frmContactEditorCalAdrADT : public wxDialog
        protected:
                wxNotebook* nbkWebsite;
                wxPanel* tabGeneral;
+               wxFlexGridSizer* szrGeneral;
                wxStaticText* lblAddress;
                wxTextCtrl* txtAddress;
                wxStaticText* lblType;
                wxChoice* cmbType;
                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(); }
                
@@ -1471,15 +1451,12 @@ class frmContactEditorKeyADT : public wxDialog
        protected:
                wxNotebook* nbkWebsite;
                wxPanel* tabGeneral;
+               wxFlexGridSizer* szrGeneral;
                wxStaticText* lblKeyType;
                wxChoice* cmbKeyMainType;
                wxStaticText* lblType;
                wxChoice* cmbType;
                wxStaticText* lblPriority;
-               wxCheckBox* chkUsePref;
-               wxSlider* sliPriority;
-               wxStaticText* lblHigh;
-               wxStaticText* lblLow;
                wxPanel* tabURL;
                wxStaticText* lblKeyFormat;
                wxComboBox* cmbURL;
@@ -1495,7 +1472,6 @@ class frmContactEditorKeyADT : public wxDialog
                
                // Virtual event handlers, overide them in your derived class
                virtual void ProcessKeyType( wxCommandEvent& event ) { event.Skip(); }
-               virtual void EnablePriority( wxCommandEvent& event ) { event.Skip(); }
                virtual void ConvertURLType( wxCommandEvent& event ) { event.Skip(); }
                virtual void ConvertKeyType( wxCommandEvent& event ) { event.Skip(); }
                virtual void ProcessAction( wxCommandEvent& event ) { event.Skip(); }
@@ -1519,18 +1495,14 @@ class frmContactEditorEmailADT : public wxDialog
        protected:
                wxNotebook* nbkEmail;
                wxPanel* tabGeneral;
+               wxFlexGridSizer* szrGeneral;
                wxStaticText* lblEmailAddress;
                wxTextCtrl* txtEmail;
                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 ProcessData( wxCommandEvent& event ) { event.Skip(); }
                virtual void CloseWindow( wxCommandEvent& event ) { event.Skip(); }
                
@@ -1552,27 +1524,23 @@ class frmContactEditorIMADT : public wxDialog
        protected:
                wxNotebook* nbkIM;
                wxPanel* tabGeneral;
+               wxFlexGridSizer* szrGeneral;
                wxStaticText* lblIMType;
                wxComboBox* cmbIMType;
                wxStaticText* lblUsername;
                wxTextCtrl* txtUsername;
                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:
                
-               frmContactEditorIMADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Instant Messaging Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 424,224 ), long style = wxDEFAULT_DIALOG_STYLE ); 
+               frmContactEditorIMADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Instant Messaging Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 421,279 ), long style = wxDEFAULT_DIALOG_STYLE ); 
                ~frmContactEditorIMADT();
        
 };
@@ -1607,7 +1575,7 @@ class frmContactEditorCategoryADT : public wxDialog
        
        public:
                
-               frmContactEditorCategoryADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Category Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 424,224 ), long style = wxDEFAULT_DIALOG_STYLE ); 
+               frmContactEditorCategoryADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Category Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 424,245 ), long style = wxDEFAULT_DIALOG_STYLE ); 
                ~frmContactEditorCategoryADT();
        
 };
@@ -1648,7 +1616,7 @@ class frmContactEditorTelephoneADT : public wxDialog
        
        public:
                
-               frmContactEditorTelephoneADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Telephone Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 401,262 ), long style = wxDEFAULT_DIALOG_STYLE ); 
+               frmContactEditorTelephoneADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Telephone Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 402,331 ), long style = wxDEFAULT_DIALOG_STYLE ); 
                ~frmContactEditorTelephoneADT();
        
 };
@@ -1681,7 +1649,7 @@ class frmContactEditorLanguagesADT : public wxDialog
        
        public:
                
-               frmContactEditorLanguagesADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Language Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 350,184 ), long style = wxDEFAULT_DIALOG_STYLE ); 
+               frmContactEditorLanguagesADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Language Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 369,206 ), long style = wxDEFAULT_DIALOG_STYLE ); 
                ~frmContactEditorLanguagesADT();
        
 };
@@ -1714,7 +1682,7 @@ class frmContactEditorTimezonesADT : public wxDialog
        
        public:
                
-               frmContactEditorTimezonesADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Timezone Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 350,184 ), long style = wxDEFAULT_DIALOG_STYLE ); 
+               frmContactEditorTimezonesADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Timezone Editor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 350,231 ), long style = wxDEFAULT_DIALOG_STYLE ); 
                ~frmContactEditorTimezonesADT();
        
 };
@@ -1810,7 +1778,7 @@ class frmEditAccountADT : public wxDialog
        
        public:
                
-               frmEditAccountADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Edit Account"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 306,319 ), long style = wxDEFAULT_DIALOG_STYLE ); 
+               frmEditAccountADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("Edit Account"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 306,341 ), long style = wxDEFAULT_DIALOG_STYLE ); 
                ~frmEditAccountADT();
        
 };
@@ -1907,7 +1875,7 @@ class frmImportContactsADT : public wxDialog
        
        public:
                
-               frmImportContactsADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 362,403 ), long style = wxDEFAULT_DIALOG_STYLE ); 
+               frmImportContactsADT( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 325,400 ), long style = wxDEFAULT_DIALOG_STYLE ); 
                ~frmImportContactsADT();
        
 };