X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FAppXestiaAddrBk.cpp;h=1e6652470b71f379544abe7e9f997e2180b350c2;hb=8dafa6487aa09e3447393f041e0cd6ab04081baf;hp=57ad0b1ec68b51715c8f1d977f6922aa718426c2;hpb=45729fca56479bd9158486e0cda0c4a94b4dd1dc;p=xestiaab%2F.git diff --git a/source/AppXestiaAddrBk.cpp b/source/AppXestiaAddrBk.cpp index 57ad0b1..1e66524 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 Feb 10 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 ); @@ -70,11 +70,6 @@ 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 ); mnuContact->Append( mnuFindContact ); @@ -83,6 +78,7 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title, 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,7 +203,7 @@ 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 ); @@ -227,6 +214,7 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title, 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 +224,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 +239,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,16 +250,16 @@ 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( 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( wxID_ANY, 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_VIEW_FNLN, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::SortFNLN ) ); this->Disconnect( ID_VIEW_LNFN, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::SortLNFN ) ); @@ -286,10 +274,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 ); @@ -477,11 +466,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 +490,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 +504,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 ) ); @@ -548,7 +537,7 @@ frmPreferencesADT::frmPreferencesADT( wxWindow* parent, wxWindowID id, const wxS tabGeneral->SetSizer( szrChecks ); tabGeneral->Layout(); szrChecks->Fit( tabGeneral ); - NbtPreferences->AddPage( tabGeneral, wxT("General"), false ); + NbtPreferences->AddPage( tabGeneral, wxT("General"), true ); tabTheme = new wxPanel( NbtPreferences, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); tabTheme->Hide(); @@ -624,7 +613,7 @@ frmPreferencesADT::frmPreferencesADT( wxWindow* parent, wxWindowID id, const wxS tabAccounts->SetSizer( szrAccounts ); tabAccounts->Layout(); szrAccounts->Fit( tabAccounts ); - NbtPreferences->AddPage( tabAccounts, wxT("Accounts"), true ); + NbtPreferences->AddPage( tabAccounts, wxT("Accounts"), false ); szrTabs->Add( NbtPreferences, 1, wxALL|wxEXPAND, 5 ); @@ -1055,7 +1044,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; @@ -1782,7 +1771,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 +2959,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 +3007,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 +3064,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 +3099,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 +3556,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 +3736,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 +3785,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 ); @@ -3883,7 +3891,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 +3900,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 ); @@ -3994,7 +4001,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 +4012,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 ); @@ -4085,11 +4092,6 @@ frmActivityMgrADT::frmActivityMgrADT( wxWindow* parent, wxWindowID id, const wxS 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(); @@ -4640,7 +4642,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 ); @@ -5812,7 +5813,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 ); @@ -5863,14 +5864,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 ); @@ -6338,7 +6338,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 ); @@ -6978,7 +6978,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 ); @@ -7021,7 +7021,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 +7112,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; @@ -7185,6 +7185,8 @@ frmImportResultsADT::frmImportResultsADT( wxWindow* parent, wxWindowID id, const 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 );