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
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
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
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
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_IMPORT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenImportDialog ) );\r
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
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
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
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
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
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
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
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
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
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