X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorLanguages.cpp;h=c40c6549f69fc8a9235aa36e69f7fd0803b3925d;hb=1cd99f1d6252ccfd70cea70a86f6977e4f2d6e6d;hp=d13d8045b38c32cb50bb3d99073ca1584cce1c37;hpb=da64d37d0a13895554e4ad945c46dd0af6d1c0e6;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditorLanguages.cpp b/source/contacteditor/frmContactEditorLanguages.cpp
index d13d804..c40c654 100644
--- a/source/contacteditor/frmContactEditorLanguages.cpp
+++ b/source/contacteditor/frmContactEditorLanguages.cpp
@@ -24,17 +24,13 @@ frmContactEditorLanguages::frmContactEditorLanguages( wxWindow* parent )
 :
 frmContactEditorLanguagesADT( parent )
 {
+	
+	// Setup the window.
+	
 	EditorMode = FALSE;
-	sliPriority->Disable();
-}
-
-void frmContactEditorLanguages::EnablePriority( wxCommandEvent& event )
-{
-	if (chkUsePref->IsChecked()){
-		sliPriority->Enable();
-	} else {
-		sliPriority->Disable();
-	}
+	priorityCtrl = new XABPriorityCtrl(tabGeneral);
+	szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5);
+	
 }
 
 void frmContactEditorLanguages::SetEditorMode(bool EditMode, SectionType SectType)
@@ -74,11 +70,11 @@ void frmContactEditorLanguages::SetEditorMode(bool EditMode, SectionType SectTyp
 		
 		intiter = LanguageListPrefPtr->find(LanguageListIndex);
 		
-		if (intiter->first == LanguageListIndex && intiter->second > 0){
+		if (intiter->first == LanguageListIndex && intiter->second > 0 &&
+			intiter != LanguageListPrefPtr->end()){
 		
-			sliPriority->SetValue(intiter->second);
-			sliPriority->Enable();
-			chkUsePref->SetValue(TRUE);
+			priorityCtrl->SetValue(intiter->second);
+			priorityCtrl->EnablePriority(true);
 		
 		}	
 		
@@ -90,6 +86,8 @@ void frmContactEditorLanguages::SetEditorMode(bool EditMode, SectionType SectTyp
 void frmContactEditorLanguages::ProcessAction( wxCommandEvent& event )
 {
 
+	// Process the action.
+	
 	long ListCtrlIndex;
 
 	if (EditorMode == FALSE){
@@ -120,9 +118,9 @@ void frmContactEditorLanguages::ProcessAction( wxCommandEvent& event )
 		
 		// Add Language priority.
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			LanguageListPrefPtr->insert(std::make_pair(LanguageListIndex, sliPriority->GetValue()));
+			LanguageListPrefPtr->insert(std::make_pair(LanguageListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -139,9 +137,9 @@ void frmContactEditorLanguages::ProcessAction( wxCommandEvent& event )
 		coldata.SetText(txtLanguage->GetValue());
 		ListCtrlIndex =	LanguageListCtrlPtr->InsertItem(coldata);
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			LanguageListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			LanguageListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		}
 		
@@ -160,9 +158,9 @@ void frmContactEditorLanguages::ProcessAction( wxCommandEvent& event )
 		
 		LanguageListPrefPtr->erase(LanguageListIndex);
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			LanguageListPrefPtr->insert(std::make_pair(LanguageListIndex, sliPriority->GetValue()));
+			LanguageListPrefPtr->insert(std::make_pair(LanguageListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -180,9 +178,9 @@ void frmContactEditorLanguages::ProcessAction( wxCommandEvent& event )
 		
 		LanguageListCtrlPtr->SetItem(longSelected, 0, txtLanguage->GetValue());		
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			LanguageListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			LanguageListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -226,4 +224,5 @@ void frmContactEditorLanguages::SetupPointers(std::map<int, wxString> *LanguageL
 	LanguageListPrefPtr = LanguageListPref;
 	LanguageListCtrlPtr = LanguageListCtrl;
 	LanguageListIndex = LanguageIndex;
+	
 }
\ No newline at end of file