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

diff --git a/source/contacteditor/frmContactEditorGeoposition.cpp b/source/contacteditor/frmContactEditorGeoposition.cpp
index d16f8a0..bcc3e87 100644
--- a/source/contacteditor/frmContactEditorGeoposition.cpp
+++ b/source/contacteditor/frmContactEditorGeoposition.cpp
@@ -24,24 +24,21 @@ 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);
+	szrGeneral->Layout();
 	
 }
 
 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 +73,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 +90,8 @@ void frmContactEditorGeoposition::SetEditorMode(bool EditMode, SectionType SectT
 void frmContactEditorGeoposition::ProcessAction( wxCommandEvent& event )
 {
 
+	// Process action.
+	
 	long ListCtrlIndex;
 
 	if (EditorMode == FALSE){
@@ -125,9 +124,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 +143,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 +164,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 +184,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,13 +202,18 @@ void frmContactEditorGeoposition::ProcessAction( wxCommandEvent& event )
 
 void frmContactEditorGeoposition::CloseWindow( wxCommandEvent& event )
 {
+	
+	// Close this window.
+	
 	this->Close();
+	
 }
 
 void frmContactEditorGeoposition::SetupPointers(std::map<int, wxString> *GeopositionList,
 	std::map<int, wxString> *GeopositionListAltID,
 	std::map<int, wxString> *GeopositionListPID,
 	std::map<int, wxString> *GeopositionListType,
+	std::map<int, wxString> *GeopositionListDataType,
 	std::map<int, wxString> *GeopositionListTokens,
 	std::map<int, wxString> *GeopositionListMediatype,	
 	std::map<int, int> *GeopositionListPref,
@@ -224,6 +228,7 @@ void frmContactEditorGeoposition::SetupPointers(std::map<int, wxString> *Geoposi
 	GeopositionListAltIDPtr = GeopositionListAltID;
 	GeopositionListPIDPtr = GeopositionListPID;
 	GeopositionListTypePtr = GeopositionListType;
+	GeopositionListDataTypePtr = GeopositionListDataType;
 	GeopositionListTokensPtr = GeopositionListTokens;
 	GeopositionListPrefPtr = GeopositionListPref;
 	GeopositionListCtrlPtr = GeopositionListCtrl;