X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2FAppXestiaAddrBk.cpp;h=e6d6ead3b67d3b2ced781ede18e0d4299a846aaa;hp=fcb9c4c6b55145da167b0176c381e6d26fb3b53e;hb=16ba57d640fd0412351c4cf8d324f02fdb2b2987;hpb=ce6b921249b87bb62df485af240697ba81cd409d

diff --git a/source/AppXestiaAddrBk.cpp b/source/AppXestiaAddrBk.cpp
index fcb9c4c..e6d6ead 100644
--- a/source/AppXestiaAddrBk.cpp
+++ b/source/AppXestiaAddrBk.cpp
@@ -5586,67 +5586,21 @@ frmContactEditorTelephoneADT::frmContactEditorTelephoneADT( wxWindow* parent, wx
 	
 	nbkAddress = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 	tabGeneral = new wxPanel( nbkAddress, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxFlexGridSizer* fgSizer6;
-	fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 );
-	fgSizer6->AddGrowableCol( 1 );
-	fgSizer6->SetFlexibleDirection( wxVERTICAL );
-	fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	szrGeneral = new wxFlexGridSizer( 3, 2, 0, 0 );
+	szrGeneral->AddGrowableCol( 1 );
+	szrGeneral->SetFlexibleDirection( wxBOTH );
+	szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 	
 	lblTelephone = new wxStaticText( tabGeneral, wxID_ANY, wxT("Telephone:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblTelephone->Wrap( -1 );
-	fgSizer6->Add( lblTelephone, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	szrGeneral->Add( lblTelephone, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtTelephone = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer6->Add( txtTelephone, 0, wxALL|wxEXPAND, 5 );
-	
-	lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 );
-	lblPriority->Wrap( -1 );
-	fgSizer6->Add( lblPriority, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer260;
-	bSizer260 = new wxBoxSizer( wxHORIZONTAL );
-	
-	chkUsePref = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer260->Add( chkUsePref, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer254;
-	bSizer254 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer256;
-	bSizer256 = new wxBoxSizer( wxHORIZONTAL );
-	
-	sliPriority = new wxSlider( tabGeneral, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS );
-	bSizer256->Add( sliPriority, 1, wxALL|wxEXPAND, 5 );
-	
-	
-	bSizer254->Add( bSizer256, 1, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer255;
-	bSizer255 = new wxBoxSizer( wxHORIZONTAL );
-	
-	lblHigh = new wxStaticText( tabGeneral, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 );
-	lblHigh->Wrap( -1 );
-	bSizer255->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 );
-	
-	
-	bSizer255->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	lblLow = new wxStaticText( tabGeneral, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 );
-	lblLow->Wrap( -1 );
-	bSizer255->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 );
-	
-	
-	bSizer254->Add( bSizer255, 0, wxEXPAND, 0 );
-	
-	
-	bSizer260->Add( bSizer254, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer6->Add( bSizer260, 1, wxEXPAND, 5 );
+	szrGeneral->Add( txtTelephone, 0, wxALL|wxEXPAND, 5 );
 	
 	lblTelephoneType = new wxStaticText( tabGeneral, wxID_ANY, wxT("Type:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblTelephoneType->Wrap( 0 );
-	fgSizer6->Add( lblTelephoneType, 0, wxALIGN_TOP|wxALL, 5 );
+	szrGeneral->Add( lblTelephoneType, 0, wxALIGN_TOP|wxALL, 5 );
 	
 	wxGridSizer* gSizer5;
 	gSizer5 = new wxGridSizer( 0, 2, 0, 0 );
@@ -5673,12 +5627,16 @@ frmContactEditorTelephoneADT::frmContactEditorTelephoneADT( wxWindow* parent, wx
 	gSizer5->Add( chkPager, 0, wxALL, 2 );
 	
 	
-	fgSizer6->Add( gSizer5, 1, 0, 5 );
+	szrGeneral->Add( gSizer5, 1, 0, 5 );
 	
+	lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 );
+	lblPriority->Wrap( -1 );
+	szrGeneral->Add( lblPriority, 0, wxALL, 5 );
 	
-	tabGeneral->SetSizer( fgSizer6 );
+	
+	tabGeneral->SetSizer( szrGeneral );
 	tabGeneral->Layout();
-	fgSizer6->Fit( tabGeneral );
+	szrGeneral->Fit( tabGeneral );
 	nbkAddress->AddPage( tabGeneral, wxT("General"), false );
 	
 	bSizer251->Add( nbkAddress, 1, wxEXPAND | wxALL, 5 );
@@ -5702,7 +5660,6 @@ frmContactEditorTelephoneADT::frmContactEditorTelephoneADT( wxWindow* parent, wx
 	this->Centre( wxBOTH );
 	
 	// Connect Events
-	chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorTelephoneADT::EnablePriority ), NULL, this );
 	btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorTelephoneADT::ProcessAction ), NULL, this );
 	btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorTelephoneADT::CloseWindow ), NULL, this );
 }
@@ -5710,7 +5667,6 @@ frmContactEditorTelephoneADT::frmContactEditorTelephoneADT( wxWindow* parent, wx
 frmContactEditorTelephoneADT::~frmContactEditorTelephoneADT()
 {
 	// Disconnect Events
-	chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorTelephoneADT::EnablePriority ), NULL, this );
 	btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorTelephoneADT::ProcessAction ), NULL, this );
 	btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorTelephoneADT::CloseWindow ), NULL, this );
 	
@@ -5725,71 +5681,26 @@ frmContactEditorLanguagesADT::frmContactEditorLanguagesADT( wxWindow* parent, wx
 	
 	nbkLanguages = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 	tabGeneral = new wxPanel( nbkLanguages, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxFlexGridSizer* fgSizer6;
-	fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 );
-	fgSizer6->AddGrowableCol( 1 );
-	fgSizer6->SetFlexibleDirection( wxVERTICAL );
-	fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	szrGeneral = new wxFlexGridSizer( 2, 2, 0, 0 );
+	szrGeneral->AddGrowableCol( 1 );
+	szrGeneral->SetFlexibleDirection( wxBOTH );
+	szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 	
 	lblLanguage = new wxStaticText( tabGeneral, wxID_ANY, wxT("Language:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblLanguage->Wrap( -1 );
-	fgSizer6->Add( lblLanguage, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	szrGeneral->Add( lblLanguage, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtLanguage = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer6->Add( txtLanguage, 0, wxALL|wxEXPAND, 5 );
+	szrGeneral->Add( txtLanguage, 0, wxALL|wxEXPAND, 5 );
 	
 	lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblPriority->Wrap( -1 );
-	fgSizer6->Add( lblPriority, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer260;
-	bSizer260 = new wxBoxSizer( wxHORIZONTAL );
-	
-	chkUsePref = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer260->Add( chkUsePref, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer254;
-	bSizer254 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer256;
-	bSizer256 = new wxBoxSizer( wxHORIZONTAL );
-	
-	sliPriority = new wxSlider( tabGeneral, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS );
-	bSizer256->Add( sliPriority, 1, wxALL|wxEXPAND, 5 );
-	
-	
-	bSizer254->Add( bSizer256, 1, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer255;
-	bSizer255 = new wxBoxSizer( wxHORIZONTAL );
-	
-	lblHigh = new wxStaticText( tabGeneral, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 );
-	lblHigh->Wrap( -1 );
-	bSizer255->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 );
-	
-	
-	bSizer255->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	lblLow = new wxStaticText( tabGeneral, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 );
-	lblLow->Wrap( -1 );
-	bSizer255->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 );
-	
-	
-	bSizer254->Add( bSizer255, 1, wxEXPAND, 0 );
-	
-	
-	bSizer260->Add( bSizer254, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer6->Add( bSizer260, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 );
+	szrGeneral->Add( lblPriority, 0, wxALL, 5 );
 	
 	
-	tabGeneral->SetSizer( fgSizer6 );
+	tabGeneral->SetSizer( szrGeneral );
 	tabGeneral->Layout();
-	fgSizer6->Fit( tabGeneral );
+	szrGeneral->Fit( tabGeneral );
 	nbkLanguages->AddPage( tabGeneral, wxT("General"), false );
 	
 	bSizer251->Add( nbkLanguages, 1, wxEXPAND | wxALL, 5 );
@@ -5813,7 +5724,6 @@ frmContactEditorLanguagesADT::frmContactEditorLanguagesADT( wxWindow* parent, wx
 	this->Centre( wxBOTH );
 	
 	// Connect Events
-	chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorLanguagesADT::EnablePriority ), NULL, this );
 	btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorLanguagesADT::ProcessAction ), NULL, this );
 	btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorLanguagesADT::CloseWindow ), NULL, this );
 }
@@ -5821,7 +5731,6 @@ frmContactEditorLanguagesADT::frmContactEditorLanguagesADT( wxWindow* parent, wx
 frmContactEditorLanguagesADT::~frmContactEditorLanguagesADT()
 {
 	// Disconnect Events
-	chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorLanguagesADT::EnablePriority ), NULL, this );
 	btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorLanguagesADT::ProcessAction ), NULL, this );
 	btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorLanguagesADT::CloseWindow ), NULL, this );