X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorSound.cpp;h=28f3aeb9018dc972d695e1c706bab96352ce3be8;hp=6e77c686ecb8d61b0eeefff83e9182c781be6a28;hb=ada42724cf083b0a311cf22260485d61516c25c8;hpb=a9d9fd8ae933571915592addccada8e516a3c0e2

diff --git a/source/contacteditor/frmContactEditorSound.cpp b/source/contacteditor/frmContactEditorSound.cpp
index 6e77c68..28f3aeb 100644
--- a/source/contacteditor/frmContactEditorSound.cpp
+++ b/source/contacteditor/frmContactEditorSound.cpp
@@ -26,7 +26,9 @@ frmContactEditorSoundADT( parent )
 	// Setup the window.
 	
 	EditorMode = FALSE;
-	sliPriority->Disable();
+	priorityCtrl = new XABPriorityCtrl(tabGeneral);
+	szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5);
+	szrGeneral->Layout();
 	
 	cmbType->Append(wxT(""));
 	cmbType->Append(_("Home"));
@@ -34,19 +36,6 @@ frmContactEditorSoundADT( parent )
 	
 }
 
-void frmContactEditorSound::EnablePriority( wxCommandEvent& event )
-{
-	
-	// Enable/disable the priority setting.
-	
-	if (chkUsePref->IsChecked()){
-		sliPriority->Enable();
-	} else {
-		sliPriority->Disable();
-	}
-	
-}
-
 void frmContactEditorSound::ProcessData( wxCommandEvent& event )
 {
 	
@@ -127,9 +116,9 @@ void frmContactEditorSound::ProcessData( wxCommandEvent& event )
 		
 		// Setup Organisation Priority.
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			SoundListPrefPtr->insert(std::make_pair(SoundListIndex, sliPriority->GetValue()));
+			SoundListPrefPtr->insert(std::make_pair(SoundListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -168,9 +157,9 @@ void frmContactEditorSound::ProcessData( wxCommandEvent& event )
 		
 		}		
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			SoundListCtrlPtr->SetItem(ListCtrlIndex, 2, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			SoundListCtrlPtr->SetItem(ListCtrlIndex, 2, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		}
 		
@@ -203,9 +192,9 @@ void frmContactEditorSound::ProcessData( wxCommandEvent& event )
 		
 		SoundListPrefPtr->erase(SoundListIndex);
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			SoundListPrefPtr->insert(std::make_pair(SoundListIndex, sliPriority->GetValue()));
+			SoundListPrefPtr->insert(std::make_pair(SoundListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -226,9 +215,9 @@ void frmContactEditorSound::ProcessData( wxCommandEvent& event )
 		SoundListCtrlPtr->SetItem(longSelected, 0, wxT("Sound"));
 		SoundListCtrlPtr->SetItem(longSelected, 1, strValue);
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			SoundListCtrlPtr->SetItem(longSelected, 2, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			SoundListCtrlPtr->SetItem(longSelected, 2, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -307,9 +296,8 @@ void frmContactEditorSound::SetEditorMode(bool EditMode)
 		if (intiter->first == SoundListIndex && intiter->second > 0 &&
 			intiter != SoundListPrefPtr->end()){
 
-			sliPriority->SetValue(intiter->second);
-			sliPriority->Enable();
-			chkUsePref->SetValue(TRUE);
+			priorityCtrl->SetValue(intiter->second);
+			priorityCtrl->EnablePriority(true);
 		
 		}