X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FAppXestiaAddrBk.cpp;h=e754057491d70aa104d483ce5e84a2b37ca95f7d;hb=5cd42634a30884507da0e8812369192c3882bc0a;hp=7be4fa45495c91a9e2c48186d765aa288baf8814;hpb=c5b9277e4f51a80b2485c05476634d14f9826742;p=xestiaab%2F.git diff --git a/source/AppXestiaAddrBk.cpp b/source/AppXestiaAddrBk.cpp index 7be4fa4..e754057 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 ) ); @@ -259,10 +249,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 ) ); @@ -473,11 +464,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 ); @@ -544,7 +533,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 +572,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 ); @@ -3773,7 +3762,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 +3878,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 +4070,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 +6318,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 +6958,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 +7001,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 ); @@ -7108,13 +7092,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;