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

diff --git a/source/AppXestiaAddrBk.cpp b/source/AppXestiaAddrBk.cpp
index e6d6ead..77ae21d 100644
--- a/source/AppXestiaAddrBk.cpp
+++ b/source/AppXestiaAddrBk.cpp
@@ -5745,71 +5745,26 @@ frmContactEditorTimezonesADT::frmContactEditorTimezonesADT( wxWindow* parent, wx
 	
 	nbkTimezone = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 	tabGeneral = new wxPanel( nbkTimezone, 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 );
 	
 	lblTimezone = new wxStaticText( tabGeneral, wxID_ANY, wxT("Timezone:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblTimezone->Wrap( -1 );
-	fgSizer6->Add( lblTimezone, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	szrGeneral->Add( lblTimezone, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	cmbTimezone = new wxComboBox( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
-	fgSizer6->Add( cmbTimezone, 0, wxALL, 5 );
+	szrGeneral->Add( cmbTimezone, 0, wxALL, 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 );
 	nbkTimezone->AddPage( tabGeneral, wxT("General"), false );
 	
 	bSizer251->Add( nbkTimezone, 1, wxEXPAND | wxALL, 5 );
@@ -5833,7 +5788,6 @@ frmContactEditorTimezonesADT::frmContactEditorTimezonesADT( wxWindow* parent, wx
 	this->Centre( wxBOTH );
 	
 	// Connect Events
-	chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorTimezonesADT::EnablePriority ), NULL, this );
 	btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorTimezonesADT::ProcessAction ), NULL, this );
 	btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorTimezonesADT::CloseWindow ), NULL, this );
 }
@@ -5841,7 +5795,6 @@ frmContactEditorTimezonesADT::frmContactEditorTimezonesADT( wxWindow* parent, wx
 frmContactEditorTimezonesADT::~frmContactEditorTimezonesADT()
 {
 	// Disconnect Events
-	chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorTimezonesADT::EnablePriority ), NULL, this );
 	btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorTimezonesADT::ProcessAction ), NULL, this );
 	btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorTimezonesADT::CloseWindow ), NULL, this );