X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorRelated.cpp;h=17117ca8f2eb2fb94f40fd637a474d34edcc1306;hp=31bbf7e9ce14fa53a74ebe0495421e2292b25456;hb=ada42724cf083b0a311cf22260485d61516c25c8;hpb=da64d37d0a13895554e4ad945c46dd0af6d1c0e6

diff --git a/source/contacteditor/frmContactEditorRelated.cpp b/source/contacteditor/frmContactEditorRelated.cpp
index 31bbf7e..17117ca 100644
--- a/source/contacteditor/frmContactEditorRelated.cpp
+++ b/source/contacteditor/frmContactEditorRelated.cpp
@@ -26,8 +26,12 @@ frmContactEditorRelated::frmContactEditorRelated( wxWindow* parent )
 frmContactEditorRelatedADT( parent )
 {
 	
+	// Setup the window.
+	
 	EditorMode = FALSE;
-	sliPriority->Disable();
+	priorityCtrl = new XABPriorityCtrl(tabGeneral);
+	szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5);
+	szrGeneral->Layout();
 	
 	// Setup the list of types for the related drop down box.
 	
@@ -54,17 +58,11 @@ frmContactEditorRelatedADT( parent )
 	
 }
 
-void frmContactEditorRelated::EnablePriority( wxCommandEvent& event )
-{
-	if (chkUsePref->IsChecked()){
-		sliPriority->Enable();
-	} else {
-		sliPriority->Disable();
-	}
-}
-
 void frmContactEditorRelated::SetEditorMode(bool EditMode, SectionType SectType)
 {
+	
+	// Set the editor mode.
+	
 	if (EditMode == FALSE){
 	
 		EditorMode = FALSE;
@@ -99,7 +97,8 @@ void frmContactEditorRelated::SetEditorMode(bool EditMode, SectionType SectType)
 		
 		striter = RelatedListRelTypePtr->find(RelatedListIndex);
 		 
-		if (striter->first == RelatedListIndex){
+		if (striter->first == RelatedListIndex &&
+			striter != RelatedListRelTypePtr->end()){
 		
 			strValue = striter->second;
 		
@@ -195,11 +194,11 @@ void frmContactEditorRelated::SetEditorMode(bool EditMode, SectionType SectType)
 		
 		intiter = RelatedListPrefPtr->find(RelatedListIndex);
 		
-		if (intiter->first == RelatedListIndex && intiter->second > 0){
+		if (intiter->first == RelatedListIndex && intiter->second > 0 &&
+			intiter != RelatedListPrefPtr->end()){
 		
-			sliPriority->SetValue(intiter->second);
-			sliPriority->Enable();
-			chkUsePref->SetValue(TRUE);
+			priorityCtrl->SetValue(intiter->second);
+			priorityCtrl->EnablePriority(true);
 		
 		}
 		
@@ -211,6 +210,9 @@ void frmContactEditorRelated::SetEditorMode(bool EditMode, SectionType SectType)
 
 void frmContactEditorRelated::ProcessData( wxCommandEvent& event )
 {
+	
+	// Process data.
+	
 	long ListCtrlIndex;
 	
 	if (EditorMode == FALSE){
@@ -327,9 +329,9 @@ void frmContactEditorRelated::ProcessData( wxCommandEvent& event )
 		
 		// Add Related Priority.
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			RelatedListPrefPtr->insert(std::make_pair(RelatedListIndex, sliPriority->GetValue()));
+			RelatedListPrefPtr->insert(std::make_pair(RelatedListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -348,9 +350,9 @@ void frmContactEditorRelated::ProcessData( wxCommandEvent& event )
 		
 		RelatedListCtrlPtr->SetItem(ListCtrlIndex, 1, txtRelated->GetValue());
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			RelatedListCtrlPtr->SetItem(ListCtrlIndex, 2, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			RelatedListCtrlPtr->SetItem(ListCtrlIndex, 2, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		}		
 	
@@ -455,9 +457,9 @@ void frmContactEditorRelated::ProcessData( wxCommandEvent& event )
 		
 		RelatedListPrefPtr->erase(RelatedListIndex);
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			RelatedListPrefPtr->insert(std::make_pair(RelatedListIndex, sliPriority->GetValue()));
+			RelatedListPrefPtr->insert(std::make_pair(RelatedListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -483,9 +485,9 @@ void frmContactEditorRelated::ProcessData( wxCommandEvent& event )
 		RelatedListCtrlPtr->SetItem(longSelected, 0, cmbType->GetValue());
 		RelatedListCtrlPtr->SetItem(longSelected, 1, txtRelated->GetValue());
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			RelatedListCtrlPtr->SetItem(longSelected, 2, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			RelatedListCtrlPtr->SetItem(longSelected, 2, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -500,7 +502,11 @@ void frmContactEditorRelated::ProcessData( wxCommandEvent& event )
 
 void frmContactEditorRelated::CloseWindow( wxCommandEvent& event )
 {
+	
+	// Close this window.
+	
 	this->Close();
+	
 }
 
 void frmContactEditorRelated::SetupPointers(std::map<int, wxString> *RelatedList,
@@ -514,6 +520,8 @@ void frmContactEditorRelated::SetupPointers(std::map<int, wxString> *RelatedList
 	int RelatedIndex )
 {
 
+	// Setup the pointers.
+	
 	RelatedListPtr = RelatedList;
 	RelatedListRelTypePtr = RelatedListRelType;	
 	RelatedListAltIDPtr = RelatedListAltID;