From da8aec4292ab27928f4f9a2f2645c46029de7553 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Fri, 26 Jun 2015 22:01:04 +0200 Subject: Linux: don't ask for PIM if TrueCryptMode enabled, both in command line and GUI --- src/Main/Forms/VolumePasswordPanel.cpp | 35 ++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) mode change 100644 => 100755 src/Main/Forms/VolumePasswordPanel.cpp (limited to 'src/Main/Forms/VolumePasswordPanel.cpp') diff --git a/src/Main/Forms/VolumePasswordPanel.cpp b/src/Main/Forms/VolumePasswordPanel.cpp old mode 100644 new mode 100755 index d4200b66..5385d6c8 --- a/src/Main/Forms/VolumePasswordPanel.cpp +++ b/src/Main/Forms/VolumePasswordPanel.cpp @@ -73,6 +73,12 @@ namespace VeraCrypt if (options && !disableTruecryptMode) { TrueCryptModeCheckBox->SetValue (options->TrueCryptMode); + if (options->TrueCryptMode) + { + VolumePimStaticText->Enable (false); + VolumePimTextCtrl->Enable (false); + VolumePinHelpStaticText->Enable (false); + } } if (enablePkcs5Prf) @@ -218,15 +224,20 @@ namespace VeraCrypt int VolumePasswordPanel::GetVolumePim () const { - wxString pinStr (VolumePimTextCtrl->GetValue()); - long pin = 0; - if (pinStr.IsEmpty()) - return 0; - if (pinStr.ToLong (&pin)) - return (int) pin; + if (VolumePimTextCtrl->IsEnabled ()) + { + wxString pinStr (VolumePimTextCtrl->GetValue()); + long pin = 0; + if (pinStr.IsEmpty()) + return 0; + if (pinStr.ToLong (&pin)) + return (int) pin; + else + return -1; + } else - return -1; - } + return 0; + } bool VolumePasswordPanel::GetTrueCryptMode () const { @@ -384,4 +395,12 @@ namespace VeraCrypt } } } + + void VolumePasswordPanel::OnTrueCryptModeChecked( wxCommandEvent& event ) + { + bool bEnablePIM = !GetTrueCryptMode (); + VolumePimStaticText->Enable (bEnablePIM); + VolumePimTextCtrl->Enable (bEnablePIM); + VolumePinHelpStaticText->Enable (bEnablePIM); + } } -- cgit v1.2.3