VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Main
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2015-07-11 01:48:52 +0200
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2015-07-11 01:58:34 +0200
commit6ef41abdd2122c36d9387cc4bbdbcfc81315b94b (patch)
treecb86ea0e7857825ba985c7d81a5a6b5a53c1655f /src/Main
parent7a01453f00aba9ed41228ac9c7064e69379be8cd (diff)
downloadVeraCrypt-6ef41abdd2122c36d9387cc4bbdbcfc81315b94b.tar.gz
VeraCrypt-6ef41abdd2122c36d9387cc4bbdbcfc81315b94b.zip
Use Pim name for internal variables instead of the old name Pin
Diffstat (limited to 'src/Main')
-rw-r--r--src/Main/Forms/Forms.cpp12
-rw-r--r--src/Main/Forms/Forms.h4
-rw-r--r--src/Main/Forms/TrueCrypt.fbp4
-rw-r--r--src/Main/Forms/VolumePasswordPanel.cpp24
-rw-r--r--src/Main/Forms/VolumePimWizardPage.cpp18
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
@@ -3213,9 +3213,9 @@ VolumePasswordPanelBase::VolumePasswordPanelBase( wxWindow* parent, wxWindowID i
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 );
@@ -3349,9 +3349,9 @@ VolumePimWizardPageBase::VolumePimWizardPageBase( wxWindow* parent, wxWindowID i
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
@@ -962,7 +962,7 @@ namespace VeraCrypt
wxTextCtrl* ConfirmPasswordTextCtrl;
wxStaticText* VolumePimStaticText;
wxTextCtrl* VolumePimTextCtrl;
- wxStaticText* VolumePinHelpStaticText;
+ wxStaticText* VolumePimHelpStaticText;
wxCheckBox* CacheCheckBox;
wxCheckBox* DisplayPasswordCheckBox;
wxCheckBox* UseKeyfilesCheckBox;
@@ -1023,7 +1023,7 @@ namespace VeraCrypt
wxBoxSizer* PimSizer;
wxStaticText* VolumePimStaticText;
wxTextCtrl* VolumePimTextCtrl;
- wxStaticText* VolumePinHelpStaticText;
+ wxStaticText* VolumePimHelpStaticText;
wxStaticText* InfoStaticText;
// Virtual event handlers, overide them in your derived class
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
@@ -26056,7 +26056,7 @@
<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>
@@ -27402,7 +27402,7 @@
<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>
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
@@ -57,7 +57,7 @@ namespace VeraCrypt
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);
@@ -78,7 +78,7 @@ namespace VeraCrypt
{
VolumePimStaticText->Enable (false);
VolumePimTextCtrl->Enable (false);
- VolumePinHelpStaticText->Enable (false);
+ VolumePimHelpStaticText->Enable (false);
}
}
@@ -227,12 +227,12 @@ namespace VeraCrypt
{
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;
}
@@ -386,13 +386,13 @@ namespace VeraCrypt
{
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"]);
}
}
}
@@ -402,6 +402,6 @@ 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
@@ -33,12 +33,12 @@ namespace VeraCrypt
{
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;
}
@@ -55,13 +55,13 @@ namespace VeraCrypt
{
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"]);
}
}
}