X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorGeoposition.cpp;h=e8c89eb9d454020e5432caa8f1ab209d8f7400ea;hb=cbeea63f67490b46dfe5b2f59c3f54b5304835b6;hp=cfd61bff04a91b40187b3abffb9e66d5f81efc78;hpb=2f018d80d89ae561482844e0058e9f652e1ae148;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditorGeoposition.cpp b/source/contacteditor/frmContactEditorGeoposition.cpp
index cfd61bf..e8c89eb 100644
--- a/source/contacteditor/frmContactEditorGeoposition.cpp
+++ b/source/contacteditor/frmContactEditorGeoposition.cpp
@@ -24,24 +24,20 @@ frmContactEditorGeoposition::frmContactEditorGeoposition( wxWindow* parent )
 :
 frmContactEditorGeopositionADT( parent )
 {
+	
+	// Setup the window.
+	
 	EditorMode = FALSE;
-	sliPriority->Disable();
-}
-
-void frmContactEditorGeoposition::EnablePriority( wxCommandEvent& event )
-{
-
-	if (chkUsePref->IsChecked()){
-		sliPriority->Enable();
-	} else {
-		sliPriority->Disable();
-	}
+	priorityCtrl = new XABPriorityCtrl(tabGeneral);
+	szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5);
 	
 }
 
 void frmContactEditorGeoposition::SetEditorMode(bool EditMode, SectionType SectType)
 {
 
+	// Setup the editor mode.
+	
 	// Set the editor mode for adding or editing a timezone.
 
 	if (EditMode == FALSE){
@@ -76,11 +72,11 @@ void frmContactEditorGeoposition::SetEditorMode(bool EditMode, SectionType SectT
 		
 		intiter = GeopositionListPrefPtr->find(GeopositionListIndex);
 		
-		if (intiter->first == GeopositionListIndex && intiter->second > 0){
+		if (intiter->first == GeopositionListIndex && intiter->second > 0 &&
+			intiter != GeopositionListPrefPtr->end()){
 		
-			sliPriority->SetValue(intiter->second);
-			sliPriority->Enable();
-			chkUsePref->SetValue(TRUE);
+			priorityCtrl->SetValue(intiter->second);
+			priorityCtrl->EnablePriority(true);
 		
 		}	
 		
@@ -93,6 +89,8 @@ void frmContactEditorGeoposition::SetEditorMode(bool EditMode, SectionType SectT
 void frmContactEditorGeoposition::ProcessAction( wxCommandEvent& event )
 {
 
+	// Process action.
+	
 	long ListCtrlIndex;
 
 	if (EditorMode == FALSE){
@@ -125,9 +123,9 @@ void frmContactEditorGeoposition::ProcessAction( wxCommandEvent& event )
 		
 		// Add Language priority.
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			GeopositionListPrefPtr->insert(std::make_pair(GeopositionListIndex, sliPriority->GetValue()));
+			GeopositionListPrefPtr->insert(std::make_pair(GeopositionListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -144,9 +142,9 @@ void frmContactEditorGeoposition::ProcessAction( wxCommandEvent& event )
 		coldata.SetText(txtGeoposition->GetValue());
 		ListCtrlIndex =	GeopositionListCtrlPtr->InsertItem(coldata);
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			GeopositionListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			GeopositionListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		}
 		
@@ -165,9 +163,9 @@ void frmContactEditorGeoposition::ProcessAction( wxCommandEvent& event )
 		
 		GeopositionListPrefPtr->erase(GeopositionListIndex);
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			GeopositionListPrefPtr->insert(std::make_pair(GeopositionListIndex, sliPriority->GetValue()));
+			GeopositionListPrefPtr->insert(std::make_pair(GeopositionListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -185,9 +183,9 @@ void frmContactEditorGeoposition::ProcessAction( wxCommandEvent& event )
 		
 		GeopositionListCtrlPtr->SetItem(longSelected, 0, txtGeoposition->GetValue());
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			GeopositionListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			GeopositionListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -203,7 +201,11 @@ void frmContactEditorGeoposition::ProcessAction( wxCommandEvent& event )
 
 void frmContactEditorGeoposition::CloseWindow( wxCommandEvent& event )
 {
+	
+	// Close this window.
+	
 	this->Close();
+	
 }
 
 void frmContactEditorGeoposition::SetupPointers(std::map<int, wxString> *GeopositionList,