X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FAppXestiaAddrBk.cpp;h=63e06cef3e08b6626e7dc7bbb4fa1d2c1319fe13;hb=a27310520f595a63be801671c6817e5ce54ec90d;hp=7be4fa45495c91a9e2c48186d765aa288baf8814;hpb=c5b9277e4f51a80b2485c05476634d14f9826742;p=xestiaab%2F.git

diff --git a/source/AppXestiaAddrBk.cpp b/source/AppXestiaAddrBk.cpp
index 7be4fa4..63e06ce 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();
@@ -261,8 +261,8 @@ frmMainADT::~frmMainADT()
 	// Disconnect Events
 	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 +473,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 );
 	
@@ -3773,7 +3771,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 );
@@ -3870,7 +3868,7 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind
 	tabGeneral->SetSizer( fgSizer6 );
 	tabGeneral->Layout();
 	fgSizer6->Fit( tabGeneral );
-	nbkAddress->AddPage( tabGeneral, wxT("General"), true );
+	nbkAddress->AddPage( tabGeneral, wxT("General"), false );
 	tabLabel = new wxPanel( nbkAddress, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxBoxSizer* bSizer253;
 	bSizer253 = new wxBoxSizer( wxVERTICAL );
@@ -3886,10 +3884,10 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind
 	tabLabel->SetSizer( bSizer253 );
 	tabLabel->Layout();
 	bSizer253->Fit( tabLabel );
-	nbkAddress->AddPage( tabLabel, wxT("Label"), false );
+	nbkAddress->AddPage( tabLabel, wxT("Label"), true );
 	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 +4079,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 +6327,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 );
@@ -7108,13 +7101,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;