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

diff --git a/source/AppXestiaAddrBk.cpp b/source/AppXestiaAddrBk.cpp
index edf21c9..fcb9c4c 100644
--- a/source/AppXestiaAddrBk.cpp
+++ b/source/AppXestiaAddrBk.cpp
@@ -5511,85 +5511,40 @@ frmContactEditorCategoryADT::frmContactEditorCategoryADT( wxWindow* parent, wxWi
 	wxBoxSizer* bSizer251;
 	bSizer251 = new wxBoxSizer( wxVERTICAL );
 	
-	nbkIM = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	tabGeneral = new wxPanel( nbkIM, 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 );
+	nbkCategory = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	tabGeneral = new wxPanel( nbkCategory, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	szrGeneral = new wxFlexGridSizer( 3, 2, 0, 0 );
+	szrGeneral->AddGrowableCol( 1 );
+	szrGeneral->SetFlexibleDirection( wxBOTH );
+	szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 	
 	lblCategory = new wxStaticText( tabGeneral, wxID_ANY, wxT("Category Name:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblCategory->Wrap( 0 );
-	fgSizer6->Add( lblCategory, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	szrGeneral->Add( lblCategory, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtCategory = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer6->Add( txtCategory, 0, wxALL|wxEXPAND, 5 );
+	szrGeneral->Add( txtCategory, 0, wxALL|wxEXPAND, 5 );
 	
 	lblType = new wxStaticText( tabGeneral, wxID_ANY, wxT("Type:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblType->Wrap( -1 );
-	fgSizer6->Add( lblType, 0, wxALL, 5 );
+	szrGeneral->Add( lblType, 0, wxALL, 5 );
 	
 	wxArrayString cmbTypeChoices;
 	cmbType = new wxChoice( tabGeneral, wxID_ANY, wxDefaultPosition, wxDefaultSize, cmbTypeChoices, 0 );
 	cmbType->SetSelection( 0 );
-	fgSizer6->Add( cmbType, 0, wxALL, 5 );
+	szrGeneral->Add( cmbType, 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 );
-	nbkIM->AddPage( tabGeneral, wxT("General"), false );
+	szrGeneral->Fit( tabGeneral );
+	nbkCategory->AddPage( tabGeneral, wxT("General"), false );
 	
-	bSizer251->Add( nbkIM, 1, wxEXPAND | wxALL, 5 );
+	bSizer251->Add( nbkCategory, 1, wxEXPAND | wxALL, 5 );
 	
 	wxBoxSizer* bSizer252;
 	bSizer252 = new wxBoxSizer( wxHORIZONTAL );
@@ -5610,7 +5565,6 @@ frmContactEditorCategoryADT::frmContactEditorCategoryADT( wxWindow* parent, wxWi
 	this->Centre( wxBOTH );
 	
 	// Connect Events
-	chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorCategoryADT::EnablePriority ), NULL, this );
 	btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorCategoryADT::ProcessAction ), NULL, this );
 	btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorCategoryADT::CloseWindow ), NULL, this );
 }
@@ -5618,7 +5572,6 @@ frmContactEditorCategoryADT::frmContactEditorCategoryADT( wxWindow* parent, wxWi
 frmContactEditorCategoryADT::~frmContactEditorCategoryADT()
 {
 	// Disconnect Events
-	chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorCategoryADT::EnablePriority ), NULL, this );
 	btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorCategoryADT::ProcessAction ), NULL, this );
 	btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorCategoryADT::CloseWindow ), NULL, this );