diff options
Diffstat (limited to 'src/Main/Forms')
| -rw-r--r-- | src/Main/Forms/Forms.cpp | 12 | ||||
| -rw-r--r-- | src/Main/Forms/Forms.h | 4 | ||||
| -rw-r--r-- | src/Main/Forms/TrueCrypt.fbp | 4 | ||||
| -rw-r--r-- | src/Main/Forms/VolumePasswordPanel.cpp | 24 | ||||
| -rw-r--r-- | src/Main/Forms/VolumePimWizardPage.cpp | 18 |
5 files changed, 31 insertions, 31 deletions
diff --git a/src/Main/Forms/Forms.cpp b/src/Main/Forms/Forms.cpp index 76013e1a..ea769954 100644 --- a/src/Main/Forms/Forms.cpp +++ b/src/Main/Forms/Forms.cpp @@ -3212,11 +3212,11 @@ VolumePasswordPanelBase::VolumePasswordPanelBase( wxWindow* parent, wxWindowID i VolumePimTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
VolumePimTextCtrl->SetMaxLength( 10 );
GridBagSizer->Add( VolumePimTextCtrl, wxGBPosition( 3, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND, 5 );
- VolumePinHelpStaticText = new wxStaticText( this, wxID_ANY, _("(Empty or 0 for default iterations)"), wxDefaultPosition, wxDefaultSize, 0 );
- VolumePinHelpStaticText->Wrap( -1 );
- GridBagSizer->Add( VolumePinHelpStaticText, wxGBPosition( 3, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxBOTTOM|wxLEFT|wxRIGHT, 5 );
+ VolumePimHelpStaticText = new wxStaticText( this, wxID_ANY, _("(Empty or 0 for default iterations)"), wxDefaultPosition, wxDefaultSize, 0 );
+ VolumePimHelpStaticText->Wrap( -1 );
+ GridBagSizer->Add( VolumePimHelpStaticText, wxGBPosition( 3, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxBOTTOM|wxLEFT|wxRIGHT, 5 );
CacheCheckBox = new wxCheckBox( this, wxID_ANY, _("Cach&e passwords and keyfiles in memory "), wxDefaultPosition, wxDefaultSize, 0 );
GridBagSizer->Add( CacheCheckBox, wxGBPosition( 4, 1 ), wxGBSpan( 1, 2 ), wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
@@ -3348,11 +3348,11 @@ VolumePimWizardPageBase::VolumePimWizardPageBase( wxWindow* parent, wxWindowID i VolumePimTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
VolumePimTextCtrl->SetMaxLength( 10 );
PimSizer->Add( VolumePimTextCtrl, 0, wxALL, 5 );
- VolumePinHelpStaticText = new wxStaticText( this, wxID_ANY, _("(Empty or 0 for default iterations)"), wxDefaultPosition, wxDefaultSize, 0 );
- VolumePinHelpStaticText->Wrap( -1 );
- PimSizer->Add( VolumePinHelpStaticText, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+ VolumePimHelpStaticText = new wxStaticText( this, wxID_ANY, _("(Empty or 0 for default iterations)"), wxDefaultPosition, wxDefaultSize, 0 );
+ VolumePimHelpStaticText->Wrap( -1 );
+ PimSizer->Add( VolumePimHelpStaticText, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
PimPanelSizer->Add( PimSizer, 1, wxEXPAND, 5 );
diff --git a/src/Main/Forms/Forms.h b/src/Main/Forms/Forms.h index 143e5c8d..1c4baa79 100644 --- a/src/Main/Forms/Forms.h +++ b/src/Main/Forms/Forms.h @@ -961,9 +961,9 @@ namespace VeraCrypt wxStaticText* ConfirmPasswordStaticText;
wxTextCtrl* ConfirmPasswordTextCtrl;
wxStaticText* VolumePimStaticText;
wxTextCtrl* VolumePimTextCtrl;
- wxStaticText* VolumePinHelpStaticText;
+ wxStaticText* VolumePimHelpStaticText;
wxCheckBox* CacheCheckBox;
wxCheckBox* DisplayPasswordCheckBox;
wxCheckBox* UseKeyfilesCheckBox;
wxButton* KeyfilesButton;
@@ -1022,9 +1022,9 @@ namespace VeraCrypt wxBoxSizer* PimPanelSizer;
wxBoxSizer* PimSizer;
wxStaticText* VolumePimStaticText;
wxTextCtrl* VolumePimTextCtrl;
- wxStaticText* VolumePinHelpStaticText;
+ wxStaticText* VolumePimHelpStaticText;
wxStaticText* InfoStaticText;
// Virtual event handlers, overide them in your derived class
virtual void OnPimChanged( wxCommandEvent& event ) { event.Skip(); }
diff --git a/src/Main/Forms/TrueCrypt.fbp b/src/Main/Forms/TrueCrypt.fbp index 10472f11..78ecb556 100644 --- a/src/Main/Forms/TrueCrypt.fbp +++ b/src/Main/Forms/TrueCrypt.fbp @@ -26055,9 +26055,9 @@ <property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
- <property name="name">VolumePinHelpStaticText</property>
+ <property name="name">VolumePimHelpStaticText</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
@@ -27401,9 +27401,9 @@ <property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
- <property name="name">VolumePinHelpStaticText</property>
+ <property name="name">VolumePimHelpStaticText</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
diff --git a/src/Main/Forms/VolumePasswordPanel.cpp b/src/Main/Forms/VolumePasswordPanel.cpp index 8c0133eb..0d1e6931 100644 --- a/src/Main/Forms/VolumePasswordPanel.cpp +++ b/src/Main/Forms/VolumePasswordPanel.cpp @@ -56,9 +56,9 @@ namespace VeraCrypt DisplayPasswordCheckBox->Show (enablePassword); VolumePimStaticText->Show (enablePassword && (!enableConfirmation || (enablePkcs5Prf && !isMountPassword))); VolumePimTextCtrl->Show (enablePassword && (!enableConfirmation || (enablePkcs5Prf && !isMountPassword))); - VolumePinHelpStaticText->Show (enablePassword && (!enableConfirmation || (enablePkcs5Prf && !isMountPassword))); + VolumePimHelpStaticText->Show (enablePassword && (!enableConfirmation || (enablePkcs5Prf && !isMountPassword))); ConfirmPasswordStaticText->Show (enableConfirmation); ConfirmPasswordTextCtrl->Show (enableConfirmation); @@ -77,9 +77,9 @@ namespace VeraCrypt if (options->TrueCryptMode) { VolumePimStaticText->Enable (false); VolumePimTextCtrl->Enable (false); - VolumePinHelpStaticText->Enable (false); + VolumePimHelpStaticText->Enable (false); } } if (enablePkcs5Prf) @@ -226,14 +226,14 @@ namespace VeraCrypt int VolumePasswordPanel::GetVolumePim () const { if (VolumePimTextCtrl->IsEnabled ()) { - wxString pinStr (VolumePimTextCtrl->GetValue()); - long pin = 0; - if (pinStr.IsEmpty()) + wxString pimStr (VolumePimTextCtrl->GetValue()); + long pim = 0; + if (pimStr.IsEmpty()) return 0; - if (pinStr.ToLong (&pin)) - return (int) pin; + if (pimStr.ToLong (&pim)) + return (int) pim; else return -1; } else @@ -385,15 +385,15 @@ namespace VeraCrypt if (ConfirmPasswordTextCtrl->IsShown()) { if (GetVolumePim() != 0) { - VolumePinHelpStaticText->SetForegroundColour(*wxRED); - VolumePinHelpStaticText->SetLabel(LangString["PIM_CHANGE_WARNING"]); + VolumePimHelpStaticText->SetForegroundColour(*wxRED); + VolumePimHelpStaticText->SetLabel(LangString["PIM_CHANGE_WARNING"]); } else { - VolumePinHelpStaticText->SetForegroundColour(*wxBLACK); - VolumePinHelpStaticText->SetLabel(LangString["IDC_PIM_HELP"]); + VolumePimHelpStaticText->SetForegroundColour(*wxBLACK); + VolumePimHelpStaticText->SetLabel(LangString["IDC_PIM_HELP"]); } } } @@ -401,7 +401,7 @@ namespace VeraCrypt { bool bEnablePIM = !GetTrueCryptMode (); VolumePimStaticText->Enable (bEnablePIM); VolumePimTextCtrl->Enable (bEnablePIM); - VolumePinHelpStaticText->Enable (bEnablePIM); + VolumePimHelpStaticText->Enable (bEnablePIM); } } diff --git a/src/Main/Forms/VolumePimWizardPage.cpp b/src/Main/Forms/VolumePimWizardPage.cpp index d7176bb2..58d9d6af 100644 --- a/src/Main/Forms/VolumePimWizardPage.cpp +++ b/src/Main/Forms/VolumePimWizardPage.cpp @@ -32,14 +32,14 @@ namespace VeraCrypt int VolumePimWizardPage::GetVolumePim () const { if (VolumePimTextCtrl->IsEnabled ()) { - wxString pinStr (VolumePimTextCtrl->GetValue()); - long pin = 0; - if (pinStr.IsEmpty()) + wxString pimStr (VolumePimTextCtrl->GetValue()); + long pim = 0; + if (pimStr.IsEmpty()) return 0; - if (pinStr.ToLong (&pin)) - return (int) pin; + if (pimStr.ToLong (&pim)) + return (int) pim; else return -1; } else @@ -54,14 +54,14 @@ namespace VeraCrypt void VolumePimWizardPage::OnPimChanged (wxCommandEvent& event) { if (GetVolumePim() != 0) { - VolumePinHelpStaticText->SetForegroundColour(*wxRED); - VolumePinHelpStaticText->SetLabel(LangString["PIM_CHANGE_WARNING"]); + VolumePimHelpStaticText->SetForegroundColour(*wxRED); + VolumePimHelpStaticText->SetLabel(LangString["PIM_CHANGE_WARNING"]); } else { - VolumePinHelpStaticText->SetForegroundColour(*wxBLACK); - VolumePinHelpStaticText->SetLabel(LangString["IDC_PIM_HELP"]); + VolumePimHelpStaticText->SetForegroundColour(*wxBLACK); + VolumePimHelpStaticText->SetLabel(LangString["IDC_PIM_HELP"]); } } } |