Added source code, headers and unit testing for the KEY vCard property for ContactDat...

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

diff --git a/source/AppXestiaAddrBk.cpp b/source/AppXestiaAddrBk.cpp
index f07322d..b6a4de7 100644 (file)
--- a/source/AppXestiaAddrBk.cpp
+++ b/source/AppXestiaAddrBk.cpp
@@ -29,11 +29,11 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title,
        mnuManage->AppendSeparator();\r
        \r
        wxMenuItem* mnuImport;\r
-       mnuImport = new wxMenuItem( mnuManage, ID_MANAGE_IMPORT, wxString( wxT("Import...") ) , wxEmptyString, wxITEM_NORMAL );\r
+       mnuImport = new wxMenuItem( mnuManage, ID_IMPORT, wxString( wxT("Import...") ) , wxEmptyString, wxITEM_NORMAL );\r
        mnuManage->Append( mnuImport );\r
        \r
        wxMenuItem* mnuExport;\r
-       mnuExport = new wxMenuItem( mnuManage, ID_MANAGE_EXPORT, wxString( wxT("Export...") ) , wxEmptyString, wxITEM_NORMAL );\r
+       mnuExport = new wxMenuItem( mnuManage, ID_EXPORT, wxString( wxT("Export...") ) , wxEmptyString, wxITEM_NORMAL );\r
        mnuManage->Append( mnuExport );\r
        \r
        mnuPrefSep = mnuManage->AppendSeparator();\r
@@ -183,20 +183,9 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title,
        m_splitter13->SetMinimumPaneSize( 1 );\r
        \r
        m_panel19 = new wxPanel( m_splitter13, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );\r
-       szrContactList = new wxFlexGridSizer( 0, 1, 0, 0 );\r
-       szrContactList->AddGrowableCol( 0 );\r
-       szrContactList->AddGrowableRow( 1 );\r
-       szrContactList->SetFlexibleDirection( wxBOTH );\r
-       szrContactList->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );\r
+       szrContactList = new wxBoxSizer( wxVERTICAL );\r
        \r
-       szrAccList = new wxFlexGridSizer( 0, 2, 0, 0 );\r
-       szrAccList->SetFlexibleDirection( wxVERTICAL );\r
-       szrAccList->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );\r
-       \r
-       \r
-       szrContactList->Add( szrAccList, 0, 0, 5 );\r
-       \r
-       lstContacts = new wxListCtrl( m_panel19, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_HEADER|wxLC_REPORT|wxSUNKEN_BORDER );\r
+       lstContacts = new wxListCtrl( m_panel19, wxID_ANY, wxDefaultPosition, wxSize( 50,-1 ), wxLC_NO_HEADER|wxLC_REPORT|wxSUNKEN_BORDER );\r
        szrContactList->Add( lstContacts, 1, wxALL|wxEXPAND, 5 );\r
        \r
        \r
@@ -214,7 +203,7 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title,
        m_panel20->SetSizer( bSizer12 );\r
        m_panel20->Layout();\r
        bSizer12->Fit( m_panel20 );\r
-       m_splitter13->SplitVertically( m_panel19, m_panel20, 314 );\r
+       m_splitter13->SplitVertically( m_panel19, m_panel20, 201 );\r
        szrMain->Add( m_splitter13, 1, wxEXPAND, 5 );\r
        \r
        \r
@@ -225,6 +214,7 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title,
        this->Centre( wxBOTH );\r
        \r
        // Connect Events\r
+       this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( frmMainADT::QuitApp ) );\r
        this->Connect( mnuNewAB->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenNewABDialog ) );\r
        this->Connect( mnuRefreshAB->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::RefreshAddressBook ) );\r
        this->Connect( mnuImport->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenImportDialog ) );\r
@@ -249,9 +239,10 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title,
        this->Connect( showHelp->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowHelp ) );\r
        this->Connect( mnuHelpUpdates->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::CheckUpdates ) );\r
        this->Connect( mnuAbout->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowAboutWindow ) );\r
-       lstContacts->Connect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( frmMainADT::OpenContactInfo ), NULL, this );\r
+       lstContacts->Connect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( frmMainADT::OpenContactInfoList ), NULL, this );\r
        lstContacts->Connect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( frmMainADT::ShowContactInfo ), NULL, this );\r
        lstContacts->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( frmMainADT::ShowContactInfo ), NULL, this );\r
+       lstContacts->Connect( wxEVT_RIGHT_UP, wxMouseEventHandler( frmMainADT::ShowContactMenu ), NULL, this );\r
        htmContactData->Connect( wxEVT_RIGHT_UP, wxMouseEventHandler( frmMainADT::ShowContactSubmenu ), NULL, this );\r
        stbBottom->Connect( wxEVT_SIZE, wxSizeEventHandler( frmMainADT::UpdateSBIconPlacement ), NULL, this );\r
 }\r
@@ -259,10 +250,11 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title,
 frmMainADT::~frmMainADT()\r
 {\r
        // Disconnect Events\r
+       this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( frmMainADT::QuitApp ) );\r
        this->Disconnect( ID_MANAGE_NEWAB, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenNewABDialog ) );\r
        this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::RefreshAddressBook ) );\r
-       this->Disconnect( ID_MANAGE_IMPORT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenImportDialog ) );\r
-       this->Disconnect( ID_MANAGE_EXPORT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenExportDialog ) );\r
+       this->Disconnect( ID_IMPORT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenImportDialog ) );\r
+       this->Disconnect( ID_EXPORT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenExportDialog ) );\r
        this->Disconnect( wxID_PREFERENCES, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenPreferences ) );\r
        this->Disconnect( wxID_EXIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::QuitApp ) );\r
        this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowContactEditorNew ) );\r
@@ -283,9 +275,10 @@ frmMainADT::~frmMainADT()
        this->Disconnect( ID_HELP_SHOW, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowHelp ) );\r
        this->Disconnect( ID_MANAGE_UPDATE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::CheckUpdates ) );\r
        this->Disconnect( wxID_ABOUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowAboutWindow ) );\r
-       lstContacts->Disconnect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( frmMainADT::OpenContactInfo ), NULL, this );\r
+       lstContacts->Disconnect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( frmMainADT::OpenContactInfoList ), NULL, this );\r
        lstContacts->Disconnect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( frmMainADT::ShowContactInfo ), NULL, this );\r
        lstContacts->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( frmMainADT::ShowContactInfo ), NULL, this );\r
+       lstContacts->Disconnect( wxEVT_RIGHT_UP, wxMouseEventHandler( frmMainADT::ShowContactMenu ), NULL, this );\r
        htmContactData->Disconnect( wxEVT_RIGHT_UP, wxMouseEventHandler( frmMainADT::ShowContactSubmenu ), NULL, this );\r
        stbBottom->Disconnect( wxEVT_SIZE, wxSizeEventHandler( frmMainADT::UpdateSBIconPlacement ), NULL, this );\r
        \r
@@ -497,6 +490,7 @@ frmSearchADT::frmSearchADT( wxWindow* parent, wxWindowID id, const wxString& tit
        btnSelectAccounts->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmSearchADT::SelectAccounts ), NULL, this );\r
        btnSearch->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmSearchADT::SearchContacts ), NULL, this );\r
        btnReset->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmSearchADT::ResetContacts ), NULL, this );\r
+       lstResults->Connect( wxEVT_RIGHT_UP, wxMouseEventHandler( frmSearchADT::ShowContactMenu ), NULL, this );\r
        this->Connect( mnuContactOpen->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmSearchADT::OpenContact ) );\r
        this->Connect( mnuContactEdit->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmSearchADT::EditContact ) );\r
        this->Connect( mnuContactReveal->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmSearchADT::RevealContact ) );\r
@@ -510,6 +504,7 @@ frmSearchADT::~frmSearchADT()
        btnSelectAccounts->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmSearchADT::SelectAccounts ), NULL, this );\r
        btnSearch->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmSearchADT::SearchContacts ), NULL, this );\r
        btnReset->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmSearchADT::ResetContacts ), NULL, this );\r
+       lstResults->Disconnect( wxEVT_RIGHT_UP, wxMouseEventHandler( frmSearchADT::ShowContactMenu ), NULL, this );\r
        this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmSearchADT::OpenContact ) );\r
        this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmSearchADT::EditContact ) );\r
        this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmSearchADT::RevealContact ) );\r
@@ -542,7 +537,7 @@ frmPreferencesADT::frmPreferencesADT( wxWindow* parent, wxWindowID id, const wxS
        tabGeneral->SetSizer( szrChecks );\r
        tabGeneral->Layout();\r
        szrChecks->Fit( tabGeneral );\r
-       NbtPreferences->AddPage( tabGeneral, wxT("General"), false );\r
+       NbtPreferences->AddPage( tabGeneral, wxT("General"), true );\r
        tabTheme = new wxPanel( NbtPreferences, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );\r
        tabTheme->Hide();\r
        \r
@@ -581,7 +576,7 @@ frmPreferencesADT::frmPreferencesADT( wxWindow* parent, wxWindowID id, const wxS
        tabTheme->SetSizer( szrTheme );\r
        tabTheme->Layout();\r
        szrTheme->Fit( tabTheme );\r
-       NbtPreferences->AddPage( tabTheme, wxT("Themes"), true );\r
+       NbtPreferences->AddPage( tabTheme, wxT("Themes"), false );\r
        tabAccounts = new wxPanel( NbtPreferences, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );\r
        wxGridSizer* szrAccounts;\r
        szrAccounts = new wxGridSizer( 1, 1, 0, 0 );\r
@@ -805,8 +800,6 @@ frmNewAccountADT::frmNewAccountADT( wxWindow* parent, wxWindowID id, const wxStr
        szrNewAccount = new wxBoxSizer( wxVERTICAL );\r
        \r
        tabType = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );\r
-       tabType->Hide();\r
-       \r
        wxFlexGridSizer* fgSizer32;\r
        fgSizer32 = new wxFlexGridSizer( 0, 1, 0, 0 );\r
        fgSizer32->AddGrowableCol( 0 );\r
@@ -890,6 +883,8 @@ frmNewAccountADT::frmNewAccountADT( wxWindow* parent, wxWindowID id, const wxStr
        szrNewAccount->Add( tabType, 1, wxEXPAND | wxALL, 5 );\r
        \r
        tabConn = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );\r
+       tabConn->Hide();\r
+       \r
        wxBoxSizer* bSizer323;\r
        bSizer323 = new wxBoxSizer( wxVERTICAL );\r
        \r
@@ -1776,7 +1771,7 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const
        tabGeneral->SetSizer( bSizer18 );\r
        tabGeneral->Layout();\r
        bSizer18->Fit( tabGeneral );\r
-       nbkContact->AddPage( tabGeneral, wxT("General"), false );\r
+       nbkContact->AddPage( tabGeneral, wxT("General"), true );\r
        tabHome = new wxScrolledWindow( nbkContact, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );\r
        tabHome->SetScrollRate( 5, 5 );\r
        wxBoxSizer* bSizer181;\r
@@ -2964,20 +2959,25 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const
        wxBoxSizer* bSizer212;\r
        bSizer212 = new wxBoxSizer( wxVERTICAL );\r
        \r
-       wxBoxSizer* bSizer213;\r
-       bSizer213 = new wxBoxSizer( wxHORIZONTAL );\r
+       wxFlexGridSizer* fgSizer46;\r
+       fgSizer46 = new wxFlexGridSizer( 2, 3, 0, 0 );\r
+       fgSizer46->SetFlexibleDirection( wxBOTH );\r
+       fgSizer46->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );\r
        \r
        btnAddPicture = new wxButton( tabPictures, wxID_ANY, wxT("Add"), wxDefaultPosition, wxDefaultSize, 0 );\r
-       bSizer213->Add( btnAddPicture, 0, wxALL, 5 );\r
+       fgSizer46->Add( btnAddPicture, 0, wxALL, 5 );\r
        \r
        btnModifyPicture = new wxButton( tabPictures, wxID_ANY, wxT("Modify"), wxDefaultPosition, wxDefaultSize, 0 );\r
-       bSizer213->Add( btnModifyPicture, 0, wxALL, 5 );\r
+       fgSizer46->Add( btnModifyPicture, 0, wxALL, 5 );\r
        \r
        btnDeletePicture = new wxButton( tabPictures, wxID_ANY, wxT("Delete"), wxDefaultPosition, wxDefaultSize, 0 );\r
-       bSizer213->Add( btnDeletePicture, 0, wxALL, 5 );\r
+       fgSizer46->Add( btnDeletePicture, 0, wxALL, 5 );\r
+       \r
+       btnSavePicture = new wxButton( tabPictures, wxID_ANY, wxT("Save"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       fgSizer46->Add( btnSavePicture, 0, wxALL, 5 );\r
        \r
        \r
-       bSizer212->Add( bSizer213, 1, wxEXPAND, 5 );\r
+       bSizer212->Add( fgSizer46, 1, wxEXPAND, 5 );\r
        \r
        \r
        bSizer211->Add( bSizer212, 0, wxEXPAND, 5 );\r
@@ -3007,20 +3007,25 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const
        wxBoxSizer* bSizer2121;\r
        bSizer2121 = new wxBoxSizer( wxVERTICAL );\r
        \r
-       wxBoxSizer* bSizer2131;\r
-       bSizer2131 = new wxBoxSizer( wxHORIZONTAL );\r
+       wxFlexGridSizer* fgSizer47;\r
+       fgSizer47 = new wxFlexGridSizer( 2, 3, 0, 0 );\r
+       fgSizer47->SetFlexibleDirection( wxBOTH );\r
+       fgSizer47->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );\r
        \r
        btnAddLogo = new wxButton( tabLogo, wxID_ANY, wxT("Add"), wxDefaultPosition, wxDefaultSize, 0 );\r
-       bSizer2131->Add( btnAddLogo, 0, wxALL, 5 );\r
+       fgSizer47->Add( btnAddLogo, 0, wxALL, 5 );\r
        \r
        btnModifyLogo = new wxButton( tabLogo, wxID_ANY, wxT("Modify"), wxDefaultPosition, wxDefaultSize, 0 );\r
-       bSizer2131->Add( btnModifyLogo, 0, wxALL, 5 );\r
+       fgSizer47->Add( btnModifyLogo, 0, wxALL, 5 );\r
        \r
        btnDeleteLogo = new wxButton( tabLogo, wxID_ANY, wxT("Delete"), wxDefaultPosition, wxDefaultSize, 0 );\r
-       bSizer2131->Add( btnDeleteLogo, 0, wxALL, 5 );\r
+       fgSizer47->Add( btnDeleteLogo, 0, wxALL, 5 );\r
+       \r
+       btnSaveLogo = new wxButton( tabLogo, wxID_ANY, wxT("Save"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       fgSizer47->Add( btnSaveLogo, 0, wxALL, 5 );\r
        \r
        \r
-       bSizer2121->Add( bSizer2131, 1, wxEXPAND, 5 );\r
+       bSizer2121->Add( fgSizer47, 1, wxEXPAND, 5 );\r
        \r
        \r
        bSizer2111->Add( bSizer2121, 0, wxEXPAND, 5 );\r
@@ -3059,6 +3064,9 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const
        btnDeleteSound = new wxButton( tabSounds, wxID_ANY, wxT("Delete"), wxDefaultPosition, wxDefaultSize, 0 );\r
        bSizer472111->Add( btnDeleteSound, 0, wxALL, 5 );\r
        \r
+       btnSaveSound = new wxButton( tabSounds, wxID_ANY, wxT("Save"), wxDefaultPosition, wxDefaultSize, 0 );\r
+       bSizer472111->Add( btnSaveSound, 0, wxALL, 5 );\r
+       \r
        m_staticline1 = new wxStaticLine( tabSounds, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );\r
        bSizer472111->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 );\r
        \r
@@ -3091,7 +3099,7 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const
        tabSounds->SetSizer( szrAddresses1111 );\r
        tabSounds->Layout();\r
        szrAddresses1111->Fit( tabSounds );\r
-       nbkContact->AddPage( tabSounds, wxT("Sounds"), true );\r
+       nbkContact->AddPage( tabSounds, wxT("Sounds"), false );\r
        tabCalendaring = new wxScrolledWindow( nbkContact, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );\r
        tabCalendaring->SetScrollRate( 5, 5 );\r
        wxBoxSizer* bSizer1821;\r
@@ -3548,13 +3556,16 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const
        btnAddPicture->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::AddPicture ), NULL, this );\r
        btnModifyPicture->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::ModifyPicture ), NULL, this );\r
        btnDeletePicture->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::DeletePicture ), NULL, this );\r
+       btnSavePicture->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::SavePicture ), NULL, this );\r
        lboLogos->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( frmContactEditorADT::LoadLogo ), NULL, this );\r
        btnAddLogo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::AddLogo ), NULL, this );\r
        btnModifyLogo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::ModifyLogo ), NULL, this );\r
        btnDeleteLogo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::DeleteLogo ), NULL, this );\r
+       btnSaveLogo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::SaveLogo ), NULL, this );\r
        btnAddSound->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::AddSound ), NULL, this );\r
        btnModifySound->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::ModifySound ), NULL, this );\r
        btnDeleteSound->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::DeleteSound ), NULL, this );\r
+       btnSaveSound->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::SaveSound ), NULL, this );\r
        btnPlay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::PlaySound ), NULL, this );\r
        btnStop->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::StopSound ), NULL, this );\r
        btnAddCalendarAddress->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::AddCalendarAddress ), NULL, this );\r
@@ -3725,13 +3736,16 @@ frmContactEditorADT::~frmContactEditorADT()
        btnAddPicture->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::AddPicture ), NULL, this );\r
        btnModifyPicture->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::ModifyPicture ), NULL, this );\r
        btnDeletePicture->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::DeletePicture ), NULL, this );\r
+       btnSavePicture->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::SavePicture ), NULL, this );\r
        lboLogos->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( frmContactEditorADT::LoadLogo ), NULL, this );\r
        btnAddLogo->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::AddLogo ), NULL, this );\r
        btnModifyLogo->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::ModifyLogo ), NULL, this );\r
        btnDeleteLogo->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::DeleteLogo ), NULL, this );\r
+       btnSaveLogo->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::SaveLogo ), NULL, this );\r
        btnAddSound->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::AddSound ), NULL, this );\r
        btnModifySound->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::ModifySound ), NULL, this );\r
        btnDeleteSound->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::DeleteSound ), NULL, this );\r
+       btnSaveSound->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::SaveSound ), NULL, this );\r
        btnPlay->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::PlaySound ), NULL, this );\r
        btnStop->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::StopSound ), NULL, this );\r
        btnAddCalendarAddress->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::AddCalendarAddress ), NULL, this );\r
@@ -3771,7 +3785,7 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind
        nbkAddress = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );\r
        tabGeneral = new wxPanel( nbkAddress, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );\r
        wxFlexGridSizer* fgSizer6;\r
-       fgSizer6 = new wxFlexGridSizer( 2, 2, 0, 0 );\r
+       fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 );\r
        fgSizer6->AddGrowableCol( 1 );\r
        fgSizer6->SetFlexibleDirection( wxVERTICAL );\r
        fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );\r
@@ -3887,7 +3901,7 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind
        nbkAddress->AddPage( tabLabel, wxT("Label"), false );\r
        tabOther = new wxPanel( nbkAddress, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );\r
        wxFlexGridSizer* fgSizer61;\r
-       fgSizer61 = new wxFlexGridSizer( 2, 2, 0, 0 );\r
+       fgSizer61 = new wxFlexGridSizer( 0, 2, 0, 0 );\r
        fgSizer61->AddGrowableCol( 1 );\r
        fgSizer61->SetFlexibleDirection( wxVERTICAL );\r
        fgSizer61->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );\r
@@ -4079,11 +4093,6 @@ frmActivityMgrADT::frmActivityMgrADT( wxWindow* parent, wxWindowID id, const wxS
        \r
        wxMenuItem* mnuSleepMode;\r
        mnuSleepMode = new wxMenuItem( mnuWindow, wxID_ANY, wxString( wxT("Sleep Mode") ) , wxEmptyString, wxITEM_CHECK );\r
-       #ifdef __WXMSW__\r
-       mnuSleepMode->SetBitmaps( wxNullBitmap );\r
-       #elif (defined( __WXGTK__ ) || defined( __WXOSX__ ))\r
-       mnuSleepMode->SetBitmap( wxNullBitmap );\r
-       #endif\r
        mnuWindow->Append( mnuSleepMode );\r
        \r
        mnuWindow->AppendSeparator();\r
@@ -6332,7 +6341,7 @@ frmContactEditorTelephoneADT::frmContactEditorTelephoneADT( wxWindow* parent, wx
        fgSizer6->Add( lblTelephoneType, 0, wxALIGN_TOP|wxALL, 5 );\r
        \r
        wxGridSizer* gSizer5;\r
-       gSizer5 = new wxGridSizer( 2, 2, 0, 0 );\r
+       gSizer5 = new wxGridSizer( 0, 2, 0, 0 );\r
        \r
        chkVoice = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Voice"), wxDefaultPosition, wxDefaultSize, 0 );\r
        gSizer5->Add( chkVoice, 0, wxALL, 2 );\r
@@ -6972,7 +6981,7 @@ frmSSLCertificateADT::frmSSLCertificateADT( wxWindow* parent, wxWindowID id, con
        tabSummary->SetSizer( bSizer386 );\r
        tabSummary->Layout();\r
        bSizer386->Fit( tabSummary );\r
-       m_notebook28->AddPage( tabSummary, wxT("Summary"), false );\r
+       m_notebook28->AddPage( tabSummary, wxT("Summary"), true );\r
        tabDetail = new wxPanel( m_notebook28, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );\r
        wxBoxSizer* bSizer3891;\r
        bSizer3891 = new wxBoxSizer( wxVERTICAL );\r
@@ -7015,7 +7024,7 @@ frmSSLCertificateADT::frmSSLCertificateADT( wxWindow* parent, wxWindowID id, con
        tabHierarchy->SetSizer( bSizer390 );\r
        tabHierarchy->Layout();\r
        bSizer390->Fit( tabHierarchy );\r
-       m_notebook28->AddPage( tabHierarchy, wxT("Hierarchy"), true );\r
+       m_notebook28->AddPage( tabHierarchy, wxT("Hierarchy"), false );\r
        \r
        bSizer384->Add( m_notebook28, 1, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 );\r
        \r