X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorNickname.cpp;h=68e64efb6fb23919599dccf033d3a560431eb44f;hp=c67302cffaf858dede32cdff5547e8119d1acd83;hb=1e038086c27e3da18da6ebfa1bb3d3acf5d0f0d7;hpb=9a84daaa816cc3f4f64880594512f4098c0e29d9

diff --git a/source/contacteditor/frmContactEditorNickname.cpp b/source/contacteditor/frmContactEditorNickname.cpp
index c67302c..68e64ef 100644
--- a/source/contacteditor/frmContactEditorNickname.cpp
+++ b/source/contacteditor/frmContactEditorNickname.cpp
@@ -35,6 +35,9 @@ frmContactEditorNicknameADT( parent )
 	
 	cmbLanguage->Append(LanguageList);
 	
+	priorityCtrl = new XABPriorityCtrl(tabGeneral);
+	szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5);
+	
 }
 
 void frmContactEditorNickname::InitAddressEditor( wxInitDialogEvent& event )
@@ -42,19 +45,6 @@ void frmContactEditorNickname::InitAddressEditor( wxInitDialogEvent& event )
 	// Do nothing with this subroutine for the time being.
 }
 
-void frmContactEditorNickname::EnablePriority( wxCommandEvent& event )
-{
-	
-	// Enable/disable the priority.
-	
-	if (chkUsePref->IsChecked()){
-		sliPriority->Enable();
-	} else {
-		sliPriority->Disable();
-	}
-	
-}
-
 void frmContactEditorNickname::ProcessData( wxCommandEvent& event )
 {
 	
@@ -94,15 +84,15 @@ void frmContactEditorNickname::ProcessData( wxCommandEvent& event )
 		
 		// Add nickname priority.
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			NicknamesListPrefPtr->insert(std::make_pair(NicknamesListIndex, sliPriority->GetValue()));
+			NicknamesListPrefPtr->insert(std::make_pair(NicknamesListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
 			NicknamesListPrefPtr->insert(std::make_pair(NicknamesListIndex, 0));		
 		
-		}		
+		}
 		
 		// Add the data to the form.
 		
@@ -113,9 +103,9 @@ void frmContactEditorNickname::ProcessData( wxCommandEvent& event )
 		coldata.SetText(txtNickname->GetValue());
 		ListCtrlIndex =	NicknamesListCtrlPtr->InsertItem(coldata);
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			NicknamesListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			NicknamesListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		}
 		
@@ -134,9 +124,9 @@ void frmContactEditorNickname::ProcessData( wxCommandEvent& event )
 		
 		NicknamesListPrefPtr->erase(NicknamesListIndex);
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			NicknamesListPrefPtr->insert(std::make_pair(NicknamesListIndex, sliPriority->GetValue()));
+			NicknamesListPrefPtr->insert(std::make_pair(NicknamesListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -157,15 +147,15 @@ void frmContactEditorNickname::ProcessData( wxCommandEvent& event )
 		
 		NicknamesListCtrlPtr->SetItem(longSelected, 0, txtNickname->GetValue());
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			NicknamesListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			NicknamesListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		} else {
 		
 			NicknamesListCtrlPtr->SetItem(longSelected, 1, wxT(""));
 		
-		}	
+		}
 			
 		this->Close();
 	
@@ -238,9 +228,8 @@ void frmContactEditorNickname::SetEditorMode(bool EditMode, SectionType SectType
 		if (intiter->first == NicknamesListIndex && intiter->second > 0 &&
 			intiter != NicknamesListPrefPtr->end()){
 		
-			sliPriority->SetValue(intiter->second);
-			sliPriority->Enable();
-			chkUsePref->SetValue(TRUE);
+			priorityCtrl->SetValue(intiter->second);
+			priorityCtrl->EnablePriority(true);
 		
 		}