X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorOrganisations.cpp;h=2f67cb490ebdceae2778c1ae8abde57ab9e6ab3c;hp=fa0ca456e821a13996138f96a2ec43a8eb315215;hb=ada42724cf083b0a311cf22260485d61516c25c8;hpb=d57eb3c2b61f79f2b1052b98ba3e745499ede1c4

diff --git a/source/contacteditor/frmContactEditorOrganisations.cpp b/source/contacteditor/frmContactEditorOrganisations.cpp
index fa0ca45..2f67cb4 100644
--- a/source/contacteditor/frmContactEditorOrganisations.cpp
+++ b/source/contacteditor/frmContactEditorOrganisations.cpp
@@ -28,7 +28,9 @@ frmContactEditorOrganisationsADT( parent )
 	// Setup the window.
 	
 	EditorMode = FALSE;
-	sliPriority->Disable();
+	priorityCtrl = new XABPriorityCtrl(tabGeneral);
+	szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5);
+	szrGeneral->Layout();
 	
 }
 
@@ -73,19 +75,6 @@ void frmContactEditorOrganisations::UpdateSortAs( wxCommandEvent& event )
 
 }
 
-void frmContactEditorOrganisations::EnablePriority( wxCommandEvent& event )
-{
-	
-	// Enable/disable the priority setting.
-	
-	if (chkUsePref->IsChecked()){
-		sliPriority->Enable();
-	} else {
-		sliPriority->Disable();
-	}
-	
-}
-
 void frmContactEditorOrganisations::ProcessAction( wxCommandEvent& event )
 {
 
@@ -124,9 +113,9 @@ void frmContactEditorOrganisations::ProcessAction( wxCommandEvent& event )
 		
 		// Setup Organisation Priority.
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			OrganisationListPrefPtr->insert(std::make_pair(OrganisationListIndex, sliPriority->GetValue()));
+			OrganisationListPrefPtr->insert(std::make_pair(OrganisationListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -143,9 +132,9 @@ void frmContactEditorOrganisations::ProcessAction( wxCommandEvent& event )
 		coldata.SetText(txtOrganisation->GetValue());
 		ListCtrlIndex =	OrganisationListCtrlPtr->InsertItem(coldata);
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			OrganisationListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			OrganisationListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		}
 		
@@ -171,9 +160,9 @@ void frmContactEditorOrganisations::ProcessAction( wxCommandEvent& event )
 		
 		OrganisationListPrefPtr->erase(OrganisationListIndex);
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			OrganisationListPrefPtr->insert(std::make_pair(OrganisationListIndex, sliPriority->GetValue()));
+			OrganisationListPrefPtr->insert(std::make_pair(OrganisationListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -193,9 +182,9 @@ void frmContactEditorOrganisations::ProcessAction( wxCommandEvent& event )
 		
 		OrganisationListCtrlPtr->SetItem(longSelected, 0, txtOrganisation->GetValue());
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			OrganisationListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			OrganisationListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -270,9 +259,8 @@ void frmContactEditorOrganisations::SetEditorMode(bool EditMode, SectionType Sec
 		if (intiter->first == OrganisationListIndex && intiter->second > 0 &&
 		  intiter != OrganisationListPrefPtr->end()){
 		
-			sliPriority->SetValue(intiter->second);
-			sliPriority->Enable();
-			chkUsePref->SetValue(TRUE);
+			priorityCtrl->SetValue(intiter->second);
+			priorityCtrl->EnablePriority(true);
 		
 		}