X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorAddress.cpp;h=a653d271ae9e9d6c773f895713680c331ae75e48;hb=f69e09d827e06435ea94bb73aa71ab5f9d5c035b;hp=883e82e2dc9ed0e910f1ccf4aefbc4d2c53e3587;hpb=70d0309634e84cf79f4dacc3e71ec736e449163c;p=xestiaab%2F.git

diff --git a/source/contacteditor/frmContactEditorAddress.cpp b/source/contacteditor/frmContactEditorAddress.cpp
index 883e82e..a653d27 100644
--- a/source/contacteditor/frmContactEditorAddress.cpp
+++ b/source/contacteditor/frmContactEditorAddress.cpp
@@ -30,7 +30,9 @@ frmContactEditorAddressADT( parent )
 	// Setup the window.
 	
 	EditorMode = FALSE;
-	sliPriority->Disable();
+	priorityCtrl = new XABPriorityCtrl(tabGeneral);
+	szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5);
+	szrGeneral->Layout();
 	
 }
 
@@ -39,19 +41,6 @@ void frmContactEditorAddress::InitAddressEditor( wxInitDialogEvent& event )
 	// Do nothing with this subroutine at this time.
 }
 
-void frmContactEditorAddress::EnablePriority( wxCommandEvent& event )
-{
-	
-	// Enable/disable the priority setting.
-	
-	if (chkUsePref->IsChecked()){
-		sliPriority->Enable();
-	} else {
-		sliPriority->Disable();
-	}
-	
-}
-
 void frmContactEditorAddress::ProcessData( wxCommandEvent& event )
 {
 
@@ -119,19 +108,14 @@ void frmContactEditorAddress::ProcessData( wxCommandEvent& event )
 			AddressListTypePtr->insert(std::make_pair(AddressListIndex, wxT("work")));
 		
 		}
-		
-		//AddressListTypePtr = &AddressListType;
-		
+
 		// Add the mediatype to the list (maps).
 		
 		AddressListMediatypePtr->insert(std::make_pair(AddressListIndex, wxT("text/plain")));
 		
-		//AddressListMediatypePtr = &AddressListMediatype;
-		//AddressListPrefPtr = &AddressListPref;
-		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			AddressListPrefPtr->insert(std::make_pair(AddressListIndex, sliPriority->GetValue()));
+			AddressListPrefPtr->insert(std::make_pair(AddressListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -152,9 +136,9 @@ void frmContactEditorAddress::ProcessData( wxCommandEvent& event )
 		AddressListCtrlPtr->SetItem(ListCtrlIndex, 2, txtCounty->GetValue());
 		AddressListCtrlPtr->SetItem(ListCtrlIndex, 3, txtPostCode->GetValue());
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			AddressListCtrlPtr->SetItem(ListCtrlIndex, 4, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			AddressListCtrlPtr->SetItem(ListCtrlIndex, 4, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		}
 		
@@ -168,24 +152,6 @@ void frmContactEditorAddress::ProcessData( wxCommandEvent& event )
 		wxString strValue;
 		long longSelected = -1;
 		
-		/*
-		strAddress.Append(wxT(";;"));
-
-		strAddress.Append(txtAddress->GetValue());
-		strAddress.Append(wxT(";"));
-		
-		strAddress.Append(txtTownCity->GetValue());
-		strAddress.Append(wxT(";"));
-		
-		strAddress.Append(txtCounty->GetValue());
-		strAddress.Append(wxT(";"));
-		
-		strAddress.Append(txtPostCode->GetValue());
-		strAddress.Append(wxT(";"));
-
-		strAddress.Append(txtCountry->GetValue());
-		*/
-		
 		AddressListPtr->erase(AddressListIndex);		
 		AddressListPtr->insert(std::make_pair(AddressListIndex, txtAddress->GetValue()));
 
@@ -201,8 +167,6 @@ void frmContactEditorAddress::ProcessData( wxCommandEvent& event )
 		AddressListCountryPtr->erase(AddressListIndex);
 		AddressListCountryPtr->insert(std::make_pair(AddressListIndex, txtCountry->GetValue()));
 		
-		//AddressListLabelPtr = &AddressListLabel;
-		
 		// Add the label to the list (maps).
 		
 		AddressListLabelPtr->erase(AddressListIndex);
@@ -214,8 +178,6 @@ void frmContactEditorAddress::ProcessData( wxCommandEvent& event )
 		
 		// Add the language to the list (maps).
 		
-		//AddressListLangPtr = &AddressListLang;
-		
 		AddressListLangPtr->erase(AddressListIndex);
 		AddressListLangPtr->insert(std::make_pair(AddressListIndex, cmbLanguage->GetValue()));
 		
@@ -237,24 +199,17 @@ void frmContactEditorAddress::ProcessData( wxCommandEvent& event )
 		
 		AddressListTimezonePtr->erase(AddressListIndex);
 		AddressListTimezonePtr->insert(std::make_pair(AddressListIndex, txtTimezone->GetValue()));
-
-		// No need to update type since it will not have changed.
-		
-		//AddressListTypePtr = &AddressListType;
 		
 		// Add the mediatype to the list (maps).
 		
 		AddressListMediatypePtr->erase(AddressListIndex);
 		AddressListMediatypePtr->insert(std::make_pair(AddressListIndex, wxT("text/plain")));
 		
-		//AddressListMediatypePtr = &AddressListMediatype;
-		//AddressListPrefPtr = &AddressListPref;
-		
 		AddressListPrefPtr->erase(AddressListIndex);
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			AddressListPrefPtr->insert(std::make_pair(AddressListIndex, sliPriority->GetValue()));
+			AddressListPrefPtr->insert(std::make_pair(AddressListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -277,9 +232,9 @@ void frmContactEditorAddress::ProcessData( wxCommandEvent& event )
 		AddressListCtrlPtr->SetItem(longSelected, 2, txtCounty->GetValue());
 		AddressListCtrlPtr->SetItem(longSelected, 3, txtPostCode->GetValue());
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			AddressListCtrlPtr->SetItem(longSelected, 4, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			AddressListCtrlPtr->SetItem(longSelected, 4, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -450,9 +405,6 @@ void frmContactEditorAddress::SetEditorMode( bool EditMode, SectionType SectType
 		
 		}
 		
-		//CaptureString(&strValue, TRUE);
-		//->Replace(wxT("\;"), wxT("\;;"), TRUE);
-		
 		// Setup the Slider.
 		
 		intiter = AddressListPrefPtr->find(AddressListIndex);
@@ -460,9 +412,8 @@ void frmContactEditorAddress::SetEditorMode( bool EditMode, SectionType SectType
 		if (intiter->first == AddressListIndex && intiter->second > 0 && intiter != AddressListPrefPtr->end() &&
 		  intiter != AddressListPrefPtr->end()){
 		
-			sliPriority->SetValue(intiter->second);
-			sliPriority->Enable();
-			chkUsePref->SetValue(TRUE);
+			priorityCtrl->SetValue(intiter->second);
+			priorityCtrl->EnablePriority(true);
 		
 		}