From 515895342820a9d0a35391ec4d316c3782a75768 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Sun, 19 Jul 2015 08:46:27 +0200
Subject: User Interface enhancements for PIM

---
 src/Main/Forms/VolumePimWizardPage.cpp | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

(limited to 'src/Main/Forms/VolumePimWizardPage.cpp')

diff --git a/src/Main/Forms/VolumePimWizardPage.cpp b/src/Main/Forms/VolumePimWizardPage.cpp
index 58d9d6af..36dc4c7f 100644
--- a/src/Main/Forms/VolumePimWizardPage.cpp
+++ b/src/Main/Forms/VolumePimWizardPage.cpp
@@ -23,6 +23,10 @@ namespace VeraCrypt
 	VolumePimWizardPage::VolumePimWizardPage (wxPanel* parent)
 		: VolumePimWizardPageBase (parent)
 	{
+		wxTextValidator validator (wxFILTER_INCLUDE_CHAR_LIST);  // wxFILTER_NUMERIC does not exclude - . , etc.
+		const wxChar *valArr[] = { L"0", L"1", L"2", L"3", L"4", L"5", L"6", L"7", L"8", L"9" };
+		validator.SetIncludes (wxArrayString (array_capacity (valArr), (const wxChar **) &valArr));
+		VolumePimTextCtrl->SetValidator (validator);
 	}
 
 	VolumePimWizardPage::~VolumePimWizardPage ()
@@ -46,6 +50,20 @@ namespace VeraCrypt
 			return 0;
 	}
 
+	void VolumePimWizardPage::SetVolumePim (int pim)
+	{
+		if (pim > 0)
+		{
+			VolumePimTextCtrl->SetValue (StringConverter::FromNumber (pim));
+		}
+		else
+		{
+			VolumePimTextCtrl->SetValue (wxT(""));
+		}
+
+		OnPimChanged (pim);
+	}
+
 	bool VolumePimWizardPage::IsValid ()
 	{
 		return true;
@@ -53,7 +71,12 @@ namespace VeraCrypt
 	
 	void VolumePimWizardPage::OnPimChanged  (wxCommandEvent& event)
 	{
-		if (GetVolumePim() != 0)
+		OnPimChanged (GetVolumePim ());
+	}
+
+	void VolumePimWizardPage::OnPimChanged  (int pim)
+	{
+		if (pim > 0)
 		{
 			VolumePimHelpStaticText->SetForegroundColour(*wxRED);
 			VolumePimHelpStaticText->SetLabel(LangString["PIM_CHANGE_WARNING"]);
-- 
cgit v1.2.3