X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorRoles.cpp;h=b36bda1bc22be936a0821a63e7195d1c9a2812d2;hb=ce6b921249b87bb62df485af240697ba81cd409d;hp=3b30ff24ae566f6e6aa2d00910618fb2af400914;hpb=da64d37d0a13895554e4ad945c46dd0af6d1c0e6;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditorRoles.cpp b/source/contacteditor/frmContactEditorRoles.cpp
index 3b30ff2..b36bda1 100644
--- a/source/contacteditor/frmContactEditorRoles.cpp
+++ b/source/contacteditor/frmContactEditorRoles.cpp
@@ -26,21 +26,21 @@ frmContactEditorRoles::frmContactEditorRoles( wxWindow* parent )
 :
 frmContactEditorRolesADT( parent )
 {
+	
+	// Setup the window.
+	
 	EditorMode = FALSE;
-	sliPriority->Disable();
-}
-
-void frmContactEditorRoles::EnablePriority( wxCommandEvent& event )
-{
-	if (chkUsePref->IsChecked()){
-		sliPriority->Enable();
-	} else {
-		sliPriority->Disable();
-	}
+	
+	priorityCtrl = new XABPriorityCtrl(tabGeneral);
+	szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5);
+	
 }
 
 void frmContactEditorRoles::ProcessAction( wxCommandEvent& event )
 {
+	
+	// Process action.
+	
 	// Set if the editor is adding or editing an address.
 	// FALSE = Add
 	// TRUE = Edit
@@ -71,11 +71,11 @@ void frmContactEditorRoles::ProcessAction( wxCommandEvent& event )
 		
 		}
 		
-		// Add the website priority.
+		// Add the roles priority.
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			RolesListPrefPtr->insert(std::make_pair(RolesListIndex, sliPriority->GetValue()));
+			RolesListPrefPtr->insert(std::make_pair(RolesListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -92,11 +92,11 @@ void frmContactEditorRoles::ProcessAction( wxCommandEvent& event )
 		coldata.SetText(txtRole->GetValue());
 		ListCtrlIndex =	RolesListCtrlPtr->InsertItem(coldata);
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			RolesListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			RolesListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
-		}		
+		}
 	
 		this->Close();		
 	
@@ -112,15 +112,15 @@ void frmContactEditorRoles::ProcessAction( wxCommandEvent& event )
 		
 		RolesListPrefPtr->erase(RolesListIndex);
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			RolesListPrefPtr->insert(std::make_pair(RolesListIndex, sliPriority->GetValue()));
+			RolesListPrefPtr->insert(std::make_pair(RolesListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
 			RolesListPrefPtr->insert(std::make_pair(RolesListIndex, 0));
 		
-		}		
+		}	
 		
 		// Update the form.
 		
@@ -134,15 +134,15 @@ void frmContactEditorRoles::ProcessAction( wxCommandEvent& event )
 		
 		RolesListCtrlPtr->SetItem(longSelected, 0, txtRole->GetValue());
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			RolesListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			RolesListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		} else {
 		
 			RolesListCtrlPtr->SetItem(longSelected, 1, wxT(""));
 		
-		}		
+		}	
 	
 		this->Close();
 	
@@ -151,6 +151,9 @@ void frmContactEditorRoles::ProcessAction( wxCommandEvent& event )
 
 void frmContactEditorRoles::SetEditorMode(bool EditMode, SectionType SectType)
 {
+	
+	// Set the editor mode.
+	
 	// Set if the editor is adding or editing an address.
 	// FALSE = Add
 	// TRUE = Edit
@@ -189,11 +192,11 @@ void frmContactEditorRoles::SetEditorMode(bool EditMode, SectionType SectType)
 		
 		intiter = RolesListPrefPtr->find(RolesListIndex);
 		
-		if (intiter->first == RolesListIndex && intiter->second > 0){
+		if (intiter->first == RolesListIndex && intiter->second > 0 &&
+			intiter != RolesListPrefPtr->end()){
 		
-			sliPriority->SetValue(intiter->second);
-			sliPriority->Enable();
-			chkUsePref->SetValue(TRUE);
+			priorityCtrl->SetValue(intiter->second);
+			priorityCtrl->EnablePriority(true);
 		
 		}	
 		
@@ -205,7 +208,11 @@ void frmContactEditorRoles::SetEditorMode(bool EditMode, SectionType SectType)
 
 void frmContactEditorRoles::CloseWindow( wxCommandEvent& event )
 {
+	
+	// Close this window.
+	
 	this->Close();
+	
 }
 
 void frmContactEditorRoles::SetupPointers(std::map<int, wxString> *RolesList,
@@ -219,6 +226,8 @@ void frmContactEditorRoles::SetupPointers(std::map<int, wxString> *RolesList,
 	int RolesIndex )
 {
 
+	// Setup the pointers.
+	
 	RolesListPtr = RolesList;
 	RolesListLanguagePtr = RolesListLanguage;
 	RolesListAltIDPtr = RolesListAltID;