X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FAppXestiaAddrBk.cpp;h=b6a4de71a4982cc19097504f6d50793c9c36082b;hb=a45c3a46e4e37da415a8b8da2aaabe6a4abc4551;hp=8ca066cb24e463fae7024738a8428810bc0f5614;hpb=79157d6a23a39a27975e869e3088f0bb758809e5;p=xestiaab%2F.git diff --git a/source/AppXestiaAddrBk.cpp b/source/AppXestiaAddrBk.cpp index 8ca066c..b6a4de7 100644 --- a/source/AppXestiaAddrBk.cpp +++ b/source/AppXestiaAddrBk.cpp @@ -29,11 +29,11 @@ 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 ); mnuPrefSep = mnuManage->AppendSeparator(); @@ -183,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 ); @@ -214,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, 314 ); + m_splitter13->SplitVertically( m_panel19, m_panel20, 201 ); szrMain->Add( m_splitter13, 1, wxEXPAND, 5 ); @@ -225,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 ) ); @@ -249,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 ); } @@ -259,10 +250,11 @@ 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_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 ) ); @@ -283,9 +275,10 @@ frmMainADT::~frmMainADT() 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( wxID_ABOUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowAboutWindow ) ); - lstContacts->Disconnect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( frmMainADT::OpenContactInfo ), NULL, this ); + 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 ); @@ -473,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 ); @@ -499,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 ) ); @@ -512,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 ) ); @@ -544,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(); @@ -583,7 +576,7 @@ frmPreferencesADT::frmPreferencesADT( wxWindow* parent, wxWindowID id, const wxS tabTheme->SetSizer( szrTheme ); tabTheme->Layout(); szrTheme->Fit( tabTheme ); - NbtPreferences->AddPage( tabTheme, wxT("Themes"), true ); + NbtPreferences->AddPage( tabTheme, wxT("Themes"), false ); tabAccounts = new wxPanel( NbtPreferences, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxGridSizer* szrAccounts; szrAccounts = new wxGridSizer( 1, 1, 0, 0 ); @@ -807,8 +800,6 @@ frmNewAccountADT::frmNewAccountADT( wxWindow* parent, wxWindowID id, const wxStr szrNewAccount = new wxBoxSizer( wxVERTICAL ); tabType = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); - tabType->Hide(); - wxFlexGridSizer* fgSizer32; fgSizer32 = new wxFlexGridSizer( 0, 1, 0, 0 ); fgSizer32->AddGrowableCol( 0 ); @@ -892,6 +883,8 @@ frmNewAccountADT::frmNewAccountADT( wxWindow* parent, wxWindowID id, const wxStr szrNewAccount->Add( tabType, 1, wxEXPAND | wxALL, 5 ); tabConn = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + tabConn->Hide(); + wxBoxSizer* bSizer323; bSizer323 = new wxBoxSizer( wxVERTICAL ); @@ -1778,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; @@ -2966,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 ); @@ -3009,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 ); @@ -3061,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 ); @@ -3093,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; @@ -3550,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 ); @@ -3727,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 ); @@ -3773,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 ); @@ -3889,7 +3901,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 ); @@ -4081,11 +4093,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__ ) || defined( __WXOSX__ )) - mnuSleepMode->SetBitmap( wxNullBitmap ); - #endif mnuWindow->Append( mnuSleepMode ); mnuWindow->AppendSeparator(); @@ -6334,7 +6341,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 ); @@ -6974,7 +6981,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 ); @@ -7017,7 +7024,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 );