X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FAppXestiaAddrBk.cpp;h=8ffcff57acd6c7516db5b25286a3e5d7b2b5f898;hb=3bb2446a2c641871c2478b5b1a4a271d7843a5e6;hp=57ad0b1ec68b51715c8f1d977f6922aa718426c2;hpb=45729fca56479bd9158486e0cda0c4a94b4dd1dc;p=xestiaab%2F.git diff --git a/source/AppXestiaAddrBk.cpp b/source/AppXestiaAddrBk.cpp index 57ad0b1..8ffcff5 100644 --- a/source/AppXestiaAddrBk.cpp +++ b/source/AppXestiaAddrBk.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Feb 26 2014) +// C++ code generated with wxFormBuilder (version Nov 13 2016) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -29,26 +29,26 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title, mnuManage->AppendSeparator(); wxMenuItem* mnuImport; - mnuImport = new wxMenuItem( mnuManage, ID_MANAGE_IMPORT, wxString( wxT("Import...") ) , wxEmptyString, wxITEM_NORMAL ); + mnuImport = new wxMenuItem( mnuManage, ID_IMPORT, wxString( wxT("Import...") ) , wxEmptyString, wxITEM_NORMAL ); mnuManage->Append( mnuImport ); wxMenuItem* mnuExport; - mnuExport = new wxMenuItem( mnuManage, ID_MANAGE_EXPORT, wxString( wxT("Export...") ) , wxEmptyString, wxITEM_NORMAL ); + mnuExport = new wxMenuItem( mnuManage, ID_EXPORT, wxString( wxT("Export...") ) , wxEmptyString, wxITEM_NORMAL ); mnuManage->Append( mnuExport ); - mnuManage->AppendSeparator(); + mnuPrefSep = mnuManage->AppendSeparator(); wxMenuItem* mnuPreferences; - mnuPreferences = new wxMenuItem( mnuManage, ID_MANAGE_PREFERENCES, wxString( wxT("Preferences...") ) , wxEmptyString, wxITEM_NORMAL ); + mnuPreferences = new wxMenuItem( mnuManage, wxID_PREFERENCES, wxString( wxT("Preferences...") ) , wxEmptyString, wxITEM_NORMAL ); mnuManage->Append( mnuPreferences ); - mnuManage->AppendSeparator(); + mnuExitSep = mnuManage->AppendSeparator(); wxMenuItem* mnuExit; - mnuExit = new wxMenuItem( mnuManage, ID_MANAGE_EXIT, wxString( wxT("Exit") ) + wxT('\t') + wxT("CTRL+Q"), wxEmptyString, wxITEM_NORMAL ); + mnuExit = new wxMenuItem( mnuManage, wxID_EXIT, wxString( wxT("Exit") ) + wxT('\t') + wxT("CTRL+Q"), wxEmptyString, wxITEM_NORMAL ); #ifdef __WXMSW__ mnuExit->SetBitmaps( wxNullBitmap ); - #elif defined( __WXGTK__ ) + #elif (defined( __WXGTK__ ) || defined( __WXOSX__ )) mnuExit->SetBitmap( wxNullBitmap ); #endif mnuManage->Append( mnuExit ); @@ -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; @@ -70,19 +70,15 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title, mnuContact->AppendSeparator(); - setContactAsMyself = new wxMenuItem( mnuContact, ID_SET_CONTACT_AS_MYSELF, wxString( wxT("Set contact as myself") ) + wxT('\t') + wxT("CTRL+M"), wxEmptyString, wxITEM_NORMAL ); - mnuContact->Append( setContactAsMyself ); - - m_separator5 = 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") ); mnuView = new wxMenu(); mnuShowContactsAs = new wxMenu(); + wxMenuItem* mnuShowContactsAsItem = new wxMenuItem( mnuView, wxID_ANY, wxT("Show Contacts As"), wxEmptyString, wxITEM_NORMAL, mnuShowContactsAs ); wxMenuItem* mnuViewFNLN; mnuViewFNLN = new wxMenuItem( mnuShowContactsAs, ID_VIEW_FNLN, wxString( wxT("First Name, Last Name") ) , wxEmptyString, wxITEM_NORMAL ); mnuShowContactsAs->Append( mnuViewFNLN ); @@ -99,9 +95,10 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title, mnuViewDisplayAs = new wxMenuItem( mnuShowContactsAs, wxID_ANY, wxString( wxT("Display As Name") ) , wxEmptyString, wxITEM_NORMAL ); mnuShowContactsAs->Append( mnuViewDisplayAs ); - mnuView->Append( -1, wxT("Show Contacts As"), mnuShowContactsAs ); + mnuView->Append( mnuShowContactsAsItem ); mnuViewSortBy = new wxMenu(); + wxMenuItem* mnuViewSortByItem = new wxMenuItem( mnuView, wxID_ANY, wxT("Sort By"), wxEmptyString, wxITEM_NORMAL, mnuViewSortBy ); wxMenuItem* mnuViewAsc; mnuViewAsc = new wxMenuItem( mnuViewSortBy, ID_VIEW_ASC, wxString( wxT("Ascending") ) , wxEmptyString, wxITEM_NORMAL ); mnuViewSortBy->Append( mnuViewAsc ); @@ -110,14 +107,15 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title, mnuViewDesc = new wxMenuItem( mnuViewSortBy, ID_VIEW_DESC, wxString( wxT("Descending") ) , wxEmptyString, wxITEM_NORMAL ); mnuViewSortBy->Append( mnuViewDesc ); - mnuView->Append( -1, wxT("Sort By"), mnuViewSortBy ); + mnuView->Append( mnuViewSortByItem ); mnuViewShow = new wxMenu(); + wxMenuItem* mnuViewShowItem = new wxMenuItem( mnuView, wxID_ANY, wxT("Show"), wxEmptyString, wxITEM_NORMAL, mnuViewShow ); wxMenuItem* mnuViewStatusBar; mnuViewStatusBar = new wxMenuItem( mnuViewShow, ID_VIEW_STATUSBAR, wxString( wxT("Status Bar") ) , wxEmptyString, wxITEM_NORMAL ); mnuViewShow->Append( mnuViewStatusBar ); - mnuView->Append( -1, wxT("Show"), mnuViewShow ); + mnuView->Append( mnuViewShowItem ); mnuView->AppendSeparator(); @@ -156,10 +154,10 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title, mnuHelpUpdates = new wxMenuItem( mnuHelp, ID_MANAGE_UPDATE, wxString( wxT("Check for updates...") ) , wxEmptyString, wxITEM_NORMAL ); mnuHelp->Append( mnuHelpUpdates ); - mnuHelp->AppendSeparator(); + mnuHelpAboutSep = mnuHelp->AppendSeparator(); wxMenuItem* mnuAbout; - mnuAbout = new wxMenuItem( mnuHelp, ID_HELP_ABOUT, wxString( wxT("About") ) + wxT('\t') + wxT("SHIFT+CTRL+A"), wxEmptyString, wxITEM_NORMAL ); + mnuAbout = new wxMenuItem( mnuHelp, wxID_ABOUT, wxString( wxT("About") ) + wxT('\t') + wxT("SHIFT+CTRL+A"), wxEmptyString, wxITEM_NORMAL ); mnuHelp->Append( mnuAbout ); mnuMain->Append( mnuHelp, wxT("Help") ); @@ -185,20 +183,9 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title, m_splitter13->SetMinimumPaneSize( 1 ); m_panel19 = new wxPanel( m_splitter13, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - szrContactList = new wxFlexGridSizer( 0, 1, 0, 0 ); - szrContactList->AddGrowableCol( 0 ); - szrContactList->AddGrowableRow( 1 ); - szrContactList->SetFlexibleDirection( wxBOTH ); - szrContactList->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + szrContactList = new wxBoxSizer( wxVERTICAL ); - szrAccList = new wxFlexGridSizer( 0, 2, 0, 0 ); - szrAccList->SetFlexibleDirection( wxVERTICAL ); - szrAccList->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - - szrContactList->Add( szrAccList, 0, 0, 5 ); - - lstContacts = new wxListCtrl( m_panel19, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_HEADER|wxLC_REPORT|wxSUNKEN_BORDER ); + lstContacts = new wxListCtrl( m_panel19, wxID_ANY, wxDefaultPosition, wxSize( 50,-1 ), wxLC_NO_HEADER|wxLC_REPORT|wxSUNKEN_BORDER ); szrContactList->Add( lstContacts, 1, wxALL|wxEXPAND, 5 ); @@ -216,17 +203,39 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title, m_panel20->SetSizer( bSizer12 ); m_panel20->Layout(); bSizer12->Fit( m_panel20 ); - m_splitter13->SplitVertically( m_panel19, m_panel20, 184 ); + m_splitter13->SplitVertically( m_panel19, m_panel20, 201 ); szrMain->Add( m_splitter13, 1, wxEXPAND, 5 ); 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 ); // Connect Events + this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( frmMainADT::QuitApp ) ); this->Connect( mnuNewAB->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenNewABDialog ) ); this->Connect( mnuRefreshAB->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::RefreshAddressBook ) ); this->Connect( mnuImport->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenImportDialog ) ); @@ -236,7 +245,6 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title, this->Connect( mnuNewContact->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowContactEditorNew ) ); this->Connect( mnuEditContact->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowContactEditorEdit ) ); this->Connect( deleteContact->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::DeleteContact ) ); - this->Connect( setContactAsMyself->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::SetContactAsSelf ) ); this->Connect( mnuFindContact->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenFindContactsWindow ) ); this->Connect( mnuViewFNLN->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::SortFNLN ) ); this->Connect( mnuViewLNFN->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::SortLNFN ) ); @@ -252,9 +260,10 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title, this->Connect( showHelp->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowHelp ) ); this->Connect( mnuHelpUpdates->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::CheckUpdates ) ); this->Connect( mnuAbout->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowAboutWindow ) ); - lstContacts->Connect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( frmMainADT::OpenContactInfo ), NULL, this ); + lstContacts->Connect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( frmMainADT::OpenContactInfoList ), NULL, this ); lstContacts->Connect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( frmMainADT::ShowContactInfo ), NULL, this ); lstContacts->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( frmMainADT::ShowContactInfo ), NULL, this ); + lstContacts->Connect( wxEVT_RIGHT_UP, wxMouseEventHandler( frmMainADT::ShowContactMenu ), NULL, this ); htmContactData->Connect( wxEVT_RIGHT_UP, wxMouseEventHandler( frmMainADT::ShowContactSubmenu ), NULL, this ); stbBottom->Connect( wxEVT_SIZE, wxSizeEventHandler( frmMainADT::UpdateSBIconPlacement ), NULL, this ); } @@ -262,17 +271,17 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title, frmMainADT::~frmMainADT() { // Disconnect Events + this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( frmMainADT::QuitApp ) ); this->Disconnect( ID_MANAGE_NEWAB, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenNewABDialog ) ); this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::RefreshAddressBook ) ); - this->Disconnect( ID_MANAGE_IMPORT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenImportDialog ) ); - this->Disconnect( ID_MANAGE_EXPORT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenExportDialog ) ); - this->Disconnect( ID_MANAGE_PREFERENCES, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenPreferences ) ); - this->Disconnect( ID_MANAGE_EXIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::QuitApp ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowContactEditorNew ) ); + this->Disconnect( ID_IMPORT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenImportDialog ) ); + 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( 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( ID_SET_CONTACT_AS_MYSELF, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::SetContactAsSelf ) ); - 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 ) ); @@ -286,10 +295,11 @@ frmMainADT::~frmMainADT() this->Disconnect( ID_MANAGE_PASTE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::PasteAction ) ); this->Disconnect( ID_HELP_SHOW, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowHelp ) ); this->Disconnect( ID_MANAGE_UPDATE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::CheckUpdates ) ); - this->Disconnect( ID_HELP_ABOUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowAboutWindow ) ); - lstContacts->Disconnect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( frmMainADT::OpenContactInfo ), NULL, this ); + this->Disconnect( wxID_ABOUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowAboutWindow ) ); + lstContacts->Disconnect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( frmMainADT::OpenContactInfoList ), NULL, this ); lstContacts->Disconnect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( frmMainADT::ShowContactInfo ), NULL, this ); lstContacts->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( frmMainADT::ShowContactInfo ), NULL, this ); + lstContacts->Disconnect( wxEVT_RIGHT_UP, wxMouseEventHandler( frmMainADT::ShowContactMenu ), NULL, this ); htmContactData->Disconnect( wxEVT_RIGHT_UP, wxMouseEventHandler( frmMainADT::ShowContactSubmenu ), NULL, this ); stbBottom->Disconnect( wxEVT_SIZE, wxSizeEventHandler( frmMainADT::UpdateSBIconPlacement ), NULL, this ); @@ -317,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 ); @@ -391,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 ); @@ -477,11 +489,9 @@ frmSearchADT::frmSearchADT( wxWindow* parent, wxWindowID id, const wxString& tit mnuContactOpen = new wxMenuItem( mnuContact, wxID_ANY, wxString( wxT("Open Contact...") ) + wxT('\t') + wxT("CTRL+O"), wxEmptyString, wxITEM_NORMAL ); mnuContact->Append( mnuContactOpen ); - wxMenuItem* mnuContactEdit; mnuContactEdit = new wxMenuItem( mnuContact, wxID_ANY, wxString( wxT("Edit Contact...") ) + wxT('\t') + wxT("CTRL+E"), wxEmptyString, wxITEM_NORMAL ); mnuContact->Append( mnuContactEdit ); - wxMenuItem* mnuContactReveal; mnuContactReveal = new wxMenuItem( mnuContact, wxID_ANY, wxString( wxT("Reveal Contact") ) + wxT('\t') + wxT("CTRL+R"), wxEmptyString, wxITEM_NORMAL ); mnuContact->Append( mnuContactReveal ); @@ -503,6 +513,7 @@ frmSearchADT::frmSearchADT( wxWindow* parent, wxWindowID id, const wxString& tit btnSelectAccounts->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmSearchADT::SelectAccounts ), NULL, this ); btnSearch->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmSearchADT::SearchContacts ), NULL, this ); btnReset->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmSearchADT::ResetContacts ), NULL, this ); + lstResults->Connect( wxEVT_RIGHT_UP, wxMouseEventHandler( frmSearchADT::ShowContactMenu ), NULL, this ); this->Connect( mnuContactOpen->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmSearchADT::OpenContact ) ); this->Connect( mnuContactEdit->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmSearchADT::EditContact ) ); this->Connect( mnuContactReveal->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmSearchADT::RevealContact ) ); @@ -516,6 +527,7 @@ frmSearchADT::~frmSearchADT() btnSelectAccounts->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmSearchADT::SelectAccounts ), NULL, this ); btnSearch->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmSearchADT::SearchContacts ), NULL, this ); btnReset->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmSearchADT::ResetContacts ), NULL, this ); + lstResults->Disconnect( wxEVT_RIGHT_UP, wxMouseEventHandler( frmSearchADT::ShowContactMenu ), NULL, this ); this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmSearchADT::OpenContact ) ); this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmSearchADT::EditContact ) ); this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmSearchADT::RevealContact ) ); @@ -535,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"), false ); tabTheme = new wxPanel( NbtPreferences, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); tabTheme->Hide(); @@ -666,6 +693,7 @@ 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 ); @@ -684,6 +712,7 @@ 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 ); @@ -716,7 +745,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 ); @@ -843,7 +872,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 ); @@ -851,7 +879,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 ); @@ -859,7 +886,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 ); @@ -867,7 +893,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 ); @@ -901,7 +926,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 ); @@ -997,7 +1022,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 ); @@ -1055,7 +1079,7 @@ frmNewAccountADT::~frmNewAccountADT() frmContactEditorADT::frmContactEditorADT( 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( -1,-1 ), wxDefaultSize ); + this->SetSizeHints( wxSize( 800,500 ), wxDefaultSize ); this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); wxBoxSizer* bSizer17; @@ -1075,7 +1099,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 ); @@ -1095,7 +1118,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 ); @@ -1103,7 +1125,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 ); @@ -1111,7 +1132,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 ); @@ -1119,7 +1139,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 ); @@ -1152,14 +1171,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 ); @@ -1179,7 +1197,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 ); @@ -1199,7 +1216,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 ); @@ -1782,7 +1798,7 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const tabGeneral->SetSizer( bSizer18 ); tabGeneral->Layout(); bSizer18->Fit( tabGeneral ); - nbkContact->AddPage( tabGeneral, wxT("General"), false ); + nbkContact->AddPage( tabGeneral, wxT("General"), true ); tabHome = new wxScrolledWindow( nbkContact, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL ); tabHome->SetScrollRate( 5, 5 ); wxBoxSizer* bSizer181; @@ -2970,20 +2986,25 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const wxBoxSizer* bSizer212; bSizer212 = new wxBoxSizer( wxVERTICAL ); - wxBoxSizer* bSizer213; - bSizer213 = new wxBoxSizer( wxHORIZONTAL ); + wxFlexGridSizer* fgSizer46; + fgSizer46 = new wxFlexGridSizer( 2, 3, 0, 0 ); + fgSizer46->SetFlexibleDirection( wxBOTH ); + fgSizer46->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); btnAddPicture = new wxButton( tabPictures, wxID_ANY, wxT("Add"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer213->Add( btnAddPicture, 0, wxALL, 5 ); + fgSizer46->Add( btnAddPicture, 0, wxALL, 5 ); btnModifyPicture = new wxButton( tabPictures, wxID_ANY, wxT("Modify"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer213->Add( btnModifyPicture, 0, wxALL, 5 ); + fgSizer46->Add( btnModifyPicture, 0, wxALL, 5 ); btnDeletePicture = new wxButton( tabPictures, wxID_ANY, wxT("Delete"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer213->Add( btnDeletePicture, 0, wxALL, 5 ); + fgSizer46->Add( btnDeletePicture, 0, wxALL, 5 ); + + btnSavePicture = new wxButton( tabPictures, wxID_ANY, wxT("Save"), wxDefaultPosition, wxDefaultSize, 0 ); + fgSizer46->Add( btnSavePicture, 0, wxALL, 5 ); - bSizer212->Add( bSizer213, 1, wxEXPAND, 5 ); + bSizer212->Add( fgSizer46, 1, wxEXPAND, 5 ); bSizer211->Add( bSizer212, 0, wxEXPAND, 5 ); @@ -3013,20 +3034,25 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const wxBoxSizer* bSizer2121; bSizer2121 = new wxBoxSizer( wxVERTICAL ); - wxBoxSizer* bSizer2131; - bSizer2131 = new wxBoxSizer( wxHORIZONTAL ); + wxFlexGridSizer* fgSizer47; + fgSizer47 = new wxFlexGridSizer( 2, 3, 0, 0 ); + fgSizer47->SetFlexibleDirection( wxBOTH ); + fgSizer47->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); btnAddLogo = new wxButton( tabLogo, wxID_ANY, wxT("Add"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer2131->Add( btnAddLogo, 0, wxALL, 5 ); + fgSizer47->Add( btnAddLogo, 0, wxALL, 5 ); btnModifyLogo = new wxButton( tabLogo, wxID_ANY, wxT("Modify"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer2131->Add( btnModifyLogo, 0, wxALL, 5 ); + fgSizer47->Add( btnModifyLogo, 0, wxALL, 5 ); btnDeleteLogo = new wxButton( tabLogo, wxID_ANY, wxT("Delete"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer2131->Add( btnDeleteLogo, 0, wxALL, 5 ); + fgSizer47->Add( btnDeleteLogo, 0, wxALL, 5 ); + btnSaveLogo = new wxButton( tabLogo, wxID_ANY, wxT("Save"), wxDefaultPosition, wxDefaultSize, 0 ); + fgSizer47->Add( btnSaveLogo, 0, wxALL, 5 ); - bSizer2121->Add( bSizer2131, 1, wxEXPAND, 5 ); + + bSizer2121->Add( fgSizer47, 1, wxEXPAND, 5 ); bSizer2111->Add( bSizer2121, 0, wxEXPAND, 5 ); @@ -3065,6 +3091,9 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const btnDeleteSound = new wxButton( tabSounds, wxID_ANY, wxT("Delete"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer472111->Add( btnDeleteSound, 0, wxALL, 5 ); + btnSaveSound = new wxButton( tabSounds, wxID_ANY, wxT("Save"), wxDefaultPosition, wxDefaultSize, 0 ); + bSizer472111->Add( btnSaveSound, 0, wxALL, 5 ); + m_staticline1 = new wxStaticLine( tabSounds, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bSizer472111->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 ); @@ -3097,7 +3126,7 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const tabSounds->SetSizer( szrAddresses1111 ); tabSounds->Layout(); szrAddresses1111->Fit( tabSounds ); - nbkContact->AddPage( tabSounds, wxT("Sounds"), true ); + nbkContact->AddPage( tabSounds, wxT("Sounds"), false ); tabCalendaring = new wxScrolledWindow( nbkContact, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL ); tabCalendaring->SetScrollRate( 5, 5 ); wxBoxSizer* bSizer1821; @@ -3554,13 +3583,16 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const btnAddPicture->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::AddPicture ), NULL, this ); btnModifyPicture->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::ModifyPicture ), NULL, this ); btnDeletePicture->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::DeletePicture ), NULL, this ); + btnSavePicture->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::SavePicture ), NULL, this ); lboLogos->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( frmContactEditorADT::LoadLogo ), NULL, this ); btnAddLogo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::AddLogo ), NULL, this ); btnModifyLogo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::ModifyLogo ), NULL, this ); btnDeleteLogo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::DeleteLogo ), NULL, this ); + btnSaveLogo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::SaveLogo ), NULL, this ); btnAddSound->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::AddSound ), NULL, this ); btnModifySound->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::ModifySound ), NULL, this ); btnDeleteSound->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::DeleteSound ), NULL, this ); + btnSaveSound->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::SaveSound ), NULL, this ); btnPlay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::PlaySound ), NULL, this ); btnStop->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::StopSound ), NULL, this ); btnAddCalendarAddress->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::AddCalendarAddress ), NULL, this ); @@ -3731,13 +3763,16 @@ frmContactEditorADT::~frmContactEditorADT() btnAddPicture->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::AddPicture ), NULL, this ); btnModifyPicture->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::ModifyPicture ), NULL, this ); btnDeletePicture->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::DeletePicture ), NULL, this ); + btnSavePicture->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::SavePicture ), NULL, this ); lboLogos->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( frmContactEditorADT::LoadLogo ), NULL, this ); btnAddLogo->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::AddLogo ), NULL, this ); btnModifyLogo->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::ModifyLogo ), NULL, this ); btnDeleteLogo->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::DeleteLogo ), NULL, this ); + btnSaveLogo->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::SaveLogo ), NULL, this ); btnAddSound->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::AddSound ), NULL, this ); btnModifySound->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::ModifySound ), NULL, this ); btnDeleteSound->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::DeleteSound ), NULL, this ); + btnSaveSound->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::SaveSound ), NULL, this ); btnPlay->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::PlaySound ), NULL, this ); btnStop->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::StopSound ), NULL, this ); btnAddCalendarAddress->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::AddCalendarAddress ), NULL, this ); @@ -3777,7 +3812,7 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind nbkAddress = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); tabGeneral = new wxPanel( nbkAddress, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxFlexGridSizer* fgSizer6; - fgSizer6 = new wxFlexGridSizer( 2, 2, 0, 0 ); + fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 ); fgSizer6->AddGrowableCol( 1 ); fgSizer6->SetFlexibleDirection( wxVERTICAL ); fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); @@ -3787,7 +3822,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 ); @@ -3795,7 +3829,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 ); @@ -3803,7 +3836,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 ); @@ -3811,7 +3843,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 ); @@ -3819,7 +3850,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 ); @@ -3883,7 +3913,6 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind bSizer253->Add( btnCopyMailing, 0, wxALL, 5 ); txtLabel = new wxTextCtrl( tabLabel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE ); - txtLabel->SetMaxLength( 0 ); bSizer253->Add( txtLabel, 1, wxALL|wxEXPAND, 5 ); @@ -3893,7 +3922,7 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind nbkAddress->AddPage( tabLabel, wxT("Label"), false ); tabOther = new wxPanel( nbkAddress, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxFlexGridSizer* fgSizer61; - fgSizer61 = new wxFlexGridSizer( 2, 2, 0, 0 ); + fgSizer61 = new wxFlexGridSizer( 0, 2, 0, 0 ); fgSizer61->AddGrowableCol( 1 ); fgSizer61->SetFlexibleDirection( wxVERTICAL ); fgSizer61->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); @@ -3910,7 +3939,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 ); @@ -3918,7 +3946,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 ); @@ -3994,7 +4021,7 @@ frmConflictResolutionADT::frmConflictResolutionADT( wxWindow* parent, wxWindowID wxBoxSizer* bSizer365; bSizer365 = new wxBoxSizer( wxVERTICAL ); - htmClient = new wxHtmlWindow( m_panel44, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO ); + htmClient = new wxHtmlWindow( m_panel44, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO|wxSUNKEN_BORDER ); bSizer365->Add( htmClient, 1, wxALL|wxEXPAND, 5 ); @@ -4005,7 +4032,7 @@ frmConflictResolutionADT::frmConflictResolutionADT( wxWindow* parent, wxWindowID wxBoxSizer* bSizer366; bSizer366 = new wxBoxSizer( wxVERTICAL ); - htmServer = new wxHtmlWindow( m_panel45, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO ); + htmServer = new wxHtmlWindow( m_panel45, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO|wxSUNKEN_BORDER ); bSizer366->Add( htmServer, 1, wxALL|wxEXPAND, 5 ); @@ -4065,7 +4092,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(); @@ -4083,13 +4110,7 @@ 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 ); - #ifdef __WXMSW__ - mnuSleepMode->SetBitmaps( wxNullBitmap ); - #elif defined( __WXGTK__ ) - mnuSleepMode->SetBitmap( wxNullBitmap ); - #endif mnuWindow->Append( mnuSleepMode ); mnuWindow->AppendSeparator(); @@ -4127,7 +4148,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 ); @@ -4213,7 +4234,6 @@ frmContactEditorNicknameADT::frmContactEditorNicknameADT( wxWindow* parent, wxWi fgSizer6->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 ); lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -4414,7 +4434,6 @@ frmContactEditorRolesADT::frmContactEditorRolesADT( wxWindow* parent, wxWindowID fgSizer6->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 ); lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -4526,7 +4545,6 @@ frmContactEditorOrganisationsADT::frmContactEditorOrganisationsADT( wxWindow* pa fgSizer6->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 ); lblSortAs = new wxStaticText( tabGeneral, wxID_ANY, wxT("Sort As:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -4640,7 +4658,6 @@ frmContactEditorNotesADT::frmContactEditorNotesADT( wxWindow* parent, wxWindowID bSizer353 = new wxBoxSizer( wxVERTICAL ); txtNote = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE ); - txtNote->SetMaxLength( 0 ); bSizer353->Add( txtNote, 1, wxALL|wxEXPAND, 5 ); @@ -4783,7 +4800,6 @@ frmContactEditorTitlesADT::frmContactEditorTitlesADT( wxWindow* parent, wxWindow fgSizer6->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 ); lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -4895,7 +4911,6 @@ frmContactEditorRelatedADT::frmContactEditorRelatedADT( wxWindow* parent, wxWind fgSizer6->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 ); lblType = new wxStaticText( tabGeneral, wxID_ANY, wxT("Type:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -5254,7 +5269,6 @@ frmContactEditorWebsitesADT::frmContactEditorWebsitesADT( wxWindow* parent, wxWi fgSizer6->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 ); lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -5366,7 +5380,6 @@ frmContactEditorGeopositionADT::frmContactEditorGeopositionADT( wxWindow* parent fgSizer6->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 ); lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -5478,7 +5491,6 @@ frmContactEditorCalAdrADT::frmContactEditorCalAdrADT( wxWindow* parent, wxWindow 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 ); lblType = new wxStaticText( tabGeneral, wxID_ANY, wxT("Type:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -5599,7 +5611,6 @@ frmContactEditorVendorADT::frmContactEditorVendorADT( wxWindow* parent, wxWindow fgSizer6->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 ); lblElement = new wxStaticText( tabGeneral, wxID_ANY, wxT("Element:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -5607,7 +5618,6 @@ frmContactEditorVendorADT::frmContactEditorVendorADT( wxWindow* parent, wxWindow fgSizer6->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 ); lblValue = new wxStaticText( tabGeneral, wxID_ANY, wxT("Value:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -5615,7 +5625,6 @@ frmContactEditorVendorADT::frmContactEditorVendorADT( wxWindow* parent, wxWindow fgSizer6->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 ); @@ -5677,7 +5686,6 @@ frmContactEditorXTokenADT::frmContactEditorXTokenADT( wxWindow* parent, wxWindow fgSizer6->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 ); lblXT = new wxStaticText( tabGeneral, wxID_ANY, wxT("Value:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -5685,7 +5693,6 @@ frmContactEditorXTokenADT::frmContactEditorXTokenADT( wxWindow* parent, wxWindow fgSizer6->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 ); @@ -5812,7 +5819,7 @@ frmContactEditorKeyADT::frmContactEditorKeyADT( wxWindow* parent, wxWindowID id, tabGeneral->SetSizer( fgSizer6 ); tabGeneral->Layout(); fgSizer6->Fit( tabGeneral ); - nbkWebsite->AddPage( tabGeneral, wxT("General"), true ); + nbkWebsite->AddPage( tabGeneral, wxT("General"), false ); tabURL = new wxPanel( nbkWebsite, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxFlexGridSizer* fgSizer61; fgSizer61 = new wxFlexGridSizer( 0, 2, 0, 0 ); @@ -5832,7 +5839,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 ); @@ -5863,14 +5869,13 @@ frmContactEditorKeyADT::frmContactEditorKeyADT( wxWindow* parent, wxWindowID id, fgSizer62->Add( lblKeyData, 0, wxALL, 5 ); txtKeyData = new wxTextCtrl( tabKey, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE ); - txtKeyData->SetMaxLength( 0 ); fgSizer62->Add( txtKeyData, 1, wxALL|wxEXPAND, 5 ); tabKey->SetSizer( fgSizer62 ); tabKey->Layout(); fgSizer62->Fit( tabKey ); - nbkWebsite->AddPage( tabKey, wxT("Key"), false ); + nbkWebsite->AddPage( tabKey, wxT("Key"), true ); bSizer251->Add( nbkWebsite, 1, wxEXPAND | wxALL, 5 ); @@ -5933,7 +5938,6 @@ frmContactEditorEmailADT::frmContactEditorEmailADT( wxWindow* parent, wxWindowID 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 ); @@ -6052,7 +6056,6 @@ frmContactEditorIMADT::frmContactEditorIMADT( wxWindow* parent, wxWindowID id, c fgSizer6->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 ); lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -6164,7 +6167,6 @@ frmContactEditorCategoryADT::frmContactEditorCategoryADT( wxWindow* parent, wxWi fgSizer6->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 ); lblType = new wxStaticText( tabGeneral, wxID_ANY, wxT("Type:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -6285,7 +6287,6 @@ frmContactEditorTelephoneADT::frmContactEditorTelephoneADT( wxWindow* parent, wx fgSizer6->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 ); @@ -6338,7 +6339,7 @@ frmContactEditorTelephoneADT::frmContactEditorTelephoneADT( wxWindow* parent, wx fgSizer6->Add( lblTelephoneType, 0, wxALIGN_TOP|wxALL, 5 ); wxGridSizer* gSizer5; - gSizer5 = new wxGridSizer( 2, 2, 0, 0 ); + gSizer5 = new wxGridSizer( 0, 2, 0, 0 ); chkVoice = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Voice"), wxDefaultPosition, wxDefaultSize, 0 ); gSizer5->Add( chkVoice, 0, wxALL, 2 ); @@ -6425,7 +6426,6 @@ frmContactEditorLanguagesADT::frmContactEditorLanguagesADT( wxWindow* parent, wx fgSizer6->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 ); lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -6650,7 +6650,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 ); @@ -6764,7 +6763,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 ); @@ -6772,7 +6770,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 ); @@ -6780,7 +6777,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 ); @@ -6788,15 +6792,13 @@ 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 ); lblPassword->Wrap( -1 ); fgSizer43->Add( lblPassword, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - txtPassword = new wxTextCtrl( tabProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - txtPassword->SetMaxLength( 0 ); + txtPassword = new wxTextCtrl( tabProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); fgSizer43->Add( txtPassword, 0, wxALL|wxEXPAND, 5 ); lblPrefix = new wxStaticText( tabProperties, wxID_ANY, wxT("Prefix:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -6807,7 +6809,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 ); @@ -6840,7 +6841,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 ); @@ -6917,7 +6925,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 ); @@ -6978,7 +6986,7 @@ frmSSLCertificateADT::frmSSLCertificateADT( wxWindow* parent, wxWindowID id, con tabSummary->SetSizer( bSizer386 ); tabSummary->Layout(); bSizer386->Fit( tabSummary ); - m_notebook28->AddPage( tabSummary, wxT("Summary"), false ); + m_notebook28->AddPage( tabSummary, wxT("Summary"), true ); tabDetail = new wxPanel( m_notebook28, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxBoxSizer* bSizer3891; bSizer3891 = new wxBoxSizer( wxVERTICAL ); @@ -6987,7 +6995,6 @@ frmSSLCertificateADT::frmSSLCertificateADT( wxWindow* parent, wxWindowID id, con bSizer3891->Add( lstValues, 1, wxALL|wxEXPAND, 5 ); txtValueData = new wxTextCtrl( tabDetail, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_CHARWRAP|wxTE_MULTILINE|wxTE_READONLY ); - txtValueData->SetMaxLength( 0 ); txtValueData->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); bSizer3891->Add( txtValueData, 1, wxALL|wxEXPAND, 5 ); @@ -7021,7 +7028,7 @@ frmSSLCertificateADT::frmSSLCertificateADT( wxWindow* parent, wxWindowID id, con tabHierarchy->SetSizer( bSizer390 ); tabHierarchy->Layout(); bSizer390->Fit( tabHierarchy ); - m_notebook28->AddPage( tabHierarchy, wxT("Hierarchy"), true ); + m_notebook28->AddPage( tabHierarchy, wxT("Hierarchy"), false ); bSizer384->Add( m_notebook28, 1, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 ); @@ -7112,13 +7119,13 @@ frmInvalidSSLCertificateADT::~frmInvalidSSLCertificateADT() frmImportContactsADT::frmImportContactsADT( 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 ); + this->SetSizeHints( wxSize( 325,400 ), wxSize( 325,400 ) ); wxBoxSizer* bSizer393; bSizer393 = new wxBoxSizer( wxVERTICAL ); lblImportText = new wxStaticText( this, wxID_ANY, wxT("Select the contacts you want to import and the account to import into. Click on Import to finish."), wxDefaultPosition, wxDefaultSize, 0 ); - lblImportText->Wrap( -1 ); + lblImportText->Wrap( 300 ); bSizer393->Add( lblImportText, 0, wxALL|wxEXPAND, 5 ); wxArrayString lstContactsChoices; @@ -7178,13 +7185,14 @@ 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; bSizer397 = new wxBoxSizer( wxHORIZONTAL ); btnCopyClipboard = new wxButton( this, wxID_ANY, wxT("Copy to Clipboard"), wxDefaultPosition, wxDefaultSize, 0 ); + btnCopyClipboard->Hide(); + bSizer397->Add( btnCopyClipboard, 0, 0, 5 ); btnFinish = new wxButton( this, wxID_ANY, wxT("Finish"), wxDefaultPosition, wxDefaultSize, 0 );