X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorCalAdr.cpp;h=176bb0012b31e37c57741faa0bca47a05b09ad32;hp=ac26f5a0e02a26dbda5672c459662c54b163ed60;hb=8089428e86139e335db5f5104382ffc37dce1c42;hpb=cbeea63f67490b46dfe5b2f59c3f54b5304835b6

diff --git a/source/contacteditor/frmContactEditorCalAdr.cpp b/source/contacteditor/frmContactEditorCalAdr.cpp
index ac26f5a..176bb00 100644
--- a/source/contacteditor/frmContactEditorCalAdr.cpp
+++ b/source/contacteditor/frmContactEditorCalAdr.cpp
@@ -28,7 +28,8 @@ frmContactEditorCalAdrADT( parent )
 	// Setup the window.
 	
 	EditorMode = FALSE;
-	sliPriority->Disable();
+	priorityCtrl = new XABPriorityCtrl(tabGeneral);
+	szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5);
 	
 	cmbType->Append(wxT(""));
 	cmbType->Append(_("Home"));
@@ -36,19 +37,6 @@ frmContactEditorCalAdrADT( parent )
 	
 }
 
-void frmContactEditorCalAdr::EnablePriority( wxCommandEvent& event )
-{
-	
-	// Enable/disable the priority setting.
-	
-	if (chkUsePref->IsChecked()){
-		sliPriority->Enable();
-	} else {
-		sliPriority->Disable();
-	}
-	
-}
-
 void frmContactEditorCalAdr::ProcessAction( wxCommandEvent& event )
 {
 	
@@ -86,9 +74,9 @@ void frmContactEditorCalAdr::ProcessAction( wxCommandEvent& event )
 		
 		// Setup Calendar Priority.
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			CalAdrListPrefPtr->insert(std::make_pair(CalAdrListIndex, sliPriority->GetValue()));
+			CalAdrListPrefPtr->insert(std::make_pair(CalAdrListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -107,9 +95,9 @@ void frmContactEditorCalAdr::ProcessAction( wxCommandEvent& event )
 		
 		CalAdrListCtrlPtr->SetItem(ListCtrlIndex, 1, strValue);
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			CalAdrListCtrlPtr->SetItem(ListCtrlIndex, 2, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			CalAdrListCtrlPtr->SetItem(ListCtrlIndex, 2, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		}
 		
@@ -146,9 +134,9 @@ void frmContactEditorCalAdr::ProcessAction( wxCommandEvent& event )
 		
 		CalAdrListPrefPtr->erase(CalAdrListIndex);
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			CalAdrListPrefPtr->insert(std::make_pair(CalAdrListIndex, sliPriority->GetValue()));
+			CalAdrListPrefPtr->insert(std::make_pair(CalAdrListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -169,9 +157,9 @@ void frmContactEditorCalAdr::ProcessAction( wxCommandEvent& event )
 		CalAdrListCtrlPtr->SetItem(longSelected, 0, txtAddress->GetValue());
 		CalAdrListCtrlPtr->SetItem(longSelected, 1, strValue);		
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			CalAdrListCtrlPtr->SetItem(longSelected, 2, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			CalAdrListCtrlPtr->SetItem(longSelected, 2, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -256,9 +244,8 @@ void frmContactEditorCalAdr::SetEditorMode(bool EditMode)
 		if (intiter->first == CalAdrListIndex && intiter->second > 0 &&
 			intiter != CalAdrListPrefPtr->end()){
 		
-			sliPriority->SetValue(intiter->second);
-			sliPriority->Enable();
-			chkUsePref->SetValue(TRUE);
+			priorityCtrl->SetValue(intiter->second);
+			priorityCtrl->EnablePriority(true);
 		
 		}