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

diff --git a/source/contacteditor/frmContactEditorCalAdr.cpp b/source/contacteditor/frmContactEditorCalAdr.cpp
index f690811..c900b7c 100644
--- a/source/contacteditor/frmContactEditorCalAdr.cpp
+++ b/source/contacteditor/frmContactEditorCalAdr.cpp
@@ -24,25 +24,25 @@ frmContactEditorCalAdr::frmContactEditorCalAdr( wxWindow* parent )
 :
 frmContactEditorCalAdrADT( parent )
 {
+	
+	// Setup the window.
+	
 	EditorMode = FALSE;
-	sliPriority->Disable();
+	priorityCtrl = new XABPriorityCtrl(tabGeneral);
+	szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5);
+	szrGeneral->Layout();
 	
 	cmbType->Append(wxT(""));
 	cmbType->Append(_("Home"));
-	cmbType->Append(_("Work"));	
-}
-
-void frmContactEditorCalAdr::EnablePriority( wxCommandEvent& event )
-{
-	if (chkUsePref->IsChecked()){
-		sliPriority->Enable();
-	} else {
-		sliPriority->Disable();
-	}
+	cmbType->Append(_("Work"));
+	
 }
 
 void frmContactEditorCalAdr::ProcessAction( wxCommandEvent& event )
 {
+	
+	// Process action.
+	
 	long ListCtrlIndex;
 	
 	if (EditorMode == FALSE){
@@ -75,9 +75,9 @@ void frmContactEditorCalAdr::ProcessAction( wxCommandEvent& event )
 		
 		// Setup Calendar Priority.
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			CalAdrListPrefPtr->insert(std::make_pair(CalAdrListIndex, sliPriority->GetValue()));
+			CalAdrListPrefPtr->insert(std::make_pair(CalAdrListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -96,9 +96,9 @@ void frmContactEditorCalAdr::ProcessAction( wxCommandEvent& event )
 		
 		CalAdrListCtrlPtr->SetItem(ListCtrlIndex, 1, strValue);
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			CalAdrListCtrlPtr->SetItem(ListCtrlIndex, 2, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			CalAdrListCtrlPtr->SetItem(ListCtrlIndex, 2, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		}
 		
@@ -135,9 +135,9 @@ void frmContactEditorCalAdr::ProcessAction( wxCommandEvent& event )
 		
 		CalAdrListPrefPtr->erase(CalAdrListIndex);
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			CalAdrListPrefPtr->insert(std::make_pair(CalAdrListIndex, sliPriority->GetValue()));
+			CalAdrListPrefPtr->insert(std::make_pair(CalAdrListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -158,9 +158,9 @@ void frmContactEditorCalAdr::ProcessAction( wxCommandEvent& event )
 		CalAdrListCtrlPtr->SetItem(longSelected, 0, txtAddress->GetValue());
 		CalAdrListCtrlPtr->SetItem(longSelected, 1, strValue);		
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			CalAdrListCtrlPtr->SetItem(longSelected, 2, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			CalAdrListCtrlPtr->SetItem(longSelected, 2, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -171,10 +171,14 @@ void frmContactEditorCalAdr::ProcessAction( wxCommandEvent& event )
 		this->Close();	
 	
 	}
+	
 }
 
 void frmContactEditorCalAdr::SetEditorMode(bool EditMode)
 {
+	
+	// Set the editor mode.
+	
 	// Set if the editor is adding or editing an address.
 	// FALSE = Add
 	// TRUE = Edit
@@ -213,7 +217,8 @@ void frmContactEditorCalAdr::SetEditorMode(bool EditMode)
 		
 		striter = CalAdrListTypePtr->find(CalAdrListIndex);	
 		
-		if (striter->first == CalAdrListIndex){
+		if (striter->first == CalAdrListIndex && 
+			striter != CalAdrListTypePtr->end()){
 		
 			strValue = striter->second;
 		
@@ -237,11 +242,11 @@ void frmContactEditorCalAdr::SetEditorMode(bool EditMode)
 		
 		intiter = CalAdrListPrefPtr->find(CalAdrListIndex);
 		
-		if (intiter->first == CalAdrListIndex && intiter->second > 0){
+		if (intiter->first == CalAdrListIndex && intiter->second > 0 &&
+			intiter != CalAdrListPrefPtr->end()){
 		
-			sliPriority->SetValue(intiter->second);
-			sliPriority->Enable();
-			chkUsePref->SetValue(TRUE);
+			priorityCtrl->SetValue(intiter->second);
+			priorityCtrl->EnablePriority(true);
 		
 		}
 		
@@ -251,7 +256,11 @@ void frmContactEditorCalAdr::SetEditorMode(bool EditMode)
 
 void frmContactEditorCalAdr::CloseWindow( wxCommandEvent& event )
 {
+	
+	// Close the window.
+	
 	this->Close();
+	
 }
 
 void frmContactEditorCalAdr::SetupPointers(std::map<int, wxString> *CalAdrList,
@@ -264,6 +273,8 @@ void frmContactEditorCalAdr::SetupPointers(std::map<int, wxString> *CalAdrList,
 	int CalAdrIndex )
 {
 
+	// Setup the pointers.
+	
 	CalAdrListPtr = CalAdrList;
 	CalAdrListAltIDPtr = CalAdrListAltID;
 	CalAdrListPIDPtr = CalAdrListPID;