VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Main
diff options
context:
space:
mode:
authorDavid Foerster <david.foerster@informatik.hu-berlin.de>2016-05-10 20:16:32 (GMT)
committerDavid Foerster <david.foerster@informatik.hu-berlin.de>2016-05-10 20:18:34 (GMT)
commit11716ed2dacbb104f8f59867fe66f2c0a6984291 (patch)
tree28aa448de2e790d0f40dc57799a55a9df12ee6fb /src/Main
parent191075155835172e5596e191cf0679ff9022f0fd (diff)
downloadVeraCrypt-11716ed2dacbb104f8f59867fe66f2c0a6984291.zip
VeraCrypt-11716ed2dacbb104f8f59867fe66f2c0a6984291.tar.gz
Remove trailing whitespace
Diffstat (limited to 'src/Main')
-rw-r--r--src/Main/Application.h2
-rw-r--r--src/Main/CommandLineInterface.cpp30
-rw-r--r--src/Main/CommandLineInterface.h4
-rw-r--r--src/Main/FatalErrorHandler.cpp8
-rw-r--r--src/Main/FatalErrorHandler.h2
-rw-r--r--src/Main/FavoriteVolume.cpp4
-rw-r--r--src/Main/FavoriteVolume.h2
-rw-r--r--src/Main/Forms/AboutDialog.cpp2
-rw-r--r--src/Main/Forms/AboutDialog.h4
-rw-r--r--src/Main/Forms/BenchmarkDialog.cpp10
-rw-r--r--src/Main/Forms/BenchmarkDialog.h4
-rw-r--r--src/Main/Forms/ChangePasswordDialog.cpp18
-rw-r--r--src/Main/Forms/ChangePasswordDialog.h2
-rw-r--r--src/Main/Forms/DeviceSelectionDialog.cpp12
-rw-r--r--src/Main/Forms/DeviceSelectionDialog.h2
-rw-r--r--src/Main/Forms/EncryptionOptionsWizardPage.cpp6
-rw-r--r--src/Main/Forms/EncryptionOptionsWizardPage.h2
-rw-r--r--src/Main/Forms/EncryptionTestDialog.cpp8
-rw-r--r--src/Main/Forms/EncryptionTestDialog.h2
-rw-r--r--src/Main/Forms/FavoriteVolumesDialog.cpp8
-rw-r--r--src/Main/Forms/FavoriteVolumesDialog.h4
-rw-r--r--src/Main/Forms/Forms.cpp2402
-rw-r--r--src/Main/Forms/Forms.h516
-rw-r--r--src/Main/Forms/InfoWizardPage.cpp2
-rw-r--r--src/Main/Forms/InfoWizardPage.h2
-rw-r--r--src/Main/Forms/KeyfileGeneratorDialog.cpp44
-rw-r--r--src/Main/Forms/KeyfileGeneratorDialog.h4
-rw-r--r--src/Main/Forms/KeyfilesDialog.cpp4
-rw-r--r--src/Main/Forms/KeyfilesDialog.h2
-rw-r--r--src/Main/Forms/KeyfilesPanel.cpp4
-rw-r--r--src/Main/Forms/KeyfilesPanel.h2
-rw-r--r--src/Main/Forms/LegalNoticesDialog.cpp4
-rw-r--r--src/Main/Forms/LegalNoticesDialog.h2
-rw-r--r--src/Main/Forms/MainFrame.cpp62
-rw-r--r--src/Main/Forms/MainFrame.h6
-rw-r--r--src/Main/Forms/MountOptionsDialog.cpp12
-rw-r--r--src/Main/Forms/MountOptionsDialog.h2
-rw-r--r--src/Main/Forms/NewSecurityTokenKeyfileDialog.cpp2
-rw-r--r--src/Main/Forms/NewSecurityTokenKeyfileDialog.h2
-rw-r--r--src/Main/Forms/PreferencesDialog.cpp22
-rw-r--r--src/Main/Forms/PreferencesDialog.h4
-rw-r--r--src/Main/Forms/ProgressWizardPage.cpp2
-rw-r--r--src/Main/Forms/ProgressWizardPage.h2
-rw-r--r--src/Main/Forms/RandomPoolEnrichmentDialog.cpp12
-rw-r--r--src/Main/Forms/RandomPoolEnrichmentDialog.h4
-rw-r--r--src/Main/Forms/SecurityTokenKeyfilesDialog.cpp6
-rw-r--r--src/Main/Forms/SecurityTokenKeyfilesDialog.h2
-rw-r--r--src/Main/Forms/SelectDirectoryWizardPage.cpp4
-rw-r--r--src/Main/Forms/SelectDirectoryWizardPage.h2
-rw-r--r--src/Main/Forms/SingleChoiceWizardPage.h2
-rw-r--r--src/Main/Forms/VolumeCreationProgressWizardPage.cpp14
-rw-r--r--src/Main/Forms/VolumeCreationProgressWizardPage.h2
-rw-r--r--src/Main/Forms/VolumeCreationWizard.cpp76
-rw-r--r--src/Main/Forms/VolumeCreationWizard.h2
-rw-r--r--src/Main/Forms/VolumeFormatOptionsWizardPage.cpp2
-rw-r--r--src/Main/Forms/VolumeFormatOptionsWizardPage.h2
-rw-r--r--src/Main/Forms/VolumeLocationWizardPage.cpp4
-rw-r--r--src/Main/Forms/VolumeLocationWizardPage.h2
-rw-r--r--src/Main/Forms/VolumePasswordPanel.cpp42
-rw-r--r--src/Main/Forms/VolumePasswordPanel.h4
-rw-r--r--src/Main/Forms/VolumePasswordWizardPage.cpp2
-rw-r--r--src/Main/Forms/VolumePasswordWizardPage.h4
-rw-r--r--src/Main/Forms/VolumePimWizardPage.cpp18
-rw-r--r--src/Main/Forms/VolumePimWizardPage.h6
-rw-r--r--src/Main/Forms/VolumePropertiesDialog.cpp6
-rw-r--r--src/Main/Forms/VolumePropertiesDialog.h4
-rw-r--r--src/Main/Forms/VolumeSizeWizardPage.cpp6
-rw-r--r--src/Main/Forms/VolumeSizeWizardPage.h2
-rw-r--r--src/Main/Forms/WaitDialog.cpp8
-rw-r--r--src/Main/Forms/WaitDialog.h24
-rw-r--r--src/Main/Forms/WizardFrame.cpp10
-rw-r--r--src/Main/Forms/WizardFrame.h2
-rw-r--r--src/Main/Forms/WizardPage.h2
-rw-r--r--src/Main/GraphicUserInterface.cpp130
-rw-r--r--src/Main/GraphicUserInterface.h4
-rw-r--r--src/Main/Hotkey.cpp14
-rw-r--r--src/Main/Hotkey.h2
-rw-r--r--src/Main/LanguageStrings.cpp2
-rw-r--r--src/Main/LanguageStrings.h2
-rw-r--r--src/Main/Main.h2
-rw-r--r--src/Main/Main.make12
-rw-r--r--src/Main/Resources.cpp4
-rw-r--r--src/Main/Resources.h2
-rw-r--r--src/Main/StringFormatter.cpp2
-rw-r--r--src/Main/StringFormatter.h2
-rw-r--r--src/Main/System.cpp2
-rw-r--r--src/Main/System.h6
-rw-r--r--src/Main/SystemPrecompiled.h2
-rw-r--r--src/Main/TextUserInterface.cpp52
-rw-r--r--src/Main/TextUserInterface.h2
-rw-r--r--src/Main/Unix/Main.cpp4
-rw-r--r--src/Main/UserInterface.cpp40
-rw-r--r--src/Main/UserInterface.h2
-rw-r--r--src/Main/UserInterfaceException.h2
-rw-r--r--src/Main/UserInterfaceType.h2
-rw-r--r--src/Main/UserPreferences.cpp26
-rw-r--r--src/Main/UserPreferences.h2
-rw-r--r--src/Main/VolumeHistory.cpp2
-rw-r--r--src/Main/VolumeHistory.h2
-rw-r--r--src/Main/Xml.cpp2
-rw-r--r--src/Main/Xml.h2
101 files changed, 1922 insertions, 1922 deletions
diff --git a/src/Main/Application.h b/src/Main/Application.h
index 23d281b..b961ef4 100644
--- a/src/Main/Application.h
+++ b/src/Main/Application.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/CommandLineInterface.cpp b/src/Main/CommandLineInterface.cpp
index e48a495..0a4f41b 100644
--- a/src/Main/CommandLineInterface.cpp
+++ b/src/Main/CommandLineInterface.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -104,7 +104,7 @@ namespace VeraCrypt
if (parser.Parse () > 0)
throw_err (_("Incorrect command line specified."));
-
+
if (parser.Found (L"help"))
{
ArgCommand = CommandId::Help;
@@ -192,7 +192,7 @@ namespace VeraCrypt
ArgCommand = CommandId::CreateKeyfile;
param1IsFile = true;
}
-
+
if (parser.Found (L"delete-token-keyfiles"))
{
CheckCommandSingle();
@@ -205,7 +205,7 @@ namespace VeraCrypt
ArgCommand = CommandId::DismountVolumes;
param1IsMountedVolumeSpec = true;
}
-
+
if (parser.Found (L"export-token-keyfile"))
{
CheckCommandSingle();
@@ -294,7 +294,7 @@ namespace VeraCrypt
else
{
ArgMountOptions.FilesystemType = wstring (str);
-
+
if (str.IsSameAs (L"FAT", false))
ArgFilesystem = VolumeCreationOptions::FilesystemType::FAT;
#ifdef TC_LINUX
@@ -309,7 +309,7 @@ namespace VeraCrypt
else if (str.IsSameAs (L"exFAT", false))
ArgFilesystem = VolumeCreationOptions::FilesystemType::exFAT;
#elif defined (TC_MACOSX)
- else if ( str.IsSameAs (L"HFS", false)
+ else if ( str.IsSameAs (L"HFS", false)
|| str.IsSameAs (L"HFS+", false)
|| str.IsSameAs (L"MacOsExt", false)
)
@@ -328,7 +328,7 @@ namespace VeraCrypt
}
ArgForce = parser.Found (L"force");
-
+
ArgTrueCryptMode = parser.Found (L"truecrypt");
#if !defined(TC_WINDOWS) && !defined(TC_MACOSX)
@@ -402,7 +402,7 @@ namespace VeraCrypt
if (parser.Found (L"new-password", &str))
ArgNewPassword = ToUTF8Password (str.c_str());
-
+
if (parser.Found (L"new-pim", &str))
{
try
@@ -419,7 +419,7 @@ namespace VeraCrypt
else if (ArgNewPim > 0 && ArgTrueCryptMode)
throw_err (LangString["PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE"]);
}
-
+
if (parser.Found (L"non-interactive"))
{
if (interfaceType != UserInterfaceType::Text)
@@ -478,13 +478,13 @@ namespace VeraCrypt
ArgMountOptions.ProtectionKeyfiles = ToKeyfileList (str);
ArgMountOptions.Protection = VolumeProtection::HiddenVolumeReadOnly;
}
-
+
if (parser.Found (L"protection-password", &str))
{
ArgMountOptions.ProtectionPassword = ToUTF8Password (str.c_str());
ArgMountOptions.Protection = VolumeProtection::HiddenVolumeReadOnly;
}
-
+
if (parser.Found (L"protection-pim", &str))
{
int pim = -1;
@@ -609,7 +609,7 @@ namespace VeraCrypt
// Parameters
if (parser.GetParamCount() > 0)
{
- // in case of GUI interface, we load the preference when only
+ // in case of GUI interface, we load the preference when only
// specifying volume path without any option/switch
if (Application::GetUserInterfaceType() != UserInterfaceType::Text)
{
@@ -634,7 +634,7 @@ namespace VeraCrypt
if (param1IsVolume)
{
wxFileName volPath (parser.GetParam (0));
-
+
#ifdef TC_WINDOWS
if (!parser.GetParam (0).StartsWith (L"\\Device\\"))
#endif
@@ -699,7 +699,7 @@ namespace VeraCrypt
continue;
}
}
-
+
if (token.empty() && !tokenizer.HasMoreTokens())
break;
@@ -758,7 +758,7 @@ namespace VeraCrypt
filteredVolumes.push_back (volume);
}
}
-
+
if (!mountedVolumeSpec.IsEmpty() && filteredVolumes.size() < 1)
throw_err (_("No such volume is mounted."));
diff --git a/src/Main/CommandLineInterface.h b/src/Main/CommandLineInterface.h
index ee6566d..9bca261 100644
--- a/src/Main/CommandLineInterface.h
+++ b/src/Main/CommandLineInterface.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -95,7 +95,7 @@ namespace VeraCrypt
CommandLineInterface (const CommandLineInterface &);
CommandLineInterface &operator= (const CommandLineInterface &);
};
-
+
shared_ptr<VolumePassword> ToUTF8Password (const wchar_t* str, size_t charCount = (size_t) -1);
shared_ptr<SecureBuffer> ToUTF8Buffer (const wchar_t* str, size_t charCount = (size_t) -1);
diff --git a/src/Main/FatalErrorHandler.cpp b/src/Main/FatalErrorHandler.cpp
index 5bea2dd..37a10e7 100644
--- a/src/Main/FatalErrorHandler.cpp
+++ b/src/Main/FatalErrorHandler.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -111,7 +111,7 @@ namespace VeraCrypt
std::set_terminate (DefaultTerminateHandler);
#endif
}
-
+
uint32 FatalErrorHandler::GetAppChecksum ()
{
uint32 checkSum = 0;
@@ -130,7 +130,7 @@ namespace VeraCrypt
}
wstring FatalErrorHandler::GetCallStack (int depth)
- {
+ {
#if wxUSE_STACKWALKER == 1
class StackWalker : public wxStackWalker
@@ -176,7 +176,7 @@ namespace VeraCrypt
return stackWalker.StackVars.str();
#else // wxUSE_STACKWALKER
-
+
return wstring();
#endif // wxUSE_STACKWALKER
diff --git a/src/Main/FatalErrorHandler.h b/src/Main/FatalErrorHandler.h
index bed16fa..9213965 100644
--- a/src/Main/FatalErrorHandler.h
+++ b/src/Main/FatalErrorHandler.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/FavoriteVolume.cpp b/src/Main/FavoriteVolume.cpp
index e88bcd2..9022d60 100644
--- a/src/Main/FavoriteVolume.cpp
+++ b/src/Main/FavoriteVolume.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -31,7 +31,7 @@ namespace VeraCrypt
wstring attr = wstring (node.Attributes[L"slotnumber"]);
if (!attr.empty())
slotNumber = StringConverter::ToUInt64 (attr);
-
+
bool readOnly = false;
attr = wstring (node.Attributes[L"readonly"]);
if (!attr.empty())
diff --git a/src/Main/FavoriteVolume.h b/src/Main/FavoriteVolume.h
index 64055b4..2a902c3 100644
--- a/src/Main/FavoriteVolume.h
+++ b/src/Main/FavoriteVolume.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/Forms/AboutDialog.cpp b/src/Main/Forms/AboutDialog.cpp
index e32c626..8949673 100644
--- a/src/Main/Forms/AboutDialog.cpp
+++ b/src/Main/Forms/AboutDialog.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/Forms/AboutDialog.h b/src/Main/Forms/AboutDialog.h
index e481a12..53dfdcb 100644
--- a/src/Main/Forms/AboutDialog.h
+++ b/src/Main/Forms/AboutDialog.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -21,7 +21,7 @@ namespace VeraCrypt
{
public:
AboutDialog (wxWindow* parent);
-
+
void OnWebsiteHyperlinkClick (wxHyperlinkEvent& event) { Gui->OpenHomepageLink (this, L"main"); }
};
}
diff --git a/src/Main/Forms/BenchmarkDialog.cpp b/src/Main/Forms/BenchmarkDialog.cpp
index 0f49765..95e225e 100644
--- a/src/Main/Forms/BenchmarkDialog.cpp
+++ b/src/Main/Forms/BenchmarkDialog.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -68,7 +68,7 @@ namespace VeraCrypt
wxBusyCursor busy;
Buffer buffer ((size_t) Gui->GetSelectedData <size_t> (BufferSizeChoice));
-
+
BenchmarkThreadRoutine routine(this, results, buffer);
Gui->ExecuteWaitThreadRoutine (this, &routine);
@@ -77,7 +77,7 @@ namespace VeraCrypt
foreach (const BenchmarkResult &result, results)
{
vector <wstring> fields (BenchmarkListCtrl->GetColumnCount());
-
+
fields[ColumnAlgorithm] = result.AlgorithmName;
fields[ColumnEncryption] = Gui->SpeedToString (result.EncryptionSpeed);
fields[ColumnDecryption] = Gui->SpeedToString (result.DecryptionSpeed);
@@ -85,10 +85,10 @@ namespace VeraCrypt
Gui->AppendToListCtrl (BenchmarkListCtrl, fields);
}
-
+
BenchmarkListCtrl->SetColumnWidth(0, wxLIST_AUTOSIZE);
}
-
+
void BenchmarkDialog::DoBenchmark (list<BenchmarkResult>& results, Buffer& buffer)
{
try
diff --git a/src/Main/Forms/BenchmarkDialog.h b/src/Main/Forms/BenchmarkDialog.h
index 228bbf2..403f383 100644
--- a/src/Main/Forms/BenchmarkDialog.h
+++ b/src/Main/Forms/BenchmarkDialog.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -42,7 +42,7 @@ namespace VeraCrypt
void DoBenchmark (list<BenchmarkResult>& results, Buffer& buffer);
void OnBenchmarkButtonClick (wxCommandEvent& event);
-
+
class BenchmarkThreadRoutine : public WaitThreadRoutine
{
public:
diff --git a/src/Main/Forms/ChangePasswordDialog.cpp b/src/Main/Forms/ChangePasswordDialog.cpp
index b3e0bd0..ac8e814 100644
--- a/src/Main/Forms/ChangePasswordDialog.cpp
+++ b/src/Main/Forms/ChangePasswordDialog.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -59,7 +59,7 @@ namespace VeraCrypt
NewPasswordPanel = new VolumePasswordPanel (this, NULL, newPassword, true, newKeyfiles, false, enableNewPassword, enableNewKeyfiles, enableNewPassword, enablePkcs5Prf);
NewPasswordPanel->UpdateEvent.Connect (EventConnector <ChangePasswordDialog> (this, &ChangePasswordDialog::OnPasswordPanelUpdate));
NewPasswordPanelSizer->Add (NewPasswordPanel, 1, wxALL | wxEXPAND);
-
+
if (mode == Mode::RemoveAllKeyfiles)
NewSizer->Show (false);
@@ -98,7 +98,7 @@ namespace VeraCrypt
CurrentPasswordPanel->SetFocusToPimTextCtrl();
return;
}
-
+
shared_ptr <VolumePassword> newPassword;
int newPim = 0;
if (DialogMode == Mode::ChangePasswordAndKeyfiles)
@@ -110,7 +110,7 @@ namespace VeraCrypt
catch (PasswordException& e)
{
Gui->ShowWarning (e);
- NewPasswordPanel->SetFocusToPasswordTextCtrl();
+ NewPasswordPanel->SetFocusToPasswordTextCtrl();
return;
}
newPim = NewPasswordPanel->GetVolumePim();
@@ -126,7 +126,7 @@ namespace VeraCrypt
{
if (newPim > 0 && newPim < 485)
{
- Gui->ShowError ("PIM_REQUIRE_LONG_PASSWORD");
+ Gui->ShowError ("PIM_REQUIRE_LONG_PASSWORD");
return;
}
@@ -235,7 +235,7 @@ namespace VeraCrypt
if (passwordEmpty && keyfilesEmpty)
ok = false;
-
+
if (CurrentPasswordPanel->GetVolumePim () == -1)
ok = false;
@@ -251,7 +251,7 @@ namespace VeraCrypt
ok = false;
if (DialogMode == Mode::ChangePasswordAndKeyfiles
- && ( (NewPasswordPanel->GetPassword()->IsEmpty() && newKeyfilesEmpty)
+ && ( (NewPasswordPanel->GetPassword()->IsEmpty() && newKeyfilesEmpty)
|| !NewPasswordPanel->PasswordsMatch()
|| (NewPasswordPanel->GetVolumePim() == -1)
)
@@ -265,12 +265,12 @@ namespace VeraCrypt
}
OKButton->Enable (ok);
-
+
if (DialogMode == Mode::ChangePasswordAndKeyfiles)
{
bool pimChanged = (CurrentPasswordPanel->GetVolumePim() != NewPasswordPanel->GetVolumePim());
NewPasswordPanel->UpdatePimHelpText(pimChanged);
}
-
+
}
}
diff --git a/src/Main/Forms/ChangePasswordDialog.h b/src/Main/Forms/ChangePasswordDialog.h
index 6caaaea..2ba8399 100644
--- a/src/Main/Forms/ChangePasswordDialog.h
+++ b/src/Main/Forms/ChangePasswordDialog.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/Forms/DeviceSelectionDialog.cpp b/src/Main/Forms/DeviceSelectionDialog.cpp
index 9d70623..764edf3 100644
--- a/src/Main/Forms/DeviceSelectionDialog.cpp
+++ b/src/Main/Forms/DeviceSelectionDialog.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -39,7 +39,7 @@ namespace VeraCrypt
DeviceListCtrl->InsertColumn (ColumnMountPoint, LangString["MOUNT_POINT"], wxLIST_FORMAT_LEFT, 1);
colPermilles.push_back (396);
#endif
-
+
wxImageList *imageList = new wxImageList (16, 12, true);
imageList->Add (Resources::GetDriveIconBitmap(), Resources::GetDriveIconMaskBitmap());
DeviceListCtrl->AssignImageList (imageList, wxIMAGE_LIST_SMALL);
@@ -65,13 +65,13 @@ namespace VeraCrypt
fields[ColumnMountPoint] = device.MountPoint;
#endif
fields[ColumnSize] = Gui->SizeToString (device.Size);
- Gui->AppendToListCtrl (DeviceListCtrl, fields, 0, &device);
+ Gui->AppendToListCtrl (DeviceListCtrl, fields, 0, &device);
foreach_ref (HostDevice &partition, device.Partitions)
{
- fields[ColumnDevice] =
+ fields[ColumnDevice] =
#ifndef TC_WINDOWS
- wstring (L" ") +
+ wstring (L" ") +
#endif
wstring (partition.Path);
@@ -97,7 +97,7 @@ namespace VeraCrypt
StdButtonsOK->Disable();
StdButtonsOK->SetDefault();
}
-
+
void DeviceSelectionDialog::OnListItemActivated (wxListEvent& event)
{
if (StdButtonsOK->IsEnabled())
diff --git a/src/Main/Forms/DeviceSelectionDialog.h b/src/Main/Forms/DeviceSelectionDialog.h
index db19e15..76aaa6f 100644
--- a/src/Main/Forms/DeviceSelectionDialog.h
+++ b/src/Main/Forms/DeviceSelectionDialog.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/Forms/EncryptionOptionsWizardPage.cpp b/src/Main/Forms/EncryptionOptionsWizardPage.cpp
index cedc937..5af01d0 100644
--- a/src/Main/Forms/EncryptionOptionsWizardPage.cpp
+++ b/src/Main/Forms/EncryptionOptionsWizardPage.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -32,7 +32,7 @@ namespace VeraCrypt
}
EncryptionAlgorithmChoice->Select (0);
-
+
Hashes = Hash::GetAvailableAlgorithms();
foreach (shared_ptr <Hash> hash, Hashes)
{
@@ -117,7 +117,7 @@ namespace VeraCrypt
{
Gui->OpenHomepageLink (this, L"hashalgorithms");
}
-
+
void EncryptionOptionsWizardPage::OnTestButtonClick (wxCommandEvent& event)
{
EncryptionTestDialog dialog (this);
diff --git a/src/Main/Forms/EncryptionOptionsWizardPage.h b/src/Main/Forms/EncryptionOptionsWizardPage.h
index f9df752..58a7b5d 100644
--- a/src/Main/Forms/EncryptionOptionsWizardPage.h
+++ b/src/Main/Forms/EncryptionOptionsWizardPage.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/Forms/EncryptionTestDialog.cpp b/src/Main/Forms/EncryptionTestDialog.cpp
index 9d0b2ca..3698234 100644
--- a/src/Main/Forms/EncryptionTestDialog.cpp
+++ b/src/Main/Forms/EncryptionTestDialog.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -46,7 +46,7 @@ namespace VeraCrypt
Buffer key;
GetTextCtrlData (KeyTextCtrl, key);
-
+
if (key.Size() != ea->GetKeySize())
throw_err (LangString["TEST_KEY_SIZE"]);
@@ -100,7 +100,7 @@ namespace VeraCrypt
Buffer sector (ENCRYPTION_DATA_UNIT_SIZE);
BufferPtr block = sector.GetRange (blockNumber * ea->GetMaxBlockSize(), ea->GetMaxBlockSize());
-
+
block.CopyFrom (data);
if (encrypt)
@@ -130,7 +130,7 @@ namespace VeraCrypt
{
return Gui->GetSelectedData <EncryptionAlgorithm> (EncryptionAlgorithmChoice)->GetNew();
}
-
+
void EncryptionTestDialog::GetTextCtrlData (wxTextCtrl *textCtrl, Buffer &buffer) const
{
vector <byte> data;
diff --git a/src/Main/Forms/EncryptionTestDialog.h b/src/Main/Forms/EncryptionTestDialog.h
index fc4551a..1d0ccfb 100644
--- a/src/Main/Forms/EncryptionTestDialog.h
+++ b/src/Main/Forms/EncryptionTestDialog.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/Forms/FavoriteVolumesDialog.cpp b/src/Main/Forms/FavoriteVolumesDialog.cpp
index 858339e..f6d5f7b 100644
--- a/src/Main/Forms/FavoriteVolumesDialog.cpp
+++ b/src/Main/Forms/FavoriteVolumesDialog.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -32,7 +32,7 @@ namespace VeraCrypt
Layout();
Fit();
Center();
-
+
#ifdef TC_MACOSX
// wxMac cannot insert items to wxListCtrl due to a bug
MoveUpButton->Show (false);
@@ -46,7 +46,7 @@ namespace VeraCrypt
fields[ColumnVolumePath] = favorite->Path;
fields[ColumnMountPoint] = favorite->MountPoint;
Gui->AppendToListCtrl (FavoritesListCtrl, fields, -1, favorite.get());
-
+
if (++itemCount > Favorites.size() - newItemCount)
{
FavoritesListCtrl->SetItemState (itemCount - 1, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
@@ -57,7 +57,7 @@ namespace VeraCrypt
UpdateButtons();
FavoritesListCtrl->SetFocus();
}
-
+
void FavoriteVolumesDialog::OnMoveDownButtonClick (wxCommandEvent& event)
{
FreezeScope freeze (this);
diff --git a/src/Main/Forms/FavoriteVolumesDialog.h b/src/Main/Forms/FavoriteVolumesDialog.h
index 8da274e..bff08e9 100644
--- a/src/Main/Forms/FavoriteVolumesDialog.h
+++ b/src/Main/Forms/FavoriteVolumesDialog.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -35,7 +35,7 @@ namespace VeraCrypt
void OnRemoveAllButtonClick (wxCommandEvent& event);
void OnRemoveButtonClick (wxCommandEvent& event);
void UpdateButtons ();
-
+
enum
{
ColumnVolumePath = 0,
diff --git a/src/Main/Forms/Forms.cpp b/src/Main/Forms/Forms.cpp
index 3f0fcc9..3b6dc2c 100644
--- a/src/Main/Forms/Forms.cpp
+++ b/src/Main/Forms/Forms.cpp
@@ -15,395 +15,395 @@ using namespace VeraCrypt;
MainFrameBase::MainFrameBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )
{
this->SetSizeHints( wxSize( -1,496 ), wxDefaultSize );
-
+
MainMenuBar = new wxMenuBar( 0 );
VolumesMenu = new wxMenu();
wxMenuItem* CreateNewVolumeMenuItem;
CreateNewVolumeMenuItem = new wxMenuItem( VolumesMenu, wxID_ANY, wxString( _("Create New Volume...") ) , wxEmptyString, wxITEM_NORMAL );
VolumesMenu->Append( CreateNewVolumeMenuItem );
-
+
VolumesMenu->AppendSeparator();
-
+
MountVolumeMenuItem = new wxMenuItem( VolumesMenu, wxID_ANY, wxString( _("Mount Volume") ) , wxEmptyString, wxITEM_NORMAL );
VolumesMenu->Append( MountVolumeMenuItem );
-
+
wxMenuItem* AutoMountDevicesMenuItem;
AutoMountDevicesMenuItem = new wxMenuItem( VolumesMenu, wxID_ANY, wxString( _("Auto-Mount All Device-Hosted Volumes") ) , wxEmptyString, wxITEM_NORMAL );
VolumesMenu->Append( AutoMountDevicesMenuItem );
-
+
VolumesMenu->AppendSeparator();
-
+
DismountVolumeMenuItem = new wxMenuItem( VolumesMenu, wxID_ANY, wxString( _("Dismount Volume") ) , wxEmptyString, wxITEM_NORMAL );
VolumesMenu->Append( DismountVolumeMenuItem );
-
+
DismountAllMenuItem = new wxMenuItem( VolumesMenu, wxID_ANY, wxString( _("Dismount All Mounted Volumes") ) , wxEmptyString, wxITEM_NORMAL );
VolumesMenu->Append( DismountAllMenuItem );
-
+
VolumesMenu->AppendSeparator();
-
+
wxMenuItem* ChangePasswordMenuItem;
ChangePasswordMenuItem = new wxMenuItem( VolumesMenu, wxID_ANY, wxString( _("Change Volume Password...") ) , wxEmptyString, wxITEM_NORMAL );
VolumesMenu->Append( ChangePasswordMenuItem );
-
+
wxMenuItem* ChangePkcs5PrfMenuItem;
ChangePkcs5PrfMenuItem = new wxMenuItem( VolumesMenu, wxID_ANY, wxString( _("Change Header Key Derivation Algorithm...") ) , wxEmptyString, wxITEM_NORMAL );
VolumesMenu->Append( ChangePkcs5PrfMenuItem );
-
+
wxMenuItem* ChangeKeyfilesMenuItem;
ChangeKeyfilesMenuItem = new wxMenuItem( VolumesMenu, wxID_ANY, wxString( _("Add/Remove Keyfiles to/from Volume...") ) , wxEmptyString, wxITEM_NORMAL );
VolumesMenu->Append( ChangeKeyfilesMenuItem );
-
+
wxMenuItem* RemoveKeyfilesMenuItem;
RemoveKeyfilesMenuItem = new wxMenuItem( VolumesMenu, wxID_ANY, wxString( _("Remove All Keyfiles from Volume...") ) , wxEmptyString, wxITEM_NORMAL );
VolumesMenu->Append( RemoveKeyfilesMenuItem );
-
+
VolumesMenu->AppendSeparator();
-
+
VolumePropertiesMenuItem = new wxMenuItem( VolumesMenu, wxID_ANY, wxString( _("Volume Properties...") ) , wxEmptyString, wxITEM_NORMAL );
VolumesMenu->Append( VolumePropertiesMenuItem );
-
- MainMenuBar->Append( VolumesMenu, _("&Volumes") );
-
+
+ MainMenuBar->Append( VolumesMenu, _("&Volumes") );
+
FavoritesMenu = new wxMenu();
AddToFavoritesMenuItem = new wxMenuItem( FavoritesMenu, wxID_ANY, wxString( _("Add Selected Volume to Favorites...") ) , wxEmptyString, wxITEM_NORMAL );
FavoritesMenu->Append( AddToFavoritesMenuItem );
-
+
AddAllMountedToFavoritesMenuItem = new wxMenuItem( FavoritesMenu, wxID_ANY, wxString( _("Add All Mounted Volumes to Favorites...") ) , wxEmptyString, wxITEM_NORMAL );
FavoritesMenu->Append( AddAllMountedToFavoritesMenuItem );
-
+
wxMenuItem* OrganizeFavoritesMenuItem;
OrganizeFavoritesMenuItem = new wxMenuItem( FavoritesMenu, wxID_ANY, wxString( _("Organize Favorite Volumes...") ) , wxEmptyString, wxITEM_NORMAL );
FavoritesMenu->Append( OrganizeFavoritesMenuItem );
-
+
FavoritesMenu->AppendSeparator();
-
+
wxMenuItem* MountAllFavoritesMenuItem;
MountAllFavoritesMenuItem = new wxMenuItem( FavoritesMenu, wxID_ANY, wxString( _("Mount Favorite Volumes") ) , wxEmptyString, wxITEM_NORMAL );
FavoritesMenu->Append( MountAllFavoritesMenuItem );
-
+
FavoritesMenu->AppendSeparator();
-
- MainMenuBar->Append( FavoritesMenu, _("&Favorites") );
-
+
+ MainMenuBar->Append( FavoritesMenu, _("&Favorites") );
+
ToolsMenu = new wxMenu();
wxMenuItem* BenchmarkMenuItem;
BenchmarkMenuItem = new wxMenuItem( ToolsMenu, wxID_ANY, wxString( _("Benchmark...") ) , wxEmptyString, wxITEM_NORMAL );
ToolsMenu->Append( BenchmarkMenuItem );
-
+
wxMenuItem* EncryptionTestMenuItem;
EncryptionTestMenuItem = new wxMenuItem( ToolsMenu, wxID_ANY, wxString( _("Test Vectors...") ) , wxEmptyString, wxITEM_NORMAL );
ToolsMenu->Append( EncryptionTestMenuItem );
-
+
ToolsMenu->AppendSeparator();
-
+
wxMenuItem* VolumeCreationWizardMenuItem;
VolumeCreationWizardMenuItem = new wxMenuItem( ToolsMenu, wxID_ANY, wxString( _("Volume Creation Wizard") ) , wxEmptyString, wxITEM_NORMAL );
ToolsMenu->Append( VolumeCreationWizardMenuItem );
-
+
ToolsMenu->AppendSeparator();
-
+
BackupVolumeHeadersMenuItem = new wxMenuItem( ToolsMenu, wxID_ANY, wxString( _("Backup Volume Header...") ) , wxEmptyString, wxITEM_NORMAL );
ToolsMenu->Append( BackupVolumeHeadersMenuItem );
-
+
RestoreVolumeHeaderMenuItem = new wxMenuItem( ToolsMenu, wxID_ANY, wxString( _("Restore Volume Header...") ) , wxEmptyString, wxITEM_NORMAL );
ToolsMenu->Append( RestoreVolumeHeaderMenuItem );
-
+
ToolsMenu->AppendSeparator();
-
+
wxMenuItem* CreateKeyfileMenuItem;
CreateKeyfileMenuItem = new wxMenuItem( ToolsMenu, wxID_ANY, wxString( _("Keyfile Generator") ) , wxEmptyString, wxITEM_NORMAL );
ToolsMenu->Append( CreateKeyfileMenuItem );
-
+
wxMenuItem* ManageSecurityTokenKeyfilesMenuItem;
ManageSecurityTokenKeyfilesMenuItem = new wxMenuItem( ToolsMenu, wxID_ANY, wxString( _("Manage Security Token Keyfiles...") ) , wxEmptyString, wxITEM_NORMAL );
ToolsMenu->Append( ManageSecurityTokenKeyfilesMenuItem );
-
+
wxMenuItem* CloseAllSecurityTokenSessionsMenuItem;
CloseAllSecurityTokenSessionsMenuItem = new wxMenuItem( ToolsMenu, wxID_ANY, wxString( _("Close All Security Token Sessions") ) , wxEmptyString, wxITEM_NORMAL );
ToolsMenu->Append( CloseAllSecurityTokenSessionsMenuItem );
-
+
ToolsMenu->AppendSeparator();
-
+
WipeCachedPasswordsMenuItem = new wxMenuItem( ToolsMenu, wxID_ANY, wxString( _("Wipe Cached Passwords") ) , wxEmptyString, wxITEM_NORMAL );
ToolsMenu->Append( WipeCachedPasswordsMenuItem );
-
- MainMenuBar->Append( ToolsMenu, _("T&ools") );
-
+
+ MainMenuBar->Append( ToolsMenu, _("T&ools") );
+
SettingsMenu = new wxMenu();
HotkeysMenuItem = new wxMenuItem( SettingsMenu, wxID_ANY, wxString( _("Hotkeys...") ) , wxEmptyString, wxITEM_NORMAL );
SettingsMenu->Append( HotkeysMenuItem );
-
+
wxMenuItem* DefaultKeyfilesMenuItem;
DefaultKeyfilesMenuItem = new wxMenuItem( SettingsMenu, wxID_ANY, wxString( _("Default Keyfiles...") ) , wxEmptyString, wxITEM_NORMAL );
SettingsMenu->Append( DefaultKeyfilesMenuItem );
-
+
wxMenuItem* DefaultMountParametersMenuItem;
DefaultMountParametersMenuItem = new wxMenuItem( SettingsMenu, wxID_ANY, wxString( _("Default Mount Parameters...") ) , wxEmptyString, wxITEM_NORMAL );
SettingsMenu->Append( DefaultMountParametersMenuItem );
-
+
wxMenuItem* SecurityTokenPreferencesMenuItem;
SecurityTokenPreferencesMenuItem = new wxMenuItem( SettingsMenu, wxID_ANY, wxString( _("Security Tokens...") ) , wxEmptyString, wxITEM_NORMAL );
SettingsMenu->Append( SecurityTokenPreferencesMenuItem );
-
+
SettingsMenu->AppendSeparator();
-
+
PreferencesMenuItem = new wxMenuItem( SettingsMenu, wxID_PREFERENCES, wxString( _("&Preferences...") ) , wxEmptyString, wxITEM_NORMAL );
SettingsMenu->Append( PreferencesMenuItem );
-
- MainMenuBar->Append( SettingsMenu, _("Settin&gs") );
-
+
+ MainMenuBar->Append( SettingsMenu, _("Settin&gs") );
+
HelpMenu = new wxMenu();
wxMenuItem* UserGuideMenuItem;
UserGuideMenuItem = new wxMenuItem( HelpMenu, wxID_HELP, wxString( _("User's Guide") ) , wxEmptyString, wxITEM_NORMAL );
HelpMenu->Append( UserGuideMenuItem );
-
+
wxMenuItem* OnlineHelpMenuItem;
OnlineHelpMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("Online Help") ) , wxEmptyString, wxITEM_NORMAL );
HelpMenu->Append( OnlineHelpMenuItem );
-
+
wxMenuItem* BeginnersTutorialMenuItem;
BeginnersTutorialMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("Beginner's Tutorial") ) , wxEmptyString, wxITEM_NORMAL );
HelpMenu->Append( BeginnersTutorialMenuItem );
-
+
wxMenuItem* FaqMenuItem;
FaqMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("Frequently Asked Questions") ) , wxEmptyString, wxITEM_NORMAL );
HelpMenu->Append( FaqMenuItem );
-
+
HelpMenu->AppendSeparator();
-
+
wxMenuItem* WebsiteMenuItem;
WebsiteMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("VeraCrypt Website") ) , wxEmptyString, wxITEM_NORMAL );
HelpMenu->Append( WebsiteMenuItem );
-
+
wxMenuItem* DownloadsMenuItem;
DownloadsMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("Downloads") ) , wxEmptyString, wxITEM_NORMAL );
HelpMenu->Append( DownloadsMenuItem );
-
+
wxMenuItem* NewsMenuItem;
NewsMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("News") ) , wxEmptyString, wxITEM_NORMAL );
HelpMenu->Append( NewsMenuItem );
-
+
wxMenuItem* VersionHistoryMenuItem;
VersionHistoryMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("Version History") ) , wxEmptyString, wxITEM_NORMAL );
HelpMenu->Append( VersionHistoryMenuItem );
-
+
HelpMenu->AppendSeparator();
-
+
wxMenuItem* DonateMenuItem;
DonateMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("Donate") ) , wxEmptyString, wxITEM_NORMAL );
HelpMenu->Append( DonateMenuItem );
-
+
wxMenuItem* ContactMenuItem;
ContactMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("Contact") ) , wxEmptyString, wxITEM_NORMAL );
HelpMenu->Append( ContactMenuItem );
-
+
wxMenuItem* LegalNoticesMenuItem;
LegalNoticesMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("Legal Notices") ) , wxEmptyString, wxITEM_NORMAL );
HelpMenu->Append( LegalNoticesMenuItem );
-
+
wxMenuItem* AboutMenuItem;
AboutMenuItem = new wxMenuItem( HelpMenu, wxID_ABOUT, wxString( _("About") ) , wxEmptyString, wxITEM_NORMAL );
HelpMenu->Append( AboutMenuItem );
-
- MainMenuBar->Append( HelpMenu, _("&Help") );
-
+
+ MainMenuBar->Append( HelpMenu, _("&Help") );
+
this->SetMenuBar( MainMenuBar );
-
+
wxBoxSizer* bSizer1;
bSizer1 = new wxBoxSizer( wxVERTICAL );
-
+
MainPanel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxBoxSizer* bSizer2;
bSizer2 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer48;
bSizer48 = new wxBoxSizer( wxVERTICAL );
-
+
wxStaticBoxSizer* sbSizer1;
sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( MainPanel, wxID_ANY, wxEmptyString ), wxVERTICAL );
-
+
SlotListCtrl = new wxListCtrl( MainPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_VRULES|wxSUNKEN_BORDER );
sbSizer1->Add( SlotListCtrl, 1, wxALL|wxEXPAND, 5 );
-
-
+
+
bSizer48->Add( sbSizer1, 1, wxEXPAND, 5 );
-
+
LowStaticBoxSizer = new wxStaticBoxSizer( new wxStaticBox( MainPanel, wxID_ANY, wxEmptyString ), wxVERTICAL );
-
+
HigherButtonSizer = new wxBoxSizer( wxVERTICAL );
-
-
+
+
LowStaticBoxSizer->Add( HigherButtonSizer, 0, wxEXPAND|wxTOP, 2 );
-
+
wxGridSizer* gSizer1;
gSizer1 = new wxGridSizer( 1, 3, 0, 0 );
-
+
wxBoxSizer* bSizer17;
bSizer17 = new wxBoxSizer( wxVERTICAL );
-
- bSizer17->SetMinSize( wxSize( 138,34 ) );
+
+ bSizer17->SetMinSize( wxSize( 138,34 ) );
CreateVolumeButton = new wxButton( MainPanel, wxID_ANY, _("&Create Volume"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer17->Add( CreateVolumeButton, 1, wxALL|wxEXPAND, 5 );
-
-
+
+
gSizer1->Add( bSizer17, 0, 0, 5 );
-
+
wxBoxSizer* bSizer18;
bSizer18 = new wxBoxSizer( wxVERTICAL );
-
- bSizer18->SetMinSize( wxSize( 138,34 ) );
+
+ bSizer18->SetMinSize( wxSize( 138,34 ) );
VolumePropertiesButton = new wxButton( MainPanel, wxID_ANY, _("&Volume Properties..."), wxDefaultPosition, wxDefaultSize, 0 );
bSizer18->Add( VolumePropertiesButton, 1, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-
-
+
+
gSizer1->Add( bSizer18, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
+
wxBoxSizer* bSizer19;
bSizer19 = new wxBoxSizer( wxVERTICAL );
-
- bSizer19->SetMinSize( wxSize( 138,34 ) );
+
+ bSizer19->SetMinSize( wxSize( 138,34 ) );
WipeCacheButton = new wxButton( MainPanel, wxID_ANY, _("&Wipe Cache"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer19->Add( WipeCacheButton, 1, wxALL|wxALIGN_RIGHT|wxEXPAND, 5 );
-
-
+
+
gSizer1->Add( bSizer19, 0, wxALIGN_RIGHT, 5 );
-
-
+
+
LowStaticBoxSizer->Add( gSizer1, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-
-
+
+
LowStaticBoxSizer->Add( 0, 0, 0, 0, 5 );
-
+
VolumeStaticBoxSizer = new wxStaticBoxSizer( new wxStaticBox( MainPanel, wxID_ANY, _("Volume") ), wxVERTICAL );
-
+
VolumeGridBagSizer = new wxGridBagSizer( 0, 0 );
VolumeGridBagSizer->SetFlexibleDirection( wxBOTH );
VolumeGridBagSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
+
LogoBitmap = new wxStaticBitmap( MainPanel, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER );
LogoBitmap->SetMinSize( wxSize( 42,52 ) );
-
+
VolumeGridBagSizer->Add( LogoBitmap, wxGBPosition( 0, 0 ), wxGBSpan( 2, 1 ), wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
- VolumePathComboBox = new wxComboBox( MainPanel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN );
+
+ VolumePathComboBox = new wxComboBox( MainPanel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN );
VolumeGridBagSizer->Add( VolumePathComboBox, wxGBPosition( 0, 1 ), wxGBSpan( 1, 2 ), wxEXPAND|wxALL, 5 );
-
+
wxBoxSizer* bSizer191;
bSizer191 = new wxBoxSizer( wxVERTICAL );
-
- bSizer191->SetMinSize( wxSize( 138,34 ) );
+
+ bSizer191->SetMinSize( wxSize( 138,34 ) );
SelectFileButton = new wxButton( MainPanel, wxID_ANY, _("Select &File..."), wxDefaultPosition, wxDefaultSize, 0 );
bSizer191->Add( SelectFileButton, 1, wxALL|wxEXPAND, 5 );
-
-
+
+
VolumeGridBagSizer->Add( bSizer191, wxGBPosition( 0, 3 ), wxGBSpan( 1, 1 ), wxEXPAND, 5 );
-
+
NoHistoryCheckBox = new wxCheckBox( MainPanel, wxID_ANY, _("&Never save history"), wxDefaultPosition, wxDefaultSize, 0 );
VolumeGridBagSizer->Add( NoHistoryCheckBox, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
+
wxBoxSizer* bSizer20;
bSizer20 = new wxBoxSizer( wxVERTICAL );
-
- bSizer20->SetMinSize( wxSize( 138,34 ) );
+
+ bSizer20->SetMinSize( wxSize( 138,34 ) );
VolumeToolsButton = new wxButton( MainPanel, wxID_ANY, _("Volume &Tools..."), wxDefaultPosition, wxDefaultSize, 0 );
bSizer20->Add( VolumeToolsButton, 1, wxALL|wxEXPAND, 5 );
-
-
+
+
VolumeGridBagSizer->Add( bSizer20, wxGBPosition( 1, 2 ), wxGBSpan( 1, 1 ), wxALIGN_RIGHT, 5 );
-
+
wxBoxSizer* bSizer21;
bSizer21 = new wxBoxSizer( wxVERTICAL );
-
- bSizer21->SetMinSize( wxSize( 138,34 ) );
+
+ bSizer21->SetMinSize( wxSize( 138,34 ) );
SelectDeviceButton = new wxButton( MainPanel, wxID_ANY, _("Select D&evice..."), wxDefaultPosition, wxDefaultSize, 0 );
bSizer21->Add( SelectDeviceButton, 1, wxEXPAND|wxALL, 5 );
-
-
+
+
VolumeGridBagSizer->Add( bSizer21, wxGBPosition( 1, 3 ), wxGBSpan( 1, 1 ), wxEXPAND, 5 );
-
-
+
+
VolumeGridBagSizer->AddGrowableCol( 1 );
VolumeGridBagSizer->AddGrowableRow( 0 );
-
+
VolumeStaticBoxSizer->Add( VolumeGridBagSizer, 1, wxEXPAND|wxALL, 4 );
-
-
+
+
LowStaticBoxSizer->Add( VolumeStaticBoxSizer, 1, wxEXPAND, 5 );
-
-
+
+
LowStaticBoxSizer->Add( 0, 0, 0, 0, 5 );
-
+
wxGridSizer* gSizer2;
gSizer2 = new wxGridSizer( 1, 4, 0, 0 );
-
+
wxStaticBoxSizer* sbSizer4;
sbSizer4 = new wxStaticBoxSizer( new wxStaticBox( MainPanel, wxID_ANY, wxEmptyString ), wxVERTICAL );
-
- sbSizer4->SetMinSize( wxSize( 139,-1 ) );
+
+ sbSizer4->SetMinSize( wxSize( 139,-1 ) );
VolumeButton = new wxButton( MainPanel, wxID_ANY, _("&Mount"), wxDefaultPosition, wxDefaultSize, 0 );
- VolumeButton->SetDefault();
+ VolumeButton->SetDefault();
VolumeButton->SetMinSize( wxSize( -1,32 ) );
-
+
sbSizer4->Add( VolumeButton, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP, 2 );
-
-
+
+
gSizer2->Add( sbSizer4, 1, wxEXPAND, 0 );
-
+
wxStaticBoxSizer* sbSizer41;
sbSizer41 = new wxStaticBoxSizer( new wxStaticBox( MainPanel, wxID_ANY, wxEmptyString ), wxVERTICAL );
-
+
MountAllDevicesButton = new wxButton( MainPanel, wxID_ANY, _("&Auto-Mount Devices"), wxDefaultPosition, wxDefaultSize, 0 );
MountAllDevicesButton->SetMinSize( wxSize( -1,32 ) );
-
+
sbSizer41->Add( MountAllDevicesButton, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP, 2 );
-
-
+
+
gSizer2->Add( sbSizer41, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-
+
wxStaticBoxSizer* sbSizer42;
sbSizer42 = new wxStaticBoxSizer( new wxStaticBox( MainPanel, wxID_ANY, wxEmptyString ), wxVERTICAL );
-
+
DismountAllButton = new wxButton( MainPanel, wxID_ANY, _("Di&smount All"), wxDefaultPosition, wxDefaultSize, 0 );
DismountAllButton->SetMinSize( wxSize( -1,32 ) );
-
+
sbSizer42->Add( DismountAllButton, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP, 2 );
-
-
+
+
gSizer2->Add( sbSizer42, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-
+
wxStaticBoxSizer* sbSizer43;
sbSizer43 = new wxStaticBoxSizer( new wxStaticBox( MainPanel, wxID_ANY, wxEmptyString ), wxVERTICAL );
-
+
ExitButton = new wxButton( MainPanel, wxID_ANY, _("E&xit"), wxDefaultPosition, wxDefaultSize, 0 );
ExitButton->SetMinSize( wxSize( -1,32 ) );
-
+
sbSizer43->Add( ExitButton, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP, 2 );
-
-
+
+
gSizer2->Add( sbSizer43, 1, wxALIGN_RIGHT|wxEXPAND, 5 );
-
-
+
+
LowStaticBoxSizer->Add( gSizer2, 0, wxEXPAND, 5 );
-
-
+
+
bSizer48->Add( LowStaticBoxSizer, 0, wxEXPAND, 5 );
-
-
+
+
bSizer2->Add( bSizer48, 1, wxEXPAND, 5 );
-
-
+
+
MainPanel->SetSizer( bSizer2 );
MainPanel->Layout();
bSizer2->Fit( MainPanel );
bSizer1->Add( MainPanel, 1, wxEXPAND, 0 );
-
-
+
+
this->SetSizer( bSizer1 );
this->Layout();
bSizer1->Fit( this );
-
+
this->Centre( wxBOTH );
-
+
// Connect Events
this->Connect( wxEVT_ACTIVATE, wxActivateEventHandler( MainFrameBase::OnActivate ) );
this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainFrameBase::OnClose ) );
@@ -526,96 +526,96 @@ MainFrameBase::~MainFrameBase()
MountAllDevicesButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnMountAllDevicesButtonClick ), NULL, this );
DismountAllButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnDismountAllButtonClick ), NULL, this );
ExitButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainFrameBase::OnExitButtonClick ), NULL, this );
-
+
}
WizardFrameBase::WizardFrameBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )
{
this->SetSizeHints( wxSize( 800,500 ), wxDefaultSize );
-
+
MainSizer = new wxBoxSizer( wxVERTICAL );
-
+
MainPanel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxBoxSizer* bSizer63;
bSizer63 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer64;
bSizer64 = new wxBoxSizer( wxVERTICAL );
-
+
wxStaticBoxSizer* sbSizer27;
sbSizer27 = new wxStaticBoxSizer( new wxStaticBox( MainPanel, wxID_ANY, wxEmptyString ), wxHORIZONTAL );
-
+
WizardBitmap = new wxStaticBitmap( MainPanel, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
sbSizer27->Add( WizardBitmap, 0, wxALL|wxEXPAND, 5 );
-
+
wxBoxSizer* bSizer66;
bSizer66 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer126;
bSizer126 = new wxBoxSizer( wxHORIZONTAL );
-
+
PageTitleStaticText = new wxStaticText( MainPanel, wxID_ANY, _("Page Title"), wxDefaultPosition, wxDefaultSize, 0 );
PageTitleStaticText->Wrap( -1 );
PageTitleStaticText->SetFont( wxFont( 16, 70, 90, 90, false, wxT("Times New Roman") ) );
-
+
bSizer126->Add( PageTitleStaticText, 0, wxALL, 5 );
-
-
+
+
bSizer66->Add( bSizer126, 0, wxLEFT, 5 );
-
+
PageSizer = new wxBoxSizer( wxVERTICAL );
-
-
+
+
bSizer66->Add( PageSizer, 1, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-
+
+
sbSizer27->Add( bSizer66, 1, wxEXPAND|wxLEFT, 5 );
-
-
+
+
bSizer64->Add( sbSizer27, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-
+
wxBoxSizer* bSizer70;
bSizer70 = new wxBoxSizer( wxHORIZONTAL );
-
-
+
+
bSizer70->Add( 0, 0, 1, wxEXPAND, 5 );
-
+
HelpButton = new wxButton( MainPanel, wxID_HELP, _("&Help"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer70->Add( HelpButton, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
-
-
+
+
bSizer70->Add( 0, 0, 0, wxLEFT|wxALIGN_RIGHT, 5 );
-
+
PreviousButton = new wxButton( MainPanel, wxID_ANY, _("< &Prev"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer70->Add( PreviousButton, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
-
+
NextButton = new wxButton( MainPanel, wxID_ANY, _("&Next >"), wxDefaultPosition, wxDefaultSize, 0|wxWANTS_CHARS );
- NextButton->SetDefault();
+ NextButton->SetDefault();
bSizer70->Add( NextButton, 0, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
-
-
+
+
bSizer70->Add( 0, 0, 0, wxLEFT|wxALIGN_RIGHT, 5 );
-
+
CancelButton = new wxButton( MainPanel, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer70->Add( CancelButton, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
-
-
+
+
bSizer64->Add( bSizer70, 0, wxEXPAND|wxALIGN_RIGHT|wxALL, 5 );
-
-
+
+
bSizer63->Add( bSizer64, 1, wxEXPAND, 5 );
-
-
+
+
MainPanel->SetSizer( bSizer63 );
MainPanel->Layout();
bSizer63->Fit( MainPanel );
MainSizer->Add( MainPanel, 1, wxEXPAND, 5 );
-
-
+
+
this->SetSizer( MainSizer );
this->Layout();
MainSizer->Fit( this );
-
+
// Connect Events
this->Connect( wxEVT_ACTIVATE, wxActivateEventHandler( WizardFrameBase::OnActivate ) );
this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( WizardFrameBase::OnClose ) );
@@ -636,123 +636,123 @@ WizardFrameBase::~WizardFrameBase()
PreviousButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WizardFrameBase::OnPreviousButtonClick ), NULL, this );
NextButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WizardFrameBase::OnNextButtonClick ), NULL, this );
CancelButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WizardFrameBase::OnCancelButtonClick ), NULL, this );
-
+
}
AboutDialogBase::AboutDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
{
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-
+
wxBoxSizer* bSizer116;
bSizer116 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer117;
bSizer117 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer120;
bSizer120 = new wxBoxSizer( wxVERTICAL );
-
- bSizer120->SetMinSize( wxSize( -1,78 ) );
+
+ bSizer120->SetMinSize( wxSize( -1,78 ) );
m_panel14 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
m_panel14->SetBackgroundColour( wxColour( 10, 108, 206 ) );
-
+
wxBoxSizer* bSizer121;
bSizer121 = new wxBoxSizer( wxVERTICAL );
-
-
+
+
bSizer121->Add( 0, 0, 1, wxEXPAND|wxALL, 5 );
-
+
wxBoxSizer* bSizer122;
bSizer122 = new wxBoxSizer( wxVERTICAL );
-
+
LogoBitmap = new wxStaticBitmap( m_panel14, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
bSizer122->Add( LogoBitmap, 0, wxALL, 10 );
-
-
+
+
bSizer121->Add( bSizer122, 0, wxEXPAND|wxLEFT, 8 );
-
-
+
+
m_panel14->SetSizer( bSizer121 );
m_panel14->Layout();
bSizer121->Fit( m_panel14 );
bSizer120->Add( m_panel14, 1, wxEXPAND, 5 );
-
-
+
+
bSizer117->Add( bSizer120, 0, wxEXPAND, 5 );
-
+
wxBoxSizer* bSizer118;
bSizer118 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer123;
bSizer123 = new wxBoxSizer( wxVERTICAL );
-
+
VersionStaticText = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
VersionStaticText->Wrap( -1 );
bSizer123->Add( VersionStaticText, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-
-
+
+
bSizer123->Add( 0, 0, 0, wxTOP, 3 );
-
+
CopyrightStaticText = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
CopyrightStaticText->Wrap( -1 );
bSizer123->Add( CopyrightStaticText, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
-
+
+
bSizer123->Add( 0, 0, 0, wxTOP, 3 );
-
+
WebsiteHyperlink = new wxHyperlinkCtrl( this, wxID_ANY, wxEmptyString, wxT("."), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-
+
WebsiteHyperlink->SetHoverColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ) );
WebsiteHyperlink->SetNormalColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ) );
WebsiteHyperlink->SetVisitedColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ) );
bSizer123->Add( WebsiteHyperlink, 0, wxALL, 5 );
-
-
+
+
bSizer118->Add( bSizer123, 1, wxEXPAND|wxLEFT, 5 );
-
-
+
+
bSizer117->Add( bSizer118, 1, wxALL|wxEXPAND, 15 );
-
+
m_staticline3 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
bSizer117->Add( m_staticline3, 0, wxEXPAND|wxBOTTOM, 5 );
-
+
CreditsTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxSUNKEN_BORDER );
bSizer117->Add( CreditsTextCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 10 );
-
-
+
+
bSizer117->Add( 0, 0, 0, wxTOP, 5 );
-
+
m_staticline4 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
bSizer117->Add( m_staticline4, 0, wxEXPAND|wxTOP|wxBOTTOM, 3 );
-
+
m_staticline5 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
bSizer117->Add( m_staticline5, 0, wxEXPAND|wxBOTTOM, 5 );
-
+
wxBoxSizer* bSizer119;
bSizer119 = new wxBoxSizer( wxHORIZONTAL );
-
-
+
+
bSizer119->Add( 0, 0, 1, wxEXPAND|wxALL, 5 );
-
+
wxButton* OKButton;
OKButton = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
- OKButton->SetDefault();
+ OKButton->SetDefault();
bSizer119->Add( OKButton, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
+
+
bSizer119->Add( 0, 0, 0, wxLEFT, 5 );
-
-
+
+
bSizer117->Add( bSizer119, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 6 );
-
-
+
+
bSizer116->Add( bSizer117, 1, wxEXPAND, 5 );
-
-
+
+
this->SetSizer( bSizer116 );
this->Layout();
bSizer116->Fit( this );
-
+
// Connect Events
WebsiteHyperlink->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( AboutDialogBase::OnWebsiteHyperlinkClick ), NULL, this );
}
@@ -761,76 +761,76 @@ AboutDialogBase::~AboutDialogBase()
{
// Disconnect Events
WebsiteHyperlink->Disconnect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( AboutDialogBase::OnWebsiteHyperlinkClick ), NULL, this );
-
+
}
BenchmarkDialogBase::BenchmarkDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
{
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-
+
wxBoxSizer* bSizer153;
bSizer153 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer154;
bSizer154 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer155;
bSizer155 = new wxBoxSizer( wxHORIZONTAL );
-
+
wxStaticText* m_staticText54;
m_staticText54 = new wxStaticText( this, wxID_ANY, _("Buffer Size:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText54->Wrap( -1 );
bSizer155->Add( m_staticText54, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
+
wxArrayString BufferSizeChoiceChoices;
BufferSizeChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, BufferSizeChoiceChoices, 0 );
BufferSizeChoice->SetSelection( 0 );
bSizer155->Add( BufferSizeChoice, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
+
+
bSizer154->Add( bSizer155, 0, wxEXPAND, 5 );
-
+
wxStaticLine* m_staticline6;
m_staticline6 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
bSizer154->Add( m_staticline6, 0, wxEXPAND | wxALL, 5 );
-
+
wxBoxSizer* bSizer156;
bSizer156 = new wxBoxSizer( wxHORIZONTAL );
-
+
BenchmarkListCtrl = new wxListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxSUNKEN_BORDER );
bSizer156->Add( BenchmarkListCtrl, 1, wxALL|wxEXPAND, 5 );
-
+
RightSizer = new wxBoxSizer( wxVERTICAL );
-
+
BenchmarkButton = new wxButton( this, wxID_OK, _("Benchmark"), wxDefaultPosition, wxDefaultSize, 0 );
- BenchmarkButton->SetDefault();
+ BenchmarkButton->SetDefault();
RightSizer->Add( BenchmarkButton, 0, wxALL|wxEXPAND, 5 );
-
+
wxButton* CancelButton;
CancelButton = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
RightSizer->Add( CancelButton, 0, wxALL|wxEXPAND, 5 );
-
-
+
+
RightSizer->Add( 0, 0, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
-
+
BenchmarkNoteStaticText = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
BenchmarkNoteStaticText->Wrap( -1 );
RightSizer->Add( BenchmarkNoteStaticText, 1, wxALL|wxEXPAND, 5 );
-
-
+
+
bSizer156->Add( RightSizer, 0, wxEXPAND, 5 );
-
-
+
+
bSizer154->Add( bSizer156, 1, wxEXPAND, 5 );
-
-
+
+
bSizer153->Add( bSizer154, 1, wxEXPAND|wxALL, 5 );
-
-
+
+
this->SetSizer( bSizer153 );
this->Layout();
bSizer153->Fit( this );
-
+
// Connect Events
BenchmarkButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BenchmarkDialogBase::OnBenchmarkButtonClick ), NULL, this );
}
@@ -839,67 +839,67 @@ BenchmarkDialogBase::~BenchmarkDialogBase()
{
// Disconnect Events
BenchmarkButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BenchmarkDialogBase::OnBenchmarkButtonClick ), NULL, this );
-
+
}
ChangePasswordDialogBase::ChangePasswordDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
{
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
this->SetExtraStyle( GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY );
-
+
wxBoxSizer* bSizer30;
bSizer30 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer31;
bSizer31 = new wxBoxSizer( wxHORIZONTAL );
-
+
wxBoxSizer* bSizer32;
bSizer32 = new wxBoxSizer( wxVERTICAL );
-
+
CurrentSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Current") ), wxVERTICAL );
-
+
CurrentPasswordPanelSizer = new wxBoxSizer( wxVERTICAL );
-
-
+
+
CurrentSizer->Add( CurrentPasswordPanelSizer, 0, wxALIGN_LEFT, 5 );
-
-
+
+
bSizer32->Add( CurrentSizer, 0, wxEXPAND, 5 );
-
+
NewSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("New") ), wxVERTICAL );
-
+
NewPasswordPanelSizer = new wxBoxSizer( wxVERTICAL );
-
-
+
+
NewSizer->Add( NewPasswordPanelSizer, 0, wxALIGN_LEFT, 5 );
-
-
+
+
bSizer32->Add( NewSizer, 0, wxTOP|wxEXPAND, 5 );
-
-
+
+
bSizer31->Add( bSizer32, 1, wxEXPAND|wxALL, 5 );
-
+
wxBoxSizer* bSizer33;
bSizer33 = new wxBoxSizer( wxVERTICAL );
-
+
OKButton = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
- OKButton->SetDefault();
+ OKButton->SetDefault();
bSizer33->Add( OKButton, 0, wxALL|wxEXPAND, 5 );
-
+
CancelButton = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer33->Add( CancelButton, 0, wxALL|wxEXPAND, 5 );
-
-
+
+
bSizer31->Add( bSizer33, 0, 0, 5 );
-
-
+
+
bSizer30->Add( bSizer31, 1, wxEXPAND|wxALL, 5 );
-
-
+
+
this->SetSizer( bSizer30 );
this->Layout();
bSizer30->Fit( this );
-
+
// Connect Events
OKButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ChangePasswordDialogBase::OnOKButtonClick ), NULL, this );
}
@@ -908,42 +908,42 @@ ChangePasswordDialogBase::~ChangePasswordDialogBase()
{
// Disconnect Events
OKButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ChangePasswordDialogBase::OnOKButtonClick ), NULL, this );
-
+
}
DeviceSelectionDialogBase::DeviceSelectionDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
{
this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
this->SetExtraStyle( GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY );
-
+
wxBoxSizer* bSizer3;
bSizer3 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer4;
bSizer4 = new wxBoxSizer( wxVERTICAL );
-
+
DeviceListCtrl = new wxListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_VRULES|wxSUNKEN_BORDER );
bSizer4->Add( DeviceListCtrl, 1, wxALL|wxEXPAND, 5 );
-
+
StdButtons = new wxStdDialogButtonSizer();
StdButtonsOK = new wxButton( this, wxID_OK );
StdButtons->AddButton( StdButtonsOK );
StdButtonsCancel = new wxButton( this, wxID_CANCEL );
StdButtons->AddButton( StdButtonsCancel );
StdButtons->Realize();
-
+
bSizer4->Add( StdButtons, 0, wxEXPAND|wxALL, 5 );
-
-
+
+
bSizer3->Add( bSizer4, 1, wxEXPAND|wxALL, 5 );
-
-
+
+
this->SetSizer( bSizer3 );
this->Layout();
bSizer3->Fit( this );
-
+
this->Centre( wxBOTH );
-
+
// Connect Events
DeviceListCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( DeviceSelectionDialogBase::OnListItemActivated ), NULL, this );
DeviceListCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( DeviceSelectionDialogBase::OnListItemDeselected ), NULL, this );
@@ -956,154 +956,154 @@ DeviceSelectionDialogBase::~DeviceSelectionDialogBase()
DeviceListCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( DeviceSelectionDialogBase::OnListItemActivated ), NULL, this );
DeviceListCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( DeviceSelectionDialogBase::OnListItemDeselected ), NULL, this );
DeviceListCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( DeviceSelectionDialogBase::OnListItemSelected ), NULL, this );
-
+
}
EncryptionTestDialogBase::EncryptionTestDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
{
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-
+
wxBoxSizer* bSizer132;
bSizer132 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer133;
bSizer133 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer134;
bSizer134 = new wxBoxSizer( wxHORIZONTAL );
-
+
wxStaticText* m_staticText41;
m_staticText41 = new wxStaticText( this, wxID_ANY, _("Encryption algorithm:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText41->Wrap( -1 );
bSizer134->Add( m_staticText41, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
+
wxArrayString EncryptionAlgorithmChoiceChoices;
EncryptionAlgorithmChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, EncryptionAlgorithmChoiceChoices, 0 );
EncryptionAlgorithmChoice->SetSelection( 0 );
bSizer134->Add( EncryptionAlgorithmChoice, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
+
XtsModeCheckBox = new wxCheckBox( this, wxID_ANY, _("XTS mode"), wxDefaultPosition, wxDefaultSize, 0 );
- XtsModeCheckBox->SetValue(true);
+ XtsModeCheckBox->SetValue(true);
bSizer134->Add( XtsModeCheckBox, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
+
+
bSizer133->Add( bSizer134, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
+
wxStaticBoxSizer* sbSizer38;
sbSizer38 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Key (hexadecimal)") ), wxVERTICAL );
-
+
KeyTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- KeyTextCtrl->SetMaxLength( 0 );
+ KeyTextCtrl->SetMaxLength( 0 );
KeyTextCtrl->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxT("Courier") ) );
-
+
sbSizer38->Add( KeyTextCtrl, 1, wxALL|wxEXPAND, 5 );
-
+
wxBoxSizer* bSizer135;
bSizer135 = new wxBoxSizer( wxHORIZONTAL );
-
+
wxStaticText* m_staticText43;
m_staticText43 = new wxStaticText( this, wxID_ANY, _("Key size:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText43->Wrap( -1 );
bSizer135->Add( m_staticText43, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
+
KeySizeStaticText = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
KeySizeStaticText->Wrap( -1 );
bSizer135->Add( KeySizeStaticText, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
-
-
+
+
sbSizer38->Add( bSizer135, 0, wxEXPAND, 5 );
-
-
+
+
bSizer133->Add( sbSizer38, 0, wxEXPAND|wxALL, 5 );
-
+
wxStaticBoxSizer* sbSizer39;
sbSizer39 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("XTS mode") ), wxVERTICAL );
-
+
wxStaticText* m_staticText45;
m_staticText45 = new wxStaticText( this, wxID_ANY, _("Secondary key (hexadecimal)"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText45->Wrap( -1 );
sbSizer39->Add( m_staticText45, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-
+
SecondaryKeyTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- SecondaryKeyTextCtrl->SetMaxLength( 0 );
+ SecondaryKeyTextCtrl->SetMaxLength( 0 );
SecondaryKeyTextCtrl->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxT("Courier") ) );
-
+
sbSizer39->Add( SecondaryKeyTextCtrl, 0, wxEXPAND|wxALL, 5 );
-
+
wxStaticText* m_staticText46;
m_staticText46 = new wxStaticText( this, wxID_ANY, _("Data unit number (64-bit, data unit size is 512 bytes)"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText46->Wrap( -1 );
sbSizer39->Add( m_staticText46, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-
+
DataUnitNumberTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- DataUnitNumberTextCtrl->SetMaxLength( 0 );
+ DataUnitNumberTextCtrl->SetMaxLength( 0 );
sbSizer39->Add( DataUnitNumberTextCtrl, 0, wxALL, 5 );
-
+
wxStaticText* m_staticText47;
m_staticText47 = new wxStaticText( this, wxID_ANY, _("Block number:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText47->Wrap( -1 );
sbSizer39->Add( m_staticText47, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-
+
BlockNumberTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- BlockNumberTextCtrl->SetMaxLength( 0 );
+ BlockNumberTextCtrl->SetMaxLength( 0 );
sbSizer39->Add( BlockNumberTextCtrl, 0, wxALL, 5 );
-
-
+
+
bSizer133->Add( sbSizer39, 1, wxEXPAND|wxALL, 5 );
-
+
wxStaticBoxSizer* sbSizer40;
sbSizer40 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Plaintext (hexadecimal)") ), wxVERTICAL );
-
+
PlainTextTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- PlainTextTextCtrl->SetMaxLength( 0 );
+ PlainTextTextCtrl->SetMaxLength( 0 );
PlainTextTextCtrl->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxT("Courier") ) );
-
+
sbSizer40->Add( PlainTextTextCtrl, 0, wxALL|wxEXPAND, 5 );
-
-
+
+
bSizer133->Add( sbSizer40, 0, wxEXPAND|wxALL, 5 );
-
+
wxStaticBoxSizer* sbSizer41;
sbSizer41 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Ciphertext (hexadecimal)") ), wxVERTICAL );
-
+
CipherTextTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- CipherTextTextCtrl->SetMaxLength( 0 );
+ CipherTextTextCtrl->SetMaxLength( 0 );
CipherTextTextCtrl->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxT("Courier") ) );
-
+
sbSizer41->Add( CipherTextTextCtrl, 0, wxALL|wxEXPAND, 5 );
-
-
+
+
bSizer133->Add( sbSizer41, 0, wxEXPAND|wxALL, 5 );
-
+
wxBoxSizer* bSizer136;
bSizer136 = new wxBoxSizer( wxHORIZONTAL );
-
+
EncryptButton = new wxButton( this, wxID_ANY, _("&Encrypt"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer136->Add( EncryptButton, 0, wxALL, 5 );
-
+
DecryptButton = new wxButton( this, wxID_ANY, _("&Decrypt"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer136->Add( DecryptButton, 0, wxALL, 5 );
-
+
AutoTestAllButton = new wxButton( this, wxID_ANY, _("&Auto-Test All"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer136->Add( AutoTestAllButton, 0, wxALL, 5 );
-
+
ResetButton = new wxButton( this, wxID_ANY, _("&Reset"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer136->Add( ResetButton, 0, wxALL, 5 );
-
+
CloseButton = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer136->Add( CloseButton, 0, wxALL, 5 );
-
-
+
+
bSizer133->Add( bSizer136, 0, wxEXPAND, 5 );
-
-
+
+
bSizer132->Add( bSizer133, 1, wxEXPAND|wxALL, 5 );
-
-
+
+
this->SetSizer( bSizer132 );
this->Layout();
bSizer132->Fit( this );
-
+
// Connect Events
EncryptionAlgorithmChoice->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( EncryptionTestDialogBase::OnEncryptionAlgorithmSelected ), NULL, this );
XtsModeCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( EncryptionTestDialogBase::OnXtsModeCheckBoxClick ), NULL, this );
@@ -1122,79 +1122,79 @@ EncryptionTestDialogBase::~EncryptionTestDialogBase()
DecryptButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( EncryptionTestDialogBase::OnDecryptButtonClick ), NULL, this );
AutoTestAllButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( EncryptionTestDialogBase::OnAutoTestAllButtonClick ), NULL, this );
ResetButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( EncryptionTestDialogBase::OnResetButtonClick ), NULL, this );
-
+
}
FavoriteVolumesDialogBase::FavoriteVolumesDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
{
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-
+
wxBoxSizer* bSizer57;
bSizer57 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer60;
bSizer60 = new wxBoxSizer( wxHORIZONTAL );
-
+
wxBoxSizer* bSizer58;
bSizer58 = new wxBoxSizer( wxVERTICAL );
-
+
FavoritesListCtrl = new wxListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_VRULES|wxSUNKEN_BORDER );
bSizer58->Add( FavoritesListCtrl, 1, wxALL|wxEXPAND, 5 );
-
+
wxGridSizer* gSizer5;
gSizer5 = new wxGridSizer( 1, 4, 0, 0 );
-
+
MoveUpButton = new wxButton( this, wxID_ANY, _("Move &Up"), wxDefaultPosition, wxDefaultSize, 0 );
gSizer5->Add( MoveUpButton, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-
+
MoveDownButton = new wxButton( this, wxID_ANY, _("Move &Down"), wxDefaultPosition, wxDefaultSize, 0 );
gSizer5->Add( MoveDownButton, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-
+
RemoveButton = new wxButton( this, wxID_ANY, _("&Remove"), wxDefaultPosition, wxDefaultSize, 0 );
gSizer5->Add( RemoveButton, 0, wxALIGN_RIGHT|wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
+
RemoveAllButton = new wxButton( this, wxID_ANY, _("Remove &All"), wxDefaultPosition, wxDefaultSize, 0 );
gSizer5->Add( RemoveAllButton, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-
+
+
bSizer58->Add( gSizer5, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-
+
wxFlexGridSizer* fgSizer4;
fgSizer4 = new wxFlexGridSizer( 1, 5, 0, 0 );
fgSizer4->AddGrowableCol( 2 );
fgSizer4->SetFlexibleDirection( wxBOTH );
fgSizer4->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
-
+
+
fgSizer4->Add( 0, 0, 1, wxEXPAND, 5 );
-
-
+
+
bSizer58->Add( fgSizer4, 0, wxEXPAND, 5 );
-
-
+
+
bSizer60->Add( bSizer58, 1, wxEXPAND, 5 );
-
+
wxBoxSizer* bSizer59;
bSizer59 = new wxBoxSizer( wxVERTICAL );
-
+
OKButton = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
- OKButton->SetDefault();
+ OKButton->SetDefault();
bSizer59->Add( OKButton, 0, wxALL, 5 );
-
+
CancelButton = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer59->Add( CancelButton, 0, wxALL, 5 );
-
-
+
+
bSizer60->Add( bSizer59, 0, wxEXPAND, 5 );
-
-
+
+
bSizer57->Add( bSizer60, 1, wxEXPAND|wxALL, 5 );
-
-
+
+
this->SetSizer( bSizer57 );
this->Layout();
bSizer57->Fit( this );
-
+
// Connect Events
FavoritesListCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( FavoriteVolumesDialogBase::OnListItemDeselected ), NULL, this );
FavoritesListCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( FavoriteVolumesDialogBase::OnListItemSelected ), NULL, this );
@@ -1215,91 +1215,91 @@ FavoriteVolumesDialogBase::~FavoriteVolumesDialogBase()
RemoveButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FavoriteVolumesDialogBase::OnRemoveButtonClick ), NULL, this );
RemoveAllButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FavoriteVolumesDialogBase::OnRemoveAllButtonClick ), NULL, this );
OKButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FavoriteVolumesDialogBase::OnOKButtonClick ), NULL, this );
-
+
}
KeyfilesDialogBase::KeyfilesDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
{
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
this->SetExtraStyle( GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY );
-
+
wxBoxSizer* bSizer26;
bSizer26 = new wxBoxSizer( wxVERTICAL );
-
+
UpperSizer = new wxBoxSizer( wxHORIZONTAL );
-
+
PanelSizer = new wxBoxSizer( wxVERTICAL );
-
-
+
+
UpperSizer->Add( PanelSizer, 1, wxEXPAND, 5 );
-
+
wxBoxSizer* bSizer22;
bSizer22 = new wxBoxSizer( wxVERTICAL );
-
+
OKButton = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
- OKButton->SetDefault();
+ OKButton->SetDefault();
bSizer22->Add( OKButton, 0, wxALL|wxEXPAND, 5 );
-
+
CancelButton = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer22->Add( CancelButton, 0, wxALL|wxEXPAND, 5 );
-
+
WarningStaticText = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
WarningStaticText->Wrap( -1 );
bSizer22->Add( WarningStaticText, 1, wxALL|wxEXPAND, 5 );
-
-
+
+
UpperSizer->Add( bSizer22, 0, wxEXPAND, 5 );
-
-
+
+
bSizer26->Add( UpperSizer, 1, wxTOP|wxRIGHT|wxLEFT, 5 );
-
+
wxBoxSizer* bSizer23;
bSizer23 = new wxBoxSizer( wxVERTICAL );
-
+
KeyfilesNoteSizer = new wxBoxSizer( wxVERTICAL );
-
+
wxStaticLine* m_staticline1;
m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
KeyfilesNoteSizer->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 );
-
+
KeyfilesNoteStaticText = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
KeyfilesNoteStaticText->Wrap( -1 );
KeyfilesNoteSizer->Add( KeyfilesNoteStaticText, 0, wxALL|wxEXPAND, 5 );
-
+
wxStaticLine* m_staticline2;
m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
KeyfilesNoteSizer->Add( m_staticline2, 0, wxEXPAND | wxALL, 5 );
-
-
+
+
bSizer23->Add( KeyfilesNoteSizer, 1, wxEXPAND, 5 );
-
+
wxFlexGridSizer* fgSizer2;
fgSizer2 = new wxFlexGridSizer( 1, 2, 0, 0 );
fgSizer2->AddGrowableCol( 0 );
fgSizer2->SetFlexibleDirection( wxBOTH );
fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
+
KeyfilesHyperlink = new wxHyperlinkCtrl( this, wxID_ANY, _("More information on keyfiles"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-
+
KeyfilesHyperlink->SetHoverColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ) );
KeyfilesHyperlink->SetNormalColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ) );
KeyfilesHyperlink->SetVisitedColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ) );
fgSizer2->Add( KeyfilesHyperlink, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
+
CreateKeyfileButtton = new wxButton( this, wxID_ANY, _("&Generate Random Keyfile..."), wxDefaultPosition, wxDefaultSize, 0 );
fgSizer2->Add( CreateKeyfileButtton, 0, wxALL, 5 );
-
-
+
+
bSizer23->Add( fgSizer2, 0, wxEXPAND, 5 );
-
-
+
+
bSizer26->Add( bSizer23, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
-
+
+
this->SetSizer( bSizer26 );
this->Layout();
bSizer26->Fit( this );
-
+
// Connect Events
KeyfilesHyperlink->Connect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( KeyfilesDialogBase::OnKeyfilesHyperlinkClick ), NULL, this );
CreateKeyfileButtton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( KeyfilesDialogBase::OnCreateKeyfileButttonClick ), NULL, this );
@@ -1310,158 +1310,158 @@ KeyfilesDialogBase::~KeyfilesDialogBase()
// Disconnect Events
KeyfilesHyperlink->Disconnect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( KeyfilesDialogBase::OnKeyfilesHyperlinkClick ), NULL, this );
CreateKeyfileButtton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( KeyfilesDialogBase::OnCreateKeyfileButttonClick ), NULL, this );
-
+
}
KeyfileGeneratorDialogBase::KeyfileGeneratorDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
{
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-
+
MainSizer = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer144;
bSizer144 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer145;
bSizer145 = new wxBoxSizer( wxHORIZONTAL );
-
-
+
+
bSizer145->Add( 0, 0, 1, wxEXPAND, 5 );
-
+
wxStaticText* m_staticText49;
m_staticText49 = new wxStaticText( this, wxID_ANY, _("Mixing PRF:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText49->Wrap( -1 );
bSizer145->Add( m_staticText49, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
+
wxArrayString HashChoiceChoices;
HashChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, HashChoiceChoices, 0 );
HashChoice->SetSelection( 0 );
bSizer145->Add( HashChoice, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
+
+
bSizer145->Add( 0, 0, 1, wxEXPAND, 5 );
-
-
+
+
bSizer144->Add( bSizer145, 0, wxEXPAND, 5 );
-
+
wxStaticBoxSizer* sbSizer43;
sbSizer43 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxEmptyString ), wxVERTICAL );
-
+
wxBoxSizer* bSizer147;
bSizer147 = new wxBoxSizer( wxHORIZONTAL );
-
+
wxStaticText* m_staticText52;
m_staticText52 = new wxStaticText( this, wxID_ANY, _("Random Pool:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText52->Wrap( -1 );
bSizer147->Add( m_staticText52, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-
+
RandomPoolStaticText = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
RandomPoolStaticText->Wrap( -1 );
RandomPoolStaticText->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxT("Courier New") ) );
-
+
bSizer147->Add( RandomPoolStaticText, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
+
ShowRandomPoolCheckBox = new wxCheckBox( this, wxID_ANY, _("Show"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer147->Add( ShowRandomPoolCheckBox, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
+
+
sbSizer43->Add( bSizer147, 0, wxEXPAND|wxTOP, 5 );
-
-
+
+
sbSizer43->Add( 0, 0, 1, wxEXPAND, 5 );
-
+
wxStaticBoxSizer* sbSizer45;
sbSizer45 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Randomness Collected From Mouse Movements") ), wxVERTICAL );
-
+
CollectedEntropy = new wxGauge( this, wxID_ANY, 2560, wxDefaultPosition, wxDefaultSize, wxGA_HORIZONTAL|wxGA_SMOOTH );
- CollectedEntropy->SetValue( 0 );
+ CollectedEntropy->SetValue( 0 );
sbSizer45->Add( CollectedEntropy, 1, wxALL|wxEXPAND, 5 );
-
-
+
+
sbSizer43->Add( sbSizer45, 0, wxBOTTOM|wxEXPAND|wxTOP, 5 );
-
-
+
+
sbSizer43->Add( 0, 0, 1, wxEXPAND, 5 );
-
+
MouseStaticText = new wxStaticText( this, wxID_ANY, _("IMPORTANT: Move your mouse as randomly as possible within this window. The longer you move it, the better. This significantly increases the cryptographic strength of the keyfile."), wxDefaultPosition, wxDefaultSize, 0 );
MouseStaticText->Wrap( -1 );
sbSizer43->Add( MouseStaticText, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
+
+
sbSizer43->Add( 0, 0, 1, wxEXPAND, 5 );
-
-
+
+
bSizer144->Add( sbSizer43, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
+
wxBoxSizer* bSizer162;
bSizer162 = new wxBoxSizer( wxVERTICAL );
-
+
wxFlexGridSizer* fgSizer8;
fgSizer8 = new wxFlexGridSizer( 3, 3, 0, 0 );
fgSizer8->AddGrowableCol( 2 );
fgSizer8->SetFlexibleDirection( wxBOTH );
fgSizer8->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
+
m_staticText60 = new wxStaticText( this, wxID_ANY, _("Number of keyfiles:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText60->Wrap( -1 );
fgSizer8->Add( m_staticText60, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
+
NumberOfKeyfiles = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 1, 9999999, 1 );
fgSizer8->Add( NumberOfKeyfiles, 0, wxALL, 5 );
-
+
m_panel18 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
fgSizer8->Add( m_panel18, 1, wxEXPAND | wxALL, 5 );
-
+
m_staticText63 = new wxStaticText( this, wxID_ANY, _("Keyfiles size (in Bytes):"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText63->Wrap( -1 );
fgSizer8->Add( m_staticText63, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
+
KeyfilesSize = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 64, 1048576, 64 );
fgSizer8->Add( KeyfilesSize, 0, wxALL, 5 );
-
+
RandomSizeCheckBox = new wxCheckBox( this, wxID_ANY, _("Random size (64 <-> 1048576)"), wxDefaultPosition, wxDefaultSize, 0 );
fgSizer8->Add( RandomSizeCheckBox, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
+
m_staticText65 = new wxStaticText( this, wxID_ANY, _("Keyfiles base name:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText65->Wrap( -1 );
fgSizer8->Add( m_staticText65, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
+
KeyfilesBaseName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
fgSizer8->Add( KeyfilesBaseName, 0, wxALL, 5 );
-
+
m_panel19 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
fgSizer8->Add( m_panel19, 1, wxEXPAND | wxALL, 5 );
-
-
+
+
bSizer162->Add( fgSizer8, 1, wxEXPAND, 5 );
-
-
+
+
bSizer144->Add( bSizer162, 0, wxALL|wxEXPAND, 5 );
-
+
wxBoxSizer* bSizer146;
bSizer146 = new wxBoxSizer( wxHORIZONTAL );
-
+
GenerateButton = new wxButton( this, wxID_ANY, _("Generate and Save Keyfile..."), wxDefaultPosition, wxDefaultSize, 0 );
bSizer146->Add( GenerateButton, 0, wxALL, 5 );
-
-
+
+
bSizer146->Add( 0, 0, 1, wxEXPAND, 5 );
-
+
wxButton* m_button61;
m_button61 = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer146->Add( m_button61, 0, wxALL, 5 );
-
-
+
+
bSizer144->Add( bSizer146, 0, wxEXPAND, 5 );
-
-
+
+
MainSizer->Add( bSizer144, 1, wxEXPAND|wxALL, 5 );
-
-
+
+
this->SetSizer( MainSizer );
this->Layout();
MainSizer->Fit( this );
-
+
// Connect Events
this->Connect( wxEVT_MOTION, wxMouseEventHandler( KeyfileGeneratorDialogBase::OnMouseMotion ) );
HashChoice->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( KeyfileGeneratorDialogBase::OnHashSelected ), NULL, this );
@@ -1478,31 +1478,31 @@ KeyfileGeneratorDialogBase::~KeyfileGeneratorDialogBase()
ShowRandomPoolCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( KeyfileGeneratorDialogBase::OnShowRandomPoolCheckBoxClicked ), NULL, this );
RandomSizeCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( KeyfileGeneratorDialogBase::OnRandomSizeCheckBoxClicked ), NULL, this );
GenerateButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( KeyfileGeneratorDialogBase::OnGenerateButtonClick ), NULL, this );
-
+
}
LegalNoticesDialogBase::LegalNoticesDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
{
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-
+
wxBoxSizer* bSizer114;
bSizer114 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer115;
bSizer115 = new wxBoxSizer( wxVERTICAL );
-
+
LegalNoticesTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY );
bSizer115->Add( LegalNoticesTextCtrl, 1, wxALL|wxEXPAND, 5 );
-
+
wxButton* OKButton;
OKButton = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
- OKButton->SetDefault();
+ OKButton->SetDefault();
bSizer115->Add( OKButton, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
+
+
bSizer114->Add( bSizer115, 1, wxEXPAND|wxALL, 5 );
-
-
+
+
this->SetSizer( bSizer114 );
this->Layout();
bSizer114->Fit( this );
@@ -1516,163 +1516,163 @@ MountOptionsDialogBase::MountOptionsDialogBase( wxWindow* parent, wxWindowID id,
{
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
this->SetExtraStyle( GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY );
-
+
MainSizer = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer19;
bSizer19 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer14;
bSizer14 = new wxBoxSizer( wxHORIZONTAL );
-
+
PasswordSizer = new wxBoxSizer( wxVERTICAL );
-
-
+
+
bSizer14->Add( PasswordSizer, 1, wxEXPAND, 5 );
-
+
wxBoxSizer* bSizer9;
bSizer9 = new wxBoxSizer( wxVERTICAL );
-
+
OKButton = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
- OKButton->SetDefault();
+ OKButton->SetDefault();
bSizer9->Add( OKButton, 0, wxALL|wxEXPAND, 5 );
-
+
CancelButton = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer9->Add( CancelButton, 0, wxALL|wxEXPAND, 5 );
-
-
+
+
bSizer9->Add( 0, 0, 1, wxTOP|wxEXPAND, 5 );
-
+
OptionsButton = new wxButton( this, wxID_ANY, _("Op&tions"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer9->Add( OptionsButton, 0, wxALL|wxEXPAND, 5 );
-
-
+
+
bSizer14->Add( bSizer9, 0, wxEXPAND, 5 );
-
-
+
+
bSizer19->Add( bSizer14, 0, wxEXPAND|wxALL, 5 );
-
+
wxBoxSizer* bSizer6;
bSizer6 = new wxBoxSizer( wxVERTICAL );
-
+
OptionsPanel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
OptionsSizer = new wxStaticBoxSizer( new wxStaticBox( OptionsPanel, wxID_ANY, wxEmptyString ), wxVERTICAL );
-
-
+
+
OptionsSizer->Add( 0, 0, 0, wxTOP, 5 );
-
+
ReadOnlyCheckBox = new wxCheckBox( OptionsPanel, wxID_ANY, _("Mount volume as &read-only"), wxDefaultPosition, wxDefaultSize, 0 );
OptionsSizer->Add( ReadOnlyCheckBox, 0, wxALL, 5 );
-
+
RemovableCheckBox = new wxCheckBox( OptionsPanel, wxID_ANY, _("Mount volume as removable &medium"), wxDefaultPosition, wxDefaultSize, 0 );
OptionsSizer->Add( RemovableCheckBox, 0, wxALL, 5 );
-
+
PartitionInSystemEncryptionScopeCheckBox = new wxCheckBox( OptionsPanel, wxID_ANY, _("Mount partition &using system encryption (preboot authentication)"), wxDefaultPosition, wxDefaultSize, 0 );
OptionsSizer->Add( PartitionInSystemEncryptionScopeCheckBox, 0, wxALL, 5 );
-
+
ProtectionSizer = new wxStaticBoxSizer( new wxStaticBox( OptionsPanel, wxID_ANY, _("Hidden Volume Protection") ), wxVERTICAL );
-
+
ProtectionCheckBox = new wxCheckBox( OptionsPanel, wxID_ANY, _("&Protect hidden volume when mounting outer volume"), wxDefaultPosition, wxDefaultSize, 0 );
ProtectionSizer->Add( ProtectionCheckBox, 0, wxALL, 5 );
-
+
ProtectionPasswordSizer = new wxBoxSizer( wxVERTICAL );
-
-
+
+
ProtectionSizer->Add( ProtectionPasswordSizer, 1, wxEXPAND|wxLEFT, 5 );
-
+
ProtectionHyperlinkCtrl = new wxHyperlinkCtrl( OptionsPanel, wxID_ANY, _("What is hidden volume protection?"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-
+
ProtectionHyperlinkCtrl->SetHoverColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ) );
ProtectionHyperlinkCtrl->SetNormalColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ) );
ProtectionHyperlinkCtrl->SetVisitedColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ) );
ProtectionSizer->Add( ProtectionHyperlinkCtrl, 0, wxALL, 5 );
-
-
+
+
OptionsSizer->Add( ProtectionSizer, 1, wxEXPAND|wxALL, 5 );
-
+
FilesystemSizer = new wxBoxSizer( wxVERTICAL );
-
+
m_panel8 = new wxPanel( OptionsPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxStaticBoxSizer* sbSizer28;
sbSizer28 = new wxStaticBoxSizer( new wxStaticBox( m_panel8, wxID_ANY, _("Filesystem") ), wxVERTICAL );
-
+
wxBoxSizer* bSizer54;
bSizer54 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer55;
bSizer55 = new wxBoxSizer( wxVERTICAL );
-
+
NoFilesystemCheckBox = new wxCheckBox( m_panel8, wxID_ANY, _("Do &not mount"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer55->Add( NoFilesystemCheckBox, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-
-
+
+
bSizer54->Add( bSizer55, 1, wxEXPAND, 5 );
-
+
FilesystemOptionsSizer = new wxGridBagSizer( 0, 0 );
FilesystemOptionsSizer->SetFlexibleDirection( wxBOTH );
FilesystemOptionsSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
FilesystemOptionsSizer->SetEmptyCellSize( wxSize( 0,0 ) );
-
+
FilesystemSpacer = new wxBoxSizer( wxVERTICAL );
-
-
+
+
FilesystemOptionsSizer->Add( FilesystemSpacer, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxEXPAND|wxTOP, 5 );
-
+
MountPointTextCtrlStaticText = new wxStaticText( m_panel8, wxID_ANY, _("Mount at directory:"), wxDefaultPosition, wxDefaultSize, 0 );
MountPointTextCtrlStaticText->Wrap( -1 );
FilesystemOptionsSizer->Add( MountPointTextCtrlStaticText, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
+
MountPointTextCtrl = new wxTextCtrl( m_panel8, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- MountPointTextCtrl->SetMaxLength( 0 );
+ MountPointTextCtrl->SetMaxLength( 0 );
FilesystemOptionsSizer->Add( MountPointTextCtrl, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-
+
MountPointButton = new wxButton( m_panel8, wxID_ANY, _("Se&lect..."), wxDefaultPosition, wxDefaultSize, 0 );
FilesystemOptionsSizer->Add( MountPointButton, wxGBPosition( 1, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-
+
FilesystemOptionsStaticText = new wxStaticText( m_panel8, wxID_ANY, _("Mount options:"), wxDefaultPosition, wxDefaultSize, 0 );
FilesystemOptionsStaticText->Wrap( -1 );
FilesystemOptionsSizer->Add( FilesystemOptionsStaticText, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxLEFT, 5 );
-
+
FilesystemOptionsTextCtrl = new wxTextCtrl( m_panel8, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- FilesystemOptionsTextCtrl->SetMaxLength( 0 );
+ FilesystemOptionsTextCtrl->SetMaxLength( 0 );
FilesystemOptionsSizer->Add( FilesystemOptionsTextCtrl, wxGBPosition( 2, 1 ), wxGBSpan( 1, 2 ), wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
-
-
+
+
FilesystemOptionsSizer->AddGrowableCol( 1 );
-
+
bSizer54->Add( FilesystemOptionsSizer, 0, wxEXPAND, 5 );
-
-
+
+
sbSizer28->Add( bSizer54, 0, wxEXPAND|wxBOTTOM, 5 );
-
-
+
+
m_panel8->SetSizer( sbSizer28 );
m_panel8->Layout();
sbSizer28->Fit( m_panel8 );
FilesystemSizer->Add( m_panel8, 0, wxEXPAND | wxALL, 5 );
-
-
+
+
OptionsSizer->Add( FilesystemSizer, 0, wxEXPAND, 5 );
-
-
+
+
OptionsPanel->SetSizer( OptionsSizer );
OptionsPanel->Layout();
OptionsSizer->Fit( OptionsPanel );
bSizer6->Add( OptionsPanel, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
-
+
+
bSizer19->Add( bSizer6, 0, wxEXPAND, 5 );
-
-
+
+
MainSizer->Add( bSizer19, 1, wxEXPAND, 5 );
-
-
+
+
this->SetSizer( MainSizer );
this->Layout();
MainSizer->Fit( this );
-
+
this->Centre( wxBOTH );
-
+
// Connect Events
this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( MountOptionsDialogBase::OnInitDialog ) );
OKButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MountOptionsDialogBase::OnOKButtonClick ), NULL, this );
@@ -1695,69 +1695,69 @@ MountOptionsDialogBase::~MountOptionsDialogBase()
ProtectionHyperlinkCtrl->Disconnect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( MountOptionsDialogBase::OnProtectionHyperlinkClick ), NULL, this );
NoFilesystemCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MountOptionsDialogBase::OnNoFilesystemCheckBoxClick ), NULL, this );
MountPointButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MountOptionsDialogBase::OnMountPointButtonClick ), NULL, this );
-
+
}
NewSecurityTokenKeyfileDialogBase::NewSecurityTokenKeyfileDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
{
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-
+
wxBoxSizer* bSizer143;
bSizer143 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer144;
bSizer144 = new wxBoxSizer( wxVERTICAL );
-
+
wxStaticBoxSizer* sbSizer42;
sbSizer42 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxEmptyString ), wxVERTICAL );
-
+
wxFlexGridSizer* fgSizer7;
fgSizer7 = new wxFlexGridSizer( 2, 2, 0, 0 );
fgSizer7->SetFlexibleDirection( wxBOTH );
fgSizer7->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
+
wxStaticText* m_staticText47;
m_staticText47 = new wxStaticText( this, wxID_ANY, _("Security token:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
m_staticText47->Wrap( -1 );
fgSizer7->Add( m_staticText47, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
+
wxArrayString SecurityTokenChoiceChoices;
SecurityTokenChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, SecurityTokenChoiceChoices, 0 );
SecurityTokenChoice->SetSelection( 0 );
fgSizer7->Add( SecurityTokenChoice, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-
+
wxStaticText* m_staticText48;
m_staticText48 = new wxStaticText( this, wxID_ANY, _("Keyfile name:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
m_staticText48->Wrap( -1 );
fgSizer7->Add( m_staticText48, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
+
KeyfileNameTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- KeyfileNameTextCtrl->SetMaxLength( 0 );
+ KeyfileNameTextCtrl->SetMaxLength( 0 );
fgSizer7->Add( KeyfileNameTextCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, 5 );
-
-
+
+
sbSizer42->Add( fgSizer7, 1, wxEXPAND|wxTOP, 5 );
-
-
+
+
bSizer144->Add( sbSizer42, 1, wxEXPAND|wxALL, 5 );
-
+
StdButtons = new wxStdDialogButtonSizer();
StdButtonsOK = new wxButton( this, wxID_OK );
StdButtons->AddButton( StdButtonsOK );
StdButtonsCancel = new wxButton( this, wxID_CANCEL );
StdButtons->AddButton( StdButtonsCancel );
StdButtons->Realize();
-
+
bSizer144->Add( StdButtons, 0, wxALIGN_RIGHT|wxALL, 5 );
-
-
+
+
bSizer143->Add( bSizer144, 1, wxEXPAND|wxALL, 5 );
-
-
+
+
this->SetSizer( bSizer143 );
this->Layout();
bSizer143->Fit( this );
-
+
// Connect Events
KeyfileNameTextCtrl->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( NewSecurityTokenKeyfileDialogBase::OnKeyfileNameChanged ), NULL, this );
}
@@ -1766,94 +1766,94 @@ NewSecurityTokenKeyfileDialogBase::~NewSecurityTokenKeyfileDialogBase()
{
// Disconnect Events
KeyfileNameTextCtrl->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( NewSecurityTokenKeyfileDialogBase::OnKeyfileNameChanged ), NULL, this );
-
+
}
PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
{
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
this->SetExtraStyle( GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY );
-
+
wxBoxSizer* bSizer32;
bSizer32 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer41;
bSizer41 = new wxBoxSizer( wxVERTICAL );
-
+
PreferencesNotebook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
SecurityPage = new wxPanel( PreferencesNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxBoxSizer* bSizer44;
bSizer44 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer33;
bSizer33 = new wxBoxSizer( wxVERTICAL );
-
+
AutoDismountSizer = new wxStaticBoxSizer( new wxStaticBox( SecurityPage, wxID_ANY, _("Auto-Dismount") ), wxVERTICAL );
-
+
wxStaticBoxSizer* sbSizer13;
sbSizer13 = new wxStaticBoxSizer( new wxStaticBox( SecurityPage, wxID_ANY, _("Dismount All Volumes When") ), wxVERTICAL );
-
+
DismountOnLogOffCheckBox = new wxCheckBox( SecurityPage, wxID_ANY, _("User logs off"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer13->Add( DismountOnLogOffCheckBox, 0, wxALL, 5 );
-
+
DismountOnScreenSaverCheckBox = new wxCheckBox( SecurityPage, wxID_ANY, _("Screen saver is launched"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer13->Add( DismountOnScreenSaverCheckBox, 0, wxALL, 5 );
-
+
DismountOnPowerSavingCheckBox = new wxCheckBox( SecurityPage, wxID_ANY, _("System is entering power saving mode"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer13->Add( DismountOnPowerSavingCheckBox, 0, wxALL, 5 );
-
-
+
+
AutoDismountSizer->Add( sbSizer13, 0, wxEXPAND|wxALL, 5 );
-
+
wxBoxSizer* bSizer34;
bSizer34 = new wxBoxSizer( wxHORIZONTAL );
-
+
DismountOnInactivityCheckBox = new wxCheckBox( SecurityPage, wxID_ANY, _("Auto-dismount volume after no data has been read/written to it for"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer34->Add( DismountOnInactivityCheckBox, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-
+
DismountOnInactivitySpinCtrl = new wxSpinCtrl( SecurityPage, wxID_ANY, wxT("1"), wxDefaultPosition, wxSize( -1,-1 ), wxSP_ARROW_KEYS, 1, 9999, 1 );
DismountOnInactivitySpinCtrl->SetMinSize( wxSize( 60,-1 ) );
-
+
bSizer34->Add( DismountOnInactivitySpinCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
+
wxStaticText* m_staticText5;
m_staticText5 = new wxStaticText( SecurityPage, wxID_ANY, _("minutes"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText5->Wrap( -1 );
bSizer34->Add( m_staticText5, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-
-
+
+
AutoDismountSizer->Add( bSizer34, 0, wxEXPAND, 5 );
-
+
ForceAutoDismountCheckBox = new wxCheckBox( SecurityPage, wxID_ANY, _("Force auto-dismount even if volume contains open files or directories"), wxDefaultPosition, wxDefaultSize, 0 );
AutoDismountSizer->Add( ForceAutoDismountCheckBox, 0, wxALL, 5 );
-
-
+
+
bSizer33->Add( AutoDismountSizer, 0, wxEXPAND|wxALL, 5 );
-
+
FilesystemSecuritySizer = new wxStaticBoxSizer( new wxStaticBox( SecurityPage, wxID_ANY, _("Filesystem") ), wxVERTICAL );
-
+
PreserveTimestampsCheckBox = new wxCheckBox( SecurityPage, wxID_ANY, _("Preserve modification timestamp of file containers"), wxDefaultPosition, wxDefaultSize, 0 );
FilesystemSecuritySizer->Add( PreserveTimestampsCheckBox, 0, wxALL, 5 );
-
-
+
+
bSizer33->Add( FilesystemSecuritySizer, 0, wxEXPAND|wxALL, 5 );
-
+
wxStaticBoxSizer* sbSizer14;
sbSizer14 = new wxStaticBoxSizer( new wxStaticBox( SecurityPage, wxID_ANY, _("Password Cache") ), wxVERTICAL );
-
+
WipeCacheOnCloseCheckBox = new wxCheckBox( SecurityPage, wxID_ANY, _("Wipe after VeraCrypt window has been closed"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer14->Add( WipeCacheOnCloseCheckBox, 0, wxALL, 5 );
-
+
WipeCacheOnAutoDismountCheckBox = new wxCheckBox( SecurityPage, wxID_ANY, _("Wipe after volume has been auto-dismounted"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer14->Add( WipeCacheOnAutoDismountCheckBox, 0, wxALL, 5 );
-
-
+
+
bSizer33->Add( sbSizer14, 0, wxEXPAND|wxALL, 5 );
-
-
+
+
bSizer44->Add( bSizer33, 1, wxEXPAND|wxALL, 5 );
-
-
+
+
SecurityPage->SetSizer( bSizer44 );
SecurityPage->Layout();
bSizer44->Fit( SecurityPage );
@@ -1861,70 +1861,70 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
DefaultMountOptionsPage = new wxPanel( PreferencesNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxBoxSizer* bSizer46;
bSizer46 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer35;
bSizer35 = new wxBoxSizer( wxVERTICAL );
-
+
wxStaticBoxSizer* sbSizer15;
sbSizer15 = new wxStaticBoxSizer( new wxStaticBox( DefaultMountOptionsPage, wxID_ANY, _("Default Mount Options") ), wxVERTICAL );
-
+
MountReadOnlyCheckBox = new wxCheckBox( DefaultMountOptionsPage, wxID_ANY, _("Mount volumes as read-only"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer15->Add( MountReadOnlyCheckBox, 0, wxALL, 5 );
-
+
MountRemovableCheckBox = new wxCheckBox( DefaultMountOptionsPage, wxID_ANY, _("Mount volumes as removable media"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer15->Add( MountRemovableCheckBox, 0, wxALL, 5 );
-
+
CachePasswordsCheckBox = new wxCheckBox( DefaultMountOptionsPage, wxID_ANY, _("Cache passwords in memory"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer15->Add( CachePasswordsCheckBox, 0, wxALL, 5 );
-
+
TrueCryptModeCheckBox = new wxCheckBox( DefaultMountOptionsPage, wxID_ANY, _("TrueCrypt Mode"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer15->Add( TrueCryptModeCheckBox, 0, wxALL, 5 );
-
+
wxBoxSizer* bSizer163;
bSizer163 = new wxBoxSizer( wxHORIZONTAL );
-
+
Pkcs5PrfStaticText = new wxStaticText( DefaultMountOptionsPage, wxID_ANY, _("PKCS5-PRF:"), wxDefaultPosition, wxDefaultSize, 0 );
Pkcs5PrfStaticText->Wrap( -1 );
bSizer163->Add( Pkcs5PrfStaticText, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
+
wxArrayString Pkcs5PrfChoiceChoices;
Pkcs5PrfChoice = new wxChoice( DefaultMountOptionsPage, wxID_ANY, wxDefaultPosition, wxDefaultSize, Pkcs5PrfChoiceChoices, 0 );
Pkcs5PrfChoice->SetSelection( 0 );
bSizer163->Add( Pkcs5PrfChoice, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-
+
+
sbSizer15->Add( bSizer163, 0, wxEXPAND, 5 );
-
-
+
+
bSizer35->Add( sbSizer15, 0, wxEXPAND|wxALL, 5 );
-
+
FilesystemSizer = new wxStaticBoxSizer( new wxStaticBox( DefaultMountOptionsPage, wxID_ANY, _("Filesystem") ), wxVERTICAL );
-
+
wxFlexGridSizer* fgSizer3;
fgSizer3 = new wxFlexGridSizer( 1, 2, 0, 0 );
fgSizer3->AddGrowableCol( 1 );
fgSizer3->SetFlexibleDirection( wxBOTH );
fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
+
wxStaticText* m_staticText6;
m_staticText6 = new wxStaticText( DefaultMountOptionsPage, wxID_ANY, _("Mount options:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText6->Wrap( -1 );
fgSizer3->Add( m_staticText6, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
-
+
FilesystemOptionsTextCtrl = new wxTextCtrl( DefaultMountOptionsPage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- FilesystemOptionsTextCtrl->SetMaxLength( 0 );
+ FilesystemOptionsTextCtrl->SetMaxLength( 0 );
fgSizer3->Add( FilesystemOptionsTextCtrl, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-
-
+
+
FilesystemSizer->Add( fgSizer3, 1, wxEXPAND, 5 );
-
-
+
+
bSizer35->Add( FilesystemSizer, 0, wxEXPAND|wxALL, 5 );
-
-
+
+
bSizer46->Add( bSizer35, 1, wxEXPAND|wxALL, 5 );
-
-
+
+
DefaultMountOptionsPage->SetSizer( bSizer46 );
DefaultMountOptionsPage->Layout();
bSizer46->Fit( DefaultMountOptionsPage );
@@ -1932,41 +1932,41 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
BackgroundTaskPanel = new wxPanel( PreferencesNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxBoxSizer* bSizer61;
bSizer61 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer62;
bSizer62 = new wxBoxSizer( wxVERTICAL );
-
+
wxStaticBoxSizer* sbSizer18;
sbSizer18 = new wxStaticBoxSizer( new wxStaticBox( BackgroundTaskPanel, wxID_ANY, _("VeraCrypt Background Task") ), wxVERTICAL );
-
+
BackgroundTaskEnabledCheckBox = new wxCheckBox( BackgroundTaskPanel, wxID_ANY, _("Enabled"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer18->Add( BackgroundTaskEnabledCheckBox, 0, wxALL, 5 );
-
+
CloseBackgroundTaskOnNoVolumesCheckBox = new wxCheckBox( BackgroundTaskPanel, wxID_ANY, _("Exit when there are no mounted volumes"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer18->Add( CloseBackgroundTaskOnNoVolumesCheckBox, 0, wxALL, 5 );
-
+
wxStaticBoxSizer* sbSizer26;
sbSizer26 = new wxStaticBoxSizer( new wxStaticBox( BackgroundTaskPanel, wxID_ANY, _("Task Icon Menu Items") ), wxVERTICAL );
-
+
BackgroundTaskMenuMountItemsEnabledCheckBox = new wxCheckBox( BackgroundTaskPanel, wxID_ANY, _("Mount Favorite Volumes"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer26->Add( BackgroundTaskMenuMountItemsEnabledCheckBox, 0, wxALL, 5 );
-
+
BackgroundTaskMenuOpenItemsEnabledCheckBox = new wxCheckBox( BackgroundTaskPanel, wxID_ANY, _("Open Mounted Volumes"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer26->Add( BackgroundTaskMenuOpenItemsEnabledCheckBox, 0, wxALL, 5 );
-
+
BackgroundTaskMenuDismountItemsEnabledCheckBox = new wxCheckBox( BackgroundTaskPanel, wxID_ANY, _("Dismount Mounted Volumes"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer26->Add( BackgroundTaskMenuDismountItemsEnabledCheckBox, 0, wxALL, 5 );
-
-
+
+
sbSizer18->Add( sbSizer26, 1, wxEXPAND|wxALL, 5 );
-
-
+
+
bSizer62->Add( sbSizer18, 0, wxEXPAND|wxALL, 5 );
-
-
+
+
bSizer61->Add( bSizer62, 1, wxEXPAND|wxALL, 5 );
-
-
+
+
BackgroundTaskPanel->SetSizer( bSizer61 );
BackgroundTaskPanel->Layout();
bSizer61->Fit( BackgroundTaskPanel );
@@ -1974,47 +1974,47 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
SystemIntegrationPage = new wxPanel( PreferencesNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxBoxSizer* bSizer49;
bSizer49 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer37;
bSizer37 = new wxBoxSizer( wxVERTICAL );
-
+
LogOnSizer = new wxStaticBoxSizer( new wxStaticBox( SystemIntegrationPage, wxID_ANY, _("Actions to Perform when User Logs On") ), wxVERTICAL );
-
+
StartOnLogonCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Start VeraCrypt Background Task"), wxDefaultPosition, wxDefaultSize, 0 );
LogOnSizer->Add( StartOnLogonCheckBox, 0, wxALL, 5 );
-
+
MountFavoritesOnLogonCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Mount favorite volumes"), wxDefaultPosition, wxDefaultSize, 0 );
LogOnSizer->Add( MountFavoritesOnLogonCheckBox, 0, wxALL, 5 );
-
+
MountDevicesOnLogonCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Mount all device-hosted VeraCrypt volumes"), wxDefaultPosition, wxDefaultSize, 0 );
LogOnSizer->Add( MountDevicesOnLogonCheckBox, 0, wxALL, 5 );
-
-
+
+
bSizer37->Add( LogOnSizer, 0, wxALL|wxEXPAND, 5 );
-
+
ExplorerSizer = new wxStaticBoxSizer( new wxStaticBox( SystemIntegrationPage, wxID_ANY, _("Filesystem Explorer") ), wxVERTICAL );
-
+
OpenExplorerWindowAfterMountCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Open Explorer window for successfully mounted volume"), wxDefaultPosition, wxDefaultSize, 0 );
ExplorerSizer->Add( OpenExplorerWindowAfterMountCheckBox, 0, wxALL, 5 );
-
+
CloseExplorerWindowsOnDismountCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Close all Explorer windows of volume being dismounted"), wxDefaultPosition, wxDefaultSize, 0 );
ExplorerSizer->Add( CloseExplorerWindowsOnDismountCheckBox, 0, wxALL, 5 );
-
-
+
+
bSizer37->Add( ExplorerSizer, 0, wxEXPAND|wxALL, 5 );
-
+
KernelServicesSizer = new wxStaticBoxSizer( new wxStaticBox( SystemIntegrationPage, wxID_ANY, _("Kernel Services") ), wxVERTICAL );
-
+
NoKernelCryptoCheckBox = new wxCheckBox( SystemIntegrationPage, wxID_ANY, _("Do not use kernel cryptographic services"), wxDefaultPosition, wxDefaultSize, 0 );
KernelServicesSizer->Add( NoKernelCryptoCheckBox, 0, wxALL, 5 );
-
-
+
+
bSizer37->Add( KernelServicesSizer, 0, wxEXPAND|wxALL, 5 );
-
-
+
+
bSizer49->Add( bSizer37, 1, wxEXPAND|wxALL, 5 );
-
-
+
+
SystemIntegrationPage->SetSizer( bSizer49 );
SystemIntegrationPage->Layout();
bSizer49->Fit( SystemIntegrationPage );
@@ -2022,41 +2022,41 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
PerformanceOptionsPage = new wxPanel( PreferencesNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxBoxSizer* bSizer151;
bSizer151 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer152;
bSizer152 = new wxBoxSizer( wxVERTICAL );
-
+
wxStaticBoxSizer* sbSizer44;
sbSizer44 = new wxStaticBoxSizer( new wxStaticBox( PerformanceOptionsPage, wxID_ANY, _("Hardware Acceleration") ), wxVERTICAL );
-
+
wxBoxSizer* bSizer158;
bSizer158 = new wxBoxSizer( wxHORIZONTAL );
-
+
wxStaticText* m_staticText57;
m_staticText57 = new wxStaticText( PerformanceOptionsPage, wxID_ANY, _("Processor (CPU) in this computer supports hardware acceleration for AES:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText57->Wrap( -1 );
bSizer158->Add( m_staticText57, 0, wxALL, 5 );
-
+
AesHwCpuSupportedStaticText = new wxStaticText( PerformanceOptionsPage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0|wxSUNKEN_BORDER );
AesHwCpuSupportedStaticText->Wrap( -1 );
bSizer158->Add( AesHwCpuSupportedStaticText, 0, wxALL, 5 );
-
-
+
+
sbSizer44->Add( bSizer158, 1, wxEXPAND, 5 );
-
-
+
+
sbSizer44->Add( 0, 0, 0, wxBOTTOM, 5 );
-
+
NoHardwareCryptoCheckBox = new wxCheckBox( PerformanceOptionsPage, wxID_ANY, _("Do not accelerate AES encryption/decryption by using the AES instructions of the processor"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer44->Add( NoHardwareCryptoCheckBox, 0, wxALL, 5 );
-
-
+
+
bSizer152->Add( sbSizer44, 0, wxEXPAND|wxALL, 5 );
-
-
+
+
bSizer151->Add( bSizer152, 1, wxALL|wxEXPAND, 5 );
-
-
+
+
PerformanceOptionsPage->SetSizer( bSizer151 );
PerformanceOptionsPage->Layout();
bSizer151->Fit( PerformanceOptionsPage );
@@ -2064,28 +2064,28 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
DefaultKeyfilesPage = new wxPanel( PreferencesNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxBoxSizer* bSizer40;
bSizer40 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer43;
bSizer43 = new wxBoxSizer( wxVERTICAL );
-
+
wxStaticBoxSizer* bSizer42;
bSizer42 = new wxStaticBoxSizer( new wxStaticBox( DefaultKeyfilesPage, wxID_ANY, _("Default Keyfiles") ), wxVERTICAL );
-
+
DefaultKeyfilesSizer = new wxBoxSizer( wxVERTICAL );
-
-
+
+
bSizer42->Add( DefaultKeyfilesSizer, 1, wxEXPAND, 5 );
-
-
+
+
bSizer43->Add( bSizer42, 1, wxEXPAND|wxALL, 5 );
-
+
UseKeyfilesCheckBox = new wxCheckBox( DefaultKeyfilesPage, wxID_ANY, _("Use keyfiles by default"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer43->Add( UseKeyfilesCheckBox, 0, wxALL, 5 );
-
-
+
+
bSizer40->Add( bSizer43, 1, wxEXPAND|wxALL, 5 );
-
-
+
+
DefaultKeyfilesPage->SetSizer( bSizer40 );
DefaultKeyfilesPage->Layout();
bSizer40->Fit( DefaultKeyfilesPage );
@@ -2093,42 +2093,42 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
SecurityTokensPage = new wxPanel( PreferencesNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxBoxSizer* bSizer127;
bSizer127 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer128;
bSizer128 = new wxBoxSizer( wxVERTICAL );
-
+
wxStaticBoxSizer* sbSizer36;
sbSizer36 = new wxStaticBoxSizer( new wxStaticBox( SecurityTokensPage, wxID_ANY, _("PKCS #11 Library Path") ), wxVERTICAL );
-
+
wxBoxSizer* bSizer129;
bSizer129 = new wxBoxSizer( wxHORIZONTAL );
-
+
Pkcs11ModulePathTextCtrl = new wxTextCtrl( SecurityTokensPage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- Pkcs11ModulePathTextCtrl->SetMaxLength( 0 );
+ Pkcs11ModulePathTextCtrl->SetMaxLength( 0 );
bSizer129->Add( Pkcs11ModulePathTextCtrl, 1, wxALL, 5 );
-
+
SelectPkcs11ModuleButton = new wxButton( SecurityTokensPage, wxID_ANY, _("Select &Library..."), wxDefaultPosition, wxDefaultSize, 0 );
bSizer129->Add( SelectPkcs11ModuleButton, 0, wxALL, 5 );
-
-
+
+
sbSizer36->Add( bSizer129, 1, wxEXPAND, 5 );
-
-
+
+
bSizer128->Add( sbSizer36, 0, wxEXPAND|wxALL, 5 );
-
+
wxStaticBoxSizer* sbSizer37;
sbSizer37 = new wxStaticBoxSizer( new wxStaticBox( SecurityTokensPage, wxID_ANY, _("Security Options") ), wxVERTICAL );
-
+
CloseSecurityTokenSessionsAfterMountCheckBox = new wxCheckBox( SecurityTokensPage, wxID_ANY, _("&Close token session (log out) after a volume is successfully mounted"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer37->Add( CloseSecurityTokenSessionsAfterMountCheckBox, 0, wxALL, 5 );
-
-
+
+
bSizer128->Add( sbSizer37, 0, wxEXPAND|wxALL, 5 );
-
-
+
+
bSizer127->Add( bSizer128, 1, wxEXPAND|wxALL, 5 );
-
-
+
+
SecurityTokensPage->SetSizer( bSizer127 );
SecurityTokensPage->Layout();
bSizer127->Fit( SecurityTokensPage );
@@ -2136,109 +2136,109 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
HotkeysPage = new wxPanel( PreferencesNotebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxBoxSizer* bSizer51;
bSizer51 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer38;
bSizer38 = new wxBoxSizer( wxVERTICAL );
-
+
wxStaticBoxSizer* sbSizer21;
sbSizer21 = new wxStaticBoxSizer( new wxStaticBox( HotkeysPage, wxID_ANY, _("System-Wide Hotkeys") ), wxVERTICAL );
-
+
HotkeyListCtrl = new wxListCtrl( HotkeysPage, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_VRULES|wxSUNKEN_BORDER );
sbSizer21->Add( HotkeyListCtrl, 1, wxALL|wxEXPAND, 5 );
-
+
wxStaticBoxSizer* sbSizer23;
sbSizer23 = new wxStaticBoxSizer( new wxStaticBox( HotkeysPage, wxID_ANY, _("Shortcut") ), wxVERTICAL );
-
+
wxFlexGridSizer* fgSizer4;
fgSizer4 = new wxFlexGridSizer( 2, 3, 0, 0 );
fgSizer4->SetFlexibleDirection( wxBOTH );
fgSizer4->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
+
wxStaticText* m_staticText10;
m_staticText10 = new wxStaticText( HotkeysPage, wxID_ANY, _("Key to assign:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText10->Wrap( -1 );
fgSizer4->Add( m_staticText10, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
+
HotkeyTextCtrl = new wxTextCtrl( HotkeysPage, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- HotkeyTextCtrl->SetMaxLength( 0 );
+ HotkeyTextCtrl->SetMaxLength( 0 );
fgSizer4->Add( HotkeyTextCtrl, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-
+
AssignHotkeyButton = new wxButton( HotkeysPage, wxID_ANY, _("Assign"), wxDefaultPosition, wxDefaultSize, 0 );
fgSizer4->Add( AssignHotkeyButton, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
+
+
fgSizer4->Add( 0, 0, 1, wxEXPAND, 5 );
-
+
wxGridSizer* gSizer4;
gSizer4 = new wxGridSizer( 1, 4, 0, 0 );
-
+
HotkeyControlCheckBox = new wxCheckBox( HotkeysPage, wxID_ANY, _("Control"), wxDefaultPosition, wxDefaultSize, 0 );
gSizer4->Add( HotkeyControlCheckBox, 0, wxALL, 5 );
-
+
HotkeyShiftCheckBox = new wxCheckBox( HotkeysPage, wxID_ANY, _("Shift"), wxDefaultPosition, wxDefaultSize, 0 );
gSizer4->Add( HotkeyShiftCheckBox, 0, wxALL, 5 );
-
+
HotkeyAltCheckBox = new wxCheckBox( HotkeysPage, wxID_ANY, _("Alt"), wxDefaultPosition, wxDefaultSize, 0 );
gSizer4->Add( HotkeyAltCheckBox, 0, wxALL, 5 );
-
+
HotkeyWinCheckBox = new wxCheckBox( HotkeysPage, wxID_ANY, _("Win"), wxDefaultPosition, wxDefaultSize, 0 );
gSizer4->Add( HotkeyWinCheckBox, 0, wxALL, 5 );
-
-
+
+
fgSizer4->Add( gSizer4, 1, wxEXPAND, 5 );
-
+
RemoveHotkeyButton = new wxButton( HotkeysPage, wxID_ANY, _("Remove"), wxDefaultPosition, wxDefaultSize, 0 );
fgSizer4->Add( RemoveHotkeyButton, 1, wxALL, 5 );
-
-
+
+
sbSizer23->Add( fgSizer4, 1, wxALIGN_RIGHT, 5 );
-
-
+
+
sbSizer21->Add( sbSizer23, 0, wxEXPAND|wxALL, 5 );
-
+
wxStaticBoxSizer* sbSizer24;
sbSizer24 = new wxStaticBoxSizer( new wxStaticBox( HotkeysPage, wxID_ANY, _("Options") ), wxVERTICAL );
-
+
BeepAfterHotkeyMountDismountCheckBox = new wxCheckBox( HotkeysPage, wxID_ANY, _("Play system notification sound after mount/dismount"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer24->Add( BeepAfterHotkeyMountDismountCheckBox, 0, wxALL, 5 );
-
+
DisplayMessageAfterHotkeyDismountCheckBox = new wxCheckBox( HotkeysPage, wxID_ANY, _("Display confirmation message box after dismount"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer24->Add( DisplayMessageAfterHotkeyDismountCheckBox, 0, wxALL, 5 );
-
-
+
+
sbSizer21->Add( sbSizer24, 0, wxEXPAND|wxALL, 5 );
-
-
+
+
bSizer38->Add( sbSizer21, 1, wxEXPAND|wxALL, 5 );
-
-
+
+
bSizer51->Add( bSizer38, 1, wxEXPAND|wxALL, 5 );
-
-
+
+
HotkeysPage->SetSizer( bSizer51 );
HotkeysPage->Layout();
bSizer51->Fit( HotkeysPage );
PreferencesNotebook->AddPage( HotkeysPage, _("Hotkeys"), false );
-
+
bSizer41->Add( PreferencesNotebook, 1, wxEXPAND | wxALL, 5 );
-
+
StdButtons = new wxStdDialogButtonSizer();
StdButtonsOK = new wxButton( this, wxID_OK );
StdButtons->AddButton( StdButtonsOK );
StdButtonsCancel = new wxButton( this, wxID_CANCEL );
StdButtons->AddButton( StdButtonsCancel );
StdButtons->Realize();
-
+
bSizer41->Add( StdButtons, 0, wxEXPAND|wxALL, 5 );
-
-
+
+
bSizer32->Add( bSizer41, 1, wxEXPAND|wxALL, 5 );
-
-
+
+
this->SetSizer( bSizer32 );
this->Layout();
bSizer32->Fit( this );
-
+
// Connect Events
this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( PreferencesDialogBase::OnClose ) );
DismountOnScreenSaverCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( PreferencesDialogBase::OnDismountOnScreenSaverCheckBoxClick ), NULL, this );
@@ -2275,115 +2275,115 @@ PreferencesDialogBase::~PreferencesDialogBase()
RemoveHotkeyButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PreferencesDialogBase::OnRemoveHotkeyButtonClick ), NULL, this );
StdButtonsCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PreferencesDialogBase::OnCancelButtonClick ), NULL, this );
StdButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PreferencesDialogBase::OnOKButtonClick ), NULL, this );
-
+
}
RandomPoolEnrichmentDialogBase::RandomPoolEnrichmentDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
{
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-
+
MainSizer = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer144;
bSizer144 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer145;
bSizer145 = new wxBoxSizer( wxHORIZONTAL );
-
-
+
+
bSizer145->Add( 0, 0, 1, wxEXPAND, 5 );
-
+
wxStaticText* m_staticText49;
m_staticText49 = new wxStaticText( this, wxID_ANY, _("Mixing PRF:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText49->Wrap( -1 );
bSizer145->Add( m_staticText49, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
+
wxArrayString HashChoiceChoices;
HashChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, HashChoiceChoices, 0 );
HashChoice->SetSelection( 0 );
bSizer145->Add( HashChoice, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
+
+
bSizer145->Add( 0, 0, 1, wxEXPAND, 5 );
-
-
+
+
bSizer144->Add( bSizer145, 0, wxEXPAND, 5 );
-
+
wxStaticBoxSizer* sbSizer43;
sbSizer43 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxEmptyString ), wxVERTICAL );
-
+
wxBoxSizer* bSizer147;
bSizer147 = new wxBoxSizer( wxHORIZONTAL );
-
+
wxStaticText* m_staticText52;
m_staticText52 = new wxStaticText( this, wxID_ANY, _("Random Pool:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText52->Wrap( -1 );
bSizer147->Add( m_staticText52, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-
+
RandomPoolStaticText = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
RandomPoolStaticText->Wrap( -1 );
RandomPoolStaticText->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxT("Courier New") ) );
-
+
bSizer147->Add( RandomPoolStaticText, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
+
ShowRandomPoolCheckBox = new wxCheckBox( this, wxID_ANY, _("Show"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer147->Add( ShowRandomPoolCheckBox, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
+
+
sbSizer43->Add( bSizer147, 0, wxEXPAND|wxTOP, 5 );
-
-
+
+
sbSizer43->Add( 0, 0, 1, wxEXPAND, 5 );
-
+
wxStaticBoxSizer* sbSizer45;
sbSizer45 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Randomness Collected From Mouse Movements") ), wxVERTICAL );
-
+
CollectedEntropy = new wxGauge( this, wxID_ANY, 2560, wxDefaultPosition, wxDefaultSize, wxGA_HORIZONTAL|wxGA_SMOOTH );
- CollectedEntropy->SetValue( 0 );
+ CollectedEntropy->SetValue( 0 );
sbSizer45->Add( CollectedEntropy, 0, wxALL|wxEXPAND, 5 );
-
-
+
+
sbSizer43->Add( sbSizer45, 0, wxBOTTOM|wxEXPAND|wxTOP, 5 );
-
-
+
+
sbSizer43->Add( 0, 0, 1, wxEXPAND, 5 );
-
+
MouseStaticText = new wxStaticText( this, wxID_ANY, _("IMPORTANT: Move your mouse as randomly as possible within this window. The longer you move it, the better. This significantly increases security. When done, click 'Continue'."), wxDefaultPosition, wxDefaultSize, 0 );
MouseStaticText->Wrap( -1 );
sbSizer43->Add( MouseStaticText, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
+
+
sbSizer43->Add( 0, 0, 1, wxEXPAND, 5 );
-
-
+
+
bSizer144->Add( sbSizer43, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
+
wxBoxSizer* bSizer146;
bSizer146 = new wxBoxSizer( wxHORIZONTAL );
-
-
+
+
bSizer146->Add( 0, 0, 1, wxEXPAND, 5 );
-
+
ContinueButton = new wxButton( this, wxID_OK, _("&Continue"), wxDefaultPosition, wxDefaultSize, 0 );
- ContinueButton->SetDefault();
+ ContinueButton->SetDefault();
bSizer146->Add( ContinueButton, 0, wxALL, 5 );
-
-
+
+
bSizer146->Add( 0, 0, 1, wxEXPAND, 5 );
-
-
+
+
bSizer144->Add( bSizer146, 0, wxEXPAND, 5 );
-
-
+
+
MainSizer->Add( bSizer144, 1, wxEXPAND|wxALL, 5 );
-
-
+
+
this->SetSizer( MainSizer );
this->Layout();
MainSizer->Fit( this );
-
+
this->Centre( wxBOTH );
-
+
// Connect Events
this->Connect( wxEVT_MOTION, wxMouseEventHandler( RandomPoolEnrichmentDialogBase::OnMouseMotion ) );
HashChoice->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( RandomPoolEnrichmentDialogBase::OnHashSelected ), NULL, this );
@@ -2396,68 +2396,68 @@ RandomPoolEnrichmentDialogBase::~RandomPoolEnrichmentDialogBase()
this->Disconnect( wxEVT_MOTION, wxMouseEventHandler( RandomPoolEnrichmentDialogBase::OnMouseMotion ) );
HashChoice->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( RandomPoolEnrichmentDialogBase::OnHashSelected ), NULL, this );
ShowRandomPoolCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( RandomPoolEnrichmentDialogBase::OnShowRandomPoolCheckBoxClicked ), NULL, this );
-
+
}
SecurityTokenKeyfilesDialogBase::SecurityTokenKeyfilesDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
{
this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
this->SetExtraStyle( GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY );
-
+
wxBoxSizer* bSizer3;
bSizer3 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer138;
bSizer138 = new wxBoxSizer( wxHORIZONTAL );
-
+
wxBoxSizer* bSizer142;
bSizer142 = new wxBoxSizer( wxVERTICAL );
-
+
SecurityTokenKeyfileListCtrl = new wxListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_VRULES|wxSUNKEN_BORDER );
bSizer142->Add( SecurityTokenKeyfileListCtrl, 1, wxALL|wxEXPAND, 5 );
-
+
wxBoxSizer* bSizer141;
bSizer141 = new wxBoxSizer( wxHORIZONTAL );
-
+
ExportButton = new wxButton( this, wxID_ANY, _("&Export..."), wxDefaultPosition, wxDefaultSize, 0 );
bSizer141->Add( ExportButton, 0, wxALL, 5 );
-
+
DeleteButton = new wxButton( this, wxID_ANY, _("&Delete"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer141->Add( DeleteButton, 0, wxALL, 5 );
-
-
+
+
bSizer141->Add( 0, 0, 1, wxEXPAND|wxLEFT, 5 );
-
+
ImportButton = new wxButton( this, wxID_ANY, _("&Import Keyfile to Token..."), wxDefaultPosition, wxDefaultSize, 0 );
bSizer141->Add( ImportButton, 0, wxALL, 5 );
-
-
+
+
bSizer142->Add( bSizer141, 0, wxEXPAND, 5 );
-
-
+
+
bSizer138->Add( bSizer142, 1, wxEXPAND, 5 );
-
+
wxBoxSizer* bSizer139;
bSizer139 = new wxBoxSizer( wxVERTICAL );
-
+
OKButton = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );
- OKButton->SetDefault();
+ OKButton->SetDefault();
bSizer139->Add( OKButton, 0, wxALL, 5 );
-
+
CancelButton = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer139->Add( CancelButton, 0, wxALL, 5 );
-
-
+
+
bSizer138->Add( bSizer139, 0, wxEXPAND, 5 );
-
-
+
+
bSizer3->Add( bSizer138, 1, wxEXPAND|wxALL, 5 );
-
-
+
+
this->SetSizer( bSizer3 );
this->Layout();
bSizer3->Fit( this );
-
+
// Connect Events
SecurityTokenKeyfileListCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( SecurityTokenKeyfilesDialogBase::OnListItemActivated ), NULL, this );
SecurityTokenKeyfileListCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( SecurityTokenKeyfilesDialogBase::OnListItemDeselected ), NULL, this );
@@ -2478,33 +2478,33 @@ SecurityTokenKeyfilesDialogBase::~SecurityTokenKeyfilesDialogBase()
DeleteButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SecurityTokenKeyfilesDialogBase::OnDeleteButtonClick ), NULL, this );
ImportButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SecurityTokenKeyfilesDialogBase::OnImportButtonClick ), NULL, this );
OKButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SecurityTokenKeyfilesDialogBase::OnOKButtonClick ), NULL, this );
-
+
}
VolumePropertiesDialogBase::VolumePropertiesDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
{
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-
+
wxBoxSizer* bSizer49;
bSizer49 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer50;
bSizer50 = new wxBoxSizer( wxVERTICAL );
-
+
PropertiesListCtrl = new wxListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_VRULES|wxSUNKEN_BORDER );
bSizer50->Add( PropertiesListCtrl, 1, wxALL|wxEXPAND, 5 );
-
+
StdButtons = new wxStdDialogButtonSizer();
StdButtonsOK = new wxButton( this, wxID_OK );
StdButtons->AddButton( StdButtonsOK );
StdButtons->Realize();
-
+
bSizer50->Add( StdButtons, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
+
+
bSizer49->Add( bSizer50, 1, wxEXPAND|wxALL, 5 );
-
-
+
+
this->SetSizer( bSizer49 );
this->Layout();
bSizer49->Fit( this );
@@ -2518,85 +2518,85 @@ EncryptionOptionsWizardPageBase::EncryptionOptionsWizardPageBase( wxWindow* pare
{
wxBoxSizer* bSizer93;
bSizer93 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer94;
bSizer94 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer95;
bSizer95 = new wxBoxSizer( wxVERTICAL );
-
+
wxStaticBoxSizer* sbSizer29;
sbSizer29 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Encryption Algorithm") ), wxVERTICAL );
-
+
wxBoxSizer* bSizer96;
bSizer96 = new wxBoxSizer( wxHORIZONTAL );
-
+
wxArrayString EncryptionAlgorithmChoiceChoices;
EncryptionAlgorithmChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, EncryptionAlgorithmChoiceChoices, 0 );
EncryptionAlgorithmChoice->SetSelection( 0 );
bSizer96->Add( EncryptionAlgorithmChoice, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
+
TestButton = new wxButton( this, wxID_ANY, _("&Test"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer96->Add( TestButton, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-
-
+
+
sbSizer29->Add( bSizer96, 0, wxEXPAND, 5 );
-
+
EncryptionAlgorithmStaticText = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
EncryptionAlgorithmStaticText->Wrap( -1 );
sbSizer29->Add( EncryptionAlgorithmStaticText, 1, wxALL|wxEXPAND, 5 );
-
+
wxBoxSizer* bSizer97;
bSizer97 = new wxBoxSizer( wxHORIZONTAL );
-
+
EncryptionAlgorithmHyperlink = new wxHyperlinkCtrl( this, wxID_ANY, _("More information"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-
+
EncryptionAlgorithmHyperlink->SetHoverColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ) );
EncryptionAlgorithmHyperlink->SetNormalColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ) );
EncryptionAlgorithmHyperlink->SetVisitedColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ) );
bSizer97->Add( EncryptionAlgorithmHyperlink, 0, wxALL, 5 );
-
-
+
+
bSizer97->Add( 0, 0, 1, wxEXPAND, 5 );
-
+
BenchmarkButton = new wxButton( this, wxID_ANY, _("&Benchmark"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer97->Add( BenchmarkButton, 0, wxALL, 5 );
-
-
+
+
sbSizer29->Add( bSizer97, 0, wxEXPAND, 5 );
-
-
+
+
bSizer95->Add( sbSizer29, 1, wxEXPAND|wxALL, 5 );
-
+
wxStaticBoxSizer* sbSizer30;
sbSizer30 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Hash Algorithm") ), wxHORIZONTAL );
-
+
wxArrayString HashChoiceChoices;
HashChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, HashChoiceChoices, 0 );
HashChoice->SetSelection( 0 );
sbSizer30->Add( HashChoice, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
+
HashHyperlink = new wxHyperlinkCtrl( this, wxID_ANY, _("Information on hash algorithms"), wxEmptyString, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-
+
HashHyperlink->SetHoverColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ) );
HashHyperlink->SetNormalColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ) );
HashHyperlink->SetVisitedColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ) );
sbSizer30->Add( HashHyperlink, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
+
+
bSizer95->Add( sbSizer30, 0, wxEXPAND|wxALL, 5 );
-
-
+
+
bSizer94->Add( bSizer95, 1, wxEXPAND, 5 );
-
-
+
+
bSizer93->Add( bSizer94, 1, wxEXPAND, 5 );
-
-
+
+
this->SetSizer( bSizer93 );
this->Layout();
bSizer93->Fit( this );
-
+
// Connect Events
EncryptionAlgorithmChoice->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( EncryptionOptionsWizardPageBase::OnEncryptionAlgorithmSelected ), NULL, this );
TestButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( EncryptionOptionsWizardPageBase::OnTestButtonClick ), NULL, this );
@@ -2613,24 +2613,24 @@ EncryptionOptionsWizardPageBase::~EncryptionOptionsWizardPageBase()
EncryptionAlgorithmHyperlink->Disconnect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( EncryptionOptionsWizardPageBase::OnEncryptionAlgorithmHyperlinkClick ), NULL, this );
BenchmarkButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( EncryptionOptionsWizardPageBase::OnBenchmarkButtonClick ), NULL, this );
HashHyperlink->Disconnect( wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler( EncryptionOptionsWizardPageBase::OnHashHyperlinkClick ), NULL, this );
-
+
}
InfoWizardPageBase::InfoWizardPageBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : WizardPage( parent, id, pos, size, style )
{
wxBoxSizer* bSizer71;
bSizer71 = new wxBoxSizer( wxVERTICAL );
-
+
InfoPageSizer = new wxBoxSizer( wxVERTICAL );
-
+
InfoStaticText = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
InfoStaticText->Wrap( -1 );
InfoPageSizer->Add( InfoStaticText, 1, wxALL|wxEXPAND, 5 );
-
-
+
+
bSizer71->Add( InfoPageSizer, 1, wxEXPAND, 5 );
-
-
+
+
this->SetSizer( bSizer71 );
this->Layout();
bSizer71->Fit( this );
@@ -2643,51 +2643,51 @@ InfoWizardPageBase::~InfoWizardPageBase()
KeyfilesPanelBase::KeyfilesPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
{
this->SetMinSize( wxSize( 500,300 ) );
-
+
wxBoxSizer* bSizer19;
bSizer19 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer20;
bSizer20 = new wxBoxSizer( wxHORIZONTAL );
-
+
wxBoxSizer* bSizer21;
bSizer21 = new wxBoxSizer( wxVERTICAL );
-
+
KeyfilesListCtrl = new wxListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxSUNKEN_BORDER );
bSizer21->Add( KeyfilesListCtrl, 1, wxEXPAND|wxALL, 5 );
-
+
wxBoxSizer* bSizer137;
bSizer137 = new wxBoxSizer( wxHORIZONTAL );
-
+
AddFilesButton = new wxButton( this, wxID_ANY, _("Add &Files..."), wxDefaultPosition, wxDefaultSize, 0 );
bSizer137->Add( AddFilesButton, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
+
AddDirectoryButton = new wxButton( this, wxID_ANY, _("Add &Path..."), wxDefaultPosition, wxDefaultSize, 0 );
bSizer137->Add( AddDirectoryButton, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
+
AddSecurityTokenSignatureButton = new wxButton( this, wxID_ANY, _("Add &Token Files..."), wxDefaultPosition, wxDefaultSize, 0 );
bSizer137->Add( AddSecurityTokenSignatureButton, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
+
RemoveButton = new wxButton( this, wxID_ANY, _("&Remove"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer137->Add( RemoveButton, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
+
RemoveAllButton = new wxButton( this, wxID_ANY, _("Remove &All"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer137->Add( RemoveAllButton, 0, wxEXPAND|wxALL, 5 );
-
-
+
+
bSizer21->Add( bSizer137, 0, wxEXPAND, 5 );
-
-
+
+
bSizer20->Add( bSizer21, 1, wxEXPAND, 5 );
-
-
+
+
bSizer19->Add( bSizer20, 1, wxEXPAND, 5 );
-
-
+
+
this->SetSizer( bSizer19 );
this->Layout();
bSizer19->Fit( this );
-
+
// Connect Events
KeyfilesListCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( KeyfilesPanelBase::OnListItemDeselected ), NULL, this );
KeyfilesListCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( KeyfilesPanelBase::OnListItemSelected ), NULL, this );
@@ -2710,43 +2710,43 @@ KeyfilesPanelBase::~KeyfilesPanelBase()
AddSecurityTokenSignatureButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( KeyfilesPanelBase::OnAddSecurityTokenSignatureButtonClick ), NULL, this );
RemoveButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( KeyfilesPanelBase::OnRemoveButtonClick ), NULL, this );
RemoveAllButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( KeyfilesPanelBase::OnRemoveAllButtonClick ), NULL, this );
-
+
}
ProgressWizardPageBase::ProgressWizardPageBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : WizardPage( parent, id, pos, size, style )
{
wxBoxSizer* bSizer81;
bSizer81 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer82;
bSizer82 = new wxBoxSizer( wxVERTICAL );
-
+
ProgressSizer = new wxBoxSizer( wxHORIZONTAL );
-
+
ProgressGauge = new wxGauge( this, wxID_ANY, 100, wxDefaultPosition, wxSize( -1,-1 ), wxGA_HORIZONTAL|wxGA_SMOOTH );
- ProgressGauge->SetValue( 0 );
+ ProgressGauge->SetValue( 0 );
ProgressSizer->Add( ProgressGauge, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
+
AbortButton = new wxButton( this, wxID_ANY, _("&Abort"), wxDefaultPosition, wxDefaultSize, 0 );
AbortButton->Enable( false );
-
+
ProgressSizer->Add( AbortButton, 0, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
-
-
+
+
bSizer82->Add( ProgressSizer, 0, wxEXPAND, 5 );
-
+
InfoStaticText = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
InfoStaticText->Wrap( -1 );
bSizer82->Add( InfoStaticText, 0, wxALL|wxEXPAND, 5 );
-
-
+
+
bSizer81->Add( bSizer82, 0, wxEXPAND, 5 );
-
-
+
+
this->SetSizer( bSizer81 );
this->Layout();
bSizer81->Fit( this );
-
+
// Connect Events
AbortButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ProgressWizardPageBase::OnAbortButtonClick ), NULL, this );
}
@@ -2755,44 +2755,44 @@ ProgressWizardPageBase::~ProgressWizardPageBase()
{
// Disconnect Events
AbortButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ProgressWizardPageBase::OnAbortButtonClick ), NULL, this );
-
+
}
SelectDirectoryWizardPageBase::SelectDirectoryWizardPageBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : WizardPage( parent, id, pos, size, style )
{
this->SetMinSize( wxSize( 200,65 ) );
-
+
wxBoxSizer* bSizer68;
bSizer68 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer69;
bSizer69 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer70;
bSizer70 = new wxBoxSizer( wxHORIZONTAL );
-
+
DirectoryTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- DirectoryTextCtrl->SetMaxLength( 0 );
+ DirectoryTextCtrl->SetMaxLength( 0 );
bSizer70->Add( DirectoryTextCtrl, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
+
BrowseButton = new wxButton( this, wxID_ANY, _("&Browse..."), wxDefaultPosition, wxDefaultSize, 0 );
bSizer70->Add( BrowseButton, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
+
+
bSizer69->Add( bSizer70, 0, wxEXPAND, 5 );
-
+
InfoStaticText = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
InfoStaticText->Wrap( 300 );
bSizer69->Add( InfoStaticText, 1, wxALL|wxEXPAND, 5 );
-
-
+
+
bSizer68->Add( bSizer69, 1, wxEXPAND, 5 );
-
-
+
+
this->SetSizer( bSizer68 );
this->Layout();
bSizer68->Fit( this );
-
+
// Connect Events
DirectoryTextCtrl->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( SelectDirectoryWizardPageBase::OnDirectoryTextChanged ), NULL, this );
BrowseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SelectDirectoryWizardPageBase::OnBrowseButtonClick ), NULL, this );
@@ -2803,38 +2803,38 @@ SelectDirectoryWizardPageBase::~SelectDirectoryWizardPageBase()
// Disconnect Events
DirectoryTextCtrl->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( SelectDirectoryWizardPageBase::OnDirectoryTextChanged ), NULL, this );
BrowseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SelectDirectoryWizardPageBase::OnBrowseButtonClick ), NULL, this );
-
+
}
SingleChoiceWizardPageBase::SingleChoiceWizardPageBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : WizardPage( parent, id, pos, size, style )
{
wxBoxSizer* bSizer71;
bSizer71 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer77;
bSizer77 = new wxBoxSizer( wxVERTICAL );
-
-
+
+
bSizer77->Add( 0, 0, 0, wxEXPAND|wxTOP, 5 );
-
+
OuterChoicesSizer = new wxBoxSizer( wxVERTICAL );
-
+
ChoicesSizer = new wxBoxSizer( wxVERTICAL );
-
-
+
+
OuterChoicesSizer->Add( ChoicesSizer, 0, wxEXPAND, 5 );
-
-
+
+
bSizer77->Add( OuterChoicesSizer, 0, wxEXPAND, 5 );
-
+
InfoStaticText = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
InfoStaticText->Wrap( -1 );
bSizer77->Add( InfoStaticText, 1, wxALL|wxEXPAND, 5 );
-
-
+
+
bSizer71->Add( bSizer77, 1, wxEXPAND, 5 );
-
-
+
+
this->SetSizer( bSizer71 );
this->Layout();
bSizer71->Fit( this );
@@ -2848,194 +2848,194 @@ VolumeCreationProgressWizardPageBase::VolumeCreationProgressWizardPageBase( wxWi
{
wxBoxSizer* bSizer104;
bSizer104 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer105;
bSizer105 = new wxBoxSizer( wxVERTICAL );
-
+
wxStaticBoxSizer* sbSizer31;
sbSizer31 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxEmptyString ), wxVERTICAL );
-
+
KeySamplesUpperSizer = new wxBoxSizer( wxVERTICAL );
-
+
KeySamplesUpperInnerSizer = new wxBoxSizer( wxVERTICAL );
-
-
+
+
KeySamplesUpperSizer->Add( KeySamplesUpperInnerSizer, 1, wxEXPAND|wxTOP, 3 );
-
-
+
+
sbSizer31->Add( KeySamplesUpperSizer, 1, wxEXPAND, 30 );
-
+
wxFlexGridSizer* fgSizer5;
fgSizer5 = new wxFlexGridSizer( 3, 2, 0, 0 );
fgSizer5->SetFlexibleDirection( wxBOTH );
fgSizer5->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
+
wxStaticText* m_staticText25;
m_staticText25 = new wxStaticText( this, wxID_ANY, _("Random Pool:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText25->Wrap( -1 );
fgSizer5->Add( m_staticText25, 0, wxALL|wxALIGN_RIGHT|wxALIGN_BOTTOM, 5 );
-
+
wxBoxSizer* bSizer126;
bSizer126 = new wxBoxSizer( wxHORIZONTAL );
-
+
RandomPoolSampleStaticText = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
RandomPoolSampleStaticText->Wrap( -1 );
RandomPoolSampleStaticText->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxT("Courier New") ) );
-
+
bSizer126->Add( RandomPoolSampleStaticText, 0, wxEXPAND|wxTOP|wxRIGHT|wxALIGN_BOTTOM, 7 );
-
+
DisplayKeysCheckBox = new wxCheckBox( this, wxID_ANY, _("Show"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer126->Add( DisplayKeysCheckBox, 0, wxEXPAND|wxRIGHT, 5 );
-
-
+
+
fgSizer5->Add( bSizer126, 1, wxEXPAND|wxALIGN_BOTTOM, 5 );
-
+
wxStaticText* m_staticText28;
m_staticText28 = new wxStaticText( this, wxID_ANY, _("Header Key:"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
m_staticText28->Wrap( -1 );
fgSizer5->Add( m_staticText28, 0, wxALIGN_RIGHT|wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_BOTTOM, 5 );
-
+
HeaderKeySampleStaticText = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
HeaderKeySampleStaticText->Wrap( -1 );
HeaderKeySampleStaticText->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxT("Courier New") ) );
-
+
fgSizer5->Add( HeaderKeySampleStaticText, 0, wxALIGN_BOTTOM|wxEXPAND|wxTOP|wxRIGHT, 2 );
-
+
wxStaticText* m_staticText29;
m_staticText29 = new wxStaticText( this, wxID_ANY, _("Master Key:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText29->Wrap( -1 );
fgSizer5->Add( m_staticText29, 0, wxALIGN_RIGHT|wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_BOTTOM, 5 );
-
+
MasterKeySampleStaticText = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
MasterKeySampleStaticText->Wrap( -1 );
MasterKeySampleStaticText->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxT("Courier New") ) );
-
+
fgSizer5->Add( MasterKeySampleStaticText, 0, wxEXPAND|wxALIGN_BOTTOM|wxTOP|wxRIGHT, 2 );
-
-
+
+
sbSizer31->Add( fgSizer5, 0, wxEXPAND, 5 );
-
-
+
+
bSizer105->Add( sbSizer31, 0, wxALL|wxEXPAND, 5 );
-
+
wxStaticBoxSizer* sbSizer45;
sbSizer45 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Randomness Collected From Mouse Movements") ), wxVERTICAL );
-
+
CollectedEntropy = new wxGauge( this, wxID_ANY, 2560, wxDefaultPosition, wxDefaultSize, wxGA_HORIZONTAL|wxGA_SMOOTH );
- CollectedEntropy->SetValue( 0 );
+ CollectedEntropy->SetValue( 0 );
sbSizer45->Add( CollectedEntropy, 0, wxALL|wxEXPAND, 5 );
-
-
+
+
bSizer105->Add( sbSizer45, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 );
-
+
wxStaticBoxSizer* sbSizer32;
sbSizer32 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxEmptyString ), wxVERTICAL );
-
+
wxBoxSizer* bSizer106;
bSizer106 = new wxBoxSizer( wxHORIZONTAL );
-
+
ProgressGauge = new wxGauge( this, wxID_ANY, 100, wxDefaultPosition, wxDefaultSize, wxGA_HORIZONTAL|wxGA_SMOOTH );
bSizer106->Add( ProgressGauge, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
+
AbortButton = new wxButton( this, wxID_ANY, _("Abort"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer106->Add( AbortButton, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-
+
+
sbSizer32->Add( bSizer106, 0, wxEXPAND, 5 );
-
+
wxGridSizer* gSizer6;
gSizer6 = new wxGridSizer( 1, 3, 0, 0 );
-
+
wxBoxSizer* bSizer108;
bSizer108 = new wxBoxSizer( wxHORIZONTAL );
-
+
m_staticText31 = new wxStaticText( this, wxID_ANY, _("Done"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText31->Wrap( -1 );
bSizer108->Add( m_staticText31, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
+
m_panel12 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxSUNKEN_BORDER );
wxBoxSizer* bSizer115;
bSizer115 = new wxBoxSizer( wxHORIZONTAL );
-
+
SizeDoneStaticText = new wxStaticText( m_panel12, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE );
SizeDoneStaticText->Wrap( -1 );
bSizer115->Add( SizeDoneStaticText, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, 3 );
-
-
+
+
m_panel12->SetSizer( bSizer115 );
m_panel12->Layout();
bSizer115->Fit( m_panel12 );
bSizer108->Add( m_panel12, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-
+
+
gSizer6->Add( bSizer108, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-
+
wxBoxSizer* bSizer1081;
bSizer1081 = new wxBoxSizer( wxHORIZONTAL );
-
+
m_staticText311 = new wxStaticText( this, wxID_ANY, _("Speed"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText311->Wrap( -1 );
bSizer1081->Add( m_staticText311, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
+
m_panel121 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER );
wxBoxSizer* bSizer1151;
bSizer1151 = new wxBoxSizer( wxHORIZONTAL );
-
+
SpeedStaticText = new wxStaticText( m_panel121, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE );
SpeedStaticText->Wrap( -1 );
bSizer1151->Add( SpeedStaticText, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 3 );
-
-
+
+
m_panel121->SetSizer( bSizer1151 );
m_panel121->Layout();
bSizer1151->Fit( m_panel121 );
bSizer1081->Add( m_panel121, 1, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-
-
+
+
gSizer6->Add( bSizer1081, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
+
wxBoxSizer* bSizer1082;
bSizer1082 = new wxBoxSizer( wxHORIZONTAL );
-
+
m_staticText312 = new wxStaticText( this, wxID_ANY, _("Left"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText312->Wrap( -1 );
bSizer1082->Add( m_staticText312, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
+
m_panel122 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL );
wxBoxSizer* bSizer1152;
bSizer1152 = new wxBoxSizer( wxHORIZONTAL );
-
+
TimeLeftStaticText = new wxStaticText( m_panel122, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT|wxST_NO_AUTORESIZE );
TimeLeftStaticText->Wrap( -1 );
bSizer1152->Add( TimeLeftStaticText, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 3 );
-
-
+
+
m_panel122->SetSizer( bSizer1152 );
m_panel122->Layout();
bSizer1152->Fit( m_panel122 );
bSizer1082->Add( m_panel122, 1, wxALL|wxEXPAND, 5 );
-
-
+
+
gSizer6->Add( bSizer1082, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
-
-
+
+
sbSizer32->Add( gSizer6, 0, wxEXPAND|wxTOP, 2 );
-
-
+
+
bSizer105->Add( sbSizer32, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
+
InfoStaticText = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
InfoStaticText->Wrap( -1 );
bSizer105->Add( InfoStaticText, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 );
-
-
+
+
bSizer104->Add( bSizer105, 1, wxEXPAND, 5 );
-
-
+
+
this->SetSizer( bSizer104 );
this->Layout();
bSizer104->Fit( this );
-
+
// Connect Events
DisplayKeysCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( VolumeCreationProgressWizardPageBase::OnDisplayKeysCheckBoxClick ), NULL, this );
AbortButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( VolumeCreationProgressWizardPageBase::OnAbortButtonClick ), NULL, this );
@@ -3046,80 +3046,80 @@ VolumeCreationProgressWizardPageBase::~VolumeCreationProgressWizardPageBase()
// Disconnect Events
DisplayKeysCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( VolumeCreationProgressWizardPageBase::OnDisplayKeysCheckBoxClick ), NULL, this );
AbortButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( VolumeCreationProgressWizardPageBase::OnAbortButtonClick ), NULL, this );
-
+
}
VolumeLocationWizardPageBase::VolumeLocationWizardPageBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : WizardPage( parent, id, pos, size, style )
{
wxBoxSizer* bSizer86;
bSizer86 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer87;
bSizer87 = new wxBoxSizer( wxVERTICAL );
-
-
+
+
bSizer87->Add( 0, 0, 0, wxEXPAND|wxTOP, 5 );
-
+
wxBoxSizer* bSizer88;
bSizer88 = new wxBoxSizer( wxHORIZONTAL );
-
+
wxBoxSizer* bSizer89;
bSizer89 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer126;
bSizer126 = new wxBoxSizer( wxHORIZONTAL );
-
- VolumePathComboBox = new wxComboBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN );
+
+ VolumePathComboBox = new wxComboBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN );
bSizer126->Add( VolumePathComboBox, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
+
wxBoxSizer* bSizer90;
bSizer90 = new wxBoxSizer( wxVERTICAL );
-
+
SelectFileButton = new wxButton( this, wxID_ANY, _("Select &File..."), wxDefaultPosition, wxDefaultSize, 0 );
bSizer90->Add( SelectFileButton, 0, wxALL|wxEXPAND, 5 );
-
+
SelectDeviceButton = new wxButton( this, wxID_ANY, _("Select D&evice..."), wxDefaultPosition, wxDefaultSize, 0 );
bSizer90->Add( SelectDeviceButton, 0, wxALL|wxEXPAND, 5 );
-
-
+
+
bSizer126->Add( bSizer90, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-
+
+
bSizer89->Add( bSizer126, 0, wxEXPAND, 5 );
-
+
wxBoxSizer* bSizer91;
bSizer91 = new wxBoxSizer( wxHORIZONTAL );
-
-
+
+
bSizer91->Add( 0, 0, 0, wxLEFT, 5 );
-
+
NoHistoryCheckBox = new wxCheckBox( this, wxID_ANY, _("&Never save history"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer91->Add( NoHistoryCheckBox, 0, wxALL|wxEXPAND, 5 );
-
-
+
+
bSizer89->Add( bSizer91, 0, wxEXPAND, 5 );
-
-
+
+
bSizer88->Add( bSizer89, 1, wxEXPAND, 5 );
-
-
+
+
bSizer87->Add( bSizer88, 0, wxEXPAND, 5 );
-
-
+
+
bSizer87->Add( 0, 0, 0, wxEXPAND|wxBOTTOM, 5 );
-
+
InfoStaticText = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
InfoStaticText->Wrap( -1 );
bSizer87->Add( InfoStaticText, 0, wxALL|wxEXPAND, 5 );
-
-
+
+
bSizer86->Add( bSizer87, 1, wxEXPAND, 5 );
-
-
+
+
this->SetSizer( bSizer86 );
this->Layout();
bSizer86->Fit( this );
-
+
// Connect Events
VolumePathComboBox->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( VolumeLocationWizardPageBase::OnVolumePathTextChanged ), NULL, this );
SelectFileButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( VolumeLocationWizardPageBase::OnSelectFileButtonClick ), NULL, this );
@@ -3134,64 +3134,64 @@ VolumeLocationWizardPageBase::~VolumeLocationWizardPageBase()
SelectFileButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( VolumeLocationWizardPageBase::OnSelectFileButtonClick ), NULL, this );
SelectDeviceButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( VolumeLocationWizardPageBase::OnSelectDeviceButtonClick ), NULL, this );
NoHistoryCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( VolumeLocationWizardPageBase::OnNoHistoryCheckBoxClick ), NULL, this );
-
+
}
VolumeFormatOptionsWizardPageBase::VolumeFormatOptionsWizardPageBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : WizardPage( parent, id, pos, size, style )
{
wxBoxSizer* bSizer124;
bSizer124 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer125;
bSizer125 = new wxBoxSizer( wxVERTICAL );
-
+
wxStaticBoxSizer* sbSizer33;
sbSizer33 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Filesystem Options") ), wxVERTICAL );
-
+
wxFlexGridSizer* fgSizer6;
fgSizer6 = new wxFlexGridSizer( 2, 2, 0, 0 );
fgSizer6->SetFlexibleDirection( wxBOTH );
fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
+
m_staticText43 = new wxStaticText( this, wxID_ANY, _("Filesystem type:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText43->Wrap( -1 );
fgSizer6->Add( m_staticText43, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
+
wxArrayString FilesystemTypeChoiceChoices;
FilesystemTypeChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, FilesystemTypeChoiceChoices, 0 );
FilesystemTypeChoice->SetSelection( 0 );
fgSizer6->Add( FilesystemTypeChoice, 0, wxALL, 5 );
-
-
+
+
sbSizer33->Add( fgSizer6, 1, wxEXPAND, 5 );
-
-
+
+
bSizer125->Add( sbSizer33, 0, wxEXPAND|wxALL, 5 );
-
+
wxStaticBoxSizer* sbSizer34;
sbSizer34 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Volume Format Options") ), wxVERTICAL );
-
+
QuickFormatCheckBox = new wxCheckBox( this, wxID_ANY, _("Quick format"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer34->Add( QuickFormatCheckBox, 0, wxALL, 5 );
-
-
+
+
bSizer125->Add( sbSizer34, 0, wxEXPAND|wxALL, 5 );
-
-
+
+
bSizer125->Add( 0, 0, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 );
-
+
InfoStaticText = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
InfoStaticText->Wrap( -1 );
bSizer125->Add( InfoStaticText, 0, wxALL, 5 );
-
-
+
+
bSizer124->Add( bSizer125, 0, wxEXPAND, 5 );
-
-
+
+
this->SetSizer( bSizer124 );
this->Layout();
bSizer124->Fit( this );
-
+
// Connect Events
FilesystemTypeChoice->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( VolumeFormatOptionsWizardPageBase::OnFilesystemTypeSelected ), NULL, this );
QuickFormatCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( VolumeFormatOptionsWizardPageBase::OnQuickFormatCheckBoxClick ), NULL, this );
@@ -3202,109 +3202,109 @@ VolumeFormatOptionsWizardPageBase::~VolumeFormatOptionsWizardPageBase()
// Disconnect Events
FilesystemTypeChoice->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( VolumeFormatOptionsWizardPageBase::OnFilesystemTypeSelected ), NULL, this );
QuickFormatCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( VolumeFormatOptionsWizardPageBase::OnQuickFormatCheckBoxClick ), NULL, this );
-
+
}
VolumePasswordPanelBase::VolumePasswordPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
{
wxBoxSizer* bSizer7;
bSizer7 = new wxBoxSizer( wxVERTICAL );
-
+
GridBagSizer = new wxGridBagSizer( 0, 0 );
GridBagSizer->SetFlexibleDirection( wxBOTH );
GridBagSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
GridBagSizer->SetEmptyCellSize( wxSize( 0,0 ) );
-
+
PasswordStaticText = new wxStaticText( this, wxID_ANY, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 );
PasswordStaticText->Wrap( -1 );
GridBagSizer->Add( PasswordStaticText, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxBOTTOM|wxRIGHT, 5 );
-
+
PasswordTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD );
- PasswordTextCtrl->SetMaxLength( 1 );
+ PasswordTextCtrl->SetMaxLength( 1 );
PasswordTextCtrl->SetMinSize( wxSize( 232,-1 ) );
-
+
GridBagSizer->Add( PasswordTextCtrl, wxGBPosition( 1, 1 ), wxGBSpan( 1, 2 ), wxBOTTOM|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-
+
ConfirmPasswordStaticText = new wxStaticText( this, wxID_ANY, _("Confirm password:"), wxDefaultPosition, wxDefaultSize, 0 );
ConfirmPasswordStaticText->Wrap( -1 );
GridBagSizer->Add( ConfirmPasswordStaticText, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
-
+
ConfirmPasswordTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD );
- ConfirmPasswordTextCtrl->SetMaxLength( 1 );
+ ConfirmPasswordTextCtrl->SetMaxLength( 1 );
ConfirmPasswordTextCtrl->SetMinSize( wxSize( 232,-1 ) );
-
+
GridBagSizer->Add( ConfirmPasswordTextCtrl, wxGBPosition( 2, 1 ), wxGBSpan( 1, 2 ), wxBOTTOM|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-
+
VolumePimStaticText = new wxStaticText( this, wxID_ANY, _("Volume PIM:"), wxDefaultPosition, wxDefaultSize, 0 );
VolumePimStaticText->Wrap( -1 );
GridBagSizer->Add( VolumePimStaticText, wxGBPosition( 3, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxBOTTOM|wxRIGHT, 5 );
-
+
VolumePimTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD );
- VolumePimTextCtrl->SetMaxLength( 7 );
+ VolumePimTextCtrl->SetMaxLength( 7 );
GridBagSizer->Add( VolumePimTextCtrl, wxGBPosition( 3, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND, 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 );
-
+
PimCheckBox = new wxCheckBox( this, wxID_ANY, _("Use PIM"), wxDefaultPosition, wxDefaultSize, 0 );
GridBagSizer->Add( PimCheckBox, wxGBPosition( 4, 1 ), wxGBSpan( 1, 2 ), wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-
+
CacheCheckBox = new wxCheckBox( this, wxID_ANY, _("Cach&e passwords and keyfiles in memory "), wxDefaultPosition, wxDefaultSize, 0 );
GridBagSizer->Add( CacheCheckBox, wxGBPosition( 5, 1 ), wxGBSpan( 1, 2 ), wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-
+
DisplayPasswordCheckBox = new wxCheckBox( this, wxID_ANY, _("&Display password"), wxDefaultPosition, wxDefaultSize, 0 );
GridBagSizer->Add( DisplayPasswordCheckBox, wxGBPosition( 6, 1 ), wxGBSpan( 1, 2 ), wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-
+
UseKeyfilesCheckBox = new wxCheckBox( this, wxID_ANY, _("U&se keyfiles"), wxDefaultPosition, wxDefaultSize, 0 );
GridBagSizer->Add( UseKeyfilesCheckBox, wxGBPosition( 7, 1 ), wxGBSpan( 1, 1 ), wxTOP|wxRIGHT|wxLEFT, 5 );
-
+
KeyfilesButton = new wxButton( this, wxID_ANY, _("&Keyfiles..."), wxDefaultPosition, wxDefaultSize, 0 );
GridBagSizer->Add( KeyfilesButton, wxGBPosition( 7, 2 ), wxGBSpan( 1, 1 ), wxALIGN_RIGHT|wxALIGN_BOTTOM|wxLEFT, 5 );
-
+
Pkcs5PrfSizer = new wxBoxSizer( wxVERTICAL );
-
-
+
+
GridBagSizer->Add( Pkcs5PrfSizer, wxGBPosition( 8, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxTOP|wxBOTTOM, 5 );
-
+
Pkcs5PrfStaticText = new wxStaticText( this, wxID_ANY, _("PKCS-5 PRF:"), wxDefaultPosition, wxDefaultSize, 0 );
Pkcs5PrfStaticText->Wrap( -1 );
GridBagSizer->Add( Pkcs5PrfStaticText, wxGBPosition( 9, 0 ), wxGBSpan( 1, 1 ), wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
+
wxString Pkcs5PrfChoiceChoices[] = { _("Unchanged") };
int Pkcs5PrfChoiceNChoices = sizeof( Pkcs5PrfChoiceChoices ) / sizeof( wxString );
Pkcs5PrfChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, Pkcs5PrfChoiceNChoices, Pkcs5PrfChoiceChoices, 0 );
Pkcs5PrfChoice->SetSelection( 0 );
GridBagSizer->Add( Pkcs5PrfChoice, wxGBPosition( 9, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-
+
TrueCryptModeCheckBox = new wxCheckBox( this, wxID_ANY, _("TrueCrypt Mode"), wxDefaultPosition, wxDefaultSize, 0 );
GridBagSizer->Add( TrueCryptModeCheckBox, wxGBPosition( 9, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-
+
HeaderWipeCountText = new wxStaticText( this, wxID_ANY, _("Header Wipe:"), wxDefaultPosition, wxDefaultSize, 0 );
HeaderWipeCountText->Wrap( -1 );
GridBagSizer->Add( HeaderWipeCountText, wxGBPosition( 10, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT, 5 );
-
+
wxString HeaderWipeCountChoices[] = { _("1-pass"), _("3-pass"), _("7-pass"), _("35-pass"), _("256-pass") };
int HeaderWipeCountNChoices = sizeof( HeaderWipeCountChoices ) / sizeof( wxString );
HeaderWipeCount = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, HeaderWipeCountNChoices, HeaderWipeCountChoices, 0 );
HeaderWipeCount->SetSelection( 1 );
GridBagSizer->Add( HeaderWipeCount, wxGBPosition( 10, 1 ), wxGBSpan( 1, 1 ), wxALL, 5 );
-
+
PasswordPlaceholderSizer = new wxBoxSizer( wxVERTICAL );
-
-
+
+
GridBagSizer->Add( PasswordPlaceholderSizer, wxGBPosition( 11, 1 ), wxGBSpan( 1, 2 ), wxTOP|wxEXPAND, 5 );
-
-
+
+
GridBagSizer->AddGrowableCol( 1 );
-
+
bSizer7->Add( GridBagSizer, 1, wxALL|wxEXPAND, 5 );
-
-
+
+
this->SetSizer( bSizer7 );
this->Layout();
bSizer7->Fit( this );
-
+
// Connect Events
PasswordTextCtrl->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( VolumePasswordPanelBase::OnTextChanged ), NULL, this );
ConfirmPasswordTextCtrl->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( VolumePasswordPanelBase::OnTextChanged ), NULL, this );
@@ -3331,30 +3331,30 @@ VolumePasswordPanelBase::~VolumePasswordPanelBase()
KeyfilesButton->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( VolumePasswordPanelBase::OnKeyfilesButtonRightDown ), NULL, this );
KeyfilesButton->Disconnect( wxEVT_RIGHT_UP, wxMouseEventHandler( VolumePasswordPanelBase::OnKeyfilesButtonRightClick ), NULL, this );
TrueCryptModeCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( VolumePasswordPanelBase::OnTrueCryptModeChecked ), NULL, this );
-
+
}
VolumePasswordWizardPageBase::VolumePasswordWizardPageBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : WizardPage( parent, id, pos, size, style )
{
wxBoxSizer* bSizer101;
bSizer101 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer102;
bSizer102 = new wxBoxSizer( wxVERTICAL );
-
+
PasswordPanelSizer = new wxBoxSizer( wxVERTICAL );
-
-
+
+
bSizer102->Add( PasswordPanelSizer, 0, wxEXPAND, 5 );
-
+
InfoStaticText = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
InfoStaticText->Wrap( -1 );
bSizer102->Add( InfoStaticText, 0, wxALL|wxEXPAND, 5 );
-
-
+
+
bSizer101->Add( bSizer102, 1, wxEXPAND, 5 );
-
-
+
+
this->SetSizer( bSizer101 );
this->Layout();
bSizer101->Fit( this );
@@ -3368,53 +3368,53 @@ VolumePimWizardPageBase::VolumePimWizardPageBase( wxWindow* parent, wxWindowID i
{
wxBoxSizer* bSizer101;
bSizer101 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer102;
bSizer102 = new wxBoxSizer( wxVERTICAL );
-
+
PimPanelSizer = new wxBoxSizer( wxVERTICAL );
-
+
PimSizer = new wxBoxSizer( wxHORIZONTAL );
-
+
VolumePimStaticText = new wxStaticText( this, wxID_ANY, _("Volume PIM:"), wxDefaultPosition, wxDefaultSize, 0 );
VolumePimStaticText->Wrap( -1 );
PimSizer->Add( VolumePimStaticText, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
+
VolumePimTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD );
- VolumePimTextCtrl->SetMaxLength( 7 );
+ VolumePimTextCtrl->SetMaxLength( 7 );
PimSizer->Add( VolumePimTextCtrl, 0, 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 );
-
+
wxBoxSizer* bSizer166;
bSizer166 = new wxBoxSizer( wxHORIZONTAL );
-
+
DisplayPimCheckBox = new wxCheckBox( this, wxID_ANY, _("&Display PIM"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer166->Add( DisplayPimCheckBox, 1, wxALL|wxEXPAND, 5 );
-
-
+
+
PimPanelSizer->Add( bSizer166, 1, wxEXPAND, 5 );
-
-
+
+
bSizer102->Add( PimPanelSizer, 0, wxEXPAND, 5 );
-
+
InfoStaticText = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
InfoStaticText->Wrap( -1 );
bSizer102->Add( InfoStaticText, 0, wxALL|wxEXPAND, 5 );
-
-
+
+
bSizer101->Add( bSizer102, 1, wxEXPAND, 5 );
-
-
+
+
this->SetSizer( bSizer101 );
this->Layout();
bSizer101->Fit( this );
-
+
// Connect Events
VolumePimTextCtrl->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( VolumePimWizardPageBase::OnPimChanged ), NULL, this );
DisplayPimCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( VolumePimWizardPageBase::OnDisplayPimCheckBoxClick ), NULL, this );
@@ -3425,57 +3425,57 @@ VolumePimWizardPageBase::~VolumePimWizardPageBase()
// Disconnect Events
VolumePimTextCtrl->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( VolumePimWizardPageBase::OnPimChanged ), NULL, this );
DisplayPimCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( VolumePimWizardPageBase::OnDisplayPimCheckBoxClick ), NULL, this );
-
+
}
VolumeSizeWizardPageBase::VolumeSizeWizardPageBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : WizardPage( parent, id, pos, size, style )
{
wxBoxSizer* bSizer98;
bSizer98 = new wxBoxSizer( wxVERTICAL );
-
+
wxBoxSizer* bSizer99;
bSizer99 = new wxBoxSizer( wxVERTICAL );
-
-
+
+
bSizer99->Add( 0, 0, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
-
+
wxBoxSizer* bSizer100;
bSizer100 = new wxBoxSizer( wxHORIZONTAL );
-
+
VolumeSizeTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- VolumeSizeTextCtrl->SetMaxLength( 0 );
+ VolumeSizeTextCtrl->SetMaxLength( 0 );
bSizer100->Add( VolumeSizeTextCtrl, 0, wxALL, 5 );
-
+
wxArrayString VolumeSizePrefixChoiceChoices;
VolumeSizePrefixChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, VolumeSizePrefixChoiceChoices, 0 );
VolumeSizePrefixChoice->SetSelection( 0 );
bSizer100->Add( VolumeSizePrefixChoice, 0, wxALL, 5 );
-
-
+
+
bSizer99->Add( bSizer100, 0, wxEXPAND, 5 );
-
-
+
+
bSizer99->Add( 0, 0, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
-
+
FreeSpaceStaticText = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
FreeSpaceStaticText->Wrap( -1 );
bSizer99->Add( FreeSpaceStaticText, 0, wxALL|wxEXPAND, 5 );
-
-
+
+
bSizer99->Add( 0, 0, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
-
+
InfoStaticText = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
InfoStaticText->Wrap( -1 );
bSizer99->Add( InfoStaticText, 0, wxALL|wxEXPAND, 5 );
-
-
+
+
bSizer98->Add( bSizer99, 0, wxEXPAND, 5 );
-
-
+
+
this->SetSizer( bSizer98 );
this->Layout();
bSizer98->Fit( this );
-
+
// Connect Events
VolumeSizeTextCtrl->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( VolumeSizeWizardPageBase::OnVolumeSizeTextChanged ), NULL, this );
VolumeSizePrefixChoice->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( VolumeSizeWizardPageBase::OnVolumeSizePrefixSelected ), NULL, this );
@@ -3486,31 +3486,31 @@ VolumeSizeWizardPageBase::~VolumeSizeWizardPageBase()
// Disconnect Events
VolumeSizeTextCtrl->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( VolumeSizeWizardPageBase::OnVolumeSizeTextChanged ), NULL, this );
VolumeSizePrefixChoice->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( VolumeSizeWizardPageBase::OnVolumeSizePrefixSelected ), NULL, this );
-
+
}
WaitDialogBase::WaitDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
{
this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-
+
wxBoxSizer* bSizer160;
bSizer160 = new wxBoxSizer( wxVERTICAL );
-
+
WaitStaticText = new wxStaticText( this, wxID_ANY, _("MyLabel"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
WaitStaticText->Wrap( -1 );
bSizer160->Add( WaitStaticText, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5 );
-
+
WaitProgessBar = new wxGauge( this, wxID_ANY, 100, wxDefaultPosition, wxDefaultSize, wxGA_HORIZONTAL|wxGA_SMOOTH );
- WaitProgessBar->SetValue( 0 );
+ WaitProgessBar->SetValue( 0 );
bSizer160->Add( WaitProgessBar, 0, wxALL|wxEXPAND, 5 );
-
-
+
+
this->SetSizer( bSizer160 );
this->Layout();
bSizer160->Fit( this );
-
+
this->Centre( wxBOTH );
-
+
// Connect Events
this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( WaitDialogBase::OnWaitDialogClose ) );
this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( WaitDialogBase::OnWaitDialogInit ) );
@@ -3521,5 +3521,5 @@ WaitDialogBase::~WaitDialogBase()
// Disconnect Events
this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( WaitDialogBase::OnWaitDialogClose ) );
this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( WaitDialogBase::OnWaitDialogInit ) );
-
+
}
diff --git a/src/Main/Forms/Forms.h b/src/Main/Forms/Forms.h
index fd558e9..129ae15 100644
--- a/src/Main/Forms/Forms.h
+++ b/src/Main/Forms/Forms.h
@@ -50,10 +50,10 @@ namespace VeraCrypt
///////////////////////////////////////////////////////////////////////////////
/// Class MainFrameBase
///////////////////////////////////////////////////////////////////////////////
- class MainFrameBase : public wxFrame
+ class MainFrameBase : public wxFrame
{
private:
-
+
protected:
wxMenuBar* MainMenuBar;
wxMenu* VolumesMenu;
@@ -91,7 +91,7 @@ namespace VeraCrypt
wxButton* MountAllDevicesButton;
wxButton* DismountAllButton;
wxButton* ExitButton;
-
+
// Virtual event handlers, overide them in your derived class
virtual void OnActivate( wxActivateEvent& event ) { event.Skip(); }
virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
@@ -145,23 +145,23 @@ namespace VeraCrypt
virtual void OnSelectDeviceButtonClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnVolumeButtonClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnExitButtonClick( wxCommandEvent& event ) { event.Skip(); }
-
-
+
+
public:
-
+
MainFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("VeraCrypt"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxCAPTION|wxCLOSE_BOX|wxMINIMIZE_BOX|wxSYSTEM_MENU|wxTAB_TRAVERSAL );
-
+
~MainFrameBase();
-
+
};
-
+
///////////////////////////////////////////////////////////////////////////////
/// Class WizardFrameBase
///////////////////////////////////////////////////////////////////////////////
- class WizardFrameBase : public wxFrame
+ class WizardFrameBase : public wxFrame
{
private:
-
+
protected:
wxBoxSizer* MainSizer;
wxPanel* MainPanel;
@@ -172,7 +172,7 @@ namespace VeraCrypt
wxButton* PreviousButton;
wxButton* NextButton;
wxButton* CancelButton;
-
+
// Virtual event handlers, overide them in your derived class
virtual void OnActivate( wxActivateEvent& event ) { event.Skip(); }
virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
@@ -181,23 +181,23 @@ namespace VeraCrypt
virtual void OnPreviousButtonClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnNextButtonClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnCancelButtonClick( wxCommandEvent& event ) { event.Skip(); }
-
-
+
+
public:
-
+
WizardFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxCAPTION|wxCLOSE_BOX|wxMINIMIZE_BOX|wxSYSTEM_MENU|wxTAB_TRAVERSAL );
-
+
~WizardFrameBase();
-
+
};
-
+
///////////////////////////////////////////////////////////////////////////////
/// Class AboutDialogBase
///////////////////////////////////////////////////////////////////////////////
- class AboutDialogBase : public wxDialog
+ class AboutDialogBase : public wxDialog
{
private:
-
+
protected:
wxPanel* m_panel14;
wxStaticBitmap* LogoBitmap;
@@ -208,50 +208,50 @@ namespace VeraCrypt
wxTextCtrl* CreditsTextCtrl;
wxStaticLine* m_staticline4;
wxStaticLine* m_staticline5;
-
+
// Virtual event handlers, overide them in your derived class
virtual void OnWebsiteHyperlinkClick( wxHyperlinkEvent& event ) { event.Skip(); }
-
-
+
+
public:
-
- AboutDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+
+ AboutDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
~AboutDialogBase();
-
+
};
-
+
///////////////////////////////////////////////////////////////////////////////
/// Class BenchmarkDialogBase
///////////////////////////////////////////////////////////////////////////////
- class BenchmarkDialogBase : public wxDialog
+ class BenchmarkDialogBase : public wxDialog
{
private:
-
+
protected:
wxChoice* BufferSizeChoice;
wxListCtrl* BenchmarkListCtrl;
wxBoxSizer* RightSizer;
wxButton* BenchmarkButton;
wxStaticText* BenchmarkNoteStaticText;
-
+
// Virtual event handlers, overide them in your derived class
virtual void OnBenchmarkButtonClick( wxCommandEvent& event ) { event.Skip(); }
-
-
+
+
public:
-
- BenchmarkDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("VeraCrypt - Encryption Algorithm Benchmark"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+
+ BenchmarkDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("VeraCrypt - Encryption Algorithm Benchmark"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
~BenchmarkDialogBase();
-
+
};
-
+
///////////////////////////////////////////////////////////////////////////////
/// Class ChangePasswordDialogBase
///////////////////////////////////////////////////////////////////////////////
- class ChangePasswordDialogBase : public wxDialog
+ class ChangePasswordDialogBase : public wxDialog
{
private:
-
+
protected:
wxStaticBoxSizer* CurrentSizer;
wxBoxSizer* CurrentPasswordPanelSizer;
@@ -259,51 +259,51 @@ namespace VeraCrypt
wxBoxSizer* NewPasswordPanelSizer;
wxButton* OKButton;
wxButton* CancelButton;
-
+
// Virtual event handlers, overide them in your derived class
virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
-
-
+
+
public:
-
- ChangePasswordDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+
+ ChangePasswordDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
~ChangePasswordDialogBase();
-
+
};
-
+
///////////////////////////////////////////////////////////////////////////////
/// Class DeviceSelectionDialogBase
///////////////////////////////////////////////////////////////////////////////
- class DeviceSelectionDialogBase : public wxDialog
+ class DeviceSelectionDialogBase : public wxDialog
{
private:
-
+
protected:
wxListCtrl* DeviceListCtrl;
wxStdDialogButtonSizer* StdButtons;
wxButton* StdButtonsOK;
wxButton* StdButtonsCancel;
-
+
// Virtual event handlers, overide them in your derived class
virtual void OnListItemActivated( wxListEvent& event ) { event.Skip(); }
virtual void OnListItemDeselected( wxListEvent& event ) { event.Skip(); }
virtual void OnListItemSelected( wxListEvent& event ) { event.Skip(); }
-
-
+
+
public:
-
- DeviceSelectionDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select a Partition or Device"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
+
+ DeviceSelectionDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select a Partition or Device"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
~DeviceSelectionDialogBase();
-
+
};
-
+
///////////////////////////////////////////////////////////////////////////////
/// Class EncryptionTestDialogBase
///////////////////////////////////////////////////////////////////////////////
- class EncryptionTestDialogBase : public wxDialog
+ class EncryptionTestDialogBase : public wxDialog
{
private:
-
+
protected:
wxChoice* EncryptionAlgorithmChoice;
wxCheckBox* XtsModeCheckBox;
@@ -319,7 +319,7 @@ namespace VeraCrypt
wxButton* AutoTestAllButton;
wxButton* ResetButton;
wxButton* CloseButton;
-
+
// Virtual event handlers, overide them in your derived class
virtual void OnEncryptionAlgorithmSelected( wxCommandEvent& event ) { event.Skip(); }
virtual void OnXtsModeCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
@@ -327,22 +327,22 @@ namespace VeraCrypt
virtual void OnDecryptButtonClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnAutoTestAllButtonClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnResetButtonClick( wxCommandEvent& event ) { event.Skip(); }
-
-
+
+
public:
-
- EncryptionTestDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("VeraCrypt - Test Vectors"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+
+ EncryptionTestDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("VeraCrypt - Test Vectors"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
~EncryptionTestDialogBase();
-
+
};
-
+
///////////////////////////////////////////////////////////////////////////////
/// Class FavoriteVolumesDialogBase
///////////////////////////////////////////////////////////////////////////////
- class FavoriteVolumesDialogBase : public wxDialog
+ class FavoriteVolumesDialogBase : public wxDialog
{
private:
-
+
protected:
wxListCtrl* FavoritesListCtrl;
wxButton* MoveUpButton;
@@ -351,7 +351,7 @@ namespace VeraCrypt
wxButton* RemoveAllButton;
wxButton* OKButton;
wxButton* CancelButton;
-
+
// Virtual event handlers, overide them in your derived class
virtual void OnListItemDeselected( wxListEvent& event ) { event.Skip(); }
virtual void OnListItemSelected( wxListEvent& event ) { event.Skip(); }
@@ -360,22 +360,22 @@ namespace VeraCrypt
virtual void OnRemoveButtonClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnRemoveAllButtonClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
-
-
+
+
public:
-
- FavoriteVolumesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Favorite Volumes"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+
+ FavoriteVolumesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Favorite Volumes"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
~FavoriteVolumesDialogBase();
-
+
};
-
+
///////////////////////////////////////////////////////////////////////////////
/// Class KeyfilesDialogBase
///////////////////////////////////////////////////////////////////////////////
- class KeyfilesDialogBase : public wxDialog
+ class KeyfilesDialogBase : public wxDialog
{
private:
-
+
protected:
wxBoxSizer* UpperSizer;
wxBoxSizer* PanelSizer;
@@ -386,26 +386,26 @@ namespace VeraCrypt
wxStaticText* KeyfilesNoteStaticText;
wxHyperlinkCtrl* KeyfilesHyperlink;
wxButton* CreateKeyfileButtton;
-
+
// Virtual event handlers, overide them in your derived class
virtual void OnKeyfilesHyperlinkClick( wxHyperlinkEvent& event ) { event.Skip(); }
virtual void OnCreateKeyfileButttonClick( wxCommandEvent& event ) { event.Skip(); }
-
-
+
+
public:
-
- KeyfilesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select Keyfiles"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+
+ KeyfilesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select Keyfiles"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
~KeyfilesDialogBase();
-
+
};
-
+
///////////////////////////////////////////////////////////////////////////////
/// Class KeyfileGeneratorDialogBase
///////////////////////////////////////////////////////////////////////////////
- class KeyfileGeneratorDialogBase : public wxDialog
+ class KeyfileGeneratorDialogBase : public wxDialog
{
private:
-
+
protected:
wxBoxSizer* MainSizer;
wxChoice* HashChoice;
@@ -423,46 +423,46 @@ namespace VeraCrypt
wxTextCtrl* KeyfilesBaseName;
wxPanel* m_panel19;
wxButton* GenerateButton;
-
+
// Virtual event handlers, overide them in your derived class
virtual void OnMouseMotion( wxMouseEvent& event ) { event.Skip(); }
virtual void OnHashSelected( wxCommandEvent& event ) { event.Skip(); }
virtual void OnShowRandomPoolCheckBoxClicked( wxCommandEvent& event ) { event.Skip(); }
virtual void OnRandomSizeCheckBoxClicked( wxCommandEvent& event ) { event.Skip(); }
virtual void OnGenerateButtonClick( wxCommandEvent& event ) { event.Skip(); }
-
-
+
+
public:
-
- KeyfileGeneratorDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+
+ KeyfileGeneratorDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
~KeyfileGeneratorDialogBase();
-
+
};
-
+
///////////////////////////////////////////////////////////////////////////////
/// Class LegalNoticesDialogBase
///////////////////////////////////////////////////////////////////////////////
- class LegalNoticesDialogBase : public wxDialog
+ class LegalNoticesDialogBase : public wxDialog
{
private:
-
+
protected:
wxTextCtrl* LegalNoticesTextCtrl;
-
+
public:
-
- LegalNoticesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("VeraCrypt - Legal Notices"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+
+ LegalNoticesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("VeraCrypt - Legal Notices"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
~LegalNoticesDialogBase();
-
+
};
-
+
///////////////////////////////////////////////////////////////////////////////
/// Class MountOptionsDialogBase
///////////////////////////////////////////////////////////////////////////////
- class MountOptionsDialogBase : public wxDialog
+ class MountOptionsDialogBase : public wxDialog
{
private:
-
+
protected:
wxBoxSizer* MainSizer;
wxBoxSizer* PasswordSizer;
@@ -488,7 +488,7 @@ namespace VeraCrypt
wxButton* MountPointButton;
wxStaticText* FilesystemOptionsStaticText;
wxTextCtrl* FilesystemOptionsTextCtrl;
-
+
// Virtual event handlers, overide them in your derived class
virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
@@ -498,47 +498,47 @@ namespace VeraCrypt
virtual void OnProtectionHyperlinkClick( wxHyperlinkEvent& event ) { event.Skip(); }
virtual void OnNoFilesystemCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnMountPointButtonClick( wxCommandEvent& event ) { event.Skip(); }
-
-
+
+
public:
-
- MountOptionsDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Enter VeraCrypt Volume Password"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
+
+ MountOptionsDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Enter VeraCrypt Volume Password"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
~MountOptionsDialogBase();
-
+
};
-
+
///////////////////////////////////////////////////////////////////////////////
/// Class NewSecurityTokenKeyfileDialogBase
///////////////////////////////////////////////////////////////////////////////
- class NewSecurityTokenKeyfileDialogBase : public wxDialog
+ class NewSecurityTokenKeyfileDialogBase : public wxDialog
{
private:
-
+
protected:
wxChoice* SecurityTokenChoice;
wxTextCtrl* KeyfileNameTextCtrl;
wxStdDialogButtonSizer* StdButtons;
wxButton* StdButtonsOK;
wxButton* StdButtonsCancel;
-
+
// Virtual event handlers, overide them in your derived class
virtual void OnKeyfileNameChanged( wxCommandEvent& event ) { event.Skip(); }
-
-
+
+
public:
-
- NewSecurityTokenKeyfileDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("New Security Token Keyfile Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+
+ NewSecurityTokenKeyfileDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("New Security Token Keyfile Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
~NewSecurityTokenKeyfileDialogBase();
-
+
};
-
+
///////////////////////////////////////////////////////////////////////////////
/// Class PreferencesDialogBase
///////////////////////////////////////////////////////////////////////////////
- class PreferencesDialogBase : public wxDialog
+ class PreferencesDialogBase : public wxDialog
{
private:
-
+
protected:
wxNotebook* PreferencesNotebook;
wxPanel* SecurityPage;
@@ -598,7 +598,7 @@ namespace VeraCrypt
wxStdDialogButtonSizer* StdButtons;
wxButton* StdButtonsOK;
wxButton* StdButtonsCancel;
-
+
// Virtual event handlers, overide them in your derived class
virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
virtual void OnDismountOnScreenSaverCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
@@ -615,26 +615,26 @@ namespace VeraCrypt
virtual void OnRemoveHotkeyButtonClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnCancelButtonClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
-
-
+
+
public:
wxPanel* DefaultMountOptionsPage;
wxPanel* DefaultKeyfilesPage;
wxPanel* SecurityTokensPage;
wxPanel* HotkeysPage;
-
- PreferencesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Preferences"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+
+ PreferencesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Preferences"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
~PreferencesDialogBase();
-
+
};
-
+
///////////////////////////////////////////////////////////////////////////////
/// Class RandomPoolEnrichmentDialogBase
///////////////////////////////////////////////////////////////////////////////
- class RandomPoolEnrichmentDialogBase : public wxDialog
+ class RandomPoolEnrichmentDialogBase : public wxDialog
{
private:
-
+
protected:
wxBoxSizer* MainSizer;
wxChoice* HashChoice;
@@ -643,27 +643,27 @@ namespace VeraCrypt
wxGauge* CollectedEntropy;
wxStaticText* MouseStaticText;
wxButton* ContinueButton;
-
+
// Virtual event handlers, overide them in your derived class
virtual void OnMouseMotion( wxMouseEvent& event ) { event.Skip(); }
virtual void OnHashSelected( wxCommandEvent& event ) { event.Skip(); }
virtual void OnShowRandomPoolCheckBoxClicked( wxCommandEvent& event ) { event.Skip(); }
-
-
+
+
public:
-
- RandomPoolEnrichmentDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("VeraCrypt - Random Pool Enrichment"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+
+ RandomPoolEnrichmentDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("VeraCrypt - Random Pool Enrichment"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
~RandomPoolEnrichmentDialogBase();
-
+
};
-
+
///////////////////////////////////////////////////////////////////////////////
/// Class SecurityTokenKeyfilesDialogBase
///////////////////////////////////////////////////////////////////////////////
- class SecurityTokenKeyfilesDialogBase : public wxDialog
+ class SecurityTokenKeyfilesDialogBase : public wxDialog
{
private:
-
+
protected:
wxListCtrl* SecurityTokenKeyfileListCtrl;
wxButton* ExportButton;
@@ -671,7 +671,7 @@ namespace VeraCrypt
wxButton* ImportButton;
wxButton* OKButton;
wxButton* CancelButton;
-
+
// Virtual event handlers, overide them in your derived class
virtual void OnListItemActivated( wxListEvent& event ) { event.Skip(); }
virtual void OnListItemDeselected( wxListEvent& event ) { event.Skip(); }
@@ -680,41 +680,41 @@ namespace VeraCrypt
virtual void OnDeleteButtonClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnImportButtonClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
-
-
+
+
public:
-
- SecurityTokenKeyfilesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Security Token Keyfiles"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
+
+ SecurityTokenKeyfilesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Security Token Keyfiles"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
~SecurityTokenKeyfilesDialogBase();
-
+
};
-
+
///////////////////////////////////////////////////////////////////////////////
/// Class VolumePropertiesDialogBase
///////////////////////////////////////////////////////////////////////////////
- class VolumePropertiesDialogBase : public wxDialog
+ class VolumePropertiesDialogBase : public wxDialog
{
private:
-
+
protected:
wxListCtrl* PropertiesListCtrl;
wxStdDialogButtonSizer* StdButtons;
wxButton* StdButtonsOK;
-
+
public:
-
- VolumePropertiesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Volume Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+
+ VolumePropertiesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Volume Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
~VolumePropertiesDialogBase();
-
+
};
-
+
///////////////////////////////////////////////////////////////////////////////
/// Class EncryptionOptionsWizardPageBase
///////////////////////////////////////////////////////////////////////////////
class EncryptionOptionsWizardPageBase : public WizardPage
{
private:
-
+
protected:
wxChoice* EncryptionAlgorithmChoice;
wxButton* TestButton;
@@ -723,47 +723,47 @@ namespace VeraCrypt
wxButton* BenchmarkButton;
wxChoice* HashChoice;
wxHyperlinkCtrl* HashHyperlink;
-
+
// Virtual event handlers, overide them in your derived class
virtual void OnEncryptionAlgorithmSelected( wxCommandEvent& event ) { event.Skip(); }
virtual void OnTestButtonClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnEncryptionAlgorithmHyperlinkClick( wxHyperlinkEvent& event ) { event.Skip(); }
virtual void OnBenchmarkButtonClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnHashHyperlinkClick( wxHyperlinkEvent& event ) { event.Skip(); }
-
-
+
+
public:
-
- EncryptionOptionsWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
+
+ EncryptionOptionsWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
~EncryptionOptionsWizardPageBase();
-
+
};
-
+
///////////////////////////////////////////////////////////////////////////////
/// Class InfoWizardPageBase
///////////////////////////////////////////////////////////////////////////////
class InfoWizardPageBase : public WizardPage
{
private:
-
+
protected:
wxBoxSizer* InfoPageSizer;
wxStaticText* InfoStaticText;
-
+
public:
-
- InfoWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
+
+ InfoWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
~InfoWizardPageBase();
-
+
};
-
+
///////////////////////////////////////////////////////////////////////////////
/// Class KeyfilesPanelBase
///////////////////////////////////////////////////////////////////////////////
- class KeyfilesPanelBase : public wxPanel
+ class KeyfilesPanelBase : public wxPanel
{
private:
-
+
protected:
wxListCtrl* KeyfilesListCtrl;
wxButton* AddFilesButton;
@@ -771,7 +771,7 @@ namespace VeraCrypt
wxButton* AddSecurityTokenSignatureButton;
wxButton* RemoveButton;
wxButton* RemoveAllButton;
-
+
// Virtual event handlers, overide them in your derived class
virtual void OnListItemDeselected( wxListEvent& event ) { event.Skip(); }
virtual void OnListItemSelected( wxListEvent& event ) { event.Skip(); }
@@ -781,89 +781,89 @@ namespace VeraCrypt
virtual void OnAddSecurityTokenSignatureButtonClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnRemoveButtonClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnRemoveAllButtonClick( wxCommandEvent& event ) { event.Skip(); }
-
-
+
+
public:
-
- KeyfilesPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
+
+ KeyfilesPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
~KeyfilesPanelBase();
-
+
};
-
+
///////////////////////////////////////////////////////////////////////////////
/// Class ProgressWizardPageBase
///////////////////////////////////////////////////////////////////////////////
class ProgressWizardPageBase : public WizardPage
{
private:
-
+
protected:
wxBoxSizer* ProgressSizer;
wxGauge* ProgressGauge;
wxButton* AbortButton;
wxStaticText* InfoStaticText;
-
+
// Virtual event handlers, overide them in your derived class
virtual void OnAbortButtonClick( wxCommandEvent& event ) { event.Skip(); }
-
-
+
+
public:
-
- ProgressWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
+
+ ProgressWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
~ProgressWizardPageBase();
-
+
};
-
+
///////////////////////////////////////////////////////////////////////////////
/// Class SelectDirectoryWizardPageBase
///////////////////////////////////////////////////////////////////////////////
class SelectDirectoryWizardPageBase : public WizardPage
{
private:
-
+
protected:
wxTextCtrl* DirectoryTextCtrl;
wxButton* BrowseButton;
wxStaticText* InfoStaticText;
-
+
// Virtual event handlers, overide them in your derived class
virtual void OnDirectoryTextChanged( wxCommandEvent& event ) { event.Skip(); }
virtual void OnBrowseButtonClick( wxCommandEvent& event ) { event.Skip(); }
-
-
+
+
public:
-
- SelectDirectoryWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
+
+ SelectDirectoryWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
~SelectDirectoryWizardPageBase();
-
+
};
-
+
///////////////////////////////////////////////////////////////////////////////
/// Class SingleChoiceWizardPageBase
///////////////////////////////////////////////////////////////////////////////
class SingleChoiceWizardPageBase : public WizardPage
{
private:
-
+
protected:
wxBoxSizer* OuterChoicesSizer;
wxBoxSizer* ChoicesSizer;
wxStaticText* InfoStaticText;
-
+
public:
-
- SingleChoiceWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
+
+ SingleChoiceWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
~SingleChoiceWizardPageBase();
-
+
};
-
+
///////////////////////////////////////////////////////////////////////////////
/// Class VolumeCreationProgressWizardPageBase
///////////////////////////////////////////////////////////////////////////////
class VolumeCreationProgressWizardPageBase : public WizardPage
{
private:
-
+
protected:
wxBoxSizer* KeySamplesUpperSizer;
wxBoxSizer* KeySamplesUpperInnerSizer;
@@ -884,79 +884,79 @@ namespace VeraCrypt
wxPanel* m_panel122;
wxStaticText* TimeLeftStaticText;
wxStaticText* InfoStaticText;
-
+
// Virtual event handlers, overide them in your derived class
virtual void OnDisplayKeysCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnAbortButtonClick( wxCommandEvent& event ) { event.Skip(); }
-
-
+
+
public:
-
- VolumeCreationProgressWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
+
+ VolumeCreationProgressWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
~VolumeCreationProgressWizardPageBase();
-
+
};
-
+
///////////////////////////////////////////////////////////////////////////////
/// Class VolumeLocationWizardPageBase
///////////////////////////////////////////////////////////////////////////////
class VolumeLocationWizardPageBase : public WizardPage
{
private:
-
+
protected:
wxComboBox* VolumePathComboBox;
wxButton* SelectFileButton;
wxButton* SelectDeviceButton;
wxCheckBox* NoHistoryCheckBox;
wxStaticText* InfoStaticText;
-
+
// Virtual event handlers, overide them in your derived class
virtual void OnVolumePathTextChanged( wxCommandEvent& event ) { event.Skip(); }
virtual void OnSelectFileButtonClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnSelectDeviceButtonClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnNoHistoryCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
-
-
+
+
public:
-
- VolumeLocationWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
+
+ VolumeLocationWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
~VolumeLocationWizardPageBase();
-
+
};
-
+
///////////////////////////////////////////////////////////////////////////////
/// Class VolumeFormatOptionsWizardPageBase
///////////////////////////////////////////////////////////////////////////////
class VolumeFormatOptionsWizardPageBase : public WizardPage
{
private:
-
+
protected:
wxStaticText* m_staticText43;
wxChoice* FilesystemTypeChoice;
wxCheckBox* QuickFormatCheckBox;
wxStaticText* InfoStaticText;
-
+
// Virtual event handlers, overide them in your derived class
virtual void OnFilesystemTypeSelected( wxCommandEvent& event ) { event.Skip(); }
virtual void OnQuickFormatCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
-
-
+
+
public:
-
- VolumeFormatOptionsWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
+
+ VolumeFormatOptionsWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
~VolumeFormatOptionsWizardPageBase();
-
+
};
-
+
///////////////////////////////////////////////////////////////////////////////
/// Class VolumePasswordPanelBase
///////////////////////////////////////////////////////////////////////////////
- class VolumePasswordPanelBase : public wxPanel
+ class VolumePasswordPanelBase : public wxPanel
{
private:
-
+
protected:
wxGridBagSizer* GridBagSizer;
wxStaticText* PasswordStaticText;
@@ -978,7 +978,7 @@ namespace VeraCrypt
wxStaticText* HeaderWipeCountText;
wxChoice* HeaderWipeCount;
wxBoxSizer* PasswordPlaceholderSizer;
-
+
// Virtual event handlers, overide them in your derived class
virtual void OnTextChanged( wxCommandEvent& event ) { event.Skip(); }
virtual void OnPimChanged( wxCommandEvent& event ) { event.Skip(); }
@@ -989,40 +989,40 @@ namespace VeraCrypt
virtual void OnKeyfilesButtonRightDown( wxMouseEvent& event ) { event.Skip(); }
virtual void OnKeyfilesButtonRightClick( wxMouseEvent& event ) { event.Skip(); }
virtual void OnTrueCryptModeChecked( wxCommandEvent& event ) { event.Skip(); }
-
-
+
+
public:
-
- VolumePasswordPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
+
+ VolumePasswordPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
~VolumePasswordPanelBase();
-
+
};
-
+
///////////////////////////////////////////////////////////////////////////////
/// Class VolumePasswordWizardPageBase
///////////////////////////////////////////////////////////////////////////////
class VolumePasswordWizardPageBase : public WizardPage
{
private:
-
+
protected:
wxBoxSizer* PasswordPanelSizer;
wxStaticText* InfoStaticText;
-
+
public:
-
- VolumePasswordWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
+
+ VolumePasswordWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
~VolumePasswordWizardPageBase();
-
+
};
-
+
///////////////////////////////////////////////////////////////////////////////
/// Class VolumePimWizardPageBase
///////////////////////////////////////////////////////////////////////////////
class VolumePimWizardPageBase : public WizardPage
{
private:
-
+
protected:
wxBoxSizer* PimPanelSizer;
wxBoxSizer* PimSizer;
@@ -1031,67 +1031,67 @@ namespace VeraCrypt
wxStaticText* VolumePimHelpStaticText;
wxCheckBox* DisplayPimCheckBox;
wxStaticText* InfoStaticText;
-
+
// Virtual event handlers, overide them in your derived class
virtual void OnPimChanged( wxCommandEvent& event ) { event.Skip(); }
virtual void OnDisplayPimCheckBoxClick( wxCommandEvent& event ) { event.Skip(); }
-
-
+
+
public:
-
- VolumePimWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
+
+ VolumePimWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
~VolumePimWizardPageBase();
-
+
};
-
+
///////////////////////////////////////////////////////////////////////////////
/// Class VolumeSizeWizardPageBase
///////////////////////////////////////////////////////////////////////////////
class VolumeSizeWizardPageBase : public WizardPage
{
private:
-
+
protected:
wxTextCtrl* VolumeSizeTextCtrl;
wxChoice* VolumeSizePrefixChoice;
wxStaticText* FreeSpaceStaticText;
wxStaticText* InfoStaticText;
-
+
// Virtual event handlers, overide them in your derived class
virtual void OnVolumeSizeTextChanged( wxCommandEvent& event ) { event.Skip(); }
virtual void OnVolumeSizePrefixSelected( wxCommandEvent& event ) { event.Skip(); }
-
-
+
+
public:
-
- VolumeSizeWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
+
+ VolumeSizeWizardPageBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
~VolumeSizeWizardPageBase();
-
+
};
-
+
///////////////////////////////////////////////////////////////////////////////
/// Class WaitDialogBase
///////////////////////////////////////////////////////////////////////////////
- class WaitDialogBase : public wxDialog
+ class WaitDialogBase : public wxDialog
{
private:
-
+
protected:
wxStaticText* WaitStaticText;
wxGauge* WaitProgessBar;
-
+
// Virtual event handlers, overide them in your derived class
virtual void OnWaitDialogClose( wxCloseEvent& event ) { event.Skip(); }
virtual void OnWaitDialogInit( wxInitDialogEvent& event ) { event.Skip(); }
-
-
+
+
public:
-
- WaitDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("VeraCrypt"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxCAPTION );
+
+ WaitDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("VeraCrypt"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxCAPTION );
~WaitDialogBase();
-
+
};
-
+
} // namespace VeraCrypt
#endif //__FORMS_H__
diff --git a/src/Main/Forms/InfoWizardPage.cpp b/src/Main/Forms/InfoWizardPage.cpp
index f41b1d5..1c36d11 100644
--- a/src/Main/Forms/InfoWizardPage.cpp
+++ b/src/Main/Forms/InfoWizardPage.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/Forms/InfoWizardPage.h b/src/Main/Forms/InfoWizardPage.h
index 1540204..f44061c 100644
--- a/src/Main/Forms/InfoWizardPage.h
+++ b/src/Main/Forms/InfoWizardPage.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/Forms/KeyfileGeneratorDialog.cpp b/src/Main/Forms/KeyfileGeneratorDialog.cpp
index 61f1628..885f56d 100644
--- a/src/Main/Forms/KeyfileGeneratorDialog.cpp
+++ b/src/Main/Forms/KeyfileGeneratorDialog.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -17,10 +17,10 @@
namespace VeraCrypt
{
- KeyfileGeneratorDialog::KeyfileGeneratorDialog (wxWindow* parent) : KeyfileGeneratorDialogBase (parent)
+ KeyfileGeneratorDialog::KeyfileGeneratorDialog (wxWindow* parent) : KeyfileGeneratorDialogBase (parent)
{
RandomNumberGenerator::Start();
-
+
Hashes = Hash::GetAvailableAlgorithms();
foreach (shared_ptr <Hash> hash, Hashes)
{
@@ -33,7 +33,7 @@ namespace VeraCrypt
HideBytes (RandomPoolStaticText, 24);
MouseStaticText->Wrap (Gui->GetCharWidth (MouseStaticText) * 70);
-
+
CollectedEntropy->SetRange (RNG_POOL_SIZE * 8);
MainSizer->SetMinSize (wxSize (-1, Gui->GetCharHeight (this) * 24));
@@ -41,7 +41,7 @@ namespace VeraCrypt
Layout();
Fit();
Center();
-
+
MouseEventsCounter = 0;
foreach (wxWindow *c, this->GetChildren())
@@ -57,36 +57,36 @@ namespace VeraCrypt
try
{
int keyfilesCount = NumberOfKeyfiles->GetValue();
- int keyfilesSize = KeyfilesSize->GetValue();
+ int keyfilesSize = KeyfilesSize->GetValue();
bool useRandomSize = RandomSizeCheckBox->IsChecked();
wxString keyfileBaseName = KeyfilesBaseName->GetValue();
keyfileBaseName.Trim(true);
keyfileBaseName.Trim(false);
-
+
if (keyfileBaseName.IsEmpty())
{
Gui->ShowWarning("KEYFILE_EMPTY_BASE_NAME");
return;
}
-
+
wxFileName baseFileName = wxFileName::FileName (keyfileBaseName);
if (!baseFileName.IsOk())
{
Gui->ShowWarning("KEYFILE_INVALID_BASE_NAME");
return;
}
-
+
DirectoryPath keyfilesDir = Gui->SelectDirectory (Gui->GetActiveWindow(), LangString["SELECT_KEYFILE_GENERATION_DIRECTORY"], false);
if (keyfilesDir.IsEmpty())
return;
-
+
wxFileName dirFileName = wxFileName::DirName( wstring(keyfilesDir).c_str() );
if (!dirFileName.IsDirWritable ())
{
Gui->ShowWarning(L"You don't have write permission on the selected directory");
return;
}
-
+
wxBusyCursor busy;
for (int i = 0; i < keyfilesCount; i++)
{
@@ -95,26 +95,26 @@ namespace VeraCrypt
{
SecureBuffer sizeBuffer (sizeof(int));
RandomNumberGenerator::GetData (sizeBuffer, true);
-
+
memcpy(&bufferLen, sizeBuffer.Ptr(), sizeof(int));
/* since keyfilesSize < 1024 * 1024, we mask with 0x000FFFFF */
bufferLen = (long) (((unsigned long) bufferLen) & 0x000FFFFF);
bufferLen %= ((1024*1024 - 64) + 1);
- bufferLen += 64;
+ bufferLen += 64;
}
else
bufferLen = keyfilesSize;
SecureBuffer keyfileBuffer (bufferLen);
RandomNumberGenerator::GetData (keyfileBuffer, true);
-
+
wstringstream convertStream;
convertStream << i;
- wxString suffix = L"_";
- suffix += convertStream.str().c_str();
-
+ wxString suffix = L"_";
+ suffix += convertStream.str().c_str();
+
wxFileName keyfileName;
if (i == 0)
{
@@ -131,12 +131,12 @@ namespace VeraCrypt
keyfileName.Assign(dirFileName.GetPath(), keyfileBaseName + suffix);
}
}
-
+
if (keyfileName.Exists())
{
wxString msg = wxString::Format(LangString["KEYFILE_ALREADY_EXISTS"], keyfileName.GetFullPath());
if (!Gui->AskYesNo (msg, false, true))
- return;
+ return;
}
{
@@ -175,7 +175,7 @@ namespace VeraCrypt
ShowBytes (RandomPoolStaticText, RandomNumberGenerator::PeekPool().GetRange (0, 24));
else
HideBytes (RandomPoolStaticText, 24);
-
+
/* conservative estimate: 1 mouse move event brings 1 bit of entropy
* https://security.stackexchange.com/questions/32844/for-how-much-time-should-i-randomly-move-the-mouse-for-generating-encryption-key/32848#32848
*/
@@ -183,7 +183,7 @@ namespace VeraCrypt
if (MouseEventsCounter < (RNG_POOL_SIZE * 8))
CollectedEntropy->SetValue (++MouseEventsCounter);
}
-
+
void KeyfileGeneratorDialog::OnShowRandomPoolCheckBoxClicked (wxCommandEvent& event)
{
if (!event.IsChecked())
@@ -217,7 +217,7 @@ namespace VeraCrypt
str[i] = L'X';
}
}
-
+
void KeyfileGeneratorDialog::HideBytes (wxStaticText *textCtrl, size_t len)
{
wxString str;
diff --git a/src/Main/Forms/KeyfileGeneratorDialog.h b/src/Main/Forms/KeyfileGeneratorDialog.h
index e4fd363..e990a70 100644
--- a/src/Main/Forms/KeyfileGeneratorDialog.h
+++ b/src/Main/Forms/KeyfileGeneratorDialog.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -32,7 +32,7 @@ namespace VeraCrypt
void OnRandomSizeCheckBoxClicked( wxCommandEvent& event );
void ShowBytes (wxStaticText *textCtrl, const ConstBufferPtr &buffer, bool appendDots = true);
void HideBytes (wxStaticText *textCtrl, size_t len);
-
+
HashList Hashes;
int MouseEventsCounter;
Mutex AccessMutex;
diff --git a/src/Main/Forms/KeyfilesDialog.cpp b/src/Main/Forms/KeyfilesDialog.cpp
index 9c7d456..f07df6b 100644
--- a/src/Main/Forms/KeyfilesDialog.cpp
+++ b/src/Main/Forms/KeyfilesDialog.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -35,7 +35,7 @@ namespace VeraCrypt
Fit();
Center();
}
-
+
void KeyfilesDialog::OnCreateKeyfileButttonClick (wxCommandEvent& event)
{
Gui->CreateKeyfile();
diff --git a/src/Main/Forms/KeyfilesDialog.h b/src/Main/Forms/KeyfilesDialog.h
index 01c5273..2471506 100644
--- a/src/Main/Forms/KeyfilesDialog.h
+++ b/src/Main/Forms/KeyfilesDialog.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/Forms/KeyfilesPanel.cpp b/src/Main/Forms/KeyfilesPanel.cpp
index d7e4835..782a5cd 100644
--- a/src/Main/Forms/KeyfilesPanel.cpp
+++ b/src/Main/Forms/KeyfilesPanel.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -84,7 +84,7 @@ namespace VeraCrypt
return keyfiles;
}
-
+
void KeyfilesPanel::OnAddDirectoryButtonClick (wxCommandEvent& event)
{
DirectoryPath dir = Gui->SelectDirectory (this, LangString["SELECT_KEYFILE_PATH"]);
diff --git a/src/Main/Forms/KeyfilesPanel.h b/src/Main/Forms/KeyfilesPanel.h
index 104a96d..e929732 100644
--- a/src/Main/Forms/KeyfilesPanel.h
+++ b/src/Main/Forms/KeyfilesPanel.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/Forms/LegalNoticesDialog.cpp b/src/Main/Forms/LegalNoticesDialog.cpp
index 5ed18ac..1bbdb2d 100644
--- a/src/Main/Forms/LegalNoticesDialog.cpp
+++ b/src/Main/Forms/LegalNoticesDialog.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -22,7 +22,7 @@ namespace VeraCrypt
LegalNoticesTextCtrl->SetMinSize (wxSize (
Gui->GetCharWidth (LegalNoticesTextCtrl) * 88,
Gui->GetCharHeight (LegalNoticesTextCtrl) * 28));
-
+
Layout();
Fit();
Center();
diff --git a/src/Main/Forms/LegalNoticesDialog.h b/src/Main/Forms/LegalNoticesDialog.h
index e33f35c..49b1878 100644
--- a/src/Main/Forms/LegalNoticesDialog.h
+++ b/src/Main/Forms/LegalNoticesDialog.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/Forms/MainFrame.cpp b/src/Main/Forms/MainFrame.cpp
index e467eba..b693fbe 100644
--- a/src/Main/Forms/MainFrame.cpp
+++ b/src/Main/Forms/MainFrame.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -208,7 +208,7 @@ namespace VeraCrypt
wstring args = StringFormatter (repair ? L"/C echo {0} & chkdsk {1} /F /X & pause" : L"/C echo {0} & chkdsk {1} & pause",
StringFormatter (LangString[repair ? "REPAIRING_FS" : "CHECKING_FS"], mountPoint), mountPoint);
- ShellExecute (static_cast <HWND> (GetHandle()),
+ ShellExecute (static_cast <HWND> (GetHandle()),
L"runas",
L"cmd.exe", args.c_str(), nullptr, SW_SHOW);
#else
@@ -260,7 +260,7 @@ namespace VeraCrypt
void MainFrame::InitControls ()
{
LogoBitmap->SetBitmap (Resources::GetLogoBitmap());
-
+
list <int> colPermilles;
#ifndef TC_WINDOWS
@@ -280,7 +280,7 @@ namespace VeraCrypt
MountAllDevicesButton->SetLabel (_("Mount All Devices"));
#endif
-#ifdef TC_WINDOWS
+#ifdef TC_WINDOWS
SlotListCtrl->InsertColumn (ColumnSlot, LangString["DRIVE"], wxLIST_FORMAT_LEFT, 1);
colPermilles.push_back (75);
#else
@@ -289,20 +289,20 @@ namespace VeraCrypt
#endif
SlotListCtrl->InsertColumn (ColumnPath, LangString["VOLUME"], wxLIST_FORMAT_LEFT, 1);
-#ifdef TC_WINDOWS
+#ifdef TC_WINDOWS
colPermilles.push_back (487);
#else
colPermilles.push_back (429);
#endif
SlotListCtrl->InsertColumn (ColumnSize, LangString["SIZE"], wxLIST_FORMAT_RIGHT, 1);
-#ifdef TC_WINDOWS
+#ifdef TC_WINDOWS
colPermilles.push_back (126);
#else
colPermilles.push_back (130);
#endif
-#ifdef TC_WINDOWS
+#ifdef TC_WINDOWS
SlotListCtrl->InsertColumn (ColumnEA, LangString["ENCRYPTION_ALGORITHM_LV"], wxLIST_FORMAT_LEFT, 1);
colPermilles.push_back (233);
#else
@@ -323,7 +323,7 @@ namespace VeraCrypt
#ifndef TC_WINDOWS
int screenHeight = wxSystemSettings::GetMetric (wxSYS_SCREEN_Y);
-
+
if (screenHeight < 480)
slotListRowCount = 1;
else if (screenHeight <= 600)
@@ -355,7 +355,7 @@ namespace VeraCrypt
SetMaxSize (GetSize());
Gui->SetListCtrlColumnWidths (SlotListCtrl, colPermilles);
-
+
UpdateVolumeList();
UpdateWipeCacheButton();
}
@@ -434,7 +434,7 @@ namespace VeraCrypt
{
MainFrame *frame = dynamic_cast <MainFrame *> (Gui->GetMainFrame());
PDEV_BROADCAST_HDR hdr = (PDEV_BROADCAST_HDR) lParam;
-
+
if (wParam == DBT_DEVICEREMOVECOMPLETE && hdr->dbch_devicetype == DBT_DEVTYP_VOLUME)
{
PDEV_BROADCAST_VOLUME vol = (PDEV_BROADCAST_VOLUME) lParam;
@@ -504,15 +504,15 @@ namespace VeraCrypt
}
wxMenu *CreatePopupMenu ()
- {
+ {
auto_ptr <wxMenu> popup (new wxMenu);
Gui->AppendToMenu (*popup, LangString[Gui->IsInBackgroundMode() ? "SHOW_TC" : "HIDE_TC"], this, wxCommandEventHandler (TaskBarIcon::OnShowHideMenuItemSelected));
-
+
popup->AppendSeparator();
Gui->AppendToMenu (*popup, _("Mount All Favorite Volumes"), this, wxCommandEventHandler (TaskBarIcon::OnMountAllFavoritesMenuItemSelected))->Enable (!Busy);
Gui->AppendToMenu (*popup, _("Dismount All Mounted Volumes"), this, wxCommandEventHandler (TaskBarIcon::OnDismountAllMenuItemSelected))->Enable (!Busy);
-
+
// Favorite volumes
if (Gui->GetPreferences().BackgroundTaskMenuMountItemsEnabled && !Frame->FavoriteVolumesMenuMap.empty())
{
@@ -628,7 +628,7 @@ namespace VeraCrypt
Gui->SetPreferences (prefs);
NoHistoryCheckBox->SetValue (!prefs.SaveHistory);
}
-
+
void MainFrame::MountAllDevices ()
{
try
@@ -891,7 +891,7 @@ namespace VeraCrypt
}
void MainFrame::OnDefaultMountParametersMenuItemSelected(wxCommandEvent& event)
- {
+ {
#ifdef TC_MACOSX
if (Gui->IsInBackgroundMode())
Gui->SetBackgroundMode (false);
@@ -921,7 +921,7 @@ namespace VeraCrypt
if (volume->Path.IsDevice() && !Core->IsDevicePresent (volume->Path))
removedVolumes.push_back (volume);
}
-
+
if (!removedVolumes.empty())
Gui->AutoDismountVolumes (removedVolumes, true);
}
@@ -1035,7 +1035,7 @@ namespace VeraCrypt
case Hotkey::Id::MountAllFavorites:
{
size_t mountedCount = Core->GetMountedVolumes().size();
-
+
if (event.GetId() == Hotkey::Id::MountAllDevices)
MountAllDevices();
else
@@ -1102,7 +1102,7 @@ namespace VeraCrypt
if (SelectedItemIndex > itemIndex)
--SelectedItemIndex;
}
-
+
void MainFrame::OnListItemDeselected (wxListEvent& event)
{
OnListItemSelectionChanged();
@@ -1155,7 +1155,7 @@ namespace VeraCrypt
else if (IsFreeSlotSelected())
{
Gui->AppendToMenu (popup, _("Mount Volume"), this, wxCommandEventHandler (MainFrame::OnMountVolumeMenuItemSelected));
-
+
popup.AppendSeparator();
Gui->AppendToMenu (popup, LangString["SELECT_FILE_AND_MOUNT"], this, wxCommandEventHandler (MainFrame::OnSelectFileAndMountMenuItemSelected));
@@ -1174,12 +1174,12 @@ namespace VeraCrypt
SelectedItemIndex = event.GetIndex();
OnListItemSelectionChanged();
}
-
+
void MainFrame::OnListItemSelectionChanged ()
{
if (SlotListCtrl->GetSelectedItemCount() < 1)
SelectedItemIndex = -1;
-
+
if (SelectedItemIndex >= 0)
SelectedSlotNumber = (VolumeSlotNumber) SlotListCtrl->GetItemData (SelectedItemIndex);
else
@@ -1187,7 +1187,7 @@ namespace VeraCrypt
UpdateControls();
}
-
+
void MainFrame::OnManageSecurityTokenKeyfilesMenuItemSelected (wxCommandEvent& event)
{
try
@@ -1280,7 +1280,7 @@ namespace VeraCrypt
SavePreferences();
}
-
+
void MainFrame::OnRestoreVolumeHeaderMenuItemSelected (wxCommandEvent& event)
{
if (!CheckVolumePathNotEmpty ())
@@ -1307,7 +1307,7 @@ namespace VeraCrypt
dialog.ShowModal();
}
-
+
void MainFrame::OnSelectDeviceAndMountMenuItemSelected (wxCommandEvent& event)
{
DevicePath path = Gui->SelectDevice (this);
@@ -1344,7 +1344,7 @@ namespace VeraCrypt
if (!path.IsEmpty())
SetVolumePath (path);
}
-
+
void MainFrame::OnTimer ()
{
try
@@ -1502,7 +1502,7 @@ namespace VeraCrypt
WipeCache();
Gui->ShowInfo ("PASSWORD_CACHE_WIPED");
}
-
+
void MainFrame::OpenSelectedVolume () const
{
shared_ptr <VolumeInfo> selectedVolume = GetSelectedVolume();
@@ -1577,7 +1577,7 @@ namespace VeraCrypt
}
return -1;
}
-
+
void MainFrame::UpdateControls ()
{
bool mounted = IsMountedSlotSelected();
@@ -1585,7 +1585,7 @@ namespace VeraCrypt
VolumeButton->SetLabel (mounted ? LangString["DISMOUNT"] : wxString (_("Mount")));
VolumePropertiesButton->Enable (mounted);
- DismountVolumeMenuItem->Enable (mounted);
+ DismountVolumeMenuItem->Enable (mounted);
MountVolumeMenuItem->Enable (!mounted);
VolumePropertiesMenuItem->Enable (mounted);
AddToFavoritesMenuItem->Enable (mounted);
@@ -1601,7 +1601,7 @@ namespace VeraCrypt
bool listChanged = false;
MountedVolumes = Core->GetMountedVolumes();
-
+
map < VolumeSlotNumber, shared_ptr <VolumeInfo> > mountedVolumesMap;
foreach (shared_ptr <VolumeInfo> volume, MountedVolumes)
{
@@ -1632,7 +1632,7 @@ namespace VeraCrypt
fields[ColumnPath] = volume->Path;
fields[ColumnSize] = Gui->SizeToString (volume->Size);
fields[ColumnType] = Gui->VolumeTypeToString (volume->Type, volume->TrueCryptMode, volume->Protection);
-
+
if (volume->HiddenVolumeProtectionTriggered)
{
fields[ColumnType] += L"(!)";
@@ -1667,7 +1667,7 @@ namespace VeraCrypt
#else
fields[ColumnSlot] = StringConverter::FromNumber (slotNumber);
#endif
-
+
#ifdef TC_WINDOWS
if (Core->IsMountPointAvailable (fields[ColumnSlot]))
#else
diff --git a/src/Main/Forms/MainFrame.h b/src/Main/Forms/MainFrame.h
index 9ae1907..15c08b3 100644
--- a/src/Main/Forms/MainFrame.h
+++ b/src/Main/Forms/MainFrame.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -87,7 +87,7 @@ namespace VeraCrypt
void OnCloseAllSecurityTokenSessionsMenuItemSelected (wxCommandEvent& event);
void OnDonateMenuItemSelected (wxCommandEvent& event) { Gui->OpenHomepageLink (this, L"donate"); }
void OnContactMenuItemSelected (wxCommandEvent& event) { Gui->OpenHomepageLink (this, L"contact"); }
- void OnCreateKeyfileMenuItemSelected (wxCommandEvent& event)
+ void OnCreateKeyfileMenuItemSelected (wxCommandEvent& event)
{
#ifdef TC_MACOSX
if (Gui->IsInBackgroundMode())
@@ -161,7 +161,7 @@ namespace VeraCrypt
void UpdateVolumeList ();
void UpdateWipeCacheButton ();
void WipeCache ();
-
+
struct VolumeActivityMapEntry
{
VolumeActivityMapEntry () { }
diff --git a/src/Main/Forms/MountOptionsDialog.cpp b/src/Main/Forms/MountOptionsDialog.cpp
index 55098b0..c6b47fd 100644
--- a/src/Main/Forms/MountOptionsDialog.cpp
+++ b/src/Main/Forms/MountOptionsDialog.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -85,21 +85,21 @@ namespace VeraCrypt
}
void MountOptionsDialog::OnOKButtonClick (wxCommandEvent& event)
- {
+ {
bool bUnsupportedKdf = false;
-
+
/* verify that PIM values are valid before continuing*/
int Pim = PasswordPanel->GetVolumePim();
int ProtectionPim = (!ReadOnlyCheckBox->IsChecked() && ProtectionCheckBox->IsChecked())?
ProtectionPasswordPanel->GetVolumePim() : 0;
-
+
/* invalid PIM: set focus to PIM field and stop processing */
if (-1 == Pim || (PartitionInSystemEncryptionScopeCheckBox->IsChecked() && Pim > MAX_BOOT_PIM_VALUE))
{
PasswordPanel->SetFocusToPimTextCtrl();
return;
}
-
+
if (-1 == ProtectionPim || (PartitionInSystemEncryptionScopeCheckBox->IsChecked() && ProtectionPim > MAX_BOOT_PIM_VALUE))
{
ProtectionPasswordPanel->SetFocusToPimTextCtrl();
@@ -142,7 +142,7 @@ namespace VeraCrypt
Gui->ShowWarning (e);
return;
}
- Options.Protection = VolumeProtection::HiddenVolumeReadOnly;
+ Options.Protection = VolumeProtection::HiddenVolumeReadOnly;
Options.ProtectionPim = ProtectionPim;
Options.ProtectionKdf = ProtectionPasswordPanel->GetPkcs5Kdf(Options.TrueCryptMode, bUnsupportedKdf);
if (bUnsupportedKdf)
diff --git a/src/Main/Forms/MountOptionsDialog.h b/src/Main/Forms/MountOptionsDialog.h
index bf50057..77214e6 100644
--- a/src/Main/Forms/MountOptionsDialog.h
+++ b/src/Main/Forms/MountOptionsDialog.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/Forms/NewSecurityTokenKeyfileDialog.cpp b/src/Main/Forms/NewSecurityTokenKeyfileDialog.cpp
index 34cd08f..e3019a7 100644
--- a/src/Main/Forms/NewSecurityTokenKeyfileDialog.cpp
+++ b/src/Main/Forms/NewSecurityTokenKeyfileDialog.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/Forms/NewSecurityTokenKeyfileDialog.h b/src/Main/Forms/NewSecurityTokenKeyfileDialog.h
index dad2879..ca3d525 100644
--- a/src/Main/Forms/NewSecurityTokenKeyfileDialog.h
+++ b/src/Main/Forms/NewSecurityTokenKeyfileDialog.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/Forms/PreferencesDialog.cpp b/src/Main/Forms/PreferencesDialog.cpp
index 436b950..3f38c7c 100644
--- a/src/Main/Forms/PreferencesDialog.cpp
+++ b/src/Main/Forms/PreferencesDialog.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -52,16 +52,16 @@ namespace VeraCrypt
MountRemovableCheckBox->SetValidator (wxGenericValidator (&Preferences.DefaultMountOptions.Removable));
FilesystemOptionsTextCtrl->SetValue (Preferences.DefaultMountOptions.FilesystemOptions);
-
+
TrueCryptModeCheckBox->SetValidator (wxGenericValidator (&Preferences.DefaultMountOptions.TrueCryptMode));
-
+
int index, prfInitialIndex = 0;
- Pkcs5PrfChoice->Append (LangString["AUTODETECTION"]);
+ Pkcs5PrfChoice->Append (LangString["AUTODETECTION"]);
foreach_ref (const Pkcs5Kdf &kdf, Pkcs5Kdf::GetAvailableAlgorithms(false))
{
index = Pkcs5PrfChoice->Append (kdf.GetName());
- if (Preferences.DefaultMountOptions.Kdf
+ if (Preferences.DefaultMountOptions.Kdf
&& (Preferences.DefaultMountOptions.Kdf->GetName() == kdf.GetName())
)
{
@@ -157,7 +157,7 @@ namespace VeraCrypt
colPermilles.push_back (358);
vector <wstring> fields (HotkeyListCtrl->GetColumnCount());
-
+
UnregisteredHotkeys = Preferences.Hotkeys;
Hotkey::UnregisterList (Gui->GetMainFrame(), UnregisteredHotkeys);
@@ -363,7 +363,7 @@ namespace VeraCrypt
#endif
if (!Validate())
return;
-
+
shared_ptr <Pkcs5Kdf> selectedKdf;
if (Pkcs5PrfChoice->GetSelection () != 0)
{
@@ -383,7 +383,7 @@ namespace VeraCrypt
Preferences.DefaultMountOptions.Protection = MountReadOnlyCheckBox->IsChecked() ? VolumeProtection::ReadOnly : VolumeProtection::None;
Preferences.DefaultMountOptions.FilesystemOptions = FilesystemOptionsTextCtrl->GetValue();
Preferences.DefaultKeyfiles = *DefaultKeyfilesPanel->GetKeyfiles();
-
+
Preferences.DefaultMountOptions.Kdf = selectedKdf;
Preferences.DefaultMountOptions.ProtectionKdf = selectedKdf;
@@ -403,7 +403,7 @@ namespace VeraCrypt
}
else
{
- Gui->InitSecurityTokenLibrary();
+ Gui->InitSecurityTokenLibrary();
}
}
}
@@ -419,7 +419,7 @@ namespace VeraCrypt
EndModal (wxID_OK);
}
-
+
void PreferencesDialog::OnPreserveTimestampsCheckBoxClick (wxCommandEvent& event)
{
#ifdef TC_LINUX
@@ -504,7 +504,7 @@ namespace VeraCrypt
HotkeyAltCheckBox->SetValue (alt);
HotkeyWinCheckBox->SetValue (win);
- HotkeyTextCtrl->ChangeValue (Hotkey::GetVirtualKeyCodeString (LastVirtualKeyPressed));
+ HotkeyTextCtrl->ChangeValue (Hotkey::GetVirtualKeyCodeString (LastVirtualKeyPressed));
UpdateHotkeyButtons();
return;
}
diff --git a/src/Main/Forms/PreferencesDialog.h b/src/Main/Forms/PreferencesDialog.h
index f45145c..0f89238 100644
--- a/src/Main/Forms/PreferencesDialog.h
+++ b/src/Main/Forms/PreferencesDialog.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -53,7 +53,7 @@ namespace VeraCrypt
};
KeyfilesPanel *DefaultKeyfilesPanel;
- int LastVirtualKeyPressed;
+ int LastVirtualKeyPressed;
auto_ptr <wxTimer> mTimer;
UserPreferences Preferences;
bool RestoreValidatorBell;
diff --git a/src/Main/Forms/ProgressWizardPage.cpp b/src/Main/Forms/ProgressWizardPage.cpp
index bba162a..5ad739d 100644
--- a/src/Main/Forms/ProgressWizardPage.cpp
+++ b/src/Main/Forms/ProgressWizardPage.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/Forms/ProgressWizardPage.h b/src/Main/Forms/ProgressWizardPage.h
index 57a34da..be77406 100644
--- a/src/Main/Forms/ProgressWizardPage.h
+++ b/src/Main/Forms/ProgressWizardPage.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/Forms/RandomPoolEnrichmentDialog.cpp b/src/Main/Forms/RandomPoolEnrichmentDialog.cpp
index ecbfe7a..fa9b072 100644
--- a/src/Main/Forms/RandomPoolEnrichmentDialog.cpp
+++ b/src/Main/Forms/RandomPoolEnrichmentDialog.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -17,10 +17,10 @@
namespace VeraCrypt
{
- RandomPoolEnrichmentDialog::RandomPoolEnrichmentDialog (wxWindow* parent) : RandomPoolEnrichmentDialogBase (parent)
+ RandomPoolEnrichmentDialog::RandomPoolEnrichmentDialog (wxWindow* parent) : RandomPoolEnrichmentDialogBase (parent)
{
RandomNumberGenerator::Start();
-
+
Hashes = Hash::GetAvailableAlgorithms();
foreach (shared_ptr <Hash> hash, Hashes)
{
@@ -35,7 +35,7 @@ namespace VeraCrypt
HideBytes (RandomPoolStaticText, 24);
MouseStaticText->Wrap (Gui->GetCharWidth (MouseStaticText) * 70);
-
+
CollectedEntropy->SetRange (RNG_POOL_SIZE * 8);
MainSizer->SetMinSize (wxSize (-1, Gui->GetCharHeight (this) * 24));
@@ -43,7 +43,7 @@ namespace VeraCrypt
Layout();
Fit();
Center();
-
+
MouseEventsCounter = 0;
foreach (wxWindow *c, this->GetChildren())
@@ -107,7 +107,7 @@ namespace VeraCrypt
str[i] = L'X';
}
}
-
+
void RandomPoolEnrichmentDialog::HideBytes (wxStaticText *textCtrl, size_t len)
{
wxString str;
diff --git a/src/Main/Forms/RandomPoolEnrichmentDialog.h b/src/Main/Forms/RandomPoolEnrichmentDialog.h
index 4135ff2..aa11872 100644
--- a/src/Main/Forms/RandomPoolEnrichmentDialog.h
+++ b/src/Main/Forms/RandomPoolEnrichmentDialog.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -30,7 +30,7 @@ namespace VeraCrypt
void OnShowRandomPoolCheckBoxClicked (wxCommandEvent& event);
void ShowBytes (wxStaticText *textCtrl, const ConstBufferPtr &buffer);
void HideBytes (wxStaticText *textCtrl, size_t len);
-
+
HashList Hashes;
int MouseEventsCounter;
Mutex AccessMutex;
diff --git a/src/Main/Forms/SecurityTokenKeyfilesDialog.cpp b/src/Main/Forms/SecurityTokenKeyfilesDialog.cpp
index 05ae429..abc06a7 100644
--- a/src/Main/Forms/SecurityTokenKeyfilesDialog.cpp
+++ b/src/Main/Forms/SecurityTokenKeyfilesDialog.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -65,7 +65,7 @@ namespace VeraCrypt
fields[ColumnSecurityTokenLabel] = key.Token.Label;
fields[ColumnSecurityTokenKeyfileLabel] = key.Id;
- Gui->AppendToListCtrl (SecurityTokenKeyfileListCtrl, fields, 0, &SecurityTokenKeyfileList[i++]);
+ Gui->AppendToListCtrl (SecurityTokenKeyfileListCtrl, fields, 0, &SecurityTokenKeyfileList[i++]);
}
}
@@ -155,7 +155,7 @@ namespace VeraCrypt
{
wxBusyCursor busy;
SecurityToken::CreateKeyfile (newKeyfileDialog.GetSelectedSlotId(), keyfileData, StringConverter::ToSingle (newKeyfileDialog.GetKeyfileName()));
-
+
FillSecurityTokenKeyfileListCtrl();
}
}
diff --git a/src/Main/Forms/SecurityTokenKeyfilesDialog.h b/src/Main/Forms/SecurityTokenKeyfilesDialog.h
index 6a8b51f..de0e1f4 100644
--- a/src/Main/Forms/SecurityTokenKeyfilesDialog.h
+++ b/src/Main/Forms/SecurityTokenKeyfilesDialog.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/Forms/SelectDirectoryWizardPage.cpp b/src/Main/Forms/SelectDirectoryWizardPage.cpp
index 725371a..28b4fc9 100644
--- a/src/Main/Forms/SelectDirectoryWizardPage.cpp
+++ b/src/Main/Forms/SelectDirectoryWizardPage.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -25,7 +25,7 @@ namespace VeraCrypt
return false;
}
-
+
void SelectDirectoryWizardPage::OnBrowseButtonClick (wxCommandEvent& event)
{
DirectoryPath dir = Gui->SelectDirectory (this);
diff --git a/src/Main/Forms/SelectDirectoryWizardPage.h b/src/Main/Forms/SelectDirectoryWizardPage.h
index b50699e..f257134 100644
--- a/src/Main/Forms/SelectDirectoryWizardPage.h
+++ b/src/Main/Forms/SelectDirectoryWizardPage.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/Forms/SingleChoiceWizardPage.h b/src/Main/Forms/SingleChoiceWizardPage.h
index 751ec40..865e2b2 100644
--- a/src/Main/Forms/SingleChoiceWizardPage.h
+++ b/src/Main/Forms/SingleChoiceWizardPage.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/Forms/VolumeCreationProgressWizardPage.cpp b/src/Main/Forms/VolumeCreationProgressWizardPage.cpp
index 08986f5..ccc4cb7 100644
--- a/src/Main/Forms/VolumeCreationProgressWizardPage.cpp
+++ b/src/Main/Forms/VolumeCreationProgressWizardPage.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -54,7 +54,7 @@ namespace VeraCrypt
}
VolumeCreationProgressWizardPage *Page;
- };
+ };
RandomPoolTimer.reset (dynamic_cast <wxTimer *> (new Timer (this)));
RandomPoolTimer->Start (30);
@@ -73,9 +73,9 @@ namespace VeraCrypt
{
if (!event.IsChecked())
{
- ShowAsterisks (RandomPoolSampleStaticText);
- ShowAsterisks (HeaderKeySampleStaticText);
- ShowAsterisks (MasterKeySampleStaticText);
+ ShowAsterisks (RandomPoolSampleStaticText);
+ ShowAsterisks (HeaderKeySampleStaticText);
+ ShowAsterisks (MasterKeySampleStaticText);
}
else
{
@@ -84,7 +84,7 @@ namespace VeraCrypt
MasterKeySampleStaticText->SetLabel (L"");
}
}
-
+
void VolumeCreationProgressWizardPage::OnRandomPoolTimer ()
{
if (!VolumeCreatorRunning && DisplayKeysCheckBox->IsChecked())
@@ -187,7 +187,7 @@ namespace VeraCrypt
RealProgressBarRange = ProgressGauge->GetSize().GetWidth();
ProgressGauge->SetRange (RealProgressBarRange);
}
-
+
void VolumeCreationProgressWizardPage::IncrementEntropyProgress ()
{
ScopeLock lock (AccessMutex);
diff --git a/src/Main/Forms/VolumeCreationProgressWizardPage.h b/src/Main/Forms/VolumeCreationProgressWizardPage.h
index 417766e..8214426 100644
--- a/src/Main/Forms/VolumeCreationProgressWizardPage.h
+++ b/src/Main/Forms/VolumeCreationProgressWizardPage.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/Forms/VolumeCreationWizard.cpp b/src/Main/Forms/VolumeCreationWizard.cpp
index e9ceb3a..05568f8 100644
--- a/src/Main/Forms/VolumeCreationWizard.cpp
+++ b/src/Main/Forms/VolumeCreationWizard.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -69,7 +69,7 @@ namespace VeraCrypt
}
VolumeCreationWizard *Wizard;
- };
+ };
RandomPoolUpdateTimer.reset (dynamic_cast <wxTimer *> (new Timer (this)));
RandomPoolUpdateTimer->Start (200);
@@ -129,11 +129,11 @@ namespace VeraCrypt
page->SetVolumePath (SelectedVolumePath);
return page;
}
-
+
case Step::EncryptionOptions:
{
EncryptionOptionsWizardPage *page = new EncryptionOptionsWizardPage (GetPageParent());
-
+
if (OuterVolume)
page->SetPageTitle (LangString["CIPHER_HIDVOL_HOST_TITLE"]);
else if (SelectedVolumeType == VolumeType::Hidden)
@@ -170,10 +170,10 @@ namespace VeraCrypt
}
VolumeSizeWizardPage *page = new VolumeSizeWizardPage (GetPageParent(), SelectedVolumePath, SectorSize, freeSpaceText);
-
+
page->SetPageTitle (pageTitle);
page->SetPageText (pageText);
-
+
if (!OuterVolume && SelectedVolumeType == VolumeType::Hidden)
page->SetMaxVolumeSize (MaxHiddenVolumeSize);
else
@@ -194,29 +194,29 @@ namespace VeraCrypt
VolumePasswordWizardPage *page = new VolumePasswordWizardPage (GetPageParent(), Password, Keyfiles);
page->EnableUsePim (); // force displaying "Use PIM"
page->SetPimSelected (Pim > 0);
-
+
if (OuterVolume)
page->SetPageTitle (LangString["PASSWORD_HIDVOL_HOST_TITLE"]);
else if (SelectedVolumeType == VolumeType::Hidden)
page->SetPageTitle (LangString["PASSWORD_HIDVOL_TITLE"]);
else
page->SetPageTitle (LangString["PASSWORD_TITLE"]);
-
+
page->SetPageText (LangString[OuterVolume ? "PASSWORD_HIDDENVOL_HOST_HELP" : "PASSWORD_HELP"]);
return page;
}
-
+
case Step::VolumePim:
{
VolumePimWizardPage *page = new VolumePimWizardPage (GetPageParent());
-
+
if (OuterVolume)
page->SetPageTitle (LangString["PIM_HIDVOL_HOST_TITLE"]);
else if (SelectedVolumeType == VolumeType::Hidden)
page->SetPageTitle (LangString["PIM_HIDVOL_TITLE"]);
else
page->SetPageTitle (LangString["PIM_TITLE"]);
-
+
page->SetPageText (LangString["PIM_HELP"]);
page->SetVolumePim (Pim);
return page;
@@ -244,14 +244,14 @@ namespace VeraCrypt
page->SetPageTitle (_("Format Options"));
page->SetFilesystemType (SelectedFilesystemType);
-
+
if (!OuterVolume && SelectedVolumeType == VolumeType::Hidden)
QuickFormatEnabled = true;
page->SetQuickFormat (QuickFormatEnabled);
return page;
}
-
+
case Step::CrossPlatformSupport:
{
SingleChoiceWizardPage <bool> *page = new SingleChoiceWizardPage <bool> (GetPageParent(), wxEmptyString, true);
@@ -289,7 +289,7 @@ namespace VeraCrypt
InfoWizardPage *page = new InfoWizardPage (GetPageParent());
page->SetPageTitle (LangString["FORMAT_FINISHED_TITLE"]);
page->SetPageText (LangString["FORMAT_FINISHED_HELP"]);
-
+
SetCancelButtonText (_("Exit"));
return page;
}
@@ -318,16 +318,16 @@ namespace VeraCrypt
Close();
return new InfoWizardPage (GetPageParent());
}
-
+
struct OpenOuterVolumeFunctor : public Functor
{
OpenOuterVolumeFunctor (const DirectoryPath &outerVolumeMountPoint) : OuterVolumeMountPoint (outerVolumeMountPoint) { }
-
+
virtual void operator() ()
{
Gui->OpenExplorerWindow (OuterVolumeMountPoint);
}
-
+
DirectoryPath OuterVolumeMountPoint;
};
@@ -335,11 +335,11 @@ namespace VeraCrypt
shared_ptr <Functor> (new OpenOuterVolumeFunctor (MountedOuterVolume->MountPoint)));
page->SetPageTitle (LangString["HIDVOL_HOST_FILLING_TITLE"]);
-
+
page->SetPageText (StringFormatter (
_("Outer volume has been successfully created and mounted as '{0}'. To this volume you should now copy some sensitive-looking files that you actually do NOT want to hide. The files will be there for anyone forcing you to disclose your password. You will reveal only the password for this outer volume, not for the hidden one. The files that you really care about will be stored in the hidden volume, which will be created later on. When you finish copying, click Next. Do not dismount the volume.\n\nNote: After you click Next, the outer volume will be analyzed to determine the size of uninterrupted area of free space whose end is aligned with the end of the volume. This area will accommodate the hidden volume, so it will limit its maximum possible size. The procedure ensures no data on the outer volume are overwritten by the hidden volume."),
wstring (MountedOuterVolume->MountPoint)));
-
+
return page;
}
@@ -373,12 +373,12 @@ namespace VeraCrypt
if (!IsWorkInProgress() && RandomNumberGenerator::IsRunning())
{
RandomNumberGenerator::AddToPool (ConstBufferPtr (reinterpret_cast <byte *> (&event), sizeof (event)));
-
+
long coord = event.GetX();
RandomNumberGenerator::AddToPool (ConstBufferPtr (reinterpret_cast <byte *> (&coord), sizeof (coord)));
coord = event.GetY();
RandomNumberGenerator::AddToPool (ConstBufferPtr (reinterpret_cast <byte *> (&coord), sizeof (coord)));
-
+
VolumeCreationProgressWizardPage *page = dynamic_cast <VolumeCreationProgressWizardPage *> (GetCurrentPage());
if (page)
{
@@ -386,7 +386,7 @@ namespace VeraCrypt
}
}
}
-
+
void VolumeCreationWizard::OnProgressTimer ()
{
if (!IsWorkInProgress())
@@ -408,7 +408,7 @@ namespace VeraCrypt
}
VolumeCreator::ProgressInfo progress = Creator->GetProgressInfo();
-
+
VolumeCreationProgressWizardPage *page = dynamic_cast <VolumeCreationProgressWizardPage *> (GetCurrentPage());
page->SetProgressValue (progress.SizeDone);
@@ -418,9 +418,9 @@ namespace VeraCrypt
OnVolumeCreatorFinished ();
}
}
-
+
void VolumeCreationWizard::OnRandomPoolUpdateTimer ()
- {
+ {
if (!IsWorkInProgress())
{
wxLongLong time = wxGetLocalTimeMillis();
@@ -519,7 +519,7 @@ namespace VeraCrypt
if (SelectedFilesystemType == VolumeCreationOptions::FilesystemType::MacOsExt && VolumeSize >= 10 * BYTES_PER_MB)
args.push_back ("-J");
-
+
// Perform a quick NTFS formatting
if (SelectedFilesystemType == VolumeCreationOptions::FilesystemType::NTFS)
args.push_back ("-f");
@@ -566,7 +566,7 @@ namespace VeraCrypt
case Step::VolumeHostType:
{
SingleChoiceWizardPage <VolumeHostType::Enum> *page = dynamic_cast <SingleChoiceWizardPage <VolumeHostType::Enum> *> (GetCurrentPage());
-
+
try
{
SelectedVolumeHostType = page->GetSelection();
@@ -657,7 +657,7 @@ namespace VeraCrypt
try
{
mountPoint = Core->GetDeviceMountPoint (SelectedVolumePath);
-
+
if (!mountPoint.IsEmpty())
{
if (mountPoint == "/")
@@ -689,7 +689,7 @@ namespace VeraCrypt
return Step::EncryptionOptions;
}
-
+
case Step::EncryptionOptions:
{
EncryptionOptionsWizardPage *page = dynamic_cast <EncryptionOptionsWizardPage *> (GetCurrentPage());
@@ -704,7 +704,7 @@ namespace VeraCrypt
else
return Step::VolumeSize;
}
-
+
case Step::VolumeSize:
{
VolumeSizeWizardPage *page = dynamic_cast <VolumeSizeWizardPage *> (GetCurrentPage());
@@ -754,7 +754,7 @@ namespace VeraCrypt
Gui->ShowWarning (e);
return GetCurrentStep();
}
-
+
Kdf = page->GetPkcs5Kdf();
Keyfiles = page->GetKeyfiles();
@@ -768,7 +768,7 @@ namespace VeraCrypt
}
}
}
-
+
if (page->IsPimSelected ())
return Step::VolumePim;
else
@@ -776,7 +776,7 @@ namespace VeraCrypt
// Clear PIM
Pim = 0;
- // Skip PIM
+ // Skip PIM
if (forward && OuterVolume)
{
// Use FAT to prevent problems with free space
@@ -815,7 +815,7 @@ namespace VeraCrypt
if (Pim > 0 && Pim < 485)
{
Gui->ShowError ("PIM_REQUIRE_LONG_PASSWORD");
- return GetCurrentStep();
+ return GetCurrentStep();
}
}
else if (Pim > 0 && Pim < 485)
@@ -826,7 +826,7 @@ namespace VeraCrypt
}
}
}
-
+
if (forward && OuterVolume)
{
@@ -895,7 +895,7 @@ namespace VeraCrypt
}
if (forward && CrossPlatformSupport)
- Gui->ShowWarning (StringFormatter (_("Please note that the volume will not be formatted with a FAT filesystem and, therefore, you may be required to install additional filesystem drivers on platforms other than {0}, which will enable you to mount the volume."), SystemInfo::GetPlatformName()));
+ Gui->ShowWarning (StringFormatter (_("Please note that the volume will not be formatted with a FAT filesystem and, therefore, you may be required to install additional filesystem drivers on platforms other than {0}, which will enable you to mount the volume."), SystemInfo::GetPlatformName()));
return Step::CreationProgress;
}
@@ -987,7 +987,7 @@ namespace VeraCrypt
}
VolumeCreationWizard *Wizard;
- };
+ };
page->SetProgressRange (options->Size);
page->SetProgressState (true);
@@ -1055,7 +1055,7 @@ namespace VeraCrypt
uint64 reservedSize = outerVolume->GetSize() / 200;
if (reservedSize > 10 * BYTES_PER_MB)
reservedSize = 10 * BYTES_PER_MB;
-
+
if (MaxHiddenVolumeSize < reservedSize)
MaxHiddenVolumeSize = 0;
else
diff --git a/src/Main/Forms/VolumeCreationWizard.h b/src/Main/Forms/VolumeCreationWizard.h
index 1622b4c..8e6e15d 100644
--- a/src/Main/Forms/VolumeCreationWizard.h
+++ b/src/Main/Forms/VolumeCreationWizard.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/Forms/VolumeFormatOptionsWizardPage.cpp b/src/Main/Forms/VolumeFormatOptionsWizardPage.cpp
index 8a60a34..d8ec601 100644
--- a/src/Main/Forms/VolumeFormatOptionsWizardPage.cpp
+++ b/src/Main/Forms/VolumeFormatOptionsWizardPage.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/Forms/VolumeFormatOptionsWizardPage.h b/src/Main/Forms/VolumeFormatOptionsWizardPage.h
index af11205..371f51f 100644
--- a/src/Main/Forms/VolumeFormatOptionsWizardPage.h
+++ b/src/Main/Forms/VolumeFormatOptionsWizardPage.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/Forms/VolumeLocationWizardPage.cpp b/src/Main/Forms/VolumeLocationWizardPage.cpp
index 19ff1d6..2765b5e 100644
--- a/src/Main/Forms/VolumeLocationWizardPage.cpp
+++ b/src/Main/Forms/VolumeLocationWizardPage.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -62,7 +62,7 @@ namespace VeraCrypt
catch (exception &e) { Gui->ShowError (e); }
}
}
-
+
void VolumeLocationWizardPage::OnPageChanging (bool forward)
{
if (forward)
diff --git a/src/Main/Forms/VolumeLocationWizardPage.h b/src/Main/Forms/VolumeLocationWizardPage.h
index fb1ca67..77b48f2 100644
--- a/src/Main/Forms/VolumeLocationWizardPage.h
+++ b/src/Main/Forms/VolumeLocationWizardPage.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/Forms/VolumePasswordPanel.cpp b/src/Main/Forms/VolumePasswordPanel.cpp
index 27d66bd..920d4f9 100644
--- a/src/Main/Forms/VolumePasswordPanel.cpp
+++ b/src/Main/Forms/VolumePasswordPanel.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -43,7 +43,7 @@ namespace VeraCrypt
}
CacheCheckBox->Show (enableCache);
-
+
if (!enablePassword && enableKeyfiles)
{
Layout();
@@ -58,8 +58,8 @@ namespace VeraCrypt
PasswordStaticText->Show (enablePassword);
PasswordTextCtrl->Show (enablePassword);
DisplayPasswordCheckBox->Show (enablePassword);
-
-
+
+
EnablePimEntry = enablePassword && (!enableConfirmation || (enablePkcs5Prf && !isMountPassword));
PimCheckBox->Show (EnablePimEntry);
VolumePimStaticText->Show (false);
@@ -71,12 +71,12 @@ namespace VeraCrypt
ConfirmPasswordStaticText->Show (enableConfirmation);
ConfirmPasswordTextCtrl->Show (enableConfirmation);
-
+
UseKeyfilesCheckBox->Show (enableKeyfiles);
KeyfilesButton->Show (enableKeyfiles);
Pkcs5PrfStaticText->Show (enablePkcs5Prf);
- Pkcs5PrfChoice->Show (enablePkcs5Prf);
+ Pkcs5PrfChoice->Show (enablePkcs5Prf);
TrueCryptModeCheckBox->Show (!disableTruecryptMode);
HeaderWipeCountText->Show (enablePkcs5Prf && !isMountPassword);
HeaderWipeCount->Show (enablePkcs5Prf && !isMountPassword);
@@ -104,20 +104,20 @@ namespace VeraCrypt
}
if (enablePkcs5Prf)
- {
+ {
int index, prfInitialIndex = 0;
if (isMountPassword)
{
// case of password for mounting
Pkcs5PrfChoice->Delete (0);
- Pkcs5PrfChoice->Append (LangString["AUTODETECTION"]);
+ Pkcs5PrfChoice->Append (LangString["AUTODETECTION"]);
}
foreach_ref (const Pkcs5Kdf &kdf, Pkcs5Kdf::GetAvailableAlgorithms(false))
{
if (!kdf.IsDeprecated() || isMountPassword)
{
index = Pkcs5PrfChoice->Append (kdf.GetName());
- if (isMountPassword && options && options->Kdf
+ if (isMountPassword && options && options->Kdf
&& (options->Kdf->GetName() == kdf.GetName())
)
{
@@ -199,7 +199,7 @@ namespace VeraCrypt
int colspan = isPim? 1 : 2;
wxTextCtrl *newTextCtrl = new wxTextCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, display ? 0 : wxTE_PASSWORD);
- newTextCtrl->SetMaxLength (isPim? MAX_PIM_DIGITS : VolumePassword::MaxSize);
+ newTextCtrl->SetMaxLength (isPim? MAX_PIM_DIGITS : VolumePassword::MaxSize);
newTextCtrl->SetValue ((*textCtrl)->GetValue());
newTextCtrl->SetMinSize ((*textCtrl)->GetSize());
@@ -270,7 +270,7 @@ namespace VeraCrypt
return shared_ptr <Pkcs5Kdf> ();
}
}
-
+
int VolumePasswordPanel::GetVolumePim () const
{
if (VolumePimTextCtrl->IsEnabled () && VolumePimTextCtrl->IsShown ())
@@ -279,7 +279,7 @@ namespace VeraCrypt
long pim = 0;
if (pimStr.IsEmpty())
return 0;
- if (((size_t) wxNOT_FOUND == pimStr.find_first_not_of (wxT("0123456789")))
+ if (((size_t) wxNOT_FOUND == pimStr.find_first_not_of (wxT("0123456789")))
&& pimStr.ToLong (&pim)
&& pim <= MAX_PIM_VALUE)
return (int) pim;
@@ -288,7 +288,7 @@ namespace VeraCrypt
}
else
return 0;
- }
+ }
void VolumePasswordPanel::SetVolumePim (int pim)
{
@@ -306,7 +306,7 @@ namespace VeraCrypt
{
return TrueCryptModeCheckBox->GetValue ();
}
-
+
int VolumePasswordPanel::GetHeaderWipeCount () const
{
try
@@ -393,10 +393,10 @@ namespace VeraCrypt
void VolumePasswordPanel::OnDisplayPasswordCheckBoxClick (wxCommandEvent& event)
{
DisplayPassword (event.IsChecked(), &PasswordTextCtrl, 1);
-
+
if (ConfirmPasswordTextCtrl->IsShown())
DisplayPassword (event.IsChecked(), &ConfirmPasswordTextCtrl, 2);
-
+
if (VolumePimTextCtrl->IsShown())
DisplayPassword (event.IsChecked(), &VolumePimTextCtrl, 3);
@@ -467,7 +467,7 @@ namespace VeraCrypt
VolumePimHelpStaticText->SetLabel(LangString["IDC_PIM_HELP"]);
guiUpdated = true;
}
-
+
if (guiUpdated)
{
Layout();
@@ -485,8 +485,8 @@ namespace VeraCrypt
PimCheckBox->Show (false);
VolumePimStaticText->Show (true);
VolumePimTextCtrl->Show (true);
- VolumePimHelpStaticText->Show (true);
-
+ VolumePimHelpStaticText->Show (true);
+
if (DisplayPasswordCheckBox->IsChecked ())
DisplayPassword (true, &VolumePimTextCtrl, 3);
else
@@ -494,12 +494,12 @@ namespace VeraCrypt
Layout();
Fit();
}
-
+
GetParent()->Layout();
GetParent()->Fit();
}
}
-
+
void VolumePasswordPanel::OnTrueCryptModeChecked( wxCommandEvent& event )
{
bool bEnablePIM = !GetTrueCryptMode ();
diff --git a/src/Main/Forms/VolumePasswordPanel.h b/src/Main/Forms/VolumePasswordPanel.h
index a1f935d..e692d44 100644
--- a/src/Main/Forms/VolumePasswordPanel.h
+++ b/src/Main/Forms/VolumePasswordPanel.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -35,7 +35,7 @@ namespace VeraCrypt
int GetHeaderWipeCount () const;
void SetCacheCheckBoxValidator (const wxGenericValidator &validator) { CacheCheckBox->SetValidator (validator); }
void SetFocusToPasswordTextCtrl () { PasswordTextCtrl->SetSelection (-1, -1); PasswordTextCtrl->SetFocus(); }
- void SetFocusToPimTextCtrl () { VolumePimTextCtrl->SetSelection (-1, -1); VolumePimTextCtrl->SetFocus(); }
+ void SetFocusToPimTextCtrl () { VolumePimTextCtrl->SetSelection (-1, -1); VolumePimTextCtrl->SetFocus(); }
void SetVolumePim (int pim);
bool PasswordsMatch () const;
void EnableUsePim () { PimCheckBox->Enable (true); PimCheckBox->Show (true); }
diff --git a/src/Main/Forms/VolumePasswordWizardPage.cpp b/src/Main/Forms/VolumePasswordWizardPage.cpp
index c7035b5..f753bb3 100644
--- a/src/Main/Forms/VolumePasswordWizardPage.cpp
+++ b/src/Main/Forms/VolumePasswordWizardPage.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/Forms/VolumePasswordWizardPage.h b/src/Main/Forms/VolumePasswordWizardPage.h
index 43f39f7..06e89c3 100644
--- a/src/Main/Forms/VolumePasswordWizardPage.h
+++ b/src/Main/Forms/VolumePasswordWizardPage.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -29,7 +29,7 @@ namespace VeraCrypt
void EnableUsePim () { PasswordPanel->EnableUsePim (); }
bool IsPimSelected () const { return PasswordPanel->IsUsePimChecked ();}
void SetPimSelected (bool selected) const { PasswordPanel->SetUsePimChecked (selected);}
-
+
shared_ptr <Pkcs5Kdf> GetPkcs5Kdf () const { bool bUnsupportedKdf; return PasswordPanel->GetPkcs5Kdf(bUnsupportedKdf); }
bool IsValid ();
void SetMaxStaticTextWidth (int width) { InfoStaticText->Wrap (width); }
diff --git a/src/Main/Forms/VolumePimWizardPage.cpp b/src/Main/Forms/VolumePimWizardPage.cpp
index 2d61a71..723ca8c 100644
--- a/src/Main/Forms/VolumePimWizardPage.cpp
+++ b/src/Main/Forms/VolumePimWizardPage.cpp
@@ -10,8 +10,8 @@
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ See the License for the specific language governing permissions and
+ limitations under the License.
*/
#include "System.h"
@@ -29,7 +29,7 @@ namespace VeraCrypt
VolumePimWizardPage::~VolumePimWizardPage ()
{
}
-
+
int VolumePimWizardPage::GetVolumePim () const
{
if (VolumePimTextCtrl->IsEnabled ())
@@ -38,7 +38,7 @@ namespace VeraCrypt
long pim = 0;
if (pimStr.IsEmpty())
return 0;
- if (((size_t) wxNOT_FOUND == pimStr.find_first_not_of (wxT("0123456789")))
+ if (((size_t) wxNOT_FOUND == pimStr.find_first_not_of (wxT("0123456789")))
&& pimStr.ToLong (&pim))
return (int) pim;
else
@@ -66,7 +66,7 @@ namespace VeraCrypt
{
return true;
}
-
+
void VolumePimWizardPage::OnPimChanged (wxCommandEvent& event)
{
OnPimValueChanged (GetVolumePim ());
@@ -83,7 +83,7 @@ namespace VeraCrypt
{
VolumePimHelpStaticText->SetForegroundColour(*wxBLACK);
VolumePimHelpStaticText->SetLabel(LangString["IDC_PIM_HELP"]);
- }
+ }
Fit();
Layout();
}
@@ -99,15 +99,15 @@ namespace VeraCrypt
void VolumePimWizardPage::OnDisplayPimCheckBoxClick( wxCommandEvent& event )
{
FreezeScope freeze (this);
-
+
bool display = event.IsChecked ();
wxTextCtrl *newTextCtrl = new wxTextCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, display ? 0 : wxTE_PASSWORD);
- newTextCtrl->SetMaxLength (MAX_PIM_DIGITS);
+ newTextCtrl->SetMaxLength (MAX_PIM_DIGITS);
newTextCtrl->SetValue (VolumePimTextCtrl->GetValue());
newTextCtrl->SetMinSize (VolumePimTextCtrl->GetSize());
- PimSizer->Replace (VolumePimTextCtrl, newTextCtrl);
+ PimSizer->Replace (VolumePimTextCtrl, newTextCtrl);
VolumePimTextCtrl->Show (false);
VolumePimTextCtrl->SetValue (wxString (L'X', VolumePimTextCtrl->GetLineLength(0)));
GetVolumePim ();
diff --git a/src/Main/Forms/VolumePimWizardPage.h b/src/Main/Forms/VolumePimWizardPage.h
index 7872346..542a2e3 100644
--- a/src/Main/Forms/VolumePimWizardPage.h
+++ b/src/Main/Forms/VolumePimWizardPage.h
@@ -10,8 +10,8 @@
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ See the License for the specific language governing permissions and
+ limitations under the License.
*/
#ifndef VC_HEADER_Main_Forms_VolumePimWizardPage
@@ -33,7 +33,7 @@ namespace VeraCrypt
void SetMaxStaticTextWidth (int width) { InfoStaticText->Wrap (width); }
void SetPageText (const wxString &text) { InfoStaticText->SetLabel (text); }
void OnDisplayPimCheckBoxClick( wxCommandEvent& event );
-
+
protected:
void SetPimValidator ();
void OnPimChanged (wxCommandEvent& event);
diff --git a/src/Main/Forms/VolumePropertiesDialog.cpp b/src/Main/Forms/VolumePropertiesDialog.cpp
index bc80250..5514d30 100644
--- a/src/Main/Forms/VolumePropertiesDialog.cpp
+++ b/src/Main/Forms/VolumePropertiesDialog.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -38,7 +38,7 @@ namespace VeraCrypt
AppendToList ("SIZE", Gui->SizeToString (volumeInfo.Size));
AppendToList ("TYPE", Gui->VolumeTypeToString (volumeInfo.Type, volumeInfo.TrueCryptMode, volumeInfo.Protection));
AppendToList ("READ_ONLY", LangString [volumeInfo.Protection == VolumeProtection::ReadOnly ? "UISTR_YES" : "UISTR_NO"]);
-
+
wxString protection;
if (volumeInfo.Type == VolumeType::Hidden)
protection = LangString["NOT_APPLICABLE_OR_NOT_AVAILABLE"];
@@ -84,7 +84,7 @@ namespace VeraCrypt
#ifdef TC_LINUX
}
#endif
-
+
Layout();
Fit();
Center();
diff --git a/src/Main/Forms/VolumePropertiesDialog.h b/src/Main/Forms/VolumePropertiesDialog.h
index c9273bd..171cf6e 100644
--- a/src/Main/Forms/VolumePropertiesDialog.h
+++ b/src/Main/Forms/VolumePropertiesDialog.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -22,7 +22,7 @@ namespace VeraCrypt
{
public:
VolumePropertiesDialog (wxWindow* parent, const VolumeInfo &volumeInfo);
-
+
void AppendToList (const string &name, const wxString &value);
};
}
diff --git a/src/Main/Forms/VolumeSizeWizardPage.cpp b/src/Main/Forms/VolumeSizeWizardPage.cpp
index cdfb788..c4f855a 100644
--- a/src/Main/Forms/VolumeSizeWizardPage.cpp
+++ b/src/Main/Forms/VolumeSizeWizardPage.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -74,7 +74,7 @@ namespace VeraCrypt
return 0;
prefixMult = reinterpret_cast <uint64> (VolumeSizePrefixChoice->GetClientData (selection));
-
+
uint64 val = StringConverter::ToUInt64 (wstring (VolumeSizeTextCtrl->GetValue()));
if (val <= 0x7fffFFFFffffFFFFull / prefixMult)
{
@@ -119,7 +119,7 @@ namespace VeraCrypt
VolumeSizeTextCtrl->SetValue (L"");
return;
}
-
+
if (size % (1024 * 1024 * 1024) == 0)
{
size /= 1024 * 1024 * 1024;
diff --git a/src/Main/Forms/VolumeSizeWizardPage.h b/src/Main/Forms/VolumeSizeWizardPage.h
index c64b4d3..9779da4 100644
--- a/src/Main/Forms/VolumeSizeWizardPage.h
+++ b/src/Main/Forms/VolumeSizeWizardPage.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/Forms/WaitDialog.cpp b/src/Main/Forms/WaitDialog.cpp
index f53f5ad..4780f7e 100644
--- a/src/Main/Forms/WaitDialog.cpp
+++ b/src/Main/Forms/WaitDialog.cpp
@@ -20,7 +20,7 @@ namespace VeraCrypt
DEFINE_EVENT_TYPE(wxEVT_COMMAND_WAITDIALOG_SHOW_MSG)
wxThread::ExitCode WaitThread::Entry()
- {
+ {
m_pRoutine->Execute();
wxQueueEvent (m_pHandler, new wxCommandEvent( wxEVT_COMMAND_WAITDIALOGTHREAD_COMPLETED,0));
return (wxThread::ExitCode)0; // success
@@ -59,7 +59,7 @@ namespace VeraCrypt
VC_CONVERT_EXCEPTION (UserInterfaceException);
VC_CONVERT_EXCEPTION (MissingArgument);
VC_CONVERT_EXCEPTION (NoItemSelected);
- VC_CONVERT_EXCEPTION (StringFormatterException);
+ VC_CONVERT_EXCEPTION (StringFormatterException);
VC_CONVERT_EXCEPTION (ExecutedProcessFailed);
VC_CONVERT_EXCEPTION (AlreadyInitialized);
VC_CONVERT_EXCEPTION (AssertionFailed);
@@ -77,7 +77,7 @@ namespace VeraCrypt
VC_CONVERT_EXCEPTION (UnknownException);
VC_CONVERT_EXCEPTION (UserAbort)
VC_CONVERT_EXCEPTION (CipherInitError);
- VC_CONVERT_EXCEPTION (WeakKeyDetected);
+ VC_CONVERT_EXCEPTION (WeakKeyDetected);
VC_CONVERT_EXCEPTION (HigherVersionRequired);
VC_CONVERT_EXCEPTION (KeyfilePathEmpty);
VC_CONVERT_EXCEPTION (MissingVolumeData);
@@ -92,7 +92,7 @@ namespace VeraCrypt
VC_CONVERT_EXCEPTION (SecurityTokenLibraryNotInitialized);
VC_CONVERT_EXCEPTION (SecurityTokenKeyfileAlreadyExists);
VC_CONVERT_EXCEPTION (SecurityTokenKeyfileNotFound);
- VC_CONVERT_EXCEPTION (UnsupportedAlgoInTrueCryptMode);
+ VC_CONVERT_EXCEPTION (UnsupportedAlgoInTrueCryptMode);
VC_CONVERT_EXCEPTION (UnsupportedTrueCryptFormat);
VC_CONVERT_EXCEPTION (SystemException);
VC_CONVERT_EXCEPTION (CipherException);
diff --git a/src/Main/Forms/WaitDialog.h b/src/Main/Forms/WaitDialog.h
index a33e7e5..e9c9fa3 100644
--- a/src/Main/Forms/WaitDialog.h
+++ b/src/Main/Forms/WaitDialog.h
@@ -21,7 +21,7 @@ namespace VeraCrypt
DECLARE_LOCAL_EVENT_TYPE(wxEVT_COMMAND_WAITDIALOG_ADMIN_PASSWORD, -1);
DECLARE_LOCAL_EVENT_TYPE(wxEVT_COMMAND_WAITDIALOG_PIN, -1);
DECLARE_LOCAL_EVENT_TYPE(wxEVT_COMMAND_WAITDIALOG_SHOW_MSG, -1);
-
+
class WaitDialog;
@@ -31,12 +31,12 @@ namespace VeraCrypt
public:
WaitThread(WaitDialog *handler, WaitThreadRoutine* pRoutine) : wxThread(wxTHREAD_DETACHED), m_pRoutine(pRoutine)
{
- m_pHandler = handler;
+ m_pHandler = handler;
}
~WaitThread()
- {
+ {
}
-
+
protected:
virtual ExitCode Entry();
WaitDialog *m_pHandler;
@@ -46,7 +46,7 @@ namespace VeraCrypt
class WaitDialog : public WaitDialogBase, public WaitThreadUI
{
public:
- WaitDialog (wxWindow *parent, const wxString& label, WaitThreadRoutine* pRoutine)
+ WaitDialog (wxWindow *parent, const wxString& label, WaitThreadRoutine* pRoutine)
: WaitDialogBase(parent), WaitThreadUI(pRoutine), m_timer (this)
{
WaitStaticText->SetLabel (label);
@@ -58,11 +58,11 @@ namespace VeraCrypt
Connect( wxID_ANY, wxEVT_COMMAND_WAITDIALOG_ADMIN_PASSWORD, wxCommandEventHandler( WaitDialog::OnAdminPasswordRequest ) );
Connect( wxID_ANY, wxEVT_COMMAND_WAITDIALOG_PIN, wxCommandEventHandler( WaitDialog::OnPinRequest ) );
Connect( wxID_ANY, wxEVT_COMMAND_WAITDIALOG_SHOW_MSG, wxCommandEventHandler( WaitDialog::OnShowMsg ) );
-
+
Connect( wxEVT_TIMER, wxTimerEventHandler( WaitDialog::OnProgressTimer ), NULL, this );
m_thread = new WaitThread(this, pRoutine);
}
-
+
~WaitDialog()
{
Disconnect( wxEVT_TIMER, wxTimerEventHandler( WaitDialog::OnProgressTimer ));
@@ -73,7 +73,7 @@ namespace VeraCrypt
}
virtual void OnWaitDialogInit( wxInitDialogEvent& event )
- {
+ {
m_thread->Run();
m_timer.Start(100);
}
@@ -114,7 +114,7 @@ namespace VeraCrypt
wxQueueEvent (this, pEvent);
m_queue.Receive (sResult);
sResult.ToLong(&lResult);
- }
+ }
return (int) lResult;
}
@@ -143,7 +143,7 @@ namespace VeraCrypt
else
pin = wxT("");
}
-
+
// virtual void OnWaitDialogClose( wxCloseEvent& event ) { }
void OnThreadCompletion(wxCommandEvent &)
{
@@ -187,10 +187,10 @@ namespace VeraCrypt
}
int iResult = wxMessageBox (pParam->m_message, pParam->m_caption, pParam->m_style, this);
- delete pParam;
+ delete pParam;
m_queue.Post(wxString::Format(wxT("%d"), iResult));
}
-
+
void OnProgressTimer(wxTimerEvent& event)
{
WaitProgessBar->Pulse();
diff --git a/src/Main/Forms/WizardFrame.cpp b/src/Main/Forms/WizardFrame.cpp
index af38cdd..b5fe3be 100644
--- a/src/Main/Forms/WizardFrame.cpp
+++ b/src/Main/Forms/WizardFrame.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -61,7 +61,7 @@ namespace VeraCrypt
Gui->SetActiveFrame (this);
event.Skip();
}
-
+
void WizardFrame::OnClose (wxCloseEvent& event)
{
if (WorkInProgress)
@@ -97,12 +97,12 @@ namespace VeraCrypt
SetStep (prevStep, false);
}
}
-
+
void WizardFrame::SetCancelButtonText (const wxString &text)
{
CancelButton->SetLabel (text.empty() ? wxString (_("Cancel")) : text);
}
-
+
void WizardFrame::SetImage (const wxBitmap &bitmap)
{
WizardBitmap->SetBitmap (bitmap);
@@ -143,7 +143,7 @@ namespace VeraCrypt
CurrentPage = GetPage (newStep);
CurrentPage->PageUpdatedEvent.Connect (EventConnector <WizardFrame> (this, &WizardFrame::OnPageUpdated));
-
+
CurrentPage->Connect (wxEVT_MOTION, wxMouseEventHandler (WizardFrame::OnMouseMotion), nullptr, this);
foreach (wxWindow *c, CurrentPage->GetChildren())
c->Connect (wxEVT_MOTION, wxMouseEventHandler (WizardFrame::OnMouseMotion), nullptr, this);
diff --git a/src/Main/Forms/WizardFrame.h b/src/Main/Forms/WizardFrame.h
index 9011112..ac4f1c4 100644
--- a/src/Main/Forms/WizardFrame.h
+++ b/src/Main/Forms/WizardFrame.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/Forms/WizardPage.h b/src/Main/Forms/WizardPage.h
index f8c7d82..d47a4e9 100644
--- a/src/Main/Forms/WizardPage.h
+++ b/src/Main/Forms/WizardPage.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/GraphicUserInterface.cpp b/src/Main/GraphicUserInterface.cpp
index 3526dca..cd5c6fe 100644
--- a/src/Main/GraphicUserInterface.cpp
+++ b/src/Main/GraphicUserInterface.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -73,7 +73,7 @@ namespace VeraCrypt
signal (SIGTERM, SIG_DFL);
#endif
}
-
+
void GraphicUserInterface::AppendToListCtrl (wxListCtrl *listCtrl, const vector <wstring> &itemFields, int imageIndex, void *itemDataPtr) const
{
InsertToListCtrl (listCtrl, listCtrl->GetItemCount(), itemFields, imageIndex, itemDataPtr);
@@ -83,7 +83,7 @@ namespace VeraCrypt
{
wxMenuItem *item = new wxMenuItem (&menu, itemId, label);
menu.Append (item);
-
+
if (handler)
handler->Connect (item->GetId(), wxEVT_COMMAND_MENU_SELECTED, handlerFunction);
@@ -110,7 +110,7 @@ namespace VeraCrypt
if (Core->GetMountedVolumes().size() < mountedVolumeCount)
OnVolumesAutoDismounted();
}
-
+
void GraphicUserInterface::BackupVolumeHeaders (shared_ptr <VolumePath> volumePath) const
{
wxWindow *parent = GetActiveWindow();
@@ -196,7 +196,7 @@ namespace VeraCrypt
options->UseBackupHeaders
);
- ExecuteWaitThreadRoutine (parent, &routine);
+ ExecuteWaitThreadRoutine (parent, &routine);
volume = routine.m_pVolume;
}
catch (PasswordException &e)
@@ -332,12 +332,12 @@ namespace VeraCrypt
wxHyperlinkCtrl *GraphicUserInterface::CreateHyperlink (wxWindow *parent, const wxString &linkUrl, const wxString &linkText) const
{
wxHyperlinkCtrl *hyperlink = new wxHyperlinkCtrl (parent, wxID_ANY, linkText, linkUrl, wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE);
-
+
wxColour color = wxSystemSettings::GetColour (wxSYS_COLOUR_WINDOWTEXT);
hyperlink->SetHoverColour (color);
hyperlink->SetNormalColour (color);
hyperlink->SetVisitedColour (color);
-
+
return hyperlink;
}
@@ -345,7 +345,7 @@ namespace VeraCrypt
{
ShowMessage (message, wxOK | wxICON_ERROR);
}
-
+
void GraphicUserInterface::DoShowInfo (const wxString &message) const
{
ShowMessage (message, wxOK | wxICON_INFORMATION);
@@ -358,13 +358,13 @@ namespace VeraCrypt
void GraphicUserInterface::DoShowWarning (const wxString &message) const
{
- ShowMessage (message, wxOK
+ ShowMessage (message, wxOK
#ifndef TC_MACOSX
| wxICON_EXCLAMATION
#endif
);
}
-
+
void GraphicUserInterface::EndInteractiveBusyState (wxWindow *window) const
{
static auto_ptr <wxCursor> arrowCursor;
@@ -438,7 +438,7 @@ namespace VeraCrypt
return shared_ptr <GetStringFunctor> (new AdminPasswordRequestHandler);
}
-
+
int GraphicUserInterface::GetCharHeight (wxWindow *window) const
{
int width;
@@ -471,9 +471,9 @@ namespace VeraCrypt
#elif defined(TC_MACOSX)
13
#else
- 10
+ 10
#endif
- * GetCharHeight (window) / 13, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,
+ * GetCharHeight (window) / 13, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,
#ifdef __WXGTK__
wxFONTWEIGHT_BOLD, false);
#elif defined(TC_MACOSX)
@@ -486,7 +486,7 @@ namespace VeraCrypt
list <long> GraphicUserInterface::GetListCtrlSelectedItems (wxListCtrl *listCtrl) const
{
list <long> selectedItems;
-
+
long item = -1;
while ((item = listCtrl->GetNextItem (item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) != -1)
selectedItems.push_back (item);
@@ -500,7 +500,7 @@ namespace VeraCrypt
item.SetId (itemIndex);
item.SetColumn (columnIndex);
item.SetText (L"");
-
+
if (!listCtrl->GetItem (item))
throw ParameterIncorrect (SRC_POS);
@@ -605,7 +605,7 @@ namespace VeraCrypt
listCtrl->SetItem (item);
}
}
-
+
bool GraphicUserInterface::IsTheOnlyTopLevelWindow (const wxWindow *window) const
{
foreach (wxWindow *w, wxTopLevelWindows)
@@ -654,7 +654,7 @@ namespace VeraCrypt
item.SetId (itemIndex);
item.SetData ((void *) nullptr);
item.SetImage (-1);
-
+
if (!listCtrl->GetItem (item))
throw ParameterIncorrect (SRC_POS);
@@ -667,7 +667,7 @@ namespace VeraCrypt
}
listCtrl->DeleteItem (itemIndex);
-
+
if (newItemIndex > listCtrl->GetItemCount() - 1)
AppendToListCtrl (listCtrl, itemFields, item.GetImage(), (void *) item.GetData());
else
@@ -688,7 +688,7 @@ namespace VeraCrypt
return VolumeInfoList();
VolumeInfoList mountedVolumes = UserInterface::MountAllDeviceHostedVolumes (options);
-
+
if (!mountedVolumes.empty())
return mountedVolumes;
}
@@ -857,7 +857,7 @@ namespace VeraCrypt
wxLogLevel logLevel = wxLog::GetLogLevel();
wxLog::SetLogLevel (wxLOG_Error);
-
+
const wxString instanceCheckerName = wxString (L".") + Application::GetName() + L"-lock-" + wxGetUserId();
SingleInstanceChecker.reset (new wxSingleInstanceChecker (instanceCheckerName));
@@ -978,7 +978,7 @@ namespace VeraCrypt
return true;
}
-
+
void GraphicUserInterface::OnLogOff ()
{
VolumeInfoList mountedVolumes = Core->GetMountedVolumes();
@@ -994,10 +994,10 @@ namespace VeraCrypt
try
{
timeOver = (wxGetLocalTimeMillis() - startTime >= 4000);
-
+
DismountVolumes (mountedVolumes, !timeOver ? false : GetPreferences().ForceAutoDismount, timeOver);
OnVolumesAutoDismounted();
-
+
break;
}
catch (UserAbort&)
@@ -1075,112 +1075,112 @@ namespace VeraCrypt
wxString GraphicUserInterface::GetHomepageLinkURL (const wxString &linkId, bool secure, const wxString &extraVars) const
{
wxString url = wxString (StringConverter::ToWide (secure ? TC_APPLINK_SECURE : TC_APPLINK));
-
- if (linkId == L"donate")
+
+ if (linkId == L"donate")
{
url = L"https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=5BCXVMTTNJDCY";
}
- else if (linkId == L"main")
+ else if (linkId == L"main")
{
url = wxString (StringConverter::ToWide (TC_HOMEPAGE));
}
- else if (linkId == L"localizations")
+ else if (linkId == L"localizations")
{
url = L"https://veracrypt.codeplex.com/wikipage?title=Language%20Packs";
}
- else if (linkId == L"beginnerstutorial" || linkId == L"tutorial")
+ else if (linkId == L"beginnerstutorial" || linkId == L"tutorial")
{
url = L"https://veracrypt.codeplex.com/wikipage?title=Beginner%27s%20Tutorial";
}
- else if (linkId == L"releasenotes" || linkId == L"history")
+ else if (linkId == L"releasenotes" || linkId == L"history")
{
url = L"https://veracrypt.codeplex.com/wikipage?title=Release%20Notes";
}
- else if (linkId == L"hwacceleration")
+ else if (linkId == L"hwacceleration")
{
url = L"https://veracrypt.codeplex.com/wikipage?title=Hardware%20Acceleration";
}
- else if (linkId == L"parallelization")
+ else if (linkId == L"parallelization")
{
url = L"https://veracrypt.codeplex.com/wikipage?title=Parallelization";
}
- else if (linkId == L"help")
+ else if (linkId == L"help")
{
url = L"https://veracrypt.codeplex.com/documentation";
}
- else if (linkId == L"keyfiles")
+ else if (linkId == L"keyfiles")
{
url = L"https://veracrypt.codeplex.com/wikipage?title=Keyfiles";
}
- else if (linkId == L"introcontainer")
+ else if (linkId == L"introcontainer")
{
url = L"https://veracrypt.codeplex.com/wikipage?title=Creating%20New%20Volumes";
}
- else if (linkId == L"introsysenc")
+ else if (linkId == L"introsysenc")
{
url = L"https://veracrypt.codeplex.com/wikipage?title=System%20Encryption";
}
- else if (linkId == L"hiddensysenc")
+ else if (linkId == L"hiddensysenc")
{
url = L"https://veracrypt.codeplex.com/wikipage?title=VeraCrypt%20Hidden%20Operating%20System";
}
- else if (linkId == L"sysencprogressinfo")
+ else if (linkId == L"sysencprogressinfo")
{
url = L"https://veracrypt.codeplex.com/wikipage?title=System%20Encryption";
}
- else if (linkId == L"hiddenvolume")
+ else if (linkId == L"hiddenvolume")
{
url = L"https://veracrypt.codeplex.com/wikipage?title=Hidden%20Volume";
}
- else if (linkId == L"aes")
+ else if (linkId == L"aes")
{
url = L"https://veracrypt.codeplex.com/wikipage?title=AES";
}
- else if (linkId == L"serpent")
+ else if (linkId == L"serpent")
{
url = L"https://veracrypt.codeplex.com/wikipage?title=Serpent";
}
- else if (linkId == L"twofish")
+ else if (linkId == L"twofish")
{
url = L"https://veracrypt.codeplex.com/wikipage?title=Twofish";
}
- else if (linkId == L"cascades")
+ else if (linkId == L"cascades")
{
url = L"https://veracrypt.codeplex.com/wikipage?title=Cascades";
}
- else if (linkId == L"hashalgorithms")
+ else if (linkId == L"hashalgorithms")
{
url = L"https://veracrypt.codeplex.com/wikipage?title=Hash%20Algorithms";
}
- else if (linkId == L"isoburning")
+ else if (linkId == L"isoburning")
{
url = L"https://cdburnerxp.se/en/home";
}
- else if (linkId == L"sysfavorites")
+ else if (linkId == L"sysfavorites")
{
url = L"https://veracrypt.codeplex.com/wikipage?title=System%20Favorite%20Volumes";
}
- else if (linkId == L"favorites")
+ else if (linkId == L"favorites")
{
url = L"https://veracrypt.codeplex.com/wikipage?title=Favorite%20Volumes";
}
- else if (linkId == L"hiddenvolprotection")
+ else if (linkId == L"hiddenvolprotection")
{
url = L"https://veracrypt.codeplex.com/wikipage?title=Protection%20of%20Hidden%20Volumes";
}
- else if (linkId == L"faq")
+ else if (linkId == L"faq")
{
url = L"https://veracrypt.codeplex.com/wikipage?title=FAQ";
}
- else if (linkId == L"downloads")
+ else if (linkId == L"downloads")
{
url = L"https://veracrypt.codeplex.com/wikipage?title=Downloads";
}
- else if (linkId == L"news")
+ else if (linkId == L"news")
{
url = L"https://veracrypt.codeplex.com/wikipage?title=News";
}
- else if (linkId == L"contact")
+ else if (linkId == L"contact")
{
url = L"https://veracrypt.codeplex.com/wikipage?title=Contact";
}
@@ -1191,7 +1191,7 @@ namespace VeraCrypt
void GraphicUserInterface::OpenHomepageLink (wxWindow *parent, const wxString &linkId, const wxString &extraVars)
{
wxString url;
-
+
BeginInteractiveBusyState (parent);
wxLaunchDefaultBrowser (GetHomepageLinkURL (linkId, false, extraVars), wxBROWSER_NEW_WINDOW);
Thread::Sleep (200);
@@ -1301,7 +1301,7 @@ namespace VeraCrypt
default:
return;
}
-
+
/* force the display of the random enriching interface */
RandomNumberGenerator::SetEnrichedByUserStatus (false);
@@ -1341,7 +1341,7 @@ namespace VeraCrypt
true
);
- ExecuteWaitThreadRoutine (parent, &routine);
+ ExecuteWaitThreadRoutine (parent, &routine);
volume = routine.m_pVolume;
}
catch (PasswordException &e)
@@ -1449,7 +1449,7 @@ namespace VeraCrypt
EncryptionAlgorithmList encryptionAlgorithms = layout->GetSupportedEncryptionAlgorithms();
EncryptionModeList encryptionModes = layout->GetSupportedEncryptionModes();
- DecryptThreadRoutine decryptRoutine(layout->GetHeader(), headerBuffer, *passwordKey, options.Pim, options.Kdf, options.TrueCryptMode, keyDerivationFunctions, encryptionAlgorithms, encryptionModes);
+ DecryptThreadRoutine decryptRoutine(layout->GetHeader(), headerBuffer, *passwordKey, options.Pim, options.Kdf, options.TrueCryptMode, keyDerivationFunctions, encryptionAlgorithms, encryptionModes);
ExecuteWaitThreadRoutine (parent, &decryptRoutine);
@@ -1471,7 +1471,7 @@ namespace VeraCrypt
File volumeFile;
volumeFile.Open (*volumePath, File::OpenReadWrite, File::ShareNone, File::PreserveTimestamps);
-
+
RandomNumberGenerator::Start();
UserEnrichRandomPool (nullptr);
@@ -1497,7 +1497,7 @@ namespace VeraCrypt
ReEncryptHeaderThreadRoutine backupRoutine(newHeaderBuffer, decryptedLayout->GetHeader(), options.Password, options.Pim, options.Keyfiles);
ExecuteWaitThreadRoutine (parent, &backupRoutine);
-
+
// Write backup volume header
headerOffset = decryptedLayout->GetBackupHeaderOffset();
if (headerOffset >= 0)
@@ -1557,7 +1557,7 @@ namespace VeraCrypt
if (!fileExtensions.empty())
#endif
{
- wildcards = LangString["ALL_FILES"] +
+ wildcards = LangString["ALL_FILES"] +
#ifdef TC_WINDOWS
L" (*.*)|*.*";
#else
@@ -1595,7 +1595,7 @@ namespace VeraCrypt
return files;
}
-
+
FilePath GraphicUserInterface::SelectVolumeFile (wxWindow *parent, bool saveMode, const DirectoryPath &directory) const
{
list < pair <wstring, wstring> > extensions;
@@ -1639,14 +1639,14 @@ namespace VeraCrypt
listWidth = minListWidth;
listWidth -= GetScrollbarWidth (listCtrl, !hasVerticalScrollbar);
-
+
int col = 0;
int totalColWidth = 0;
foreach (int colWidth, columnWidthPermilles)
{
int width = listWidth * colWidth / 1000;
totalColWidth += width;
-
+
if (col == listCtrl->GetColumnCount() - 1)
width += listWidth - totalColWidth;
@@ -1712,7 +1712,7 @@ namespace VeraCrypt
{
ShowMessage (message, wxOK | wxICON_INFORMATION, true);
}
-
+
int GraphicUserInterface::ShowMessage (const wxString &message, long style, bool topMost) const
{
wxString caption = Application::GetName();
@@ -1786,7 +1786,7 @@ namespace VeraCrypt
void GraphicUserInterface::ShowWarningTopMost (const wxString &message) const
{
- ShowMessage (message, wxOK
+ ShowMessage (message, wxOK
#ifndef TC_MACOSX
| wxICON_EXCLAMATION
#endif
@@ -1810,7 +1810,7 @@ namespace VeraCrypt
foreach (wxString field, itemFields)
{
item.SetColumn (col++);
-
+
if (!listCtrl->GetItem (item))
throw ParameterIncorrect (SRC_POS);
@@ -1829,7 +1829,7 @@ namespace VeraCrypt
void GraphicUserInterface::UserEnrichRandomPool (wxWindow *parent, shared_ptr <Hash> hash) const
{
RandomNumberGenerator::Start();
-
+
if (hash)
RandomNumberGenerator::SetHash (hash);
diff --git a/src/Main/GraphicUserInterface.h b/src/Main/GraphicUserInterface.h
index c2a9fa3..a7056f0 100644
--- a/src/Main/GraphicUserInterface.h
+++ b/src/Main/GraphicUserInterface.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -89,7 +89,7 @@ namespace VeraCrypt
virtual void ShowInfoTopMost (char *langStringId) const { ShowInfoTopMost (LangString[langStringId]); }
virtual void ShowInfoTopMost (const wxString &message) const;
virtual void ShowWarningTopMost (char *langStringId) const { ShowWarningTopMost (LangString[langStringId]); }
- virtual void ShowWarningTopMost (const wxString &message) const;
+ virtual void ShowWarningTopMost (const wxString &message) const;
virtual bool UpdateListCtrlItem (wxListCtrl *listCtrl, long itemIndex, const vector <wstring> &itemFields) const;
virtual void UserEnrichRandomPool (wxWindow *parent, shared_ptr <Hash> hash = shared_ptr <Hash>()) const;
virtual void Yield () const;
diff --git a/src/Main/Hotkey.cpp b/src/Main/Hotkey.cpp
index 31f0243..132b7cb 100644
--- a/src/Main/Hotkey.cpp
+++ b/src/Main/Hotkey.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -50,13 +50,13 @@ namespace VeraCrypt
if (VirtualKeyModifiers & wxMOD_SHIFT)
str += LangString["VK_SHIFT"] + L"+";
-
+
if (VirtualKeyModifiers & wxMOD_CONTROL)
str += LangString["VK_CONTROL"] + L"+";
-
+
if (VirtualKeyModifiers & wxMOD_ALT)
str += LangString["VK_ALT"] + L"+";
-
+
if (VirtualKeyModifiers & wxMOD_WIN )
str += LangString["VK_WIN"] + L"+";
@@ -67,11 +67,11 @@ namespace VeraCrypt
{
#ifdef TC_WINDOWS
// ASCII characters
- if (virtualKeyCode >= 0x30 && virtualKeyCode <= 0x5a)
+ if (virtualKeyCode >= 0x30 && virtualKeyCode <= 0x5a)
return StringFormatter (L"{0}", char (virtualKeyCode));
// OEM-specific
- if (virtualKeyCode >= 0xE9 && virtualKeyCode <= 0xF5)
+ if (virtualKeyCode >= 0xE9 && virtualKeyCode <= 0xF5)
return StringFormatter (L"OEM-{0}", virtualKeyCode);
// F1-F24
@@ -147,7 +147,7 @@ namespace VeraCrypt
{
hotkey->VirtualKeyCode = StringConverter::ToUInt32 (wstring (node.Attributes[L"vkeycode"]));
hotkey->VirtualKeyModifiers = 0;
-
+
if (node.Attributes[L"modshift"] == L"1")
hotkey->VirtualKeyModifiers |= wxMOD_SHIFT;
diff --git a/src/Main/Hotkey.h b/src/Main/Hotkey.h
index c23feaa..86b40f7 100644
--- a/src/Main/Hotkey.h
+++ b/src/Main/Hotkey.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/LanguageStrings.cpp b/src/Main/LanguageStrings.cpp
index aa5a9e4..8892946 100644
--- a/src/Main/LanguageStrings.cpp
+++ b/src/Main/LanguageStrings.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/LanguageStrings.h b/src/Main/LanguageStrings.h
index d9cc957..a55fc08 100644
--- a/src/Main/LanguageStrings.h
+++ b/src/Main/LanguageStrings.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/Main.h b/src/Main/Main.h
index e9d7e83..18d5eda 100644
--- a/src/Main/Main.h
+++ b/src/Main/Main.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/Main.make b/src/Main/Main.make
index 99700ce..f4f254e 100644
--- a/src/Main/Main.make
+++ b/src/Main/Main.make
@@ -3,7 +3,7 @@
# Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
# by the TrueCrypt License 3.0.
#
-# Modifications and additions to the original source code (contained in this file)
+# Modifications and additions to the original source code (contained in this file)
# and all other portions of this file are Copyright (c) 2013-2016 IDRIX
# and are governed by the Apache License 2.0 the full text of which is
# contained in the file License.txt included in VeraCrypt binary and source
@@ -152,7 +152,7 @@ ifeq "$(PLATFORM)" "MacOSX"
mkdir -p $(APPNAME).app/Contents/MacOS $(APPNAME).app/Contents/Resources
-rm -f $(APPNAME).app/Contents/MacOS/$(APPNAME)
-rm -f $(APPNAME).app/Contents/MacOS/$(APPNAME)_console
-
+
ifeq "$(TC_BUILD_CONFIG)" "Release"
ifdef TC_NO_GUI
cp $(PWD)/Main/$(APPNAME) $(APPNAME).app/Contents/MacOS/$(APPNAME)_console
@@ -171,7 +171,7 @@ endif
cp $(PWD)/Resources/Icons/VeraCrypt.icns $(APPNAME).app/Contents/Resources
cp "$(PWD)/Release/Setup Files/VeraCrypt User Guide.pdf" $(APPNAME).app/Contents/Resources
-
+
echo -n APPLTRUE >$(APPNAME).app/Contents/PkgInfo
sed -e 's/_VERSION_/$(patsubst %a,%.1,$(patsubst %b,%.2,$(TC_VERSION)))/' ../Build/Resources/MacOSX/Info.plist.xml >$(APPNAME).app/Contents/Info.plist
codesign -s "Developer ID Application: Mounir IDRASSI" --timestamp $(APPNAME).app
@@ -192,7 +192,7 @@ endif
-ifeq "$(PLATFORM)" "Linux"
+ifeq "$(PLATFORM)" "Linux"
ifeq "$(TC_BUILD_CONFIG)" "Release"
mkdir -p $(PWD)/Setup/Linux/usr/bin
mkdir -p $(PWD)/Setup/Linux/usr/share/$(APPNAME)/doc
@@ -211,7 +211,7 @@ endif
tar cfz $(PWD)/Setup/Linux/$(PACKAGE_NAME) --directory $(PWD)/Setup/Linux usr
-
+
@rm -fr $(INTERNAL_INSTALLER_NAME)
@echo "#!/bin/sh" > $(INTERNAL_INSTALLER_NAME)
@echo "VERSION=$(TC_VERSION)" >> $(INTERNAL_INSTALLER_NAME)
@@ -219,7 +219,7 @@ endif
@echo "PACKAGE_NAME=$(PACKAGE_NAME)" >> $(INTERNAL_INSTALLER_NAME)
@echo "PACKAGE_START=1107" >> $(INTERNAL_INSTALLER_NAME)
@echo "INSTALLER_TYPE=$(INSTALLER_TYPE)" >> $(INTERNAL_INSTALLER_NAME)
-
+
@cat $(PWD)/Setup/Linux/veracrypt_install_template.sh >> $(INTERNAL_INSTALLER_NAME)
@cat $(PWD)/Setup/Linux/$(PACKAGE_NAME) >> $(INTERNAL_INSTALLER_NAME)
chmod +x $(INTERNAL_INSTALLER_NAME)
diff --git a/src/Main/Resources.cpp b/src/Main/Resources.cpp
index 915134d..8b0dcdf 100644
--- a/src/Main/Resources.cpp
+++ b/src/Main/Resources.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -24,7 +24,7 @@ namespace VeraCrypt
#ifdef TC_WINDOWS
static ConstBufferPtr GetWindowsResource (const wchar_t *resourceType, const wchar_t *resourceName)
{
- HGLOBAL hResL;
+ HGLOBAL hResL;
HRSRC hRes;
hRes = FindResource (NULL, resourceName, resourceType);
diff --git a/src/Main/Resources.h b/src/Main/Resources.h
index 13077f8..45b5c32 100644
--- a/src/Main/Resources.h
+++ b/src/Main/Resources.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/StringFormatter.cpp b/src/Main/StringFormatter.cpp
index 1b18475..39f7da5 100644
--- a/src/Main/StringFormatter.cpp
+++ b/src/Main/StringFormatter.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/StringFormatter.h b/src/Main/StringFormatter.h
index 29bbac3..0d5fdc5 100644
--- a/src/Main/StringFormatter.h
+++ b/src/Main/StringFormatter.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/System.cpp b/src/Main/System.cpp
index 44314c8..4cfba36 100644
--- a/src/Main/System.cpp
+++ b/src/Main/System.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/System.h b/src/Main/System.h
index 21510fb..5c62892 100644
--- a/src/Main/System.h
+++ b/src/Main/System.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -26,8 +26,8 @@
#ifndef TC_LOCAL_WIN32_WINNT_OVERRIDE
# ifndef _WIN32_WINNT
# define _WIN32_WINNT 0x0501
-# endif
-#endif
+# endif
+#endif
#ifndef _WIN32_WINDOWS
#define _WIN32_WINDOWS 0x0410
diff --git a/src/Main/SystemPrecompiled.h b/src/Main/SystemPrecompiled.h
index 6d537e1..168642a 100644
--- a/src/Main/SystemPrecompiled.h
+++ b/src/Main/SystemPrecompiled.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/TextUserInterface.cpp b/src/Main/TextUserInterface.cpp
index bddfc0b..902f461 100644
--- a/src/Main/TextUserInterface.cpp
+++ b/src/Main/TextUserInterface.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -165,7 +165,7 @@ namespace VeraCrypt
return password;
}
-
+
int TextUserInterface::AskPim (const wxString &message) const
{
int pim = -1;
@@ -196,10 +196,10 @@ namespace VeraCrypt
}
}
}
-
+
return pim;
}
-
+
ssize_t TextUserInterface::AskSelection (ssize_t optionCount, ssize_t defaultOption) const
{
while (true)
@@ -229,7 +229,7 @@ namespace VeraCrypt
ShowString (message);
return wstring (ReadInputStreamLine());
}
-
+
bool TextUserInterface::AskYesNo (const wxString &message, bool defaultYes, bool warning) const
{
while (true)
@@ -264,7 +264,7 @@ namespace VeraCrypt
#endif
ShowInfo ("EXTERNAL_VOL_HEADER_BAK_FIRST_INFO");
-
+
shared_ptr <Pkcs5Kdf> kdf;
if (CmdLine->ArgHash)
{
@@ -426,7 +426,7 @@ namespace VeraCrypt
{
password = AskPassword ();
}
-
+
// current PIM
if (!truecryptMode && !Preferences.NonInteractive && (pim < 0))
{
@@ -449,7 +449,7 @@ namespace VeraCrypt
if (!Preferences.NonInteractive)
keyfiles = AskKeyfiles ();
}
- }
+ }
if (!volume.get())
volume = Core->OpenVolume (volumePath, Preferences.DefaultMountOptions.PreserveTimestamps, password, pim, kdf, truecryptMode, keyfiles);
@@ -469,7 +469,7 @@ namespace VeraCrypt
// New password
if (!newPassword.get() && !Preferences.NonInteractive)
newPassword = AskPassword (_("Enter new password"), true);
-
+
// New PIM
if ((newPim < 0) && !Preferences.NonInteractive)
newPim = AskPim (_("Enter new PIM"));
@@ -769,7 +769,7 @@ namespace VeraCrypt
ShowString (L"\n");
options->Password = AskPassword (_("Enter password"), true);
}
-
+
// PIM
if ((options->Pim < 0) && !Preferences.NonInteractive)
{
@@ -784,7 +784,7 @@ namespace VeraCrypt
options->Keyfiles = AskKeyfiles (_("Enter keyfile path"));
}
- if ((!options->Keyfiles || options->Keyfiles->empty())
+ if ((!options->Keyfiles || options->Keyfiles->empty())
&& (!options->Password || options->Password->IsEmpty()))
{
throw_err (_("Password cannot be empty when no keyfile is specified"));
@@ -909,7 +909,7 @@ namespace VeraCrypt
ShowInfo (options->Type == VolumeType::Hidden ? "HIDVOL_FORMAT_FINISHED_HELP" : "FORMAT_FINISHED_INFO");
}
-
+
void TextUserInterface::DeleteSecurityTokenKeyfiles () const
{
shared_ptr <KeyfileList> keyfiles = AskKeyfiles();
@@ -956,7 +956,7 @@ namespace VeraCrypt
BufferPtr keyfileDataBuf (&keyfileData.front(), keyfileData.size());
finally_do_arg (BufferPtr, keyfileDataBuf, { finally_arg.Erase(); });
-
+
FilePath exportFilePath = AskFilePath();
if (exportFilePath.IsEmpty())
@@ -978,7 +978,7 @@ namespace VeraCrypt
TextUserInterface::SetTerminalEcho (false);
finally_do ({ TextUserInterface::SetTerminalEcho (true); });
-
+
wstring wPassword (UI->ReadInputStreamLine());
finally_do_arg (wstring *, &wPassword, { StringConverter::Erase (*finally_arg); });
@@ -988,7 +988,7 @@ namespace VeraCrypt
}
TextUserInterface *UI;
};
-
+
return shared_ptr <GetStringFunctor> (new AdminPasswordRequestHandler (this));
}
@@ -1060,7 +1060,7 @@ namespace VeraCrypt
TextUserInterface::SetTerminalEcho (false);
finally_do ({ TextUserInterface::SetTerminalEcho (true); });
-
+
wstring wPassword (UI->ReadInputStreamLine());
finally_do_arg (wstring *, &wPassword, { StringConverter::Erase (*finally_arg); });
@@ -1110,7 +1110,7 @@ namespace VeraCrypt
{
if (!options.Password)
options.Password = AskPassword();
-
+
if (!options.TrueCryptMode && (options.Pim < 0))
options.Pim = AskPim (_("Enter PIM"));
@@ -1118,7 +1118,7 @@ namespace VeraCrypt
options.Keyfiles = AskKeyfiles();
VolumeInfoList mountedVolumes = UserInterface::MountAllDeviceHostedVolumes (options);
-
+
if (!mountedVolumes.empty())
return mountedVolumes;
@@ -1126,7 +1126,7 @@ namespace VeraCrypt
options.Pim = -1;
}
}
-
+
shared_ptr <VolumeInfo> TextUserInterface::MountVolume (MountOptions &options) const
{
shared_ptr <VolumeInfo> volume;
@@ -1151,7 +1151,7 @@ namespace VeraCrypt
// Mount point
if (!options.MountPoint && !options.NoFilesystem)
options.MountPoint.reset (new DirectoryPath (AskString (_("Enter mount directory [default]: "))));
-
+
VolumePassword password;
KeyfileList keyfiles;
@@ -1176,7 +1176,7 @@ namespace VeraCrypt
{
options.Password = AskPassword (StringFormatter (_("Enter password for {0}"), wstring (*options.Path)));
}
-
+
if (!options.TrueCryptMode && (options.Pim < 0))
{
options.Pim = AskPim (StringFormatter (_("Enter PIM for {0}"), wstring (*options.Path)));
@@ -1276,7 +1276,7 @@ namespace VeraCrypt
}
int TextUserInterface::OnRun()
- {
+ {
try
{
if (ProcessCommandLine ())
@@ -1362,7 +1362,7 @@ namespace VeraCrypt
default:
throw UserAbort (SRC_POS);
}
-
+
/* force the display of the random enriching interface */
RandomNumberGenerator::SetEnrichedByUserStatus (false);
@@ -1513,7 +1513,7 @@ namespace VeraCrypt
File volumeFile;
volumeFile.Open (*volumePath, File::OpenReadWrite, File::ShareNone, File::PreserveTimestamps);
-
+
RandomNumberGenerator::Start();
UserEnrichRandomPool();
@@ -1534,7 +1534,7 @@ namespace VeraCrypt
{
// Re-encrypt backup volume header
Core->ReEncryptVolumeHeaderWithNewSalt (newHeaderBuffer, decryptedLayout->GetHeader(), options.Password, options.Pim, options.Keyfiles);
-
+
// Write backup volume header
headerOffset = decryptedLayout->GetBackupHeaderOffset();
if (headerOffset >= 0)
@@ -1572,7 +1572,7 @@ namespace VeraCrypt
}
#endif
}
-
+
void TextUserInterface::UserEnrichRandomPool () const
{
RandomNumberGenerator::Start();
diff --git a/src/Main/TextUserInterface.h b/src/Main/TextUserInterface.h
index fc25388..7e562b0 100644
--- a/src/Main/TextUserInterface.h
+++ b/src/Main/TextUserInterface.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/Unix/Main.cpp b/src/Main/Unix/Main.cpp
index b43ea1e..8b08a91 100644
--- a/src/Main/Unix/Main.cpp
+++ b/src/Main/Unix/Main.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -33,7 +33,7 @@ int main (int argc, char **argv)
{
// Make sure all required commands can be executed via default search path
string sysPathStr = "/usr/sbin:/sbin:/usr/bin:/bin";
-
+
char *sysPath = getenv ("PATH");
if (sysPath)
{
diff --git a/src/Main/UserInterface.cpp b/src/Main/UserInterface.cpp
index db53b7c..8d4b701 100644
--- a/src/Main/UserInterface.cpp
+++ b/src/Main/UserInterface.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -73,7 +73,7 @@ namespace VeraCrypt
static BOOL CALLBACK ChildWindows (HWND hwnd, LPARAM argsLP)
{
Args *args = reinterpret_cast <Args *> (argsLP);
-
+
char s[4096];
SendMessageA (hwnd, WM_GETTEXT, sizeof (s), (LPARAM) s);
@@ -116,7 +116,7 @@ namespace VeraCrypt
return;
args.DriveRootPath = string() + mountPoint[0] + string (":\\");
-
+
EnumWindows (Enumerator::TopLevelWindows, (LPARAM) &args);
#endif
}
@@ -237,7 +237,7 @@ namespace VeraCrypt
if (Preferences.Verbose && !message.IsEmpty())
ShowInfo (message);
}
-
+
void UserInterface::DisplayVolumeProperties (const VolumeInfoList &volumes) const
{
if (volumes.size() < 1)
@@ -281,7 +281,7 @@ namespace VeraCrypt
prop << LangString["BLOCK_SIZE"] << L": " << blockSize.str() + L" " + LangString ["BITS"] << L'\n';
prop << LangString["MODE_OF_OPERATION"] << L": " << volume.EncryptionModeName << L'\n';
prop << LangString["PKCS5_PRF"] << L": " << volume.Pkcs5PrfName << L'\n';
-
+
prop << LangString["VOLUME_FORMAT_VERSION"] << L": " << (volume.MinRequiredProgramVersion < 0x10b ? 1 : 2) << L'\n';
prop << LangString["BACKUP_HEADER"] << L": " << LangString[volume.MinRequiredProgramVersion >= 0x10b ? "UISTR_YES" : "UISTR_NO"] << L'\n';
@@ -294,7 +294,7 @@ namespace VeraCrypt
#ifdef TC_LINUX
}
#endif
-
+
prop << L'\n';
}
@@ -304,7 +304,7 @@ namespace VeraCrypt
wxString UserInterface::ExceptionToMessage (const exception &ex)
{
wxString message;
-
+
const Exception *e = dynamic_cast <const Exception *> (&ex);
if (e)
{
@@ -394,7 +394,7 @@ namespace VeraCrypt
return wxString (errOutput).Trim (true);
}
- // PasswordIncorrect
+ // PasswordIncorrect
if (dynamic_cast <const PasswordException *> (&ex))
{
wxString message = ExceptionTypeToString (typeid (ex));
@@ -419,7 +419,7 @@ namespace VeraCrypt
if (dynamic_cast <const Pkcs11Exception *> (&ex))
{
string errorString = string (dynamic_cast <const Pkcs11Exception &> (ex));
-
+
if (LangString.Exists (errorString))
return LangString[errorString];
@@ -510,7 +510,7 @@ namespace VeraCrypt
#endif
LangString.Init();
Core->Init();
-
+
CmdLine.reset (new CommandLineInterface (argc, argv, InterfaceType));
SetPreferences (CmdLine->Preferences);
@@ -551,7 +551,7 @@ namespace VeraCrypt
}
}
}
-
+
void UserInterface::ListMountedVolumes (const VolumeInfoList &volumes) const
{
if (volumes.size() < 1)
@@ -683,7 +683,7 @@ namespace VeraCrypt
VolumeInfoList UserInterface::MountAllFavoriteVolumes (MountOptions &options)
{
BusyScope busy (this);
-
+
VolumeInfoList newMountedVolumes;
foreach_ref (const FavoriteVolume &favorite, FavoriteVolume::LoadList())
{
@@ -805,7 +805,7 @@ namespace VeraCrypt
if (Preferences.OpenExplorerWindowAfterMount && !mountedVolume->MountPoint.IsEmpty())
OpenExplorerWindow (mountedVolume->MountPoint);
}
-
+
void UserInterface::OnWarning (EventArgs &args)
{
ExceptionEventArgs &e = dynamic_cast <ExceptionEventArgs &> (args);
@@ -876,7 +876,7 @@ namespace VeraCrypt
}
else if (xdgOpenPresent)
{
- // Fallback on the standard xdg-open command
+ // Fallback on the standard xdg-open command
// which is not always available by default
args.push_back (string (path));
try
@@ -905,7 +905,7 @@ namespace VeraCrypt
wstring pwdInput;
getline(wcin, pwdInput);
- cmdLine.ArgPassword = ToUTF8Password ( pwdInput.c_str (), pwdInput.size ());
+ cmdLine.ArgPassword = ToUTF8Password ( pwdInput.c_str (), pwdInput.size ());
}
switch (cmdLine.ArgCommand)
@@ -1025,7 +1025,7 @@ namespace VeraCrypt
options->VolumeHeaderKdf = Pkcs5Kdf::GetAlgorithm (*cmdLine.ArgHash, false);
RandomNumberGenerator::SetHash (cmdLine.ArgHash);
}
-
+
options->EA = cmdLine.ArgEncryptionAlgorithm;
options->Filesystem = cmdLine.ArgFilesystem;
options->Keyfiles = cmdLine.ArgKeyfiles;
@@ -1494,7 +1494,7 @@ namespace VeraCrypt
return s.str();
}
-
+
bool UserInterface::VolumeHasUnrecommendedExtension (const VolumePath &path) const
{
wxString ext = wxFileName (wxString (wstring (path)).Lower()).GetExt();
@@ -1580,7 +1580,7 @@ namespace VeraCrypt
VC_CONVERT_EXCEPTION (UserInterfaceException);
VC_CONVERT_EXCEPTION (MissingArgument);
VC_CONVERT_EXCEPTION (NoItemSelected);
- VC_CONVERT_EXCEPTION (StringFormatterException);
+ VC_CONVERT_EXCEPTION (StringFormatterException);
VC_CONVERT_EXCEPTION (ExecutedProcessFailed);
VC_CONVERT_EXCEPTION (AlreadyInitialized);
VC_CONVERT_EXCEPTION (AssertionFailed);
@@ -1598,7 +1598,7 @@ namespace VeraCrypt
VC_CONVERT_EXCEPTION (UnknownException);
VC_CONVERT_EXCEPTION (UserAbort)
VC_CONVERT_EXCEPTION (CipherInitError);
- VC_CONVERT_EXCEPTION (WeakKeyDetected);
+ VC_CONVERT_EXCEPTION (WeakKeyDetected);
VC_CONVERT_EXCEPTION (HigherVersionRequired);
VC_CONVERT_EXCEPTION (KeyfilePathEmpty);
VC_CONVERT_EXCEPTION (MissingVolumeData);
@@ -1613,7 +1613,7 @@ namespace VeraCrypt
VC_CONVERT_EXCEPTION (SecurityTokenLibraryNotInitialized);
VC_CONVERT_EXCEPTION (SecurityTokenKeyfileAlreadyExists);
VC_CONVERT_EXCEPTION (SecurityTokenKeyfileNotFound);
- VC_CONVERT_EXCEPTION (UnsupportedAlgoInTrueCryptMode);
+ VC_CONVERT_EXCEPTION (UnsupportedAlgoInTrueCryptMode);
VC_CONVERT_EXCEPTION (UnsupportedTrueCryptFormat);
VC_CONVERT_EXCEPTION (SystemException);
VC_CONVERT_EXCEPTION (CipherException);
diff --git a/src/Main/UserInterface.h b/src/Main/UserInterface.h
index 31f83e8..4f2d769 100644
--- a/src/Main/UserInterface.h
+++ b/src/Main/UserInterface.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/UserInterfaceException.h b/src/Main/UserInterfaceException.h
index d87830f..1ceacf7 100644
--- a/src/Main/UserInterfaceException.h
+++ b/src/Main/UserInterfaceException.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/UserInterfaceType.h b/src/Main/UserInterfaceType.h
index 551b784..dd5ef7a 100644
--- a/src/Main/UserInterfaceType.h
+++ b/src/Main/UserInterfaceType.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/UserPreferences.cpp b/src/Main/UserPreferences.cpp
index 9e48b92..fafd082 100644
--- a/src/Main/UserPreferences.cpp
+++ b/src/Main/UserPreferences.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
@@ -32,7 +32,7 @@ namespace VeraCrypt
else
cfgVar = StringConverter::ToUInt32 (wstring (cfgText));
}
-
+
void UserPreferences::SetValue (const wxString &cfgText, uint64 &cfgVar)
{
if (cfgText.empty())
@@ -108,12 +108,12 @@ namespace VeraCrypt
TC_CONFIG_SET (UseKeyfiles);
TC_CONFIG_SET (WipeCacheOnAutoDismount);
TC_CONFIG_SET (WipeCacheOnClose);
-
+
SetValue (configMap[L"DefaultTrueCryptMode"], DefaultMountOptions.TrueCryptMode);
-
+
wstring defaultPrf;
SetValue (configMap[L"DefaultPRF"], defaultPrf);
-
+
shared_ptr <Pkcs5Kdf> savedKdf;
try
{
@@ -123,9 +123,9 @@ namespace VeraCrypt
catch (ParameterIncorrect&)
{
}
-
+
DefaultMountOptions.Kdf = savedKdf;
- DefaultMountOptions.ProtectionKdf = savedKdf;
+ DefaultMountOptions.ProtectionKdf = savedKdf;
}
// Default keyfiles
@@ -137,7 +137,7 @@ namespace VeraCrypt
DefaultKeyfiles.push_back (make_shared <Keyfile> ((wstring) node.InnerText));
}
}
-
+
#ifdef TC_WINDOWS
// Hotkeys
Hotkeys = Hotkey::LoadList();
@@ -222,12 +222,12 @@ namespace VeraCrypt
TC_CONFIG_ADD (UseKeyfiles);
TC_CONFIG_ADD (WipeCacheOnAutoDismount);
TC_CONFIG_ADD (WipeCacheOnClose);
-
- formatter.AddEntry (L"DefaultTrueCryptMode", DefaultMountOptions.TrueCryptMode);
-
+
+ formatter.AddEntry (L"DefaultTrueCryptMode", DefaultMountOptions.TrueCryptMode);
+
wstring defaultPrf = L"autodetection";
if (DefaultMountOptions.Kdf)
- defaultPrf = DefaultMountOptions.Kdf->GetName ();
+ defaultPrf = DefaultMountOptions.Kdf->GetName ();
formatter.AddEntry (L"DefaultPRF", defaultPrf);
XmlWriter writer (Application::GetConfigFilePath (GetPreferencesFileName(), true));
@@ -236,7 +236,7 @@ namespace VeraCrypt
// Default keyfiles
FilePath keyfilesCfgPath = Application::GetConfigFilePath (GetDefaultKeyfilesFileName(), true);
-
+
if (DefaultKeyfiles.empty())
{
if (keyfilesCfgPath.IsFile())
diff --git a/src/Main/UserPreferences.h b/src/Main/UserPreferences.h
index 35d7439..cff8fab 100644
--- a/src/Main/UserPreferences.h
+++ b/src/Main/UserPreferences.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/VolumeHistory.cpp b/src/Main/VolumeHistory.cpp
index 44f43c4..67824bc 100644
--- a/src/Main/VolumeHistory.cpp
+++ b/src/Main/VolumeHistory.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/VolumeHistory.h b/src/Main/VolumeHistory.h
index 5eb0eab..7667a18 100644
--- a/src/Main/VolumeHistory.h
+++ b/src/Main/VolumeHistory.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/Xml.cpp b/src/Main/Xml.cpp
index e57678b..7197588 100644
--- a/src/Main/Xml.cpp
+++ b/src/Main/Xml.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source
diff --git a/src/Main/Xml.h b/src/Main/Xml.h
index beac8dd..bdfcce3 100644
--- a/src/Main/Xml.h
+++ b/src/Main/Xml.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
and are governed by the Apache License 2.0 the full text of which is
contained in the file License.txt included in VeraCrypt binary and source