X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorAddress.cpp;h=a653d271ae9e9d6c773f895713680c331ae75e48;hp=6c6811793ac7658d218df60f3e0473e5a6e9b8a9;hb=7ae1677354b786e1f25d49fbfe891d9ec7d6b896;hpb=074e2db3331d35762f1d2dcf06d98f15200fc225

diff --git a/source/contacteditor/frmContactEditorAddress.cpp b/source/contacteditor/frmContactEditorAddress.cpp
index 6c68117..a653d27 100644
--- a/source/contacteditor/frmContactEditorAddress.cpp
+++ b/source/contacteditor/frmContactEditorAddress.cpp
@@ -30,7 +30,9 @@ frmContactEditorAddressADT( parent )
 	// Setup the window.
 	
 	EditorMode = FALSE;
-	sliPriority->Disable();
+	priorityCtrl = new XABPriorityCtrl(tabGeneral);
+	szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5);
+	szrGeneral->Layout();
 	
 }
 
@@ -39,19 +41,6 @@ void frmContactEditorAddress::InitAddressEditor( wxInitDialogEvent& event )
 	// Do nothing with this subroutine at this time.
 }
 
-void frmContactEditorAddress::EnablePriority( wxCommandEvent& event )
-{
-	
-	// Enable/disable the priority setting.
-	
-	if (chkUsePref->IsChecked()){
-		sliPriority->Enable();
-	} else {
-		sliPriority->Disable();
-	}
-	
-}
-
 void frmContactEditorAddress::ProcessData( wxCommandEvent& event )
 {
 
@@ -124,9 +113,9 @@ void frmContactEditorAddress::ProcessData( wxCommandEvent& event )
 		
 		AddressListMediatypePtr->insert(std::make_pair(AddressListIndex, wxT("text/plain")));
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			AddressListPrefPtr->insert(std::make_pair(AddressListIndex, sliPriority->GetValue()));
+			AddressListPrefPtr->insert(std::make_pair(AddressListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -147,9 +136,9 @@ void frmContactEditorAddress::ProcessData( wxCommandEvent& event )
 		AddressListCtrlPtr->SetItem(ListCtrlIndex, 2, txtCounty->GetValue());
 		AddressListCtrlPtr->SetItem(ListCtrlIndex, 3, txtPostCode->GetValue());
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			AddressListCtrlPtr->SetItem(ListCtrlIndex, 4, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			AddressListCtrlPtr->SetItem(ListCtrlIndex, 4, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		}
 		
@@ -218,9 +207,9 @@ void frmContactEditorAddress::ProcessData( wxCommandEvent& event )
 		
 		AddressListPrefPtr->erase(AddressListIndex);
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			AddressListPrefPtr->insert(std::make_pair(AddressListIndex, sliPriority->GetValue()));
+			AddressListPrefPtr->insert(std::make_pair(AddressListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -243,9 +232,9 @@ void frmContactEditorAddress::ProcessData( wxCommandEvent& event )
 		AddressListCtrlPtr->SetItem(longSelected, 2, txtCounty->GetValue());
 		AddressListCtrlPtr->SetItem(longSelected, 3, txtPostCode->GetValue());
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			AddressListCtrlPtr->SetItem(longSelected, 4, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			AddressListCtrlPtr->SetItem(longSelected, 4, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -423,9 +412,8 @@ void frmContactEditorAddress::SetEditorMode( bool EditMode, SectionType SectType
 		if (intiter->first == AddressListIndex && intiter->second > 0 && intiter != AddressListPrefPtr->end() &&
 		  intiter != AddressListPrefPtr->end()){
 		
-			sliPriority->SetValue(intiter->second);
-			sliPriority->Enable();
-			chkUsePref->SetValue(TRUE);
+			priorityCtrl->SetValue(intiter->second);
+			priorityCtrl->EnablePriority(true);
 		
 		}