X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2FAppXestiaAddrBk.cpp;h=e6d6ead3b67d3b2ced781ede18e0d4299a846aaa;hp=8c68db4df7f9752a5ef8af32b8e4ac4361536a56;hb=16ba57d640fd0412351c4cf8d324f02fdb2b2987;hpb=d91452d39ea9212c1b2185713576ebfa4f709310 diff --git a/source/AppXestiaAddrBk.cpp b/source/AppXestiaAddrBk.cpp index 8c68db4..e6d6ead 100644 --- a/source/AppXestiaAddrBk.cpp +++ b/source/AppXestiaAddrBk.cpp @@ -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! @@ -57,7 +57,7 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title, mnuContact = new wxMenu(); wxMenuItem* mnuNewContact; - mnuNewContact = new wxMenuItem( mnuContact, wxID_ANY, wxString( wxT("New Contact...") ) + wxT('\t') + wxT("CTRL+N"), wxEmptyString, wxITEM_NORMAL ); + mnuNewContact = new wxMenuItem( mnuContact, ID_CONTACT_ADD, wxString( wxT("New Contact...") ) + wxT('\t') + wxT("CTRL+N"), wxEmptyString, wxITEM_NORMAL ); mnuContact->Append( mnuNewContact ); wxMenuItem* mnuEditContact; @@ -71,7 +71,7 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title, mnuContact->AppendSeparator(); wxMenuItem* mnuFindContact; - mnuFindContact = new wxMenuItem( mnuContact, wxID_ANY, wxString( wxT("Find Contacts...") ) + wxT('\t') + wxT("CTRL+F"), wxEmptyString, wxITEM_NORMAL ); + mnuFindContact = new wxMenuItem( mnuContact, ID_CONTACT_FIND, wxString( wxT("Find Contacts...") ) + wxT('\t') + wxT("CTRL+F"), wxEmptyString, wxITEM_NORMAL ); mnuContact->Append( mnuFindContact ); mnuMain->Append( mnuContact, wxT("Contact") ); @@ -209,7 +209,28 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title, this->SetSizer( szrMain ); this->Layout(); - stbBottom = this->CreateStatusBar( 1, wxST_SIZEGRIP, wxID_ANY ); + stbBottom = this->CreateStatusBar( 1, 0, wxID_ANY ); + tblMain = this->CreateToolBar( wxTB_HORIZONTAL, wxID_ANY ); + tbtNewAccount = tblMain->AddTool( ID_MANAGE_NEWAB, wxT("New Address Book"), wxBitmap( 1, 1, wxBITMAP_SCREEN_DEPTH ), wxNullBitmap, wxITEM_NORMAL, wxT("New Address Book"), wxT("Setup a new local or remote address book"), NULL ); + + tblMain->AddSeparator(); + + tbtPreferences = tblMain->AddTool( wxID_PREFERENCES, wxT("Preferences"), wxBitmap( 1, 1, wxBITMAP_SCREEN_DEPTH ), wxNullBitmap, wxITEM_NORMAL, wxT("Preferences"), wxT("View or change application settings"), NULL ); + + tblMain->AddSeparator(); + + tbtSearch = tblMain->AddTool( ID_CONTACT_FIND, wxT("Search Contacts"), wxBitmap( 1, 1, wxBITMAP_SCREEN_DEPTH ), wxNullBitmap, wxITEM_NORMAL, wxT("Search Contacts"), wxT("Search for contacts in address books"), NULL ); + + tblMain->AddSeparator(); + + tbtAddContact = tblMain->AddTool( ID_CONTACT_ADD, wxT("Add Contact"), wxBitmap( 1, 1, wxBITMAP_SCREEN_DEPTH ), wxNullBitmap, wxITEM_NORMAL, wxT("Add Contact"), wxT("Add a new contact"), NULL ); + + tbtEditContact = tblMain->AddTool( ID_CONTACT_EDIT, wxT("Edit Contact"), wxBitmap( 1, 1, wxBITMAP_SCREEN_DEPTH ), wxNullBitmap, wxITEM_NORMAL, wxT("Edit Contact"), wxT("Edit a contact"), NULL ); + + tbtDeleteContact = tblMain->AddTool( ID_CONTACT_DELETE, wxT("Delete Contact"), wxBitmap( 1, 1, wxBITMAP_SCREEN_DEPTH ), wxNullBitmap, wxITEM_NORMAL, wxT("Delete Contact"), wxT("Delete a contact"), NULL ); + + tblMain->Realize(); + this->Centre( wxBOTH ); @@ -257,10 +278,10 @@ frmMainADT::~frmMainADT() this->Disconnect( ID_EXPORT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenExportDialog ) ); this->Disconnect( wxID_PREFERENCES, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenPreferences ) ); this->Disconnect( wxID_EXIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::QuitApp ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowContactEditorNew ) ); + this->Disconnect( ID_CONTACT_ADD, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowContactEditorNew ) ); this->Disconnect( ID_CONTACT_EDIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowContactEditorEdit ) ); this->Disconnect( ID_CONTACT_DELETE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::DeleteContact ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenFindContactsWindow ) ); + this->Disconnect( ID_CONTACT_FIND, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenFindContactsWindow ) ); this->Disconnect( ID_VIEW_FNLN, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::SortFNLN ) ); this->Disconnect( ID_VIEW_LNFN, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::SortLNFN ) ); this->Disconnect( ID_VIEW_NICK, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::SortNickname ) ); @@ -306,6 +327,8 @@ frmUpdateADT::frmUpdateADT( wxWindow* parent, wxWindowID id, const wxString& tit lblRunningVer = new wxStaticText( pnlUpdateData, wxID_ANY, wxT("UPDATEVER"), wxDefaultPosition, wxDefaultSize, 0 ); lblRunningVer->Wrap( -1 ); + lblRunningVer->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); + fgSizer45->Add( lblRunningVer, 0, wxALL, 5 ); lblAvailableText = new wxStaticText( pnlUpdateData, wxID_ANY, wxT("Available version is:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -380,7 +403,7 @@ frmSearchADT::frmSearchADT( wxWindow* parent, wxWindowID id, const wxString& tit { this->SetSizeHints( wxSize( 300,450 ), wxDefaultSize ); - stbBottom = this->CreateStatusBar( 1, wxST_SIZEGRIP, wxID_ANY ); + stbBottom = this->CreateStatusBar( 1, 0, wxID_ANY ); wxBoxSizer* bSizer368; bSizer368 = new wxBoxSizer( wxVERTICAL ); @@ -524,19 +547,34 @@ frmPreferencesADT::frmPreferencesADT( wxWindow* parent, wxWindowID id, const wxS NbtPreferences = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); tabGeneral = new wxPanel( NbtPreferences, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - wxBoxSizer* szrChecks; - szrChecks = new wxBoxSizer( wxVERTICAL ); + wxFlexGridSizer* szrGeneral; + szrGeneral = new wxFlexGridSizer( 2, 2, 0, 0 ); + szrGeneral->AddGrowableCol( 1 ); + szrGeneral->SetFlexibleDirection( wxBOTH ); + szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + bmpWindowPosition = new wxStaticBitmap( tabGeneral, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 32,32 ), 0 ); + bmpWindowPosition->SetMinSize( wxSize( 32,32 ) ); + bmpWindowPosition->SetMaxSize( wxSize( 32,32 ) ); + + szrGeneral->Add( bmpWindowPosition, 0, wxALL, 5 ); chkSaveWindowPosition = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Save window position on exit"), wxDefaultPosition, wxDefaultSize, 0 ); - szrChecks->Add( chkSaveWindowPosition, 0, wxALL, 5 ); + szrGeneral->Add( chkSaveWindowPosition, 0, wxALL, 5 ); + + bmpLocalAddressBooks = new wxStaticBitmap( tabGeneral, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 32,32 ), 0 ); + bmpLocalAddressBooks->SetMinSize( wxSize( 32,32 ) ); + bmpLocalAddressBooks->SetMaxSize( wxSize( 32,32 ) ); + + szrGeneral->Add( bmpLocalAddressBooks, 0, wxALL, 5 ); chkHideLocal = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Hide local address books"), wxDefaultPosition, wxDefaultSize, 0 ); - szrChecks->Add( chkHideLocal, 0, wxALL, 5 ); + szrGeneral->Add( chkHideLocal, 0, wxALL, 5 ); - tabGeneral->SetSizer( szrChecks ); + tabGeneral->SetSizer( szrGeneral ); tabGeneral->Layout(); - szrChecks->Fit( tabGeneral ); + szrGeneral->Fit( tabGeneral ); NbtPreferences->AddPage( tabGeneral, wxT("General"), true ); tabTheme = new wxPanel( NbtPreferences, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); tabTheme->Hide(); @@ -614,6 +652,24 @@ frmPreferencesADT::frmPreferencesADT( wxWindow* parent, wxWindowID id, const wxS tabAccounts->Layout(); szrAccounts->Fit( tabAccounts ); NbtPreferences->AddPage( tabAccounts, wxT("Accounts"), false ); + tabContacts = new wxPanel( NbtPreferences, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + wxFlexGridSizer* szrContacts; + szrContacts = new wxFlexGridSizer( 1, 2, 0, 0 ); + szrContacts->AddGrowableCol( 0 ); + szrContacts->SetFlexibleDirection( wxBOTH ); + szrContacts->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + chkUseBackgroundColour = new wxCheckBox( tabContacts, wxID_ANY, wxT("Use different background colour"), wxDefaultPosition, wxDefaultSize, 0 ); + szrContacts->Add( chkUseBackgroundColour, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + + clpContactBackgroundColour = new wxColourPickerCtrl( tabContacts, wxID_ANY, wxColour( 255, 255, 255 ), wxDefaultPosition, wxDefaultSize, wxCLRP_DEFAULT_STYLE ); + szrContacts->Add( clpContactBackgroundColour, 0, wxALL, 5 ); + + + tabContacts->SetSizer( szrContacts ); + tabContacts->Layout(); + szrContacts->Fit( tabContacts ); + NbtPreferences->AddPage( tabContacts, wxT("Contacts"), false ); szrTabs->Add( NbtPreferences, 1, wxALL|wxEXPAND, 5 ); @@ -655,11 +711,13 @@ frmPreferencesADT::frmPreferencesADT( wxWindow* parent, wxWindowID id, const wxS btnThemeAdd->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::AddABAccount ), NULL, this ); btnThemeModify->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::ModifyABAccount ), NULL, this ); btnThemeDelete->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::DeleteABAccount ), NULL, this ); + lstAccounts->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( frmPreferencesADT::ModifyABAccount ), NULL, this ); lstAccounts->Connect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( frmPreferencesADT::DisableABButtons ), NULL, this ); lstAccounts->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( frmPreferencesADT::EnableABButtons ), NULL, this ); btnAccountAdd->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::AddABAccount ), NULL, this ); btnAccountModify->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::ModifyABAccount ), NULL, this ); btnAccountDelete->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::DeleteABAccount ), NULL, this ); + chkUseBackgroundColour->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmPreferencesADT::EnableBackgroundColourPicker ), NULL, this ); btnSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::SavePreferences ), NULL, this ); btnCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::CloseWindow ), NULL, this ); } @@ -673,11 +731,13 @@ frmPreferencesADT::~frmPreferencesADT() btnThemeAdd->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::AddABAccount ), NULL, this ); btnThemeModify->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::ModifyABAccount ), NULL, this ); btnThemeDelete->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::DeleteABAccount ), NULL, this ); + lstAccounts->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( frmPreferencesADT::ModifyABAccount ), NULL, this ); lstAccounts->Disconnect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( frmPreferencesADT::DisableABButtons ), NULL, this ); lstAccounts->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( frmPreferencesADT::EnableABButtons ), NULL, this ); btnAccountAdd->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::AddABAccount ), NULL, this ); btnAccountModify->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::ModifyABAccount ), NULL, this ); btnAccountDelete->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::DeleteABAccount ), NULL, this ); + chkUseBackgroundColour->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmPreferencesADT::EnableBackgroundColourPicker ), NULL, this ); btnSave->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::SavePreferences ), NULL, this ); btnCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::CloseWindow ), NULL, this ); @@ -705,7 +765,7 @@ frmAboutADT::frmAboutADT( wxWindow* parent, wxWindowID id, const wxString& title lblVersion = new wxStaticText( this, wxID_ANY, wxT("Version 0.00"), wxDefaultPosition, wxDefaultSize, 0 ); lblVersion->Wrap( -1 ); - lblVersion->SetFont( wxFont( 14, 70, 90, 92, false, wxEmptyString ) ); + lblVersion->SetFont( wxFont( 14, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); szrDetails->Add( lblVersion, 0, wxALL, 5 ); @@ -832,7 +892,6 @@ frmNewAccountADT::frmNewAccountADT( wxWindow* parent, wxWindowID id, const wxStr fgSizer33->Add( lblServerAddress, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtServerAddress = new wxTextCtrl( tabType, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtServerAddress->SetMaxLength( 0 ); fgSizer33->Add( txtServerAddress, 1, wxALL|wxEXPAND, 5 ); lblServerPort = new wxStaticText( tabType, wxID_ANY, wxT("Server Port:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -840,7 +899,6 @@ frmNewAccountADT::frmNewAccountADT( wxWindow* parent, wxWindowID id, const wxStr fgSizer33->Add( lblServerPort, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtServerPort = new wxTextCtrl( tabType, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtServerPort->SetMaxLength( 0 ); fgSizer33->Add( txtServerPort, 0, wxALL, 5 ); lblUsername = new wxStaticText( tabType, wxID_ANY, wxT("Username:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -848,7 +906,6 @@ frmNewAccountADT::frmNewAccountADT( wxWindow* parent, wxWindowID id, const wxStr fgSizer33->Add( lblUsername, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtUsername = new wxTextCtrl( tabType, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtUsername->SetMaxLength( 0 ); fgSizer33->Add( txtUsername, 1, wxALL|wxEXPAND, 5 ); lblPassword = new wxStaticText( tabType, wxID_ANY, wxT("Password:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -856,7 +913,6 @@ frmNewAccountADT::frmNewAccountADT( wxWindow* parent, wxWindowID id, const wxStr fgSizer33->Add( lblPassword, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtPassword = new wxTextCtrl( tabType, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); - txtPassword->SetMaxLength( 0 ); fgSizer33->Add( txtPassword, 0, wxALL|wxEXPAND, 5 ); lblSSL = new wxStaticText( tabType, wxID_ANY, wxT("SSL:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -890,7 +946,7 @@ frmNewAccountADT::frmNewAccountADT( wxWindow* parent, wxWindowID id, const wxStr lblConnectionResult = new wxStaticText( tabConn, wxID_ANY, wxT("Connection Results:"), wxDefaultPosition, wxDefaultSize, 0 ); lblConnectionResult->Wrap( -1 ); - lblConnectionResult->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Sans") ) ); + lblConnectionResult->SetFont( wxFont( 9, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxT("Sans") ) ); bSizer323->Add( lblConnectionResult, 0, wxALL, 5 ); @@ -986,7 +1042,6 @@ frmNewAccountADT::frmNewAccountADT( wxWindow* parent, wxWindowID id, const wxStr fgSizer341->Add( lblAccountName, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtAccountName = new wxTextCtrl( tabFinish, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtAccountName->SetMaxLength( 0 ); fgSizer341->Add( txtAccountName, 1, wxALL|wxEXPAND, 5 ); @@ -1064,7 +1119,6 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const gSizer7->Add( lblTitle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtTitle = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtTitle->SetMaxLength( 0 ); gSizer7->Add( txtTitle, 0, wxALL|wxEXPAND, 5 ); @@ -1084,7 +1138,6 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const gSizer7->Add( lblForename, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtForename = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtForename->SetMaxLength( 0 ); gSizer7->Add( txtForename, 0, wxALL|wxEXPAND, 5 ); lblSurname = new wxStaticText( tabGeneral, wxID_ANY, wxT("Surname:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -1092,7 +1145,6 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const gSizer7->Add( lblSurname, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtSurname = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtSurname->SetMaxLength( 0 ); gSizer7->Add( txtSurname, 0, wxALL|wxEXPAND, 5 ); lblOtherNames = new wxStaticText( tabGeneral, wxID_ANY, wxT("Other Names:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -1100,7 +1152,6 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const gSizer7->Add( lblOtherNames, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtOtherNames = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtOtherNames->SetMaxLength( 0 ); gSizer7->Add( txtOtherNames, 0, wxALL|wxEXPAND, 5 ); lblSuffix = new wxStaticText( tabGeneral, wxID_ANY, wxT("Suffix:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -1108,7 +1159,6 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const gSizer7->Add( lblSuffix, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtSuffix = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtSuffix->SetMaxLength( 0 ); gSizer7->Add( txtSuffix, 0, wxALL|wxEXPAND, 5 ); @@ -1141,14 +1191,13 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const bSizer318 = new wxBoxSizer( wxHORIZONTAL ); dapBirthday = new wxDatePickerCtrl( tabGeneral, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_ALLOWNONE|wxDP_DEFAULT|wxDP_DROPDOWN|wxDP_SHOWCENTURY ); - dapBirthday->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) ); + dapBirthday->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); dapBirthday->SetToolTip( wxT("If you don't wish to enter a year, please use '0000' as the year.") ); dapBirthday->SetMinSize( wxSize( -1,25 ) ); bSizer318->Add( dapBirthday, 0, wxALL|wxEXPAND, 5 ); txtBirthday = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtBirthday->SetMaxLength( 0 ); bSizer318->Add( txtBirthday, 1, wxALL, 5 ); @@ -1168,7 +1217,6 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const bSizer319->Add( dapAnniversary, 0, wxALL|wxEXPAND, 5 ); txtAnniversary = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtAnniversary->SetMaxLength( 0 ); bSizer319->Add( txtAnniversary, 1, wxALL, 5 ); @@ -1188,7 +1236,6 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const bSizer20->Add( cmbGender, 0, wxALL, 5 ); txtGenderDescription = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtGenderDescription->SetMaxLength( 0 ); bSizer20->Add( txtGenderDescription, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -3795,7 +3842,6 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind fgSizer6->Add( lblAddress, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtAddress = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtAddress->SetMaxLength( 0 ); fgSizer6->Add( txtAddress, 0, wxALL|wxEXPAND, 5 ); m_staticText61 = new wxStaticText( tabGeneral, wxID_ANY, wxT("Town/City:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -3803,7 +3849,6 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind fgSizer6->Add( m_staticText61, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtTownCity = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtTownCity->SetMaxLength( 0 ); fgSizer6->Add( txtTownCity, 0, wxALL|wxEXPAND, 5 ); lblCountyState = new wxStaticText( tabGeneral, wxID_ANY, wxT("County:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -3811,7 +3856,6 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind fgSizer6->Add( lblCountyState, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtCounty = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtCounty->SetMaxLength( 0 ); fgSizer6->Add( txtCounty, 0, wxALL|wxEXPAND, 5 ); lblPostCode = new wxStaticText( tabGeneral, wxID_ANY, wxT("Post Code:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -3819,7 +3863,6 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind fgSizer6->Add( lblPostCode, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtPostCode = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtPostCode->SetMaxLength( 0 ); fgSizer6->Add( txtPostCode, 0, wxALL, 5 ); lblCountry = new wxStaticText( tabGeneral, wxID_ANY, wxT("Country:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -3827,7 +3870,6 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind fgSizer6->Add( lblCountry, 0, wxALL, 5 ); txtCountry = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtCountry->SetMaxLength( 0 ); fgSizer6->Add( txtCountry, 0, wxALL|wxEXPAND, 5 ); lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -3917,7 +3959,6 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind fgSizer61->Add( lblGeography, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtGeo = new wxTextCtrl( tabOther, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtGeo->SetMaxLength( 0 ); fgSizer61->Add( txtGeo, 0, wxALL|wxEXPAND, 5 ); lblTimezone = new wxStaticText( tabOther, wxID_ANY, wxT("Timezone:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -3925,7 +3966,6 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind fgSizer61->Add( lblTimezone, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtTimezone = new wxTextCtrl( tabOther, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtTimezone->SetMaxLength( 0 ); fgSizer61->Add( txtTimezone, 0, wxALL|wxEXPAND, 5 ); @@ -4072,7 +4112,7 @@ frmConflictResolutionADT::~frmConflictResolutionADT() frmActivityMgrADT::frmActivityMgrADT( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style ) { - this->SetSizeHints( wxSize( 400,300 ), wxDefaultSize ); + this->SetSizeHints( wxSize( 400,425 ), wxDefaultSize ); mnuMenuBar = new wxMenuBar( 0 ); mnuWindow = new wxMenu(); @@ -4090,7 +4130,6 @@ frmActivityMgrADT::frmActivityMgrADT( wxWindow* parent, wxWindowID id, const wxS mnuWindow->AppendSeparator(); - wxMenuItem* mnuSleepMode; mnuSleepMode = new wxMenuItem( mnuWindow, wxID_ANY, wxString( wxT("Sleep Mode") ) , wxEmptyString, wxITEM_CHECK ); mnuWindow->Append( mnuSleepMode ); @@ -4129,7 +4168,7 @@ frmActivityMgrADT::frmActivityMgrADT( wxWindow* parent, wxWindowID id, const wxS lblDetails = new wxStaticText( m_panel46, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE ); lblDetails->Wrap( -1 ); - bSizer364->Add( lblDetails, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 0 ); + bSizer364->Add( lblDetails, 0, wxALL|wxEXPAND, 0 ); bSizer364->Add( 0, 0, 1, wxEXPAND, 5 ); @@ -4168,28 +4207,6 @@ frmActivityMgrADT::frmActivityMgrADT( wxWindow* parent, wxWindowID id, const wxS bSizer365->Fit( m_panel44 ); fgSizer38->Add( m_panel44, 5, wxALL|wxEXPAND, 0 ); - m_panel55 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - m_panel55->SetMinSize( wxSize( -1,75 ) ); - - wxBoxSizer* bSizer396; - bSizer396 = new wxBoxSizer( wxVERTICAL ); - - bSizer396->SetMinSize( wxSize( -1,75 ) ); - lblResult = new wxStaticText( m_panel55, wxID_ANY, wxT("Activity Result:"), wxDefaultPosition, wxDefaultSize, 0 ); - lblResult->Wrap( -1 ); - bSizer396->Add( lblResult, 0, wxALL, 5 ); - - txtMessage = new wxTextCtrl( m_panel55, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxNO_BORDER ); - txtMessage->SetMinSize( wxSize( -1,50 ) ); - - bSizer396->Add( txtMessage, 1, wxALL|wxEXPAND, 0 ); - - - m_panel55->SetSizer( bSizer396 ); - m_panel55->Layout(); - bSizer396->Fit( m_panel55 ); - fgSizer38->Add( m_panel55, 1, wxEXPAND | wxALL, 5 ); - this->SetSizer( fgSizer38 ); this->Layout(); @@ -4226,72 +4243,26 @@ frmContactEditorNicknameADT::frmContactEditorNicknameADT( wxWindow* parent, wxWi nbkAddress = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); tabGeneral = new wxPanel( nbkAddress, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - wxFlexGridSizer* fgSizer6; - fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer6->AddGrowableCol( 1 ); - fgSizer6->SetFlexibleDirection( wxVERTICAL ); - fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + szrGeneral = new wxFlexGridSizer( 2, 2, 0, 0 ); + szrGeneral->AddGrowableCol( 1 ); + szrGeneral->SetFlexibleDirection( wxBOTH ); + szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); lblNickname = new wxStaticText( tabGeneral, wxID_ANY, wxT("Nickname:"), wxDefaultPosition, wxDefaultSize, 0 ); lblNickname->Wrap( -1 ); - fgSizer6->Add( lblNickname, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + szrGeneral->Add( lblNickname, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtNickname = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtNickname->SetMaxLength( 0 ); - fgSizer6->Add( txtNickname, 0, wxALL|wxEXPAND, 5 ); + szrGeneral->Add( txtNickname, 0, wxALL|wxEXPAND, 5 ); lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); lblPriority->Wrap( -1 ); - fgSizer6->Add( lblPriority, 0, wxALL, 5 ); - - wxBoxSizer* bSizer260; - bSizer260 = new wxBoxSizer( wxHORIZONTAL ); - - chkUsePref = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer260->Add( chkUsePref, 0, wxALL, 5 ); - - wxBoxSizer* bSizer254; - bSizer254 = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer* bSizer256; - bSizer256 = new wxBoxSizer( wxHORIZONTAL ); - - sliPriority = new wxSlider( tabGeneral, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS ); - bSizer256->Add( sliPriority, 1, wxALL|wxEXPAND, 5 ); - - - bSizer254->Add( bSizer256, 1, wxEXPAND, 5 ); - - wxBoxSizer* bSizer255; - bSizer255 = new wxBoxSizer( wxHORIZONTAL ); - - lblHigh = new wxStaticText( tabGeneral, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 ); - lblHigh->Wrap( -1 ); - bSizer255->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 ); - - - bSizer255->Add( 0, 0, 1, wxEXPAND, 5 ); - - lblLow = new wxStaticText( tabGeneral, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 ); - lblLow->Wrap( -1 ); - bSizer255->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 ); - - - bSizer254->Add( bSizer255, 1, wxEXPAND, 0 ); - - - bSizer260->Add( bSizer254, 1, wxEXPAND, 5 ); + szrGeneral->Add( lblPriority, 0, wxALL, 5 ); - fgSizer6->Add( bSizer260, 1, wxEXPAND, 5 ); - - - fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 ); - - - tabGeneral->SetSizer( fgSizer6 ); + tabGeneral->SetSizer( szrGeneral ); tabGeneral->Layout(); - fgSizer6->Fit( tabGeneral ); + szrGeneral->Fit( tabGeneral ); nbkAddress->AddPage( tabGeneral, wxT("General"), true ); tabOther = new wxPanel( nbkAddress, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxFlexGridSizer* fgSizer61; @@ -4335,7 +4306,6 @@ frmContactEditorNicknameADT::frmContactEditorNicknameADT( wxWindow* parent, wxWi // Connect Events this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( frmContactEditorNicknameADT::InitAddressEditor ) ); - chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorNicknameADT::EnablePriority ), NULL, this ); btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorNicknameADT::ProcessData ), NULL, this ); btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorNicknameADT::CloseWindow ), NULL, this ); } @@ -4344,7 +4314,6 @@ frmContactEditorNicknameADT::~frmContactEditorNicknameADT() { // Disconnect Events this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( frmContactEditorNicknameADT::InitAddressEditor ) ); - chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorNicknameADT::EnablePriority ), NULL, this ); btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorNicknameADT::ProcessData ), NULL, this ); btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorNicknameADT::CloseWindow ), NULL, this ); @@ -4427,72 +4396,26 @@ frmContactEditorRolesADT::frmContactEditorRolesADT( wxWindow* parent, wxWindowID nbkRole = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); tabGeneral = new wxPanel( nbkRole, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - wxFlexGridSizer* fgSizer6; - fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer6->AddGrowableCol( 1 ); - fgSizer6->SetFlexibleDirection( wxVERTICAL ); - fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + szrGeneral = new wxFlexGridSizer( 2, 2, 0, 0 ); + szrGeneral->AddGrowableCol( 1 ); + szrGeneral->SetFlexibleDirection( wxBOTH ); + szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); lblRole = new wxStaticText( tabGeneral, wxID_ANY, wxT("Role Name:"), wxDefaultPosition, wxDefaultSize, 0 ); lblRole->Wrap( -1 ); - fgSizer6->Add( lblRole, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + szrGeneral->Add( lblRole, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtRole = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtRole->SetMaxLength( 0 ); - fgSizer6->Add( txtRole, 0, wxALL|wxEXPAND, 5 ); + szrGeneral->Add( txtRole, 0, wxALL|wxEXPAND, 5 ); lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); lblPriority->Wrap( -1 ); - fgSizer6->Add( lblPriority, 0, wxALL, 5 ); - - wxBoxSizer* bSizer260; - bSizer260 = new wxBoxSizer( wxHORIZONTAL ); - - chkUsePref = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer260->Add( chkUsePref, 0, wxALL, 5 ); - - wxBoxSizer* bSizer254; - bSizer254 = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer* bSizer256; - bSizer256 = new wxBoxSizer( wxHORIZONTAL ); - - sliPriority = new wxSlider( tabGeneral, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS ); - bSizer256->Add( sliPriority, 1, wxALL|wxEXPAND, 5 ); - - - bSizer254->Add( bSizer256, 1, wxEXPAND, 5 ); - - wxBoxSizer* bSizer255; - bSizer255 = new wxBoxSizer( wxHORIZONTAL ); - - lblHigh = new wxStaticText( tabGeneral, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 ); - lblHigh->Wrap( -1 ); - bSizer255->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 ); - - - bSizer255->Add( 0, 0, 1, wxEXPAND, 5 ); - - lblLow = new wxStaticText( tabGeneral, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 ); - lblLow->Wrap( -1 ); - bSizer255->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 ); - - - bSizer254->Add( bSizer255, 1, wxEXPAND, 0 ); - - - bSizer260->Add( bSizer254, 1, wxEXPAND, 5 ); - - - fgSizer6->Add( bSizer260, 1, wxEXPAND, 5 ); - - - fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 ); + szrGeneral->Add( lblPriority, 0, wxALL, 5 ); - tabGeneral->SetSizer( fgSizer6 ); + tabGeneral->SetSizer( szrGeneral ); tabGeneral->Layout(); - fgSizer6->Fit( tabGeneral ); + szrGeneral->Fit( tabGeneral ); nbkRole->AddPage( tabGeneral, wxT("General"), false ); bSizer251->Add( nbkRole, 1, wxEXPAND | wxALL, 5 ); @@ -4516,7 +4439,6 @@ frmContactEditorRolesADT::frmContactEditorRolesADT( wxWindow* parent, wxWindowID this->Centre( wxBOTH ); // Connect Events - chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorRolesADT::EnablePriority ), NULL, this ); btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorRolesADT::ProcessAction ), NULL, this ); btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorRolesADT::CloseWindow ), NULL, this ); } @@ -4524,7 +4446,6 @@ frmContactEditorRolesADT::frmContactEditorRolesADT( wxWindow* parent, wxWindowID frmContactEditorRolesADT::~frmContactEditorRolesADT() { // Disconnect Events - chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorRolesADT::EnablePriority ), NULL, this ); btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorRolesADT::ProcessAction ), NULL, this ); btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorRolesADT::CloseWindow ), NULL, this ); @@ -4539,79 +4460,33 @@ frmContactEditorOrganisationsADT::frmContactEditorOrganisationsADT( wxWindow* pa nbkOrganisation = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); tabGeneral = new wxPanel( nbkOrganisation, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - wxFlexGridSizer* fgSizer6; - fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer6->AddGrowableCol( 1 ); - fgSizer6->SetFlexibleDirection( wxBOTH ); - fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + szrGeneral = new wxFlexGridSizer( 3, 2, 0, 0 ); + szrGeneral->AddGrowableCol( 1 ); + szrGeneral->SetFlexibleDirection( wxBOTH ); + szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); lblOrganisation = new wxStaticText( tabGeneral, wxID_ANY, wxT("Organisation:"), wxDefaultPosition, wxDefaultSize, 0 ); lblOrganisation->Wrap( -1 ); - fgSizer6->Add( lblOrganisation, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + szrGeneral->Add( lblOrganisation, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtOrganisation = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtOrganisation->SetMaxLength( 0 ); - fgSizer6->Add( txtOrganisation, 0, wxALL|wxEXPAND, 5 ); + szrGeneral->Add( txtOrganisation, 0, wxALL|wxEXPAND, 5 ); lblSortAs = new wxStaticText( tabGeneral, wxID_ANY, wxT("Sort As:"), wxDefaultPosition, wxDefaultSize, 0 ); lblSortAs->Wrap( -1 ); - fgSizer6->Add( lblSortAs, 0, wxALL, 5 ); + szrGeneral->Add( lblSortAs, 0, wxALL, 5 ); cmbSortAs = new wxComboBox( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); - fgSizer6->Add( cmbSortAs, 1, wxALL, 5 ); + szrGeneral->Add( cmbSortAs, 1, wxALL, 5 ); lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); lblPriority->Wrap( -1 ); - fgSizer6->Add( lblPriority, 0, wxALL, 5 ); - - wxBoxSizer* bSizer260; - bSizer260 = new wxBoxSizer( wxHORIZONTAL ); - - chkUsePref = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer260->Add( chkUsePref, 0, wxALL, 5 ); - - wxBoxSizer* bSizer254; - bSizer254 = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer* bSizer256; - bSizer256 = new wxBoxSizer( wxHORIZONTAL ); - - sliPriority = new wxSlider( tabGeneral, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS ); - bSizer256->Add( sliPriority, 1, wxALL|wxEXPAND, 5 ); - - - bSizer254->Add( bSizer256, 1, wxEXPAND, 5 ); - - wxBoxSizer* bSizer255; - bSizer255 = new wxBoxSizer( wxHORIZONTAL ); - - lblHigh = new wxStaticText( tabGeneral, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 ); - lblHigh->Wrap( -1 ); - bSizer255->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 ); - - - bSizer255->Add( 0, 0, 1, wxEXPAND, 5 ); - - lblLow = new wxStaticText( tabGeneral, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 ); - lblLow->Wrap( -1 ); - bSizer255->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 ); - - - bSizer254->Add( bSizer255, 1, wxEXPAND, 0 ); - - - bSizer260->Add( bSizer254, 1, wxEXPAND, 5 ); - + szrGeneral->Add( lblPriority, 0, wxALL, 5 ); - fgSizer6->Add( bSizer260, 1, wxEXPAND, 5 ); - - - fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 ); - - tabGeneral->SetSizer( fgSizer6 ); + tabGeneral->SetSizer( szrGeneral ); tabGeneral->Layout(); - fgSizer6->Fit( tabGeneral ); + szrGeneral->Fit( tabGeneral ); nbkOrganisation->AddPage( tabGeneral, wxT("General"), false ); bSizer251->Add( nbkOrganisation, 1, wxEXPAND | wxALL, 5 ); @@ -4636,7 +4511,6 @@ frmContactEditorOrganisationsADT::frmContactEditorOrganisationsADT( wxWindow* pa // Connect Events txtOrganisation->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( frmContactEditorOrganisationsADT::UpdateSortAs ), NULL, this ); - chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorOrganisationsADT::EnablePriority ), NULL, this ); btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorOrganisationsADT::ProcessAction ), NULL, this ); btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorOrganisationsADT::CloseWindow ), NULL, this ); } @@ -4645,7 +4519,6 @@ frmContactEditorOrganisationsADT::~frmContactEditorOrganisationsADT() { // Disconnect Events txtOrganisation->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( frmContactEditorOrganisationsADT::UpdateSortAs ), NULL, this ); - chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorOrganisationsADT::EnablePriority ), NULL, this ); btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorOrganisationsADT::ProcessAction ), NULL, this ); btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorOrganisationsADT::CloseWindow ), NULL, this ); @@ -4672,64 +4545,14 @@ frmContactEditorNotesADT::frmContactEditorNotesADT( wxWindow* parent, wxWindowID bSizer353->Fit( tabGeneral ); nbkNotes->AddPage( tabGeneral, wxT("General"), true ); tabPriority = new wxPanel( nbkNotes, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - wxFlexGridSizer* fgSizer61; - fgSizer61 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer61->AddGrowableCol( 1 ); - fgSizer61->SetFlexibleDirection( wxVERTICAL ); - fgSizer61->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - lblPriority = new wxStaticText( tabPriority, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); - lblPriority->Wrap( -1 ); - fgSizer61->Add( lblPriority, 0, wxALL, 5 ); - - wxBoxSizer* bSizer2601; - bSizer2601 = new wxBoxSizer( wxHORIZONTAL ); - - chkUsePref = new wxCheckBox( tabPriority, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer2601->Add( chkUsePref, 0, wxALL, 5 ); + szrPriority = new wxFlexGridSizer( 1, 1, 0, 0 ); + szrPriority->SetFlexibleDirection( wxBOTH ); + szrPriority->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - wxBoxSizer* bSizer2541; - bSizer2541 = new wxBoxSizer( wxVERTICAL ); - wxBoxSizer* bSizer2561; - bSizer2561 = new wxBoxSizer( wxHORIZONTAL ); - - sliPriority = new wxSlider( tabPriority, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS ); - bSizer2561->Add( sliPriority, 1, wxALL|wxEXPAND, 5 ); - - - bSizer2541->Add( bSizer2561, 1, wxEXPAND, 5 ); - - wxBoxSizer* bSizer2551; - bSizer2551 = new wxBoxSizer( wxHORIZONTAL ); - - lblHigh = new wxStaticText( tabPriority, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 ); - lblHigh->Wrap( -1 ); - bSizer2551->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 ); - - - bSizer2551->Add( 0, 0, 1, wxEXPAND, 5 ); - - lblLow = new wxStaticText( tabPriority, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 ); - lblLow->Wrap( -1 ); - bSizer2551->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 ); - - - bSizer2541->Add( bSizer2551, 1, wxEXPAND, 0 ); - - - bSizer2601->Add( bSizer2541, 1, wxEXPAND, 5 ); - - - fgSizer61->Add( bSizer2601, 1, wxEXPAND, 5 ); - - - fgSizer61->Add( 0, 0, 1, wxEXPAND, 5 ); - - - tabPriority->SetSizer( fgSizer61 ); + tabPriority->SetSizer( szrPriority ); tabPriority->Layout(); - fgSizer61->Fit( tabPriority ); + szrPriority->Fit( tabPriority ); nbkNotes->AddPage( tabPriority, wxT("Priority"), false ); tabLanguage = new wxPanel( nbkNotes, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxFlexGridSizer* fgSizer611; @@ -4772,7 +4595,6 @@ frmContactEditorNotesADT::frmContactEditorNotesADT( wxWindow* parent, wxWindowID this->Centre( wxBOTH ); // Connect Events - chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorNotesADT::EnablePriority ), NULL, this ); btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorNotesADT::ProcessAction ), NULL, this ); btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorNotesADT::CloseWindow ), NULL, this ); } @@ -4780,7 +4602,6 @@ frmContactEditorNotesADT::frmContactEditorNotesADT( wxWindow* parent, wxWindowID frmContactEditorNotesADT::~frmContactEditorNotesADT() { // Disconnect Events - chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorNotesADT::EnablePriority ), NULL, this ); btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorNotesADT::ProcessAction ), NULL, this ); btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorNotesADT::CloseWindow ), NULL, this ); @@ -4795,96 +4616,49 @@ frmContactEditorTitlesADT::frmContactEditorTitlesADT( wxWindow* parent, wxWindow nbkTitles = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); tabGeneral = new wxPanel( nbkTitles, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - wxFlexGridSizer* fgSizer6; - fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer6->AddGrowableCol( 1 ); - fgSizer6->SetFlexibleDirection( wxVERTICAL ); - fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + szrGeneral = new wxFlexGridSizer( 2, 2, 0, 0 ); + szrGeneral->AddGrowableCol( 1 ); + szrGeneral->SetFlexibleDirection( wxBOTH ); + szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); lblTitle = new wxStaticText( tabGeneral, wxID_ANY, wxT("Title:"), wxDefaultPosition, wxDefaultSize, 0 ); lblTitle->Wrap( -1 ); - fgSizer6->Add( lblTitle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + szrGeneral->Add( lblTitle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtTitle = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtTitle->SetMaxLength( 0 ); - fgSizer6->Add( txtTitle, 0, wxALL|wxEXPAND, 5 ); + szrGeneral->Add( txtTitle, 0, wxALL|wxEXPAND, 5 ); lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); lblPriority->Wrap( -1 ); - fgSizer6->Add( lblPriority, 0, wxALL, 5 ); - - wxBoxSizer* bSizer260; - bSizer260 = new wxBoxSizer( wxHORIZONTAL ); - - chkUsePref = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer260->Add( chkUsePref, 0, wxALL, 5 ); - - wxBoxSizer* bSizer254; - bSizer254 = new wxBoxSizer( wxVERTICAL ); + szrGeneral->Add( lblPriority, 0, wxALL, 5 ); - wxBoxSizer* bSizer256; - bSizer256 = new wxBoxSizer( wxHORIZONTAL ); - sliPriority = new wxSlider( tabGeneral, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS ); - bSizer256->Add( sliPriority, 1, wxALL|wxEXPAND, 5 ); + tabGeneral->SetSizer( szrGeneral ); + tabGeneral->Layout(); + szrGeneral->Fit( tabGeneral ); + nbkTitles->AddPage( tabGeneral, wxT("General"), false ); + bSizer251->Add( nbkTitles, 1, wxEXPAND | wxALL, 5 ); - bSizer254->Add( bSizer256, 1, wxEXPAND, 5 ); + wxBoxSizer* bSizer252; + bSizer252 = new wxBoxSizer( wxHORIZONTAL ); - wxBoxSizer* bSizer255; - bSizer255 = new wxBoxSizer( wxHORIZONTAL ); + btnAction = new wxButton( this, wxID_ANY, wxT("Action"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer252->Add( btnAction, 0, wxALL, 5 ); - lblHigh = new wxStaticText( tabGeneral, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 ); - lblHigh->Wrap( -1 ); - bSizer255->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 ); + btnClose = new wxButton( this, wxID_ANY, wxT("Close"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer252->Add( btnClose, 0, wxALL, 5 ); - bSizer255->Add( 0, 0, 1, wxEXPAND, 5 ); + bSizer251->Add( bSizer252, 0, wxALIGN_RIGHT, 5 ); - lblLow = new wxStaticText( tabGeneral, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 ); - lblLow->Wrap( -1 ); - bSizer255->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 ); + this->SetSizer( bSizer251 ); + this->Layout(); - bSizer254->Add( bSizer255, 1, wxEXPAND, 0 ); - - - bSizer260->Add( bSizer254, 1, wxEXPAND, 5 ); - - - fgSizer6->Add( bSizer260, 1, wxEXPAND, 5 ); - - - fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 ); - - - tabGeneral->SetSizer( fgSizer6 ); - tabGeneral->Layout(); - fgSizer6->Fit( tabGeneral ); - nbkTitles->AddPage( tabGeneral, wxT("General"), false ); - - bSizer251->Add( nbkTitles, 1, wxEXPAND | wxALL, 5 ); - - wxBoxSizer* bSizer252; - bSizer252 = new wxBoxSizer( wxHORIZONTAL ); - - btnAction = new wxButton( this, wxID_ANY, wxT("Action"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer252->Add( btnAction, 0, wxALL, 5 ); - - btnClose = new wxButton( this, wxID_ANY, wxT("Close"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer252->Add( btnClose, 0, wxALL, 5 ); - - - bSizer251->Add( bSizer252, 0, wxALIGN_RIGHT, 5 ); - - - this->SetSizer( bSizer251 ); - this->Layout(); - - this->Centre( wxBOTH ); + this->Centre( wxBOTH ); // Connect Events - chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorTitlesADT::EnablePriority ), NULL, this ); btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorTitlesADT::ProcessAction ), NULL, this ); btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorTitlesADT::CloseWindow ), NULL, this ); } @@ -4892,7 +4666,6 @@ frmContactEditorTitlesADT::frmContactEditorTitlesADT( wxWindow* parent, wxWindow frmContactEditorTitlesADT::~frmContactEditorTitlesADT() { // Disconnect Events - chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorTitlesADT::EnablePriority ), NULL, this ); btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorTitlesADT::ProcessAction ), NULL, this ); btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorTitlesADT::CloseWindow ), NULL, this ); @@ -4907,79 +4680,33 @@ frmContactEditorRelatedADT::frmContactEditorRelatedADT( wxWindow* parent, wxWind nbkRelated = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); tabGeneral = new wxPanel( nbkRelated, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - wxFlexGridSizer* fgSizer6; - fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer6->AddGrowableCol( 0 ); - fgSizer6->SetFlexibleDirection( wxBOTH ); - fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + szrGeneral = new wxFlexGridSizer( 3, 2, 0, 0 ); + szrGeneral->AddGrowableCol( 1 ); + szrGeneral->SetFlexibleDirection( wxBOTH ); + szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); lblRelation = new wxStaticText( tabGeneral, wxID_ANY, wxT("Relation Name:"), wxDefaultPosition, wxDefaultSize, 0 ); lblRelation->Wrap( -1 ); - fgSizer6->Add( lblRelation, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + szrGeneral->Add( lblRelation, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtRelated = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtRelated->SetMaxLength( 0 ); - fgSizer6->Add( txtRelated, 0, wxALL|wxEXPAND, 5 ); + szrGeneral->Add( txtRelated, 0, wxALL|wxEXPAND, 5 ); lblType = new wxStaticText( tabGeneral, wxID_ANY, wxT("Type:"), wxDefaultPosition, wxDefaultSize, 0 ); lblType->Wrap( -1 ); - fgSizer6->Add( lblType, 0, wxALL, 5 ); + szrGeneral->Add( lblType, 0, wxALL, 5 ); cmbType = new wxComboBox( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); - fgSizer6->Add( cmbType, 0, wxALL, 5 ); + szrGeneral->Add( cmbType, 0, wxALL, 5 ); lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); lblPriority->Wrap( -1 ); - fgSizer6->Add( lblPriority, 0, wxALL, 5 ); + szrGeneral->Add( lblPriority, 0, wxALL, 5 ); - wxBoxSizer* bSizer260; - bSizer260 = new wxBoxSizer( wxHORIZONTAL ); - - chkUsePref = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer260->Add( chkUsePref, 0, wxALL, 5 ); - - wxBoxSizer* bSizer254; - bSizer254 = new wxBoxSizer( wxVERTICAL ); - wxBoxSizer* bSizer256; - bSizer256 = new wxBoxSizer( wxHORIZONTAL ); - - sliPriority = new wxSlider( tabGeneral, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS ); - bSizer256->Add( sliPriority, 1, wxALL|wxEXPAND, 5 ); - - - bSizer254->Add( bSizer256, 1, wxEXPAND, 5 ); - - wxBoxSizer* bSizer255; - bSizer255 = new wxBoxSizer( wxHORIZONTAL ); - - lblHigh = new wxStaticText( tabGeneral, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 ); - lblHigh->Wrap( -1 ); - bSizer255->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 ); - - - bSizer255->Add( 0, 0, 1, wxEXPAND, 5 ); - - lblLow = new wxStaticText( tabGeneral, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 ); - lblLow->Wrap( -1 ); - bSizer255->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 ); - - - bSizer254->Add( bSizer255, 1, wxEXPAND, 0 ); - - - bSizer260->Add( bSizer254, 1, wxEXPAND, 5 ); - - - fgSizer6->Add( bSizer260, 1, wxEXPAND, 5 ); - - - fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 ); - - - tabGeneral->SetSizer( fgSizer6 ); + tabGeneral->SetSizer( szrGeneral ); tabGeneral->Layout(); - fgSizer6->Fit( tabGeneral ); + szrGeneral->Fit( tabGeneral ); nbkRelated->AddPage( tabGeneral, wxT("General"), false ); bSizer251->Add( nbkRelated, 1, wxEXPAND | wxALL, 5 ); @@ -5003,7 +4730,6 @@ frmContactEditorRelatedADT::frmContactEditorRelatedADT( wxWindow* parent, wxWind this->Centre( wxBOTH ); // Connect Events - chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorRelatedADT::EnablePriority ), NULL, this ); btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorRelatedADT::ProcessData ), NULL, this ); btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorRelatedADT::CloseWindow ), NULL, this ); } @@ -5011,7 +4737,6 @@ frmContactEditorRelatedADT::frmContactEditorRelatedADT( wxWindow* parent, wxWind frmContactEditorRelatedADT::~frmContactEditorRelatedADT() { // Disconnect Events - chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorRelatedADT::EnablePriority ), NULL, this ); btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorRelatedADT::ProcessData ), NULL, this ); btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorRelatedADT::CloseWindow ), NULL, this ); @@ -5026,80 +4751,35 @@ frmContactEditorSoundADT::frmContactEditorSoundADT( wxWindow* parent, wxWindowID nbkRelated = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); tabGeneral = new wxPanel( nbkRelated, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - wxFlexGridSizer* fgSizer6; - fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer6->AddGrowableCol( 1 ); - fgSizer6->SetFlexibleDirection( wxBOTH ); - fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + szrGeneral = new wxFlexGridSizer( 3, 2, 0, 0 ); + szrGeneral->AddGrowableCol( 1 ); + szrGeneral->SetFlexibleDirection( wxBOTH ); + szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); lblSoundFile = new wxStaticText( tabGeneral, wxID_ANY, wxT("Sound File:"), wxDefaultPosition, wxDefaultSize, 0 ); lblSoundFile->Wrap( -1 ); - fgSizer6->Add( lblSoundFile, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + szrGeneral->Add( lblSoundFile, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); fipSound = new wxFilePickerCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxT("Select a sound file"), wxT("*.*"), wxDefaultPosition, wxDefaultSize, wxFLP_DEFAULT_STYLE ); - fgSizer6->Add( fipSound, 1, wxALL|wxEXPAND, 5 ); + szrGeneral->Add( fipSound, 1, wxALL|wxEXPAND, 5 ); lblType = new wxStaticText( tabGeneral, wxID_ANY, wxT("Type:"), wxDefaultPosition, wxDefaultSize, 0 ); lblType->Wrap( -1 ); - fgSizer6->Add( lblType, 0, wxALL, 5 ); + szrGeneral->Add( lblType, 0, wxALL, 5 ); wxArrayString cmbTypeChoices; cmbType = new wxChoice( tabGeneral, wxID_ANY, wxDefaultPosition, wxDefaultSize, cmbTypeChoices, 0 ); cmbType->SetSelection( 0 ); - fgSizer6->Add( cmbType, 0, wxALL, 5 ); + szrGeneral->Add( cmbType, 0, wxALL, 5 ); lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); lblPriority->Wrap( -1 ); - fgSizer6->Add( lblPriority, 0, wxALL, 5 ); - - wxBoxSizer* bSizer260; - bSizer260 = new wxBoxSizer( wxHORIZONTAL ); - - chkUsePref = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer260->Add( chkUsePref, 0, wxALL, 5 ); - - wxBoxSizer* bSizer254; - bSizer254 = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer* bSizer256; - bSizer256 = new wxBoxSizer( wxHORIZONTAL ); - - sliPriority = new wxSlider( tabGeneral, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS ); - bSizer256->Add( sliPriority, 1, wxALL|wxEXPAND, 5 ); - - - bSizer254->Add( bSizer256, 1, wxEXPAND, 5 ); - - wxBoxSizer* bSizer255; - bSizer255 = new wxBoxSizer( wxHORIZONTAL ); - - lblHigh = new wxStaticText( tabGeneral, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 ); - lblHigh->Wrap( -1 ); - bSizer255->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 ); - - - bSizer255->Add( 0, 0, 1, wxEXPAND, 5 ); - - lblLow = new wxStaticText( tabGeneral, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 ); - lblLow->Wrap( -1 ); - bSizer255->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 ); - - - bSizer254->Add( bSizer255, 1, wxEXPAND, 0 ); - - - bSizer260->Add( bSizer254, 1, wxEXPAND, 5 ); - - - fgSizer6->Add( bSizer260, 1, wxEXPAND, 5 ); + szrGeneral->Add( lblPriority, 0, wxALL, 5 ); - fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 ); - - - tabGeneral->SetSizer( fgSizer6 ); + tabGeneral->SetSizer( szrGeneral ); tabGeneral->Layout(); - fgSizer6->Fit( tabGeneral ); + szrGeneral->Fit( tabGeneral ); nbkRelated->AddPage( tabGeneral, wxT("General"), false ); bSizer251->Add( nbkRelated, 1, wxEXPAND | wxALL, 5 ); @@ -5123,7 +4803,6 @@ frmContactEditorSoundADT::frmContactEditorSoundADT( wxWindow* parent, wxWindowID this->Centre( wxBOTH ); // Connect Events - chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorSoundADT::EnablePriority ), NULL, this ); btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorSoundADT::ProcessData ), NULL, this ); btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorSoundADT::CloseWindow ), NULL, this ); } @@ -5131,7 +4810,6 @@ frmContactEditorSoundADT::frmContactEditorSoundADT( wxWindow* parent, wxWindowID frmContactEditorSoundADT::~frmContactEditorSoundADT() { // Disconnect Events - chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorSoundADT::EnablePriority ), NULL, this ); btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorSoundADT::ProcessData ), NULL, this ); btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorSoundADT::CloseWindow ), NULL, this ); @@ -5146,80 +4824,35 @@ frmContactEditorPictureADT::frmContactEditorPictureADT( wxWindow* parent, wxWind nbkRelated = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); tabGeneral = new wxPanel( nbkRelated, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - wxFlexGridSizer* fgSizer6; - fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer6->AddGrowableCol( 1 ); - fgSizer6->SetFlexibleDirection( wxBOTH ); - fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + szrGeneral = new wxFlexGridSizer( 3, 2, 0, 0 ); + szrGeneral->AddGrowableCol( 1 ); + szrGeneral->SetFlexibleDirection( wxBOTH ); + szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); lblPictureFile = new wxStaticText( tabGeneral, wxID_ANY, wxT("Picture File:"), wxDefaultPosition, wxDefaultSize, 0 ); lblPictureFile->Wrap( -1 ); - fgSizer6->Add( lblPictureFile, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + szrGeneral->Add( lblPictureFile, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); fipPicture = new wxFilePickerCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxT("Select a sound file"), wxT("*.*"), wxDefaultPosition, wxDefaultSize, wxFLP_DEFAULT_STYLE ); - fgSizer6->Add( fipPicture, 1, wxALL|wxEXPAND, 5 ); + szrGeneral->Add( fipPicture, 1, wxALL|wxEXPAND, 5 ); lblType = new wxStaticText( tabGeneral, wxID_ANY, wxT("Type:"), wxDefaultPosition, wxDefaultSize, 0 ); lblType->Wrap( -1 ); - fgSizer6->Add( lblType, 0, wxALL, 5 ); + szrGeneral->Add( lblType, 0, wxALL, 5 ); wxArrayString cmbTypeChoices; cmbType = new wxChoice( tabGeneral, wxID_ANY, wxDefaultPosition, wxDefaultSize, cmbTypeChoices, 0 ); cmbType->SetSelection( 0 ); - fgSizer6->Add( cmbType, 0, wxALL, 5 ); + szrGeneral->Add( cmbType, 0, wxALL, 5 ); lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); lblPriority->Wrap( -1 ); - fgSizer6->Add( lblPriority, 0, wxALL, 5 ); - - wxBoxSizer* bSizer260; - bSizer260 = new wxBoxSizer( wxHORIZONTAL ); - - chkUsePref = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer260->Add( chkUsePref, 0, wxALL, 5 ); - - wxBoxSizer* bSizer254; - bSizer254 = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer* bSizer256; - bSizer256 = new wxBoxSizer( wxHORIZONTAL ); - - sliPriority = new wxSlider( tabGeneral, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS ); - bSizer256->Add( sliPriority, 1, wxALL|wxEXPAND, 5 ); - - - bSizer254->Add( bSizer256, 1, wxEXPAND, 5 ); - - wxBoxSizer* bSizer255; - bSizer255 = new wxBoxSizer( wxHORIZONTAL ); - - lblHigh = new wxStaticText( tabGeneral, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 ); - lblHigh->Wrap( -1 ); - bSizer255->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 ); - - - bSizer255->Add( 0, 0, 1, wxEXPAND, 5 ); - - lblLow = new wxStaticText( tabGeneral, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 ); - lblLow->Wrap( -1 ); - bSizer255->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 ); - - - bSizer254->Add( bSizer255, 1, wxEXPAND, 0 ); - - - bSizer260->Add( bSizer254, 1, wxEXPAND, 5 ); - - - fgSizer6->Add( bSizer260, 1, wxEXPAND, 5 ); - - - fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 ); + szrGeneral->Add( lblPriority, 0, wxALL, 5 ); - tabGeneral->SetSizer( fgSizer6 ); + tabGeneral->SetSizer( szrGeneral ); tabGeneral->Layout(); - fgSizer6->Fit( tabGeneral ); + szrGeneral->Fit( tabGeneral ); nbkRelated->AddPage( tabGeneral, wxT("General"), false ); bSizer251->Add( nbkRelated, 1, wxEXPAND | wxALL, 5 ); @@ -5243,7 +4876,6 @@ frmContactEditorPictureADT::frmContactEditorPictureADT( wxWindow* parent, wxWind this->Centre( wxBOTH ); // Connect Events - chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorPictureADT::EnablePriority ), NULL, this ); btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorPictureADT::ProcessData ), NULL, this ); btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorPictureADT::CloseWindow ), NULL, this ); } @@ -5251,7 +4883,6 @@ frmContactEditorPictureADT::frmContactEditorPictureADT( wxWindow* parent, wxWind frmContactEditorPictureADT::~frmContactEditorPictureADT() { // Disconnect Events - chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorPictureADT::EnablePriority ), NULL, this ); btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorPictureADT::ProcessData ), NULL, this ); btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorPictureADT::CloseWindow ), NULL, this ); @@ -5266,72 +4897,26 @@ frmContactEditorWebsitesADT::frmContactEditorWebsitesADT( wxWindow* parent, wxWi nbkWebsite = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); tabGeneral = new wxPanel( nbkWebsite, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - wxFlexGridSizer* fgSizer6; - fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer6->AddGrowableCol( 1 ); - fgSizer6->SetFlexibleDirection( wxVERTICAL ); - fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + szrGeneral = new wxFlexGridSizer( 2, 2, 0, 0 ); + szrGeneral->AddGrowableCol( 1 ); + szrGeneral->SetFlexibleDirection( wxBOTH ); + szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); lblWebsite = new wxStaticText( tabGeneral, wxID_ANY, wxT("Website:"), wxDefaultPosition, wxDefaultSize, 0 ); lblWebsite->Wrap( -1 ); - fgSizer6->Add( lblWebsite, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + szrGeneral->Add( lblWebsite, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtWebsite = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtWebsite->SetMaxLength( 0 ); - fgSizer6->Add( txtWebsite, 0, wxALL|wxEXPAND, 5 ); + szrGeneral->Add( txtWebsite, 0, wxALL|wxEXPAND, 5 ); lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); lblPriority->Wrap( -1 ); - fgSizer6->Add( lblPriority, 0, wxALL, 5 ); + szrGeneral->Add( lblPriority, 0, wxALL, 5 ); - wxBoxSizer* bSizer260; - bSizer260 = new wxBoxSizer( wxHORIZONTAL ); - - chkUsePref = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer260->Add( chkUsePref, 0, wxALL, 5 ); - - wxBoxSizer* bSizer254; - bSizer254 = new wxBoxSizer( wxVERTICAL ); - wxBoxSizer* bSizer256; - bSizer256 = new wxBoxSizer( wxHORIZONTAL ); - - sliPriority = new wxSlider( tabGeneral, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS ); - bSizer256->Add( sliPriority, 1, wxALL|wxEXPAND, 5 ); - - - bSizer254->Add( bSizer256, 1, wxEXPAND, 5 ); - - wxBoxSizer* bSizer255; - bSizer255 = new wxBoxSizer( wxHORIZONTAL ); - - lblHigh = new wxStaticText( tabGeneral, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 ); - lblHigh->Wrap( -1 ); - bSizer255->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 ); - - - bSizer255->Add( 0, 0, 1, wxEXPAND, 5 ); - - lblLow = new wxStaticText( tabGeneral, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 ); - lblLow->Wrap( -1 ); - bSizer255->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 ); - - - bSizer254->Add( bSizer255, 1, wxEXPAND, 0 ); - - - bSizer260->Add( bSizer254, 1, wxEXPAND, 5 ); - - - fgSizer6->Add( bSizer260, 1, wxEXPAND, 5 ); - - - fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 ); - - - tabGeneral->SetSizer( fgSizer6 ); + tabGeneral->SetSizer( szrGeneral ); tabGeneral->Layout(); - fgSizer6->Fit( tabGeneral ); + szrGeneral->Fit( tabGeneral ); nbkWebsite->AddPage( tabGeneral, wxT("General"), false ); bSizer251->Add( nbkWebsite, 1, wxEXPAND | wxALL, 5 ); @@ -5355,7 +4940,6 @@ frmContactEditorWebsitesADT::frmContactEditorWebsitesADT( wxWindow* parent, wxWi this->Centre( wxBOTH ); // Connect Events - chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorWebsitesADT::EnablePriority ), NULL, this ); btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorWebsitesADT::ProcessAction ), NULL, this ); btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorWebsitesADT::CloseWindow ), NULL, this ); } @@ -5363,7 +4947,6 @@ frmContactEditorWebsitesADT::frmContactEditorWebsitesADT( wxWindow* parent, wxWi frmContactEditorWebsitesADT::~frmContactEditorWebsitesADT() { // Disconnect Events - chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorWebsitesADT::EnablePriority ), NULL, this ); btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorWebsitesADT::ProcessAction ), NULL, this ); btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorWebsitesADT::CloseWindow ), NULL, this ); @@ -5378,72 +4961,26 @@ frmContactEditorGeopositionADT::frmContactEditorGeopositionADT( wxWindow* parent nbkWebsite = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); tabGeneral = new wxPanel( nbkWebsite, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - wxFlexGridSizer* fgSizer6; - fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer6->AddGrowableCol( 1 ); - fgSizer6->SetFlexibleDirection( wxVERTICAL ); - fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + szrGeneral = new wxFlexGridSizer( 2, 2, 0, 0 ); + szrGeneral->AddGrowableCol( 1 ); + szrGeneral->SetFlexibleDirection( wxBOTH ); + szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); lblGeoposition = new wxStaticText( tabGeneral, wxID_ANY, wxT("Geoposition:"), wxDefaultPosition, wxDefaultSize, 0 ); lblGeoposition->Wrap( -1 ); - fgSizer6->Add( lblGeoposition, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + szrGeneral->Add( lblGeoposition, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtGeoposition = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtGeoposition->SetMaxLength( 0 ); - fgSizer6->Add( txtGeoposition, 0, wxALL|wxEXPAND, 5 ); + szrGeneral->Add( txtGeoposition, 0, wxALL|wxEXPAND, 5 ); lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); lblPriority->Wrap( -1 ); - fgSizer6->Add( lblPriority, 0, wxALL, 5 ); - - wxBoxSizer* bSizer260; - bSizer260 = new wxBoxSizer( wxHORIZONTAL ); - - chkUsePref = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer260->Add( chkUsePref, 0, wxALL, 5 ); - - wxBoxSizer* bSizer254; - bSizer254 = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer* bSizer256; - bSizer256 = new wxBoxSizer( wxHORIZONTAL ); - - sliPriority = new wxSlider( tabGeneral, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS ); - bSizer256->Add( sliPriority, 1, wxALL|wxEXPAND, 5 ); - - - bSizer254->Add( bSizer256, 1, wxEXPAND, 5 ); - - wxBoxSizer* bSizer255; - bSizer255 = new wxBoxSizer( wxHORIZONTAL ); - - lblHigh = new wxStaticText( tabGeneral, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 ); - lblHigh->Wrap( -1 ); - bSizer255->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 ); - - - bSizer255->Add( 0, 0, 1, wxEXPAND, 5 ); - - lblLow = new wxStaticText( tabGeneral, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 ); - lblLow->Wrap( -1 ); - bSizer255->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 ); + szrGeneral->Add( lblPriority, 0, wxALL, 5 ); - bSizer254->Add( bSizer255, 1, wxEXPAND, 0 ); - - - bSizer260->Add( bSizer254, 1, wxEXPAND, 5 ); - - - fgSizer6->Add( bSizer260, 1, wxEXPAND, 5 ); - - - fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 ); - - - tabGeneral->SetSizer( fgSizer6 ); + tabGeneral->SetSizer( szrGeneral ); tabGeneral->Layout(); - fgSizer6->Fit( tabGeneral ); + szrGeneral->Fit( tabGeneral ); nbkWebsite->AddPage( tabGeneral, wxT("General"), false ); bSizer251->Add( nbkWebsite, 1, wxEXPAND | wxALL, 5 ); @@ -5467,7 +5004,6 @@ frmContactEditorGeopositionADT::frmContactEditorGeopositionADT( wxWindow* parent this->Centre( wxBOTH ); // Connect Events - chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorGeopositionADT::EnablePriority ), NULL, this ); btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorGeopositionADT::ProcessAction ), NULL, this ); btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorGeopositionADT::CloseWindow ), NULL, this ); } @@ -5475,7 +5011,6 @@ frmContactEditorGeopositionADT::frmContactEditorGeopositionADT( wxWindow* parent frmContactEditorGeopositionADT::~frmContactEditorGeopositionADT() { // Disconnect Events - chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorGeopositionADT::EnablePriority ), NULL, this ); btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorGeopositionADT::ProcessAction ), NULL, this ); btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorGeopositionADT::CloseWindow ), NULL, this ); @@ -5490,81 +5025,35 @@ frmContactEditorCalAdrADT::frmContactEditorCalAdrADT( wxWindow* parent, wxWindow nbkWebsite = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); tabGeneral = new wxPanel( nbkWebsite, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - wxFlexGridSizer* fgSizer6; - fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer6->AddGrowableCol( 1 ); - fgSizer6->SetFlexibleDirection( wxVERTICAL ); - fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + szrGeneral = new wxFlexGridSizer( 3, 2, 0, 0 ); + szrGeneral->AddGrowableCol( 1 ); + szrGeneral->SetFlexibleDirection( wxBOTH ); + szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); lblAddress = new wxStaticText( tabGeneral, wxID_ANY, wxT("Address:"), wxDefaultPosition, wxDefaultSize, 0 ); lblAddress->Wrap( -1 ); - fgSizer6->Add( lblAddress, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + szrGeneral->Add( lblAddress, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtAddress = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtAddress->SetMaxLength( 0 ); - fgSizer6->Add( txtAddress, 0, wxALL|wxEXPAND, 5 ); + szrGeneral->Add( txtAddress, 0, wxALL|wxEXPAND, 5 ); lblType = new wxStaticText( tabGeneral, wxID_ANY, wxT("Type:"), wxDefaultPosition, wxDefaultSize, 0 ); lblType->Wrap( -1 ); - fgSizer6->Add( lblType, 0, wxALL, 5 ); + szrGeneral->Add( lblType, 0, wxALL, 5 ); wxArrayString cmbTypeChoices; cmbType = new wxChoice( tabGeneral, wxID_ANY, wxDefaultPosition, wxDefaultSize, cmbTypeChoices, 0 ); cmbType->SetSelection( 0 ); - fgSizer6->Add( cmbType, 0, wxALL, 5 ); + szrGeneral->Add( cmbType, 0, wxALL, 5 ); lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); lblPriority->Wrap( -1 ); - fgSizer6->Add( lblPriority, 0, wxALL, 5 ); + szrGeneral->Add( lblPriority, 0, wxALL, 5 ); - wxBoxSizer* bSizer260; - bSizer260 = new wxBoxSizer( wxHORIZONTAL ); - chkUsePref = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer260->Add( chkUsePref, 0, wxALL, 5 ); - - wxBoxSizer* bSizer254; - bSizer254 = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer* bSizer256; - bSizer256 = new wxBoxSizer( wxHORIZONTAL ); - - sliPriority = new wxSlider( tabGeneral, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS ); - bSizer256->Add( sliPriority, 1, wxALL|wxEXPAND, 5 ); - - - bSizer254->Add( bSizer256, 1, wxEXPAND, 5 ); - - wxBoxSizer* bSizer255; - bSizer255 = new wxBoxSizer( wxHORIZONTAL ); - - lblHigh = new wxStaticText( tabGeneral, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 ); - lblHigh->Wrap( -1 ); - bSizer255->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 ); - - - bSizer255->Add( 0, 0, 1, wxEXPAND, 5 ); - - lblLow = new wxStaticText( tabGeneral, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 ); - lblLow->Wrap( -1 ); - bSizer255->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 ); - - - bSizer254->Add( bSizer255, 1, wxEXPAND, 0 ); - - - bSizer260->Add( bSizer254, 1, wxEXPAND, 5 ); - - - fgSizer6->Add( bSizer260, 1, wxEXPAND, 5 ); - - - fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 ); - - - tabGeneral->SetSizer( fgSizer6 ); + tabGeneral->SetSizer( szrGeneral ); tabGeneral->Layout(); - fgSizer6->Fit( tabGeneral ); + szrGeneral->Fit( tabGeneral ); nbkWebsite->AddPage( tabGeneral, wxT("General"), false ); bSizer251->Add( nbkWebsite, 1, wxEXPAND | wxALL, 5 ); @@ -5588,7 +5077,6 @@ frmContactEditorCalAdrADT::frmContactEditorCalAdrADT( wxWindow* parent, wxWindow this->Centre( wxBOTH ); // Connect Events - chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorCalAdrADT::EnablePriority ), NULL, this ); btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorCalAdrADT::ProcessAction ), NULL, this ); btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorCalAdrADT::CloseWindow ), NULL, this ); } @@ -5596,7 +5084,6 @@ frmContactEditorCalAdrADT::frmContactEditorCalAdrADT( wxWindow* parent, wxWindow frmContactEditorCalAdrADT::~frmContactEditorCalAdrADT() { // Disconnect Events - chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorCalAdrADT::EnablePriority ), NULL, this ); btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorCalAdrADT::ProcessAction ), NULL, this ); btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorCalAdrADT::CloseWindow ), NULL, this ); @@ -5611,40 +5098,37 @@ frmContactEditorVendorADT::frmContactEditorVendorADT( wxWindow* parent, wxWindow nbkWebsite = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); tabGeneral = new wxPanel( nbkWebsite, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - wxFlexGridSizer* fgSizer6; - fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer6->AddGrowableCol( 1 ); - fgSizer6->SetFlexibleDirection( wxVERTICAL ); - fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + wxFlexGridSizer* szrGeneral; + szrGeneral = new wxFlexGridSizer( 3, 2, 0, 0 ); + szrGeneral->AddGrowableCol( 1 ); + szrGeneral->SetFlexibleDirection( wxBOTH ); + szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); lblVendorPEN = new wxStaticText( tabGeneral, wxID_ANY, wxT("Vendor PEN:"), wxDefaultPosition, wxDefaultSize, 0 ); lblVendorPEN->Wrap( -1 ); - fgSizer6->Add( lblVendorPEN, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + szrGeneral->Add( lblVendorPEN, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtPEN = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtPEN->SetMaxLength( 0 ); - fgSizer6->Add( txtPEN, 0, wxALL, 5 ); + szrGeneral->Add( txtPEN, 0, wxALL, 5 ); lblElement = new wxStaticText( tabGeneral, wxID_ANY, wxT("Element:"), wxDefaultPosition, wxDefaultSize, 0 ); lblElement->Wrap( -1 ); - fgSizer6->Add( lblElement, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + szrGeneral->Add( lblElement, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtElement = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtElement->SetMaxLength( 0 ); - fgSizer6->Add( txtElement, 0, wxALL|wxEXPAND, 5 ); + szrGeneral->Add( txtElement, 0, wxALL|wxEXPAND, 5 ); lblValue = new wxStaticText( tabGeneral, wxID_ANY, wxT("Value:"), wxDefaultPosition, wxDefaultSize, 0 ); lblValue->Wrap( -1 ); - fgSizer6->Add( lblValue, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + szrGeneral->Add( lblValue, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtValue = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtValue->SetMaxLength( 0 ); - fgSizer6->Add( txtValue, 0, wxALL|wxEXPAND, 5 ); + szrGeneral->Add( txtValue, 0, wxALL|wxEXPAND, 5 ); - tabGeneral->SetSizer( fgSizer6 ); + tabGeneral->SetSizer( szrGeneral ); tabGeneral->Layout(); - fgSizer6->Fit( tabGeneral ); + szrGeneral->Fit( tabGeneral ); nbkWebsite->AddPage( tabGeneral, wxT("General"), false ); bSizer251->Add( nbkWebsite, 1, wxEXPAND | wxALL, 5 ); @@ -5689,32 +5173,30 @@ frmContactEditorXTokenADT::frmContactEditorXTokenADT( wxWindow* parent, wxWindow nbkWebsite = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); tabGeneral = new wxPanel( nbkWebsite, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - wxFlexGridSizer* fgSizer6; - fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer6->AddGrowableCol( 1 ); - fgSizer6->SetFlexibleDirection( wxVERTICAL ); - fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + wxFlexGridSizer* szrGeneral; + szrGeneral = new wxFlexGridSizer( 2, 2, 0, 0 ); + szrGeneral->AddGrowableCol( 1 ); + szrGeneral->SetFlexibleDirection( wxBOTH ); + szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); lblTokenName = new wxStaticText( tabGeneral, wxID_ANY, wxT("Token Name:"), wxDefaultPosition, wxDefaultSize, 0 ); lblTokenName->Wrap( -1 ); - fgSizer6->Add( lblTokenName, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + szrGeneral->Add( lblTokenName, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtTokenName = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtTokenName->SetMaxLength( 0 ); - fgSizer6->Add( txtTokenName, 0, wxALL, 5 ); + szrGeneral->Add( txtTokenName, 0, wxALL, 5 ); lblXT = new wxStaticText( tabGeneral, wxID_ANY, wxT("Value:"), wxDefaultPosition, wxDefaultSize, 0 ); lblXT->Wrap( -1 ); - fgSizer6->Add( lblXT, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + szrGeneral->Add( lblXT, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtValue = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtValue->SetMaxLength( 0 ); - fgSizer6->Add( txtValue, 0, wxALL|wxEXPAND, 5 ); + szrGeneral->Add( txtValue, 0, wxALL|wxEXPAND, 5 ); - tabGeneral->SetSizer( fgSizer6 ); + tabGeneral->SetSizer( szrGeneral ); tabGeneral->Layout(); - fgSizer6->Fit( tabGeneral ); + szrGeneral->Fit( tabGeneral ); nbkWebsite->AddPage( tabGeneral, wxT("General"), false ); bSizer251->Add( nbkWebsite, 1, wxEXPAND | wxALL, 5 ); @@ -5759,83 +5241,38 @@ frmContactEditorKeyADT::frmContactEditorKeyADT( wxWindow* parent, wxWindowID id, nbkWebsite = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); tabGeneral = new wxPanel( nbkWebsite, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - wxFlexGridSizer* fgSizer6; - fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer6->AddGrowableCol( 1 ); - fgSizer6->SetFlexibleDirection( wxVERTICAL ); - fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + szrGeneral = new wxFlexGridSizer( 3, 2, 0, 0 ); + szrGeneral->AddGrowableCol( 1 ); + szrGeneral->SetFlexibleDirection( wxBOTH ); + szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); lblKeyType = new wxStaticText( tabGeneral, wxID_ANY, wxT("Key Type:"), wxDefaultPosition, wxDefaultSize, 0 ); lblKeyType->Wrap( -1 ); - fgSizer6->Add( lblKeyType, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + szrGeneral->Add( lblKeyType, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); wxArrayString cmbKeyMainTypeChoices; cmbKeyMainType = new wxChoice( tabGeneral, wxID_ANY, wxDefaultPosition, wxDefaultSize, cmbKeyMainTypeChoices, 0 ); cmbKeyMainType->SetSelection( 0 ); - fgSizer6->Add( cmbKeyMainType, 0, wxALL, 5 ); + szrGeneral->Add( cmbKeyMainType, 0, wxALL, 5 ); lblType = new wxStaticText( tabGeneral, wxID_ANY, wxT("Type:"), wxDefaultPosition, wxDefaultSize, 0 ); lblType->Wrap( -1 ); - fgSizer6->Add( lblType, 0, wxALL, 5 ); + szrGeneral->Add( lblType, 0, wxALL, 5 ); wxArrayString cmbTypeChoices; cmbType = new wxChoice( tabGeneral, wxID_ANY, wxDefaultPosition, wxDefaultSize, cmbTypeChoices, 0 ); cmbType->SetSelection( 0 ); - fgSizer6->Add( cmbType, 0, wxALL, 5 ); + szrGeneral->Add( cmbType, 0, wxALL, 5 ); lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); lblPriority->Wrap( -1 ); - fgSizer6->Add( lblPriority, 0, wxALL, 5 ); - - wxBoxSizer* bSizer260; - bSizer260 = new wxBoxSizer( wxHORIZONTAL ); - - chkUsePref = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer260->Add( chkUsePref, 0, wxALL, 5 ); - - wxBoxSizer* bSizer254; - bSizer254 = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer* bSizer256; - bSizer256 = new wxBoxSizer( wxHORIZONTAL ); - - sliPriority = new wxSlider( tabGeneral, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS ); - bSizer256->Add( sliPriority, 1, wxALL|wxEXPAND, 5 ); - - - bSizer254->Add( bSizer256, 1, wxEXPAND, 5 ); - - wxBoxSizer* bSizer255; - bSizer255 = new wxBoxSizer( wxHORIZONTAL ); - - lblHigh = new wxStaticText( tabGeneral, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 ); - lblHigh->Wrap( -1 ); - bSizer255->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 ); - - - bSizer255->Add( 0, 0, 1, wxEXPAND, 5 ); - - lblLow = new wxStaticText( tabGeneral, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 ); - lblLow->Wrap( -1 ); - bSizer255->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 ); - - - bSizer254->Add( bSizer255, 1, wxEXPAND, 0 ); + szrGeneral->Add( lblPriority, 0, wxALL, 5 ); - bSizer260->Add( bSizer254, 1, wxEXPAND, 5 ); - - - fgSizer6->Add( bSizer260, 1, wxEXPAND, 5 ); - - - fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 ); - - - tabGeneral->SetSizer( fgSizer6 ); + tabGeneral->SetSizer( szrGeneral ); tabGeneral->Layout(); - fgSizer6->Fit( tabGeneral ); - nbkWebsite->AddPage( tabGeneral, wxT("General"), false ); + szrGeneral->Fit( tabGeneral ); + nbkWebsite->AddPage( tabGeneral, wxT("General"), true ); tabURL = new wxPanel( nbkWebsite, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxFlexGridSizer* fgSizer61; fgSizer61 = new wxFlexGridSizer( 0, 2, 0, 0 ); @@ -5855,7 +5292,6 @@ frmContactEditorKeyADT::frmContactEditorKeyADT( wxWindow* parent, wxWindowID id, fgSizer61->Add( lblAddress, 0, wxALL, 5 ); txtAddress = new wxTextCtrl( tabURL, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtAddress->SetMaxLength( 0 ); fgSizer61->Add( txtAddress, 1, wxALL|wxEXPAND, 5 ); @@ -5892,7 +5328,7 @@ frmContactEditorKeyADT::frmContactEditorKeyADT( wxWindow* parent, wxWindowID id, tabKey->SetSizer( fgSizer62 ); tabKey->Layout(); fgSizer62->Fit( tabKey ); - nbkWebsite->AddPage( tabKey, wxT("Key"), true ); + nbkWebsite->AddPage( tabKey, wxT("Key"), false ); bSizer251->Add( nbkWebsite, 1, wxEXPAND | wxALL, 5 ); @@ -5909,107 +5345,59 @@ frmContactEditorKeyADT::frmContactEditorKeyADT( wxWindow* parent, wxWindowID id, bSizer251->Add( bSizer252, 0, wxALIGN_RIGHT, 5 ); - this->SetSizer( bSizer251 ); - this->Layout(); - - this->Centre( wxBOTH ); - - // Connect Events - cmbKeyMainType->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( frmContactEditorKeyADT::ProcessKeyType ), NULL, this ); - chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorKeyADT::EnablePriority ), NULL, this ); - cmbURL->Connect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( frmContactEditorKeyADT::ConvertURLType ), NULL, this ); - cmbKeyType->Connect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( frmContactEditorKeyADT::ConvertKeyType ), NULL, this ); - btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorKeyADT::ProcessAction ), NULL, this ); - btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorKeyADT::CloseWindow ), NULL, this ); -} - -frmContactEditorKeyADT::~frmContactEditorKeyADT() -{ - // Disconnect Events - cmbKeyMainType->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( frmContactEditorKeyADT::ProcessKeyType ), NULL, this ); - chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorKeyADT::EnablePriority ), NULL, this ); - cmbURL->Disconnect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( frmContactEditorKeyADT::ConvertURLType ), NULL, this ); - cmbKeyType->Disconnect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( frmContactEditorKeyADT::ConvertKeyType ), NULL, this ); - btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorKeyADT::ProcessAction ), NULL, this ); - btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorKeyADT::CloseWindow ), NULL, this ); - -} - -frmContactEditorEmailADT::frmContactEditorEmailADT( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) -{ - this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - - wxBoxSizer* bSizer251; - bSizer251 = new wxBoxSizer( wxVERTICAL ); - - nbkEmail = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - tabGeneral = new wxPanel( nbkEmail, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - wxFlexGridSizer* fgSizer6; - fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer6->AddGrowableCol( 1 ); - fgSizer6->SetFlexibleDirection( wxVERTICAL ); - fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - lblEmailAddress = new wxStaticText( tabGeneral, wxID_ANY, wxT("E-mail Address:"), wxDefaultPosition, wxDefaultSize, 0 ); - lblEmailAddress->Wrap( -1 ); - fgSizer6->Add( lblEmailAddress, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - txtEmail = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtEmail->SetMaxLength( 0 ); - fgSizer6->Add( txtEmail, 0, wxALL|wxEXPAND, 5 ); - - lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); - lblPriority->Wrap( -1 ); - fgSizer6->Add( lblPriority, 0, wxALL, 5 ); - - wxBoxSizer* bSizer260; - bSizer260 = new wxBoxSizer( wxHORIZONTAL ); - - chkUsePref = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer260->Add( chkUsePref, 0, wxALL, 5 ); - - wxBoxSizer* bSizer254; - bSizer254 = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer* bSizer256; - bSizer256 = new wxBoxSizer( wxHORIZONTAL ); - - sliPriority = new wxSlider( tabGeneral, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS ); - bSizer256->Add( sliPriority, 1, wxALL|wxEXPAND, 5 ); - - - bSizer254->Add( bSizer256, 1, wxEXPAND, 5 ); - - wxBoxSizer* bSizer255; - bSizer255 = new wxBoxSizer( wxHORIZONTAL ); - - lblHigh = new wxStaticText( tabGeneral, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 ); - lblHigh->Wrap( -1 ); - bSizer255->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 ); - - - bSizer255->Add( 0, 0, 1, wxEXPAND, 5 ); - - lblLow = new wxStaticText( tabGeneral, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 ); - lblLow->Wrap( -1 ); - bSizer255->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 ); - + this->SetSizer( bSizer251 ); + this->Layout(); - bSizer254->Add( bSizer255, 1, wxEXPAND, 0 ); + this->Centre( wxBOTH ); + + // Connect Events + cmbKeyMainType->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( frmContactEditorKeyADT::ProcessKeyType ), NULL, this ); + cmbURL->Connect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( frmContactEditorKeyADT::ConvertURLType ), NULL, this ); + cmbKeyType->Connect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( frmContactEditorKeyADT::ConvertKeyType ), NULL, this ); + btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorKeyADT::ProcessAction ), NULL, this ); + btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorKeyADT::CloseWindow ), NULL, this ); +} + +frmContactEditorKeyADT::~frmContactEditorKeyADT() +{ + // Disconnect Events + cmbKeyMainType->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( frmContactEditorKeyADT::ProcessKeyType ), NULL, this ); + cmbURL->Disconnect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( frmContactEditorKeyADT::ConvertURLType ), NULL, this ); + cmbKeyType->Disconnect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( frmContactEditorKeyADT::ConvertKeyType ), NULL, this ); + btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorKeyADT::ProcessAction ), NULL, this ); + btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorKeyADT::CloseWindow ), NULL, this ); +} + +frmContactEditorEmailADT::frmContactEditorEmailADT( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) +{ + this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - bSizer260->Add( bSizer254, 1, wxEXPAND, 5 ); + wxBoxSizer* bSizer251; + bSizer251 = new wxBoxSizer( wxVERTICAL ); + nbkEmail = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); + tabGeneral = new wxPanel( nbkEmail, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + szrGeneral = new wxFlexGridSizer( 2, 2, 0, 0 ); + szrGeneral->AddGrowableCol( 1 ); + szrGeneral->SetFlexibleDirection( wxBOTH ); + szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - fgSizer6->Add( bSizer260, 1, wxEXPAND, 5 ); + lblEmailAddress = new wxStaticText( tabGeneral, wxID_ANY, wxT("E-mail Address:"), wxDefaultPosition, wxDefaultSize, 0 ); + lblEmailAddress->Wrap( -1 ); + szrGeneral->Add( lblEmailAddress, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + txtEmail = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + szrGeneral->Add( txtEmail, 0, wxALL|wxEXPAND, 5 ); - fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 ); + lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); + lblPriority->Wrap( -1 ); + szrGeneral->Add( lblPriority, 0, wxALL, 5 ); - tabGeneral->SetSizer( fgSizer6 ); + tabGeneral->SetSizer( szrGeneral ); tabGeneral->Layout(); - fgSizer6->Fit( tabGeneral ); + szrGeneral->Fit( tabGeneral ); nbkEmail->AddPage( tabGeneral, wxT("General"), false ); bSizer251->Add( nbkEmail, 1, wxEXPAND | wxALL, 5 ); @@ -6033,7 +5421,6 @@ frmContactEditorEmailADT::frmContactEditorEmailADT( wxWindow* parent, wxWindowID this->Centre( wxBOTH ); // Connect Events - chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorEmailADT::EnablePriority ), NULL, this ); btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorEmailADT::ProcessData ), NULL, this ); btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorEmailADT::CloseWindow ), NULL, this ); } @@ -6041,7 +5428,6 @@ frmContactEditorEmailADT::frmContactEditorEmailADT( wxWindow* parent, wxWindowID frmContactEditorEmailADT::~frmContactEditorEmailADT() { // Disconnect Events - chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorEmailADT::EnablePriority ), NULL, this ); btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorEmailADT::ProcessData ), NULL, this ); btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorEmailADT::CloseWindow ), NULL, this ); @@ -6056,79 +5442,33 @@ frmContactEditorIMADT::frmContactEditorIMADT( wxWindow* parent, wxWindowID id, c nbkIM = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); tabGeneral = new wxPanel( nbkIM, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - wxFlexGridSizer* fgSizer6; - fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer6->AddGrowableCol( 1 ); - fgSizer6->SetFlexibleDirection( wxVERTICAL ); - fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + szrGeneral = new wxFlexGridSizer( 3, 2, 0, 0 ); + szrGeneral->AddGrowableCol( 1 ); + szrGeneral->SetFlexibleDirection( wxBOTH ); + szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); lblIMType = new wxStaticText( tabGeneral, wxID_ANY, wxT("IM Type:"), wxDefaultPosition, wxDefaultSize, 0 ); lblIMType->Wrap( -1 ); - fgSizer6->Add( lblIMType, 0, wxALL, 5 ); + szrGeneral->Add( lblIMType, 0, wxALL, 5 ); cmbIMType = new wxComboBox( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN ); - fgSizer6->Add( cmbIMType, 0, wxALL, 5 ); + szrGeneral->Add( cmbIMType, 0, wxALL, 5 ); lblUsername = new wxStaticText( tabGeneral, wxID_ANY, wxT("Username/E-mail address:"), wxDefaultPosition, wxDefaultSize, 0 ); lblUsername->Wrap( 0 ); - fgSizer6->Add( lblUsername, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + szrGeneral->Add( lblUsername, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtUsername = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtUsername->SetMaxLength( 0 ); - fgSizer6->Add( txtUsername, 0, wxALL|wxEXPAND, 5 ); + szrGeneral->Add( txtUsername, 0, wxALL|wxEXPAND, 5 ); lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); lblPriority->Wrap( -1 ); - fgSizer6->Add( lblPriority, 0, wxALL, 5 ); - - wxBoxSizer* bSizer260; - bSizer260 = new wxBoxSizer( wxHORIZONTAL ); - - chkUsePref = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer260->Add( chkUsePref, 0, wxALL, 5 ); - - wxBoxSizer* bSizer254; - bSizer254 = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer* bSizer256; - bSizer256 = new wxBoxSizer( wxHORIZONTAL ); - - sliPriority = new wxSlider( tabGeneral, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS ); - bSizer256->Add( sliPriority, 1, wxALL|wxEXPAND, 5 ); - - - bSizer254->Add( bSizer256, 1, wxEXPAND, 5 ); + szrGeneral->Add( lblPriority, 0, wxALL, 5 ); - wxBoxSizer* bSizer255; - bSizer255 = new wxBoxSizer( wxHORIZONTAL ); - - lblHigh = new wxStaticText( tabGeneral, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 ); - lblHigh->Wrap( -1 ); - bSizer255->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 ); - - - bSizer255->Add( 0, 0, 1, wxEXPAND, 5 ); - - lblLow = new wxStaticText( tabGeneral, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 ); - lblLow->Wrap( -1 ); - bSizer255->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 ); - - - bSizer254->Add( bSizer255, 1, wxEXPAND, 0 ); - - bSizer260->Add( bSizer254, 1, wxEXPAND, 5 ); - - - fgSizer6->Add( bSizer260, 1, wxEXPAND, 5 ); - - - fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 ); - - - tabGeneral->SetSizer( fgSizer6 ); + tabGeneral->SetSizer( szrGeneral ); tabGeneral->Layout(); - fgSizer6->Fit( tabGeneral ); + szrGeneral->Fit( tabGeneral ); nbkIM->AddPage( tabGeneral, wxT("General"), false ); bSizer251->Add( nbkIM, 1, wxEXPAND | wxALL, 5 ); @@ -6152,7 +5492,6 @@ frmContactEditorIMADT::frmContactEditorIMADT( wxWindow* parent, wxWindowID id, c this->Centre( wxBOTH ); // Connect Events - chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorIMADT::EnablePriority ), NULL, this ); btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorIMADT::ProcessAction ), NULL, this ); btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorIMADT::CloseWindow ), NULL, this ); } @@ -6160,7 +5499,6 @@ frmContactEditorIMADT::frmContactEditorIMADT( wxWindow* parent, wxWindowID id, c frmContactEditorIMADT::~frmContactEditorIMADT() { // Disconnect Events - chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorIMADT::EnablePriority ), NULL, this ); btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorIMADT::ProcessAction ), NULL, this ); btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorIMADT::CloseWindow ), NULL, this ); @@ -6173,86 +5511,40 @@ frmContactEditorCategoryADT::frmContactEditorCategoryADT( wxWindow* parent, wxWi wxBoxSizer* bSizer251; bSizer251 = new wxBoxSizer( wxVERTICAL ); - nbkIM = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - tabGeneral = new wxPanel( nbkIM, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - wxFlexGridSizer* fgSizer6; - fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer6->AddGrowableCol( 1 ); - fgSizer6->SetFlexibleDirection( wxVERTICAL ); - fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + nbkCategory = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); + tabGeneral = new wxPanel( nbkCategory, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + szrGeneral = new wxFlexGridSizer( 3, 2, 0, 0 ); + szrGeneral->AddGrowableCol( 1 ); + szrGeneral->SetFlexibleDirection( wxBOTH ); + szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); lblCategory = new wxStaticText( tabGeneral, wxID_ANY, wxT("Category Name:"), wxDefaultPosition, wxDefaultSize, 0 ); lblCategory->Wrap( 0 ); - fgSizer6->Add( lblCategory, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + szrGeneral->Add( lblCategory, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtCategory = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtCategory->SetMaxLength( 0 ); - fgSizer6->Add( txtCategory, 0, wxALL|wxEXPAND, 5 ); + szrGeneral->Add( txtCategory, 0, wxALL|wxEXPAND, 5 ); lblType = new wxStaticText( tabGeneral, wxID_ANY, wxT("Type:"), wxDefaultPosition, wxDefaultSize, 0 ); lblType->Wrap( -1 ); - fgSizer6->Add( lblType, 0, wxALL, 5 ); + szrGeneral->Add( lblType, 0, wxALL, 5 ); wxArrayString cmbTypeChoices; cmbType = new wxChoice( tabGeneral, wxID_ANY, wxDefaultPosition, wxDefaultSize, cmbTypeChoices, 0 ); cmbType->SetSelection( 0 ); - fgSizer6->Add( cmbType, 0, wxALL, 5 ); + szrGeneral->Add( cmbType, 0, wxALL, 5 ); lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); lblPriority->Wrap( -1 ); - fgSizer6->Add( lblPriority, 0, wxALL, 5 ); - - wxBoxSizer* bSizer260; - bSizer260 = new wxBoxSizer( wxHORIZONTAL ); - - chkUsePref = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer260->Add( chkUsePref, 0, wxALL, 5 ); - - wxBoxSizer* bSizer254; - bSizer254 = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer* bSizer256; - bSizer256 = new wxBoxSizer( wxHORIZONTAL ); - - sliPriority = new wxSlider( tabGeneral, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS ); - bSizer256->Add( sliPriority, 1, wxALL|wxEXPAND, 5 ); - - - bSizer254->Add( bSizer256, 1, wxEXPAND, 5 ); - - wxBoxSizer* bSizer255; - bSizer255 = new wxBoxSizer( wxHORIZONTAL ); - - lblHigh = new wxStaticText( tabGeneral, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 ); - lblHigh->Wrap( -1 ); - bSizer255->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 ); - - - bSizer255->Add( 0, 0, 1, wxEXPAND, 5 ); - - lblLow = new wxStaticText( tabGeneral, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 ); - lblLow->Wrap( -1 ); - bSizer255->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 ); - - - bSizer254->Add( bSizer255, 1, wxEXPAND, 0 ); - - - bSizer260->Add( bSizer254, 1, wxEXPAND, 5 ); - - - fgSizer6->Add( bSizer260, 1, wxEXPAND, 5 ); - - - fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 ); + szrGeneral->Add( lblPriority, 0, wxALL, 5 ); - tabGeneral->SetSizer( fgSizer6 ); + tabGeneral->SetSizer( szrGeneral ); tabGeneral->Layout(); - fgSizer6->Fit( tabGeneral ); - nbkIM->AddPage( tabGeneral, wxT("General"), false ); + szrGeneral->Fit( tabGeneral ); + nbkCategory->AddPage( tabGeneral, wxT("General"), false ); - bSizer251->Add( nbkIM, 1, wxEXPAND | wxALL, 5 ); + bSizer251->Add( nbkCategory, 1, wxEXPAND | wxALL, 5 ); wxBoxSizer* bSizer252; bSizer252 = new wxBoxSizer( wxHORIZONTAL ); @@ -6273,7 +5565,6 @@ frmContactEditorCategoryADT::frmContactEditorCategoryADT( wxWindow* parent, wxWi this->Centre( wxBOTH ); // Connect Events - chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorCategoryADT::EnablePriority ), NULL, this ); btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorCategoryADT::ProcessAction ), NULL, this ); btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorCategoryADT::CloseWindow ), NULL, this ); } @@ -6281,7 +5572,6 @@ frmContactEditorCategoryADT::frmContactEditorCategoryADT( wxWindow* parent, wxWi frmContactEditorCategoryADT::~frmContactEditorCategoryADT() { // Disconnect Events - chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorCategoryADT::EnablePriority ), NULL, this ); btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorCategoryADT::ProcessAction ), NULL, this ); btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorCategoryADT::CloseWindow ), NULL, this ); @@ -6296,68 +5586,21 @@ frmContactEditorTelephoneADT::frmContactEditorTelephoneADT( wxWindow* parent, wx nbkAddress = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); tabGeneral = new wxPanel( nbkAddress, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - wxFlexGridSizer* fgSizer6; - fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer6->AddGrowableCol( 1 ); - fgSizer6->SetFlexibleDirection( wxVERTICAL ); - fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + szrGeneral = new wxFlexGridSizer( 3, 2, 0, 0 ); + szrGeneral->AddGrowableCol( 1 ); + szrGeneral->SetFlexibleDirection( wxBOTH ); + szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); lblTelephone = new wxStaticText( tabGeneral, wxID_ANY, wxT("Telephone:"), wxDefaultPosition, wxDefaultSize, 0 ); lblTelephone->Wrap( -1 ); - fgSizer6->Add( lblTelephone, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + szrGeneral->Add( lblTelephone, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtTelephone = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtTelephone->SetMaxLength( 0 ); - fgSizer6->Add( txtTelephone, 0, wxALL|wxEXPAND, 5 ); - - lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); - lblPriority->Wrap( -1 ); - fgSizer6->Add( lblPriority, 0, wxALL, 5 ); - - wxBoxSizer* bSizer260; - bSizer260 = new wxBoxSizer( wxHORIZONTAL ); - - chkUsePref = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer260->Add( chkUsePref, 0, wxALL, 5 ); - - wxBoxSizer* bSizer254; - bSizer254 = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer* bSizer256; - bSizer256 = new wxBoxSizer( wxHORIZONTAL ); - - sliPriority = new wxSlider( tabGeneral, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS ); - bSizer256->Add( sliPriority, 1, wxALL|wxEXPAND, 5 ); - - - bSizer254->Add( bSizer256, 1, wxEXPAND, 5 ); - - wxBoxSizer* bSizer255; - bSizer255 = new wxBoxSizer( wxHORIZONTAL ); - - lblHigh = new wxStaticText( tabGeneral, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 ); - lblHigh->Wrap( -1 ); - bSizer255->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 ); - - - bSizer255->Add( 0, 0, 1, wxEXPAND, 5 ); - - lblLow = new wxStaticText( tabGeneral, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 ); - lblLow->Wrap( -1 ); - bSizer255->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 ); - - - bSizer254->Add( bSizer255, 0, wxEXPAND, 0 ); - - - bSizer260->Add( bSizer254, 1, wxEXPAND, 5 ); - - - fgSizer6->Add( bSizer260, 1, wxEXPAND, 5 ); + szrGeneral->Add( txtTelephone, 0, wxALL|wxEXPAND, 5 ); lblTelephoneType = new wxStaticText( tabGeneral, wxID_ANY, wxT("Type:"), wxDefaultPosition, wxDefaultSize, 0 ); lblTelephoneType->Wrap( 0 ); - fgSizer6->Add( lblTelephoneType, 0, wxALIGN_TOP|wxALL, 5 ); + szrGeneral->Add( lblTelephoneType, 0, wxALIGN_TOP|wxALL, 5 ); wxGridSizer* gSizer5; gSizer5 = new wxGridSizer( 0, 2, 0, 0 ); @@ -6384,12 +5627,16 @@ frmContactEditorTelephoneADT::frmContactEditorTelephoneADT( wxWindow* parent, wx gSizer5->Add( chkPager, 0, wxALL, 2 ); - fgSizer6->Add( gSizer5, 1, 0, 5 ); + szrGeneral->Add( gSizer5, 1, 0, 5 ); + lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); + lblPriority->Wrap( -1 ); + szrGeneral->Add( lblPriority, 0, wxALL, 5 ); - tabGeneral->SetSizer( fgSizer6 ); + + tabGeneral->SetSizer( szrGeneral ); tabGeneral->Layout(); - fgSizer6->Fit( tabGeneral ); + szrGeneral->Fit( tabGeneral ); nbkAddress->AddPage( tabGeneral, wxT("General"), false ); bSizer251->Add( nbkAddress, 1, wxEXPAND | wxALL, 5 ); @@ -6413,7 +5660,6 @@ frmContactEditorTelephoneADT::frmContactEditorTelephoneADT( wxWindow* parent, wx this->Centre( wxBOTH ); // Connect Events - chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorTelephoneADT::EnablePriority ), NULL, this ); btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorTelephoneADT::ProcessAction ), NULL, this ); btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorTelephoneADT::CloseWindow ), NULL, this ); } @@ -6421,7 +5667,6 @@ frmContactEditorTelephoneADT::frmContactEditorTelephoneADT( wxWindow* parent, wx frmContactEditorTelephoneADT::~frmContactEditorTelephoneADT() { // Disconnect Events - chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorTelephoneADT::EnablePriority ), NULL, this ); btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorTelephoneADT::ProcessAction ), NULL, this ); btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorTelephoneADT::CloseWindow ), NULL, this ); @@ -6436,72 +5681,26 @@ frmContactEditorLanguagesADT::frmContactEditorLanguagesADT( wxWindow* parent, wx nbkLanguages = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); tabGeneral = new wxPanel( nbkLanguages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - wxFlexGridSizer* fgSizer6; - fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer6->AddGrowableCol( 1 ); - fgSizer6->SetFlexibleDirection( wxVERTICAL ); - fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + szrGeneral = new wxFlexGridSizer( 2, 2, 0, 0 ); + szrGeneral->AddGrowableCol( 1 ); + szrGeneral->SetFlexibleDirection( wxBOTH ); + szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); lblLanguage = new wxStaticText( tabGeneral, wxID_ANY, wxT("Language:"), wxDefaultPosition, wxDefaultSize, 0 ); lblLanguage->Wrap( -1 ); - fgSizer6->Add( lblLanguage, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + szrGeneral->Add( lblLanguage, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtLanguage = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtLanguage->SetMaxLength( 0 ); - fgSizer6->Add( txtLanguage, 0, wxALL|wxEXPAND, 5 ); + szrGeneral->Add( txtLanguage, 0, wxALL|wxEXPAND, 5 ); lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); lblPriority->Wrap( -1 ); - fgSizer6->Add( lblPriority, 0, wxALL, 5 ); - - wxBoxSizer* bSizer260; - bSizer260 = new wxBoxSizer( wxHORIZONTAL ); - - chkUsePref = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer260->Add( chkUsePref, 0, wxALL, 5 ); - - wxBoxSizer* bSizer254; - bSizer254 = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer* bSizer256; - bSizer256 = new wxBoxSizer( wxHORIZONTAL ); - - sliPriority = new wxSlider( tabGeneral, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS ); - bSizer256->Add( sliPriority, 1, wxALL|wxEXPAND, 5 ); - - - bSizer254->Add( bSizer256, 1, wxEXPAND, 5 ); - - wxBoxSizer* bSizer255; - bSizer255 = new wxBoxSizer( wxHORIZONTAL ); - - lblHigh = new wxStaticText( tabGeneral, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 ); - lblHigh->Wrap( -1 ); - bSizer255->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 ); - - - bSizer255->Add( 0, 0, 1, wxEXPAND, 5 ); - - lblLow = new wxStaticText( tabGeneral, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 ); - lblLow->Wrap( -1 ); - bSizer255->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 ); + szrGeneral->Add( lblPriority, 0, wxALL, 5 ); - bSizer254->Add( bSizer255, 1, wxEXPAND, 0 ); - - - bSizer260->Add( bSizer254, 1, wxEXPAND, 5 ); - - - fgSizer6->Add( bSizer260, 1, wxEXPAND, 5 ); - - - fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 ); - - - tabGeneral->SetSizer( fgSizer6 ); + tabGeneral->SetSizer( szrGeneral ); tabGeneral->Layout(); - fgSizer6->Fit( tabGeneral ); + szrGeneral->Fit( tabGeneral ); nbkLanguages->AddPage( tabGeneral, wxT("General"), false ); bSizer251->Add( nbkLanguages, 1, wxEXPAND | wxALL, 5 ); @@ -6525,7 +5724,6 @@ frmContactEditorLanguagesADT::frmContactEditorLanguagesADT( wxWindow* parent, wx this->Centre( wxBOTH ); // Connect Events - chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorLanguagesADT::EnablePriority ), NULL, this ); btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorLanguagesADT::ProcessAction ), NULL, this ); btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorLanguagesADT::CloseWindow ), NULL, this ); } @@ -6533,7 +5731,6 @@ frmContactEditorLanguagesADT::frmContactEditorLanguagesADT( wxWindow* parent, wx frmContactEditorLanguagesADT::~frmContactEditorLanguagesADT() { // Disconnect Events - chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorLanguagesADT::EnablePriority ), NULL, this ); btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorLanguagesADT::ProcessAction ), NULL, this ); btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorLanguagesADT::CloseWindow ), NULL, this ); @@ -6672,7 +5869,6 @@ XABSearchPanelADT::XABSearchPanelADT( wxWindow* parent, wxWindowID id, const wxP szrSSet->Add( chkActive, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtSearch = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtSearch->SetMaxLength( 0 ); szrSSet->Add( txtSearch, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -6786,7 +5982,6 @@ frmEditAccountADT::frmEditAccountADT( wxWindow* parent, wxWindowID id, const wxS fgSizer43->Add( lblAccName, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtAccountName = new wxTextCtrl( tabProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtAccountName->SetMaxLength( 0 ); fgSizer43->Add( txtAccountName, 1, wxALL|wxEXPAND, 5 ); lblAccAdr = new wxStaticText( tabProperties, wxID_ANY, wxT("Address:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -6794,7 +5989,6 @@ frmEditAccountADT::frmEditAccountADT( wxWindow* parent, wxWindowID id, const wxS fgSizer43->Add( lblAccAdr, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtAddress = new wxTextCtrl( tabProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtAddress->SetMaxLength( 0 ); fgSizer43->Add( txtAddress, 0, wxALL|wxEXPAND, 5 ); m_staticText193 = new wxStaticText( tabProperties, wxID_ANY, wxT("Port:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -6802,7 +5996,14 @@ frmEditAccountADT::frmEditAccountADT( wxWindow* parent, wxWindowID id, const wxS fgSizer43->Add( m_staticText193, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtPort = new wxTextCtrl( tabProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtPort->SetMaxLength( 5 ); + #ifdef __WXGTK__ + if ( !txtPort->HasFlag( wxTE_MULTILINE ) ) + { + txtPort->SetMaxLength( 5 ); + } + #else + txtPort->SetMaxLength( 5 ); + #endif fgSizer43->Add( txtPort, 0, wxALL, 5 ); lblPort = new wxStaticText( tabProperties, wxID_ANY, wxT("Username:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -6810,7 +6011,6 @@ frmEditAccountADT::frmEditAccountADT( wxWindow* parent, wxWindowID id, const wxS fgSizer43->Add( lblPort, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtUsername = new wxTextCtrl( tabProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtUsername->SetMaxLength( 0 ); fgSizer43->Add( txtUsername, 0, wxALL|wxEXPAND, 5 ); lblPassword = new wxStaticText( tabProperties, wxID_ANY, wxT("Password:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -6818,7 +6018,6 @@ frmEditAccountADT::frmEditAccountADT( wxWindow* parent, wxWindowID id, const wxS fgSizer43->Add( lblPassword, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtPassword = new wxTextCtrl( tabProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); - txtPassword->SetMaxLength( 0 ); fgSizer43->Add( txtPassword, 0, wxALL|wxEXPAND, 5 ); lblPrefix = new wxStaticText( tabProperties, wxID_ANY, wxT("Prefix:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -6829,7 +6028,6 @@ frmEditAccountADT::frmEditAccountADT( wxWindow* parent, wxWindowID id, const wxS bSizer391 = new wxBoxSizer( wxHORIZONTAL ); txtPrefix = new wxTextCtrl( tabProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtPrefix->SetMaxLength( 0 ); bSizer391->Add( txtPrefix, 1, wxALL|wxEXPAND, 5 ); btnDetect = new wxButton( tabProperties, wxID_ANY, wxT("Detect"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT ); @@ -6862,7 +6060,14 @@ frmEditAccountADT::frmEditAccountADT( wxWindow* parent, wxWindowID id, const wxS fgSizer431->Add( lblRefresh, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); txtRefresh = new wxTextCtrl( tabRefresh, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtRefresh->SetMaxLength( 5 ); + #ifdef __WXGTK__ + if ( !txtRefresh->HasFlag( wxTE_MULTILINE ) ) + { + txtRefresh->SetMaxLength( 5 ); + } + #else + txtRefresh->SetMaxLength( 5 ); + #endif fgSizer431->Add( txtRefresh, 1, wxALL, 5 ); @@ -6939,7 +6144,7 @@ frmSSLCertificateADT::frmSSLCertificateADT( wxWindow* parent, wxWindowID id, con lblCertName = new wxStaticText( pnlTop, wxID_ANY, wxT("Certificate Name"), wxDefaultPosition, wxDefaultSize, 0 ); lblCertName->Wrap( -1 ); - lblCertName->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); + lblCertName->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizer389->Add( lblCertName, 0, wxALL, 5 ); @@ -7199,7 +6404,6 @@ frmImportResultsADT::frmImportResultsADT( wxWindow* parent, wxWindowID id, const bSizer396->Add( lblText, 0, wxALL, 5 ); txtResults = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY ); - txtResults->SetMaxLength( 0 ); bSizer396->Add( txtResults, 1, wxALL|wxEXPAND, 5 ); wxBoxSizer* bSizer397;