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

diff --git a/source/contacteditor/frmContactEditorTimezones.cpp b/source/contacteditor/frmContactEditorTimezones.cpp
index d33764b..01cc6ad 100644
--- a/source/contacteditor/frmContactEditorTimezones.cpp
+++ b/source/contacteditor/frmContactEditorTimezones.cpp
@@ -19,22 +19,20 @@
 #include "frmContactEditorTimezones.h"
 #include <map>
 #include "../common/textprocessing.h"
+#include "../widgets/XABPriorityCtrl.h"
 
 frmContactEditorTimezones::frmContactEditorTimezones( wxWindow* parent )
 :
 frmContactEditorTimezonesADT( parent )
 {
+	
+	// Setup the window.
+	
 	EditorMode = FALSE;
-	sliPriority->Disable();
-}
-
-void frmContactEditorTimezones::EnablePriority( wxCommandEvent& event )
-{
-	if (chkUsePref->IsChecked()){
-		sliPriority->Enable();
-	} else {
-		sliPriority->Disable();
-	}
+	priorityCtrl = new XABPriorityCtrl(tabGeneral);
+	szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5);
+	szrGeneral->Layout();
+	
 }
 
 void frmContactEditorTimezones::SetEditorMode(bool EditMode, SectionType SectType)
@@ -76,9 +74,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);
 		
 		}	
 		
@@ -90,6 +87,8 @@ void frmContactEditorTimezones::SetEditorMode(bool EditMode, SectionType SectTyp
 
 void frmContactEditorTimezones::ProcessAction( wxCommandEvent& event )
 {
+
+	// Process action.
 	
 	long ListCtrlIndex;
 
@@ -121,9 +120,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 {
 		
@@ -140,9 +139,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()));
 		
 		}
 		
@@ -161,9 +160,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 {
 		
@@ -181,9 +180,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 {
 		
@@ -199,7 +198,11 @@ void frmContactEditorTimezones::ProcessAction( wxCommandEvent& event )
 
 void frmContactEditorTimezones::CloseWindow( wxCommandEvent& event )
 {
+	
+	// Close this window.
+	
 	this->Close();
+	
 }
 
 void frmContactEditorTimezones::SetupPointers(std::map<int, wxString> *TZList,