X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorCategory.cpp;h=6df0ef369c89ccc29763690a0c9c098b1173a59c;hp=bb6108321bc11fe13ee4c30211f6e69df0cab070;hb=ce6b921249b87bb62df485af240697ba81cd409d;hpb=5c75ce1e9d668d15d65dcb541fb09c49f01de277

diff --git a/source/contacteditor/frmContactEditorCategory.cpp b/source/contacteditor/frmContactEditorCategory.cpp
index bb61083..6df0ef3 100644
--- a/source/contacteditor/frmContactEditorCategory.cpp
+++ b/source/contacteditor/frmContactEditorCategory.cpp
@@ -28,26 +28,14 @@ frmContactEditorCategoryADT( parent )
 	// Setup the window.
 	
 	EditorMode = FALSE;
-	sliPriority->Disable();
+	priorityCtrl = new XABPriorityCtrl(tabGeneral);
+	szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5);
 
 	cmbType->Append(wxT(""));
 	cmbType->Append(_("Home"));
 	cmbType->Append(_("Work"));	
 }
 
-void frmContactEditorCategory::EnablePriority( wxCommandEvent& event )
-{
-	
-	// Enable/disable the priority setting.
-	
-	if (chkUsePref->IsChecked()){
-		sliPriority->Enable();
-	} else {
-		sliPriority->Disable();
-	}
-	
-}
-
 void frmContactEditorCategory::ProcessAction( wxCommandEvent& event )
 {
 
@@ -85,9 +73,9 @@ void frmContactEditorCategory::ProcessAction( wxCommandEvent& event )
 		
 		// Setup Category Priority.
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			CategoryListPrefPtr->insert(std::make_pair(CategoryListIndex, sliPriority->GetValue()));
+			CategoryListPrefPtr->insert(std::make_pair(CategoryListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -104,9 +92,9 @@ void frmContactEditorCategory::ProcessAction( wxCommandEvent& event )
 		coldata.SetText(txtCategory->GetValue());
 		ListCtrlIndex =	CategoryListCtrlPtr->InsertItem(coldata);
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			CategoryListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			CategoryListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		}
 		
@@ -142,9 +130,9 @@ void frmContactEditorCategory::ProcessAction( wxCommandEvent& event )
 		
 		CategoryListPrefPtr->erase(CategoryListIndex);
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			CategoryListPrefPtr->insert(std::make_pair(CategoryListIndex, sliPriority->GetValue()));
+			CategoryListPrefPtr->insert(std::make_pair(CategoryListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -164,9 +152,9 @@ void frmContactEditorCategory::ProcessAction( wxCommandEvent& event )
 		
 		CategoryListCtrlPtr->SetItem(longSelected, 0, txtCategory->GetValue());
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			CategoryListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			CategoryListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -253,9 +241,8 @@ void frmContactEditorCategory::SetEditorMode(bool EditMode)
 		if (intiter->first == CategoryListIndex && intiter->second > 0 &&
 			intiter != CategoryListPrefPtr->end()){
 		
-			sliPriority->SetValue(intiter->second);
-			sliPriority->Enable();
-			chkUsePref->SetValue(TRUE);
+			priorityCtrl->SetValue(intiter->second);
+			priorityCtrl->EnablePriority(true);
 		
 		}