Fixed tabs on certain forms so that they show the first tab and added QuitApp to...

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

diff --git a/source/AppXestiaAddrBk.cpp b/source/AppXestiaAddrBk.cpp
index f07322d..e754057 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
@@ -259,10 +249,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
@@ -542,7 +533,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 +572,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 +796,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 +879,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
@@ -3771,7 +3762,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 +3878,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 +4070,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 +6318,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 +6958,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 +7001,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