X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorTitles.cpp;h=f1e4e24079a69b4308f97fd26557b49c5b5c4fe3;hp=497c28ea415a137ab38c70ee8ab0c99b7a505535;hb=ada42724cf083b0a311cf22260485d61516c25c8;hpb=da64d37d0a13895554e4ad945c46dd0af6d1c0e6

diff --git a/source/contacteditor/frmContactEditorTitles.cpp b/source/contacteditor/frmContactEditorTitles.cpp
index 497c28e..f1e4e24 100644
--- a/source/contacteditor/frmContactEditorTitles.cpp
+++ b/source/contacteditor/frmContactEditorTitles.cpp
@@ -26,21 +26,21 @@ frmContactEditorTitles::frmContactEditorTitles( wxWindow* parent )
 :
 frmContactEditorTitlesADT( parent )
 {
+	
+	// Setup the window.
+	
 	EditorMode = FALSE;
-	sliPriority->Disable();
-}
+	priorityCtrl = new XABPriorityCtrl(tabGeneral);
+	szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5);
+	szrGeneral->Layout();
 
-void frmContactEditorTitles::EnablePriority( wxCommandEvent& event )
-{
-	if (chkUsePref->IsChecked()){
-		sliPriority->Enable();
-	} else {
-		sliPriority->Disable();
-	}
 }
 
 void frmContactEditorTitles::ProcessAction( wxCommandEvent& event )
 {
+	
+	// Process action.
+	
 	// Set if the editor is adding or editing an address.
 	// FALSE = Add
 	// TRUE = Edit
@@ -73,9 +73,9 @@ void frmContactEditorTitles::ProcessAction( wxCommandEvent& event )
 		
 		// Add the website priority.
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			TitlesListPrefPtr->insert(std::make_pair(TitlesListIndex, sliPriority->GetValue()));
+			TitlesListPrefPtr->insert(std::make_pair(TitlesListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -92,9 +92,9 @@ void frmContactEditorTitles::ProcessAction( wxCommandEvent& event )
 		coldata.SetText(txtTitle->GetValue());
 		ListCtrlIndex =	TitlesListCtrlPtr->InsertItem(coldata);
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			TitlesListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			TitlesListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		}		
 	
@@ -112,9 +112,9 @@ void frmContactEditorTitles::ProcessAction( wxCommandEvent& event )
 		
 		TitlesListPrefPtr->erase(TitlesListIndex);
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			TitlesListPrefPtr->insert(std::make_pair(TitlesListIndex, sliPriority->GetValue()));
+			TitlesListPrefPtr->insert(std::make_pair(TitlesListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -134,9 +134,9 @@ void frmContactEditorTitles::ProcessAction( wxCommandEvent& event )
 		
 		TitlesListCtrlPtr->SetItem(longSelected, 0, txtTitle->GetValue());
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			TitlesListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			TitlesListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -151,6 +151,9 @@ void frmContactEditorTitles::ProcessAction( wxCommandEvent& event )
 
 void frmContactEditorTitles::SetEditorMode(bool EditMode, SectionType SectType)
 {
+	
+	// Set the editor mode.
+	
 	// Set if the editor is adding or editing an address.
 	// FALSE = Add
 	// TRUE = Edit
@@ -175,7 +178,8 @@ void frmContactEditorTitles::SetEditorMode(bool EditMode, SectionType SectType)
 		
 		striter = TitlesListPtr->find(TitlesListIndex);
 		 
-		if (striter->first == TitlesListIndex){
+		if (striter->first == TitlesListIndex &&
+			striter != TitlesListPtr->end()){
 		
 			strValue = striter->second;
 		
@@ -189,11 +193,11 @@ void frmContactEditorTitles::SetEditorMode(bool EditMode, SectionType SectType)
 		
 		intiter = TitlesListPrefPtr->find(TitlesListIndex);
 		
-		if (intiter->first == TitlesListIndex && intiter->second > 0){
+		if (intiter->first == TitlesListIndex && intiter->second > 0 &&
+			intiter != TitlesListPrefPtr->end()){
 		
-			sliPriority->SetValue(intiter->second);
-			sliPriority->Enable();
-			chkUsePref->SetValue(TRUE);
+			priorityCtrl->SetValue(intiter->second);
+			priorityCtrl->EnablePriority(true);
 		
 		}	
 		
@@ -205,7 +209,11 @@ void frmContactEditorTitles::SetEditorMode(bool EditMode, SectionType SectType)
 
 void frmContactEditorTitles::CloseWindow( wxCommandEvent& event )
 {
+	
+	// Close the window.
+	
 	this->Close();
+	
 }
 
 void frmContactEditorTitles::SetupPointers(std::map<int, wxString> *TitlesList,
@@ -219,6 +227,8 @@ void frmContactEditorTitles::SetupPointers(std::map<int, wxString> *TitlesList,
 	int TitlesIndex )
 {
 
+	// Setup the pointers.
+	
 	TitlesListPtr = TitlesList;
 	TitlesListLanguagePtr = TitlesListLanguage;
 	TitlesListAltIDPtr = TitlesListAltID;