X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorTimezones.cpp;h=7de1e7e36fd1aaca3a0683401baf1bb61d629df3;hp=398d0e1d63524a9003ff02fec34586c4c72c8f14;hb=1cd99f1d6252ccfd70cea70a86f6977e4f2d6e6d;hpb=16ba57d640fd0412351c4cf8d324f02fdb2b2987

diff --git a/source/contacteditor/frmContactEditorTimezones.cpp b/source/contacteditor/frmContactEditorTimezones.cpp
index 398d0e1..7de1e7e 100644
--- a/source/contacteditor/frmContactEditorTimezones.cpp
+++ b/source/contacteditor/frmContactEditorTimezones.cpp
@@ -19,6 +19,7 @@
 #include "frmContactEditorTimezones.h"
 #include <map>
 #include "../common/textprocessing.h"
+#include "../widgets/XABPriorityCtrl.h"
 
 frmContactEditorTimezones::frmContactEditorTimezones( wxWindow* parent )
 :
@@ -28,22 +29,11 @@ frmContactEditorTimezonesADT( parent )
 	// Setup the window.
 	
 	EditorMode = FALSE;
-	sliPriority->Disable();
+	priorityCtrl = new XABPriorityCtrl(tabGeneral);
+	szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5);
 	
 }
 
-void frmContactEditorTimezones::EnablePriority( wxCommandEvent& event )
-{
-	
-	// Enable/disable the priority setting.
-	
-	if (chkUsePref->IsChecked()){
-		sliPriority->Enable();
-	} else {
-		sliPriority->Disable();
-	}
-}
-
 void frmContactEditorTimezones::SetEditorMode(bool EditMode, SectionType SectType)
 {
 
@@ -83,9 +73,8 @@ void frmContactEditorTimezones::SetEditorMode(bool EditMode, SectionType SectTyp
 		
 		if (intiter->first == TZListIndex && intiter->second > 0){
 		
-			sliPriority->SetValue(intiter->second);
-			sliPriority->Enable();
-			chkUsePref->SetValue(TRUE);
+			priorityCtrl->SetValue(intiter->second);
+			priorityCtrl->EnablePriority(true);
 		
 		}	
 		
@@ -130,9 +119,9 @@ void frmContactEditorTimezones::ProcessAction( wxCommandEvent& event )
 		
 		// Add Language priority.
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			TZListPrefPtr->insert(std::make_pair(TZListIndex, sliPriority->GetValue()));
+			TZListPrefPtr->insert(std::make_pair(TZListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -149,9 +138,9 @@ void frmContactEditorTimezones::ProcessAction( wxCommandEvent& event )
 		coldata.SetText(cmbTimezone->GetValue());
 		ListCtrlIndex =	TZListCtrlPtr->InsertItem(coldata);
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			TZListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			TZListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		}
 		
@@ -170,9 +159,9 @@ void frmContactEditorTimezones::ProcessAction( wxCommandEvent& event )
 		
 		TZListPrefPtr->erase(TZListIndex);
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			TZListPrefPtr->insert(std::make_pair(TZListIndex, sliPriority->GetValue()));
+			TZListPrefPtr->insert(std::make_pair(TZListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -190,9 +179,9 @@ void frmContactEditorTimezones::ProcessAction( wxCommandEvent& event )
 		
 		TZListCtrlPtr->SetItem(longSelected, 0, cmbTimezone->GetValue());		
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			TZListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			TZListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		} else {