X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorEmail.cpp;h=fa3bb3eb3a9774011c5f04e34b1e56b82d7e2974;hp=407b63b54f174d4d63c18145d94436f01fa8fe73;hb=ada42724cf083b0a311cf22260485d61516c25c8;hpb=296baaf67d5aef9ed8e57f9de85a3d16ea86d767

diff --git a/source/contacteditor/frmContactEditorEmail.cpp b/source/contacteditor/frmContactEditorEmail.cpp
index 407b63b..fa3bb3e 100644
--- a/source/contacteditor/frmContactEditorEmail.cpp
+++ b/source/contacteditor/frmContactEditorEmail.cpp
@@ -24,21 +24,21 @@ frmContactEditorEmail::frmContactEditorEmail( wxWindow* parent )
 :
 frmContactEditorEmailADT( parent )
 {
+	
+	// Setup the window.
+	
 	EditorMode = FALSE;
-	sliPriority->Disable();
-}
-
-void frmContactEditorEmail::EnablePriority( wxCommandEvent& event )
-{
-	if (chkUsePref->IsChecked()){
-		sliPriority->Enable();
-	} else {
-		sliPriority->Disable();
-	}
+	priorityCtrl = new XABPriorityCtrl(tabGeneral);
+	szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5);
+	szrGeneral->Layout();
+	
 }
 
 void frmContactEditorEmail::ProcessData( wxCommandEvent& event )
 {
+	
+	// Process action.
+	
 	long ListCtrlIndex;
 	
 	if (EditorMode == FALSE){
@@ -70,9 +70,9 @@ void frmContactEditorEmail::ProcessData( wxCommandEvent& event )
 		
 		// Add Email priority.
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			EmailListPrefPtr->insert(std::make_pair(EmailListIndex, sliPriority->GetValue()));
+			EmailListPrefPtr->insert(std::make_pair(EmailListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -89,9 +89,9 @@ void frmContactEditorEmail::ProcessData( wxCommandEvent& event )
 		coldata.SetText(txtEmail->GetValue());
 		ListCtrlIndex =	EmailListCtrlPtr->InsertItem(coldata);
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			EmailListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			EmailListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		}
 		
@@ -110,9 +110,9 @@ void frmContactEditorEmail::ProcessData( wxCommandEvent& event )
 		
 		EmailListPrefPtr->erase(EmailListIndex);
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			EmailListPrefPtr->insert(std::make_pair(EmailListIndex, sliPriority->GetValue()));
+			EmailListPrefPtr->insert(std::make_pair(EmailListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -130,9 +130,9 @@ void frmContactEditorEmail::ProcessData( wxCommandEvent& event )
 		
 		EmailListCtrlPtr->SetItem(longSelected, 0, txtEmail->GetValue());		
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			EmailListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			EmailListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -148,12 +148,18 @@ void frmContactEditorEmail::ProcessData( wxCommandEvent& event )
 
 void frmContactEditorEmail::CloseWindow( wxCommandEvent& event )
 {
+	
+	// Close this window.
+	
 	this->Close();
+	
 }
 
 void frmContactEditorEmail::SetEditorMode(bool EditMode, SectionType SectType)
 {
 
+	// Set the editor mode.
+	
 	// Set the editor mode for adding or editing an email address.
 
 	if (EditMode == FALSE){
@@ -191,9 +197,8 @@ void frmContactEditorEmail::SetEditorMode(bool EditMode, SectionType SectType)
 		if (intiter->first == EmailListIndex && intiter->second > 0 &&
 			intiter != EmailListPrefPtr->end()){
 		
-			sliPriority->SetValue(intiter->second);
-			sliPriority->Enable();
-			chkUsePref->SetValue(TRUE);
+			priorityCtrl->SetValue(intiter->second);
+			priorityCtrl->EnablePriority(true);
 		
 		}
 		
@@ -224,4 +229,5 @@ void frmContactEditorEmail::SetupPointers(std::map<int, wxString> *EmailList,
 	EmailListPrefPtr = EmailListPref;
 	EmailListCtrlPtr = EmailListCtrl;
 	EmailListIndex = EmailIndex;
+	
 }
\ No newline at end of file