X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorWebsites.cpp;h=5ce80970d5d38f01fbb4cd07f01d5884d91d6875;hb=eda90a61f2decc2d388aed6362446aa619f55d65;hp=d75243829b7b69c585c875c5d235073974cf4fee;hpb=da64d37d0a13895554e4ad945c46dd0af6d1c0e6;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditorWebsites.cpp b/source/contacteditor/frmContactEditorWebsites.cpp
index d752438..5ce8097 100644
--- a/source/contacteditor/frmContactEditorWebsites.cpp
+++ b/source/contacteditor/frmContactEditorWebsites.cpp
@@ -26,21 +26,18 @@ frmContactEditorWebsites::frmContactEditorWebsites( wxWindow* parent )
 :
 frmContactEditorWebsitesADT( parent )
 {
+	
+	// Setup the window.
+	
 	EditorMode = FALSE;
-	sliPriority->Disable();
-}
-
-void frmContactEditorWebsites::EnablePriority( wxCommandEvent& event )
-{
-	if (chkUsePref->IsChecked()){
-		sliPriority->Enable();
-	} else {
-		sliPriority->Disable();
-	}
+	priorityCtrl = new XABPriorityCtrl(tabGeneral);
+	szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5);
+	
 }
 
 void frmContactEditorWebsites::ProcessAction( wxCommandEvent& event )
 {
+	
 	// Set if the editor is adding or editing an address.
 	// FALSE = Add
 	// TRUE = Edit
@@ -73,9 +70,9 @@ void frmContactEditorWebsites::ProcessAction( wxCommandEvent& event )
 		
 		// Add the website priority.
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			WebsiteListPrefPtr->insert(std::make_pair(WebsiteListIndex, sliPriority->GetValue()));
+			WebsiteListPrefPtr->insert(std::make_pair(WebsiteListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -92,9 +89,9 @@ void frmContactEditorWebsites::ProcessAction( wxCommandEvent& event )
 		coldata.SetText(txtWebsite->GetValue());
 		ListCtrlIndex =	WebsiteListCtrlPtr->InsertItem(coldata);
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			WebsiteListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			WebsiteListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		}		
 	
@@ -112,9 +109,9 @@ void frmContactEditorWebsites::ProcessAction( wxCommandEvent& event )
 		
 		WebsiteListPrefPtr->erase(WebsiteListIndex);
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			WebsiteListPrefPtr->insert(std::make_pair(WebsiteListIndex, sliPriority->GetValue()));
+			WebsiteListPrefPtr->insert(std::make_pair(WebsiteListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -134,9 +131,9 @@ void frmContactEditorWebsites::ProcessAction( wxCommandEvent& event )
 		
 		WebsiteListCtrlPtr->SetItem(longSelected, 0, txtWebsite->GetValue());
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			WebsiteListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			WebsiteListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -147,10 +144,12 @@ void frmContactEditorWebsites::ProcessAction( wxCommandEvent& event )
 		this->Close();
 	
 	}
+	
 }
 
 void frmContactEditorWebsites::SetEditorMode(bool EditMode, SectionType SectType)
 {
+	
 	// Set if the editor is adding or editing an address.
 	// FALSE = Add
 	// TRUE = Edit
@@ -189,11 +188,11 @@ void frmContactEditorWebsites::SetEditorMode(bool EditMode, SectionType SectType
 		
 		intiter = WebsiteListPrefPtr->find(WebsiteListIndex);
 		
-		if (intiter->first == WebsiteListIndex && intiter->second > 0){
+		if (intiter->first == WebsiteListIndex && intiter->second > 0 &&
+			intiter != WebsiteListPrefPtr->end()){
 		
-			sliPriority->SetValue(intiter->second);
-			sliPriority->Enable();
-			chkUsePref->SetValue(TRUE);
+			priorityCtrl->SetValue(intiter->second);
+			priorityCtrl->EnablePriority(true);
 		
 		}		
 		
@@ -205,7 +204,11 @@ void frmContactEditorWebsites::SetEditorMode(bool EditMode, SectionType SectType
 
 void frmContactEditorWebsites::CloseWindow( wxCommandEvent& event )
 {
+	
+	// Close the window.
+	
 	this->Close();
+	
 }
 
 void frmContactEditorWebsites::SetupPointers(std::map<int, wxString> *WebsiteList,
@@ -219,6 +222,8 @@ void frmContactEditorWebsites::SetupPointers(std::map<int, wxString> *WebsiteLis
 	int WebsiteIndex )
 {
 
+	// Setup the pointers.
+	
 	WebsiteListPtr = WebsiteList;
 	WebsiteListAltIDPtr = WebsiteListAltID;
 	WebsiteListPIDPtr = WebsiteListPID;