VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Main/Forms
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2014-06-22 14:02:42 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2014-11-08 22:20:14 (GMT)
commit41a22ca4e78df752d4ce143a692310ab9e48c686 (patch)
tree7167af89d885e032926cb79981fd981f7b685962 /src/Main/Forms
parent17823cb58c5c68e5d1cf8cc6e9d92d0ce6194d8d (diff)
downloadVeraCrypt-41a22ca4e78df752d4ce143a692310ab9e48c686.zip
VeraCrypt-41a22ca4e78df752d4ce143a692310ab9e48c686.tar.gz
Change namespace from TrueCrypt to VeraCrypt. Rename method from Resources Resources::GetTrueCryptIcon to Resources::GetVeraCryptIcon.
Diffstat (limited to 'src/Main/Forms')
-rw-r--r--src/Main/Forms/AboutDialog.cpp2
-rw-r--r--src/Main/Forms/AboutDialog.h2
-rw-r--r--src/Main/Forms/BenchmarkDialog.cpp2
-rw-r--r--src/Main/Forms/BenchmarkDialog.h2
-rw-r--r--src/Main/Forms/ChangePasswordDialog.cpp2
-rw-r--r--src/Main/Forms/ChangePasswordDialog.h2
-rw-r--r--src/Main/Forms/DeviceSelectionDialog.cpp2
-rw-r--r--src/Main/Forms/DeviceSelectionDialog.h2
-rw-r--r--src/Main/Forms/EncryptionOptionsWizardPage.cpp2
-rw-r--r--src/Main/Forms/EncryptionOptionsWizardPage.h2
-rw-r--r--src/Main/Forms/EncryptionTestDialog.cpp2
-rw-r--r--src/Main/Forms/EncryptionTestDialog.h2
-rw-r--r--src/Main/Forms/FavoriteVolumesDialog.cpp2
-rw-r--r--src/Main/Forms/FavoriteVolumesDialog.h2
-rw-r--r--src/Main/Forms/InfoWizardPage.cpp2
-rw-r--r--src/Main/Forms/InfoWizardPage.h2
-rw-r--r--src/Main/Forms/KeyfileGeneratorDialog.cpp2
-rw-r--r--src/Main/Forms/KeyfileGeneratorDialog.h2
-rw-r--r--src/Main/Forms/KeyfilesDialog.cpp2
-rw-r--r--src/Main/Forms/KeyfilesDialog.h2
-rw-r--r--src/Main/Forms/KeyfilesPanel.cpp2
-rw-r--r--src/Main/Forms/KeyfilesPanel.h2
-rw-r--r--src/Main/Forms/LegalNoticesDialog.cpp2
-rw-r--r--src/Main/Forms/LegalNoticesDialog.h2
-rw-r--r--src/Main/Forms/MainFrame.cpp6
-rw-r--r--src/Main/Forms/MainFrame.h2
-rw-r--r--src/Main/Forms/MountOptionsDialog.cpp2
-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.cpp2
-rw-r--r--src/Main/Forms/PreferencesDialog.h2
-rw-r--r--src/Main/Forms/ProgressWizardPage.cpp2
-rw-r--r--src/Main/Forms/ProgressWizardPage.h2
-rw-r--r--src/Main/Forms/RandomPoolEnrichmentDialog.cpp2
-rw-r--r--src/Main/Forms/RandomPoolEnrichmentDialog.h2
-rw-r--r--src/Main/Forms/SecurityTokenKeyfilesDialog.cpp2
-rw-r--r--src/Main/Forms/SecurityTokenKeyfilesDialog.h2
-rw-r--r--src/Main/Forms/SelectDirectoryWizardPage.cpp2
-rw-r--r--src/Main/Forms/SelectDirectoryWizardPage.h2
-rw-r--r--src/Main/Forms/SingleChoiceWizardPage.h2
-rw-r--r--src/Main/Forms/VolumeCreationProgressWizardPage.cpp2
-rw-r--r--src/Main/Forms/VolumeCreationProgressWizardPage.h2
-rw-r--r--src/Main/Forms/VolumeCreationWizard.cpp2
-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.cpp2
-rw-r--r--src/Main/Forms/VolumeLocationWizardPage.h2
-rw-r--r--src/Main/Forms/VolumePasswordPanel.cpp2
-rw-r--r--src/Main/Forms/VolumePasswordPanel.h2
-rw-r--r--src/Main/Forms/VolumePasswordWizardPage.cpp2
-rw-r--r--src/Main/Forms/VolumePasswordWizardPage.h2
-rw-r--r--src/Main/Forms/VolumePropertiesDialog.cpp2
-rw-r--r--src/Main/Forms/VolumePropertiesDialog.h2
-rw-r--r--src/Main/Forms/VolumeSizeWizardPage.cpp2
-rw-r--r--src/Main/Forms/VolumeSizeWizardPage.h2
-rw-r--r--src/Main/Forms/WizardFrame.cpp4
-rw-r--r--src/Main/Forms/WizardFrame.h2
-rw-r--r--src/Main/Forms/WizardPage.h2
60 files changed, 63 insertions, 63 deletions
diff --git a/src/Main/Forms/AboutDialog.cpp b/src/Main/Forms/AboutDialog.cpp
index c838445..9eaa4eb 100644
--- a/src/Main/Forms/AboutDialog.cpp
+++ b/src/Main/Forms/AboutDialog.cpp
@@ -13,7 +13,7 @@
#include "Main/Resources.h"
#include "AboutDialog.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
AboutDialog::AboutDialog (wxWindow* parent) : AboutDialogBase (parent)
{
diff --git a/src/Main/Forms/AboutDialog.h b/src/Main/Forms/AboutDialog.h
index 94cca8b..658e777 100644
--- a/src/Main/Forms/AboutDialog.h
+++ b/src/Main/Forms/AboutDialog.h
@@ -11,7 +11,7 @@
#include "Forms.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class AboutDialog : public AboutDialogBase
{
diff --git a/src/Main/Forms/BenchmarkDialog.cpp b/src/Main/Forms/BenchmarkDialog.cpp
index a2c1418..fd51aa6 100644
--- a/src/Main/Forms/BenchmarkDialog.cpp
+++ b/src/Main/Forms/BenchmarkDialog.cpp
@@ -11,7 +11,7 @@
#include "Main/GraphicUserInterface.h"
#include "BenchmarkDialog.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
BenchmarkDialog::BenchmarkDialog (wxWindow *parent)
: BenchmarkDialogBase (parent)
diff --git a/src/Main/Forms/BenchmarkDialog.h b/src/Main/Forms/BenchmarkDialog.h
index 3cd6151..b127295 100644
--- a/src/Main/Forms/BenchmarkDialog.h
+++ b/src/Main/Forms/BenchmarkDialog.h
@@ -12,7 +12,7 @@
#include "Forms.h"
#include "Main/Main.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class BenchmarkDialog : public BenchmarkDialogBase
{
diff --git a/src/Main/Forms/ChangePasswordDialog.cpp b/src/Main/Forms/ChangePasswordDialog.cpp
index 05d0143..2a46f1a 100644
--- a/src/Main/Forms/ChangePasswordDialog.cpp
+++ b/src/Main/Forms/ChangePasswordDialog.cpp
@@ -11,7 +11,7 @@
#include "Main/GraphicUserInterface.h"
#include "ChangePasswordDialog.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
ChangePasswordDialog::ChangePasswordDialog (wxWindow* parent, shared_ptr <VolumePath> volumePath, Mode::Enum mode, shared_ptr <VolumePassword> password, shared_ptr <KeyfileList> keyfiles, shared_ptr <VolumePassword> newPassword, shared_ptr <KeyfileList> newKeyfiles)
: ChangePasswordDialogBase (parent), DialogMode (mode), Path (volumePath)
diff --git a/src/Main/Forms/ChangePasswordDialog.h b/src/Main/Forms/ChangePasswordDialog.h
index cc14760..fd46181 100644
--- a/src/Main/Forms/ChangePasswordDialog.h
+++ b/src/Main/Forms/ChangePasswordDialog.h
@@ -13,7 +13,7 @@
#include "Main/Main.h"
#include "VolumePasswordPanel.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class ChangePasswordDialog : public ChangePasswordDialogBase
{
diff --git a/src/Main/Forms/DeviceSelectionDialog.cpp b/src/Main/Forms/DeviceSelectionDialog.cpp
index 86db68a..4c5173c 100644
--- a/src/Main/Forms/DeviceSelectionDialog.cpp
+++ b/src/Main/Forms/DeviceSelectionDialog.cpp
@@ -11,7 +11,7 @@
#include "Main/Resources.h"
#include "DeviceSelectionDialog.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
DeviceSelectionDialog::DeviceSelectionDialog (wxWindow* parent)
: DeviceSelectionDialogBase (parent)
diff --git a/src/Main/Forms/DeviceSelectionDialog.h b/src/Main/Forms/DeviceSelectionDialog.h
index df0b618..69aba12 100644
--- a/src/Main/Forms/DeviceSelectionDialog.h
+++ b/src/Main/Forms/DeviceSelectionDialog.h
@@ -12,7 +12,7 @@
#include "Forms.h"
#include "Main/Main.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class DeviceSelectionDialog : public DeviceSelectionDialogBase
{
diff --git a/src/Main/Forms/EncryptionOptionsWizardPage.cpp b/src/Main/Forms/EncryptionOptionsWizardPage.cpp
index d321add..c05ee5b 100644
--- a/src/Main/Forms/EncryptionOptionsWizardPage.cpp
+++ b/src/Main/Forms/EncryptionOptionsWizardPage.cpp
@@ -14,7 +14,7 @@
#include "EncryptionOptionsWizardPage.h"
#include "EncryptionTestDialog.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
EncryptionOptionsWizardPage::EncryptionOptionsWizardPage (wxPanel* parent)
: EncryptionOptionsWizardPageBase (parent)
diff --git a/src/Main/Forms/EncryptionOptionsWizardPage.h b/src/Main/Forms/EncryptionOptionsWizardPage.h
index 1c8b0d9..cc60cba 100644
--- a/src/Main/Forms/EncryptionOptionsWizardPage.h
+++ b/src/Main/Forms/EncryptionOptionsWizardPage.h
@@ -11,7 +11,7 @@
#include "Forms.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class EncryptionOptionsWizardPage : public EncryptionOptionsWizardPageBase
{
diff --git a/src/Main/Forms/EncryptionTestDialog.cpp b/src/Main/Forms/EncryptionTestDialog.cpp
index 3e6fa6c..ab27826 100644
--- a/src/Main/Forms/EncryptionTestDialog.cpp
+++ b/src/Main/Forms/EncryptionTestDialog.cpp
@@ -12,7 +12,7 @@
#include "Main/GraphicUserInterface.h"
#include "EncryptionTestDialog.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
EncryptionTestDialog::EncryptionTestDialog (wxWindow* parent)
: EncryptionTestDialogBase (parent)
diff --git a/src/Main/Forms/EncryptionTestDialog.h b/src/Main/Forms/EncryptionTestDialog.h
index 3466ac9..0333926 100644
--- a/src/Main/Forms/EncryptionTestDialog.h
+++ b/src/Main/Forms/EncryptionTestDialog.h
@@ -12,7 +12,7 @@
#include "Forms.h"
#include "Main/Main.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class EncryptionTestDialog : public EncryptionTestDialogBase
{
diff --git a/src/Main/Forms/FavoriteVolumesDialog.cpp b/src/Main/Forms/FavoriteVolumesDialog.cpp
index 7592b3c..b31f68e 100644
--- a/src/Main/Forms/FavoriteVolumesDialog.cpp
+++ b/src/Main/Forms/FavoriteVolumesDialog.cpp
@@ -10,7 +10,7 @@
#include "Main/GraphicUserInterface.h"
#include "FavoriteVolumesDialog.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
FavoriteVolumesDialog::FavoriteVolumesDialog (wxWindow* parent, const FavoriteVolumeList &favorites, size_t newItemCount)
: FavoriteVolumesDialogBase (parent), Favorites (favorites)
diff --git a/src/Main/Forms/FavoriteVolumesDialog.h b/src/Main/Forms/FavoriteVolumesDialog.h
index 7ab940a..85b67bb 100644
--- a/src/Main/Forms/FavoriteVolumesDialog.h
+++ b/src/Main/Forms/FavoriteVolumesDialog.h
@@ -13,7 +13,7 @@
#include "Main/Main.h"
#include "Main/FavoriteVolume.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class FavoriteVolumesDialog : public FavoriteVolumesDialogBase
{
diff --git a/src/Main/Forms/InfoWizardPage.cpp b/src/Main/Forms/InfoWizardPage.cpp
index 286ba47..5ce0e11 100644
--- a/src/Main/Forms/InfoWizardPage.cpp
+++ b/src/Main/Forms/InfoWizardPage.cpp
@@ -9,7 +9,7 @@
#include "System.h"
#include "InfoWizardPage.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
InfoWizardPage::InfoWizardPage (wxPanel *parent, const wxString &actionButtonText, shared_ptr <Functor> actionFunctor)
: InfoWizardPageBase (parent)
diff --git a/src/Main/Forms/InfoWizardPage.h b/src/Main/Forms/InfoWizardPage.h
index a3938b0..e27ffc4 100644
--- a/src/Main/Forms/InfoWizardPage.h
+++ b/src/Main/Forms/InfoWizardPage.h
@@ -11,7 +11,7 @@
#include "Forms.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class InfoWizardPage : public InfoWizardPageBase
{
diff --git a/src/Main/Forms/KeyfileGeneratorDialog.cpp b/src/Main/Forms/KeyfileGeneratorDialog.cpp
index c217d40..ce88ab0 100644
--- a/src/Main/Forms/KeyfileGeneratorDialog.cpp
+++ b/src/Main/Forms/KeyfileGeneratorDialog.cpp
@@ -11,7 +11,7 @@
#include "Volume/Hash.h"
#include "KeyfileGeneratorDialog.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
KeyfileGeneratorDialog::KeyfileGeneratorDialog (wxWindow* parent) : KeyfileGeneratorDialogBase (parent)
{
diff --git a/src/Main/Forms/KeyfileGeneratorDialog.h b/src/Main/Forms/KeyfileGeneratorDialog.h
index bc4748f..4f18490 100644
--- a/src/Main/Forms/KeyfileGeneratorDialog.h
+++ b/src/Main/Forms/KeyfileGeneratorDialog.h
@@ -12,7 +12,7 @@
#include "Forms.h"
#include "Main/Main.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class KeyfileGeneratorDialog : public KeyfileGeneratorDialogBase
{
diff --git a/src/Main/Forms/KeyfilesDialog.cpp b/src/Main/Forms/KeyfilesDialog.cpp
index 267f855..2bcdf2f 100644
--- a/src/Main/Forms/KeyfilesDialog.cpp
+++ b/src/Main/Forms/KeyfilesDialog.cpp
@@ -10,7 +10,7 @@
#include "Main/GraphicUserInterface.h"
#include "KeyfilesDialog.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
KeyfilesDialog::KeyfilesDialog (wxWindow* parent, shared_ptr <KeyfileList> keyfiles)
: KeyfilesDialogBase (parent), Keyfiles (keyfiles)
diff --git a/src/Main/Forms/KeyfilesDialog.h b/src/Main/Forms/KeyfilesDialog.h
index 722cc8b..753c757 100644
--- a/src/Main/Forms/KeyfilesDialog.h
+++ b/src/Main/Forms/KeyfilesDialog.h
@@ -13,7 +13,7 @@
#include "Main/Main.h"
#include "KeyfilesPanel.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class KeyfilesDialog : public KeyfilesDialogBase
{
diff --git a/src/Main/Forms/KeyfilesPanel.cpp b/src/Main/Forms/KeyfilesPanel.cpp
index 506e008..4f329d2 100644
--- a/src/Main/Forms/KeyfilesPanel.cpp
+++ b/src/Main/Forms/KeyfilesPanel.cpp
@@ -11,7 +11,7 @@
#include "KeyfilesPanel.h"
#include "SecurityTokenKeyfilesDialog.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
KeyfilesPanel::KeyfilesPanel (wxWindow* parent, shared_ptr <KeyfileList> keyfiles)
: KeyfilesPanelBase (parent)
diff --git a/src/Main/Forms/KeyfilesPanel.h b/src/Main/Forms/KeyfilesPanel.h
index c761745..f2b8af6 100644
--- a/src/Main/Forms/KeyfilesPanel.h
+++ b/src/Main/Forms/KeyfilesPanel.h
@@ -12,7 +12,7 @@
#include "Forms.h"
#include "Main/Main.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class KeyfilesPanel : public KeyfilesPanelBase
{
diff --git a/src/Main/Forms/LegalNoticesDialog.cpp b/src/Main/Forms/LegalNoticesDialog.cpp
index 8029965..c17e819 100644
--- a/src/Main/Forms/LegalNoticesDialog.cpp
+++ b/src/Main/Forms/LegalNoticesDialog.cpp
@@ -11,7 +11,7 @@
#include "Main/GraphicUserInterface.h"
#include "Main/Resources.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
LegalNoticesDialog::LegalNoticesDialog (wxWindow* parent) : LegalNoticesDialogBase (parent)
{
diff --git a/src/Main/Forms/LegalNoticesDialog.h b/src/Main/Forms/LegalNoticesDialog.h
index 609ed83..03a475a 100644
--- a/src/Main/Forms/LegalNoticesDialog.h
+++ b/src/Main/Forms/LegalNoticesDialog.h
@@ -11,7 +11,7 @@
#include "Forms.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class LegalNoticesDialog : public LegalNoticesDialogBase
{
diff --git a/src/Main/Forms/MainFrame.cpp b/src/Main/Forms/MainFrame.cpp
index 3443ea3..7c32929 100644
--- a/src/Main/Forms/MainFrame.cpp
+++ b/src/Main/Forms/MainFrame.cpp
@@ -34,7 +34,7 @@
#include "VolumeCreationWizard.h"
#include "VolumePropertiesDialog.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
MainFrame::MainFrame (wxWindow* parent) : MainFrameBase (parent),
ListItemRightClickEventPending (false),
@@ -46,7 +46,7 @@ namespace TrueCrypt
SetName (Application::GetName());
SetTitle (Application::GetName());
- SetIcon (Resources::GetTrueCryptIcon());
+ SetIcon (Resources::GetVeraCryptIcon());
#if defined(TC_UNIX) && !defined(TC_MACOSX)
try
@@ -1420,7 +1420,7 @@ namespace TrueCrypt
else if (show && !mTaskBarIcon->IsIconInstalled())
{
#ifndef TC_MACOSX
- mTaskBarIcon->SetIcon (Resources::GetTrueCryptIcon(), L"VeraCrypt");
+ mTaskBarIcon->SetIcon (Resources::GetVeraCryptIcon(), L"VeraCrypt");
#endif
}
}
diff --git a/src/Main/Forms/MainFrame.h b/src/Main/Forms/MainFrame.h
index 5b775ab..e4c308e 100644
--- a/src/Main/Forms/MainFrame.h
+++ b/src/Main/Forms/MainFrame.h
@@ -12,7 +12,7 @@
#include "Forms.h"
#include "ChangePasswordDialog.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
struct FavoriteVolume;
diff --git a/src/Main/Forms/MountOptionsDialog.cpp b/src/Main/Forms/MountOptionsDialog.cpp
index f4fea7a..69d821c 100644
--- a/src/Main/Forms/MountOptionsDialog.cpp
+++ b/src/Main/Forms/MountOptionsDialog.cpp
@@ -11,7 +11,7 @@
#include "Main/GraphicUserInterface.h"
#include "MountOptionsDialog.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
MountOptionsDialog::MountOptionsDialog (wxWindow *parent, MountOptions &options, const wxString &title, bool disableMountOptions)
: MountOptionsDialogBase (parent, wxID_ANY, wxString()
diff --git a/src/Main/Forms/MountOptionsDialog.h b/src/Main/Forms/MountOptionsDialog.h
index c5ef809..9adb541 100644
--- a/src/Main/Forms/MountOptionsDialog.h
+++ b/src/Main/Forms/MountOptionsDialog.h
@@ -13,7 +13,7 @@
#include "Main/Main.h"
#include "VolumePasswordPanel.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class MountOptionsDialog : public MountOptionsDialogBase
{
diff --git a/src/Main/Forms/NewSecurityTokenKeyfileDialog.cpp b/src/Main/Forms/NewSecurityTokenKeyfileDialog.cpp
index ed72825..cc6e20e 100644
--- a/src/Main/Forms/NewSecurityTokenKeyfileDialog.cpp
+++ b/src/Main/Forms/NewSecurityTokenKeyfileDialog.cpp
@@ -10,7 +10,7 @@
#include "Main/GraphicUserInterface.h"
#include "NewSecurityTokenKeyfileDialog.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
NewSecurityTokenKeyfileDialog::NewSecurityTokenKeyfileDialog (wxWindow* parent, const wstring &keyfileName) : NewSecurityTokenKeyfileDialogBase (parent)
{
diff --git a/src/Main/Forms/NewSecurityTokenKeyfileDialog.h b/src/Main/Forms/NewSecurityTokenKeyfileDialog.h
index 11891db..e240db6 100644
--- a/src/Main/Forms/NewSecurityTokenKeyfileDialog.h
+++ b/src/Main/Forms/NewSecurityTokenKeyfileDialog.h
@@ -12,7 +12,7 @@
#include "Forms.h"
#include "Common/SecurityToken.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class NewSecurityTokenKeyfileDialog : public NewSecurityTokenKeyfileDialogBase
{
diff --git a/src/Main/Forms/PreferencesDialog.cpp b/src/Main/Forms/PreferencesDialog.cpp
index 163a06f..50c9c30 100644
--- a/src/Main/Forms/PreferencesDialog.cpp
+++ b/src/Main/Forms/PreferencesDialog.cpp
@@ -18,7 +18,7 @@
#include "Volume/Cipher.h"
#include "PreferencesDialog.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
PreferencesDialog::PreferencesDialog (wxWindow* parent)
: PreferencesDialogBase (parent),
diff --git a/src/Main/Forms/PreferencesDialog.h b/src/Main/Forms/PreferencesDialog.h
index 412d7c4..d094203 100644
--- a/src/Main/Forms/PreferencesDialog.h
+++ b/src/Main/Forms/PreferencesDialog.h
@@ -13,7 +13,7 @@
#include "Main/Main.h"
#include "KeyfilesPanel.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class PreferencesDialog : public PreferencesDialogBase
{
diff --git a/src/Main/Forms/ProgressWizardPage.cpp b/src/Main/Forms/ProgressWizardPage.cpp
index 113d987..2bd24c6 100644
--- a/src/Main/Forms/ProgressWizardPage.cpp
+++ b/src/Main/Forms/ProgressWizardPage.cpp
@@ -10,7 +10,7 @@
#include "Main/GraphicUserInterface.h"
#include "ProgressWizardPage.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
ProgressWizardPage::ProgressWizardPage (wxPanel* parent, bool enableAbort)
: ProgressWizardPageBase (parent),
diff --git a/src/Main/Forms/ProgressWizardPage.h b/src/Main/Forms/ProgressWizardPage.h
index 541edd6..bd41046 100644
--- a/src/Main/Forms/ProgressWizardPage.h
+++ b/src/Main/Forms/ProgressWizardPage.h
@@ -11,7 +11,7 @@
#include "Forms.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class ProgressWizardPage : public ProgressWizardPageBase
{
diff --git a/src/Main/Forms/RandomPoolEnrichmentDialog.cpp b/src/Main/Forms/RandomPoolEnrichmentDialog.cpp
index 44e45db..a17afbf 100644
--- a/src/Main/Forms/RandomPoolEnrichmentDialog.cpp
+++ b/src/Main/Forms/RandomPoolEnrichmentDialog.cpp
@@ -11,7 +11,7 @@
#include "Volume/Hash.h"
#include "RandomPoolEnrichmentDialog.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
RandomPoolEnrichmentDialog::RandomPoolEnrichmentDialog (wxWindow* parent) : RandomPoolEnrichmentDialogBase (parent)
{
diff --git a/src/Main/Forms/RandomPoolEnrichmentDialog.h b/src/Main/Forms/RandomPoolEnrichmentDialog.h
index 8a951bc..a77ba0f 100644
--- a/src/Main/Forms/RandomPoolEnrichmentDialog.h
+++ b/src/Main/Forms/RandomPoolEnrichmentDialog.h
@@ -12,7 +12,7 @@
#include "Forms.h"
#include "Main/Main.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class RandomPoolEnrichmentDialog : public RandomPoolEnrichmentDialogBase
{
diff --git a/src/Main/Forms/SecurityTokenKeyfilesDialog.cpp b/src/Main/Forms/SecurityTokenKeyfilesDialog.cpp
index 5978b0b..a093072 100644
--- a/src/Main/Forms/SecurityTokenKeyfilesDialog.cpp
+++ b/src/Main/Forms/SecurityTokenKeyfilesDialog.cpp
@@ -12,7 +12,7 @@
#include "NewSecurityTokenKeyfileDialog.h"
#include "SecurityTokenKeyfilesDialog.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
SecurityTokenKeyfilesDialog::SecurityTokenKeyfilesDialog (wxWindow* parent, bool selectionMode)
: SecurityTokenKeyfilesDialogBase (parent)
diff --git a/src/Main/Forms/SecurityTokenKeyfilesDialog.h b/src/Main/Forms/SecurityTokenKeyfilesDialog.h
index 2fd7834..6070aae 100644
--- a/src/Main/Forms/SecurityTokenKeyfilesDialog.h
+++ b/src/Main/Forms/SecurityTokenKeyfilesDialog.h
@@ -13,7 +13,7 @@
#include "Common/SecurityToken.h"
#include "Main/Main.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class SecurityTokenKeyfilesDialog : public SecurityTokenKeyfilesDialogBase
{
diff --git a/src/Main/Forms/SelectDirectoryWizardPage.cpp b/src/Main/Forms/SelectDirectoryWizardPage.cpp
index 1299e22..a96d503 100644
--- a/src/Main/Forms/SelectDirectoryWizardPage.cpp
+++ b/src/Main/Forms/SelectDirectoryWizardPage.cpp
@@ -10,7 +10,7 @@
#include "Main/GraphicUserInterface.h"
#include "SelectDirectoryWizardPage.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
bool SelectDirectoryWizardPage::IsValid ()
{
diff --git a/src/Main/Forms/SelectDirectoryWizardPage.h b/src/Main/Forms/SelectDirectoryWizardPage.h
index 2ea8b0d..a833773 100644
--- a/src/Main/Forms/SelectDirectoryWizardPage.h
+++ b/src/Main/Forms/SelectDirectoryWizardPage.h
@@ -11,7 +11,7 @@
#include "Forms.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class SelectDirectoryWizardPage : public SelectDirectoryWizardPageBase
{
diff --git a/src/Main/Forms/SingleChoiceWizardPage.h b/src/Main/Forms/SingleChoiceWizardPage.h
index 43536ec..750ef80 100644
--- a/src/Main/Forms/SingleChoiceWizardPage.h
+++ b/src/Main/Forms/SingleChoiceWizardPage.h
@@ -11,7 +11,7 @@
#include "Forms.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
template <class ChoiceType>
class SingleChoiceWizardPage : public SingleChoiceWizardPageBase
diff --git a/src/Main/Forms/VolumeCreationProgressWizardPage.cpp b/src/Main/Forms/VolumeCreationProgressWizardPage.cpp
index 12b1159..e80292e 100644
--- a/src/Main/Forms/VolumeCreationProgressWizardPage.cpp
+++ b/src/Main/Forms/VolumeCreationProgressWizardPage.cpp
@@ -10,7 +10,7 @@
#include "Main/GraphicUserInterface.h"
#include "VolumeCreationProgressWizardPage.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
VolumeCreationProgressWizardPage::VolumeCreationProgressWizardPage (wxPanel* parent, bool displayKeyInfo)
: VolumeCreationProgressWizardPageBase (parent),
diff --git a/src/Main/Forms/VolumeCreationProgressWizardPage.h b/src/Main/Forms/VolumeCreationProgressWizardPage.h
index a33b362..449da6c 100644
--- a/src/Main/Forms/VolumeCreationProgressWizardPage.h
+++ b/src/Main/Forms/VolumeCreationProgressWizardPage.h
@@ -12,7 +12,7 @@
#include "Forms.h"
#include "Core/VolumeCreator.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class VolumeCreationProgressWizardPage : public VolumeCreationProgressWizardPageBase
{
diff --git a/src/Main/Forms/VolumeCreationWizard.cpp b/src/Main/Forms/VolumeCreationWizard.cpp
index 127880a..bd3fa7e 100644
--- a/src/Main/Forms/VolumeCreationWizard.cpp
+++ b/src/Main/Forms/VolumeCreationWizard.cpp
@@ -28,7 +28,7 @@
#include "VolumePasswordWizardPage.h"
#include "VolumeSizeWizardPage.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
VolumeCreationWizard::VolumeCreationWizard (wxWindow* parent)
: WizardFrame (parent),
diff --git a/src/Main/Forms/VolumeCreationWizard.h b/src/Main/Forms/VolumeCreationWizard.h
index fb2a8dd..abbf64c 100644
--- a/src/Main/Forms/VolumeCreationWizard.h
+++ b/src/Main/Forms/VolumeCreationWizard.h
@@ -12,7 +12,7 @@
#include "WizardFrame.h"
#include "Core/VolumeCreator.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class VolumeCreationWizard : public WizardFrame
{
diff --git a/src/Main/Forms/VolumeFormatOptionsWizardPage.cpp b/src/Main/Forms/VolumeFormatOptionsWizardPage.cpp
index 656c762..8906907 100644
--- a/src/Main/Forms/VolumeFormatOptionsWizardPage.cpp
+++ b/src/Main/Forms/VolumeFormatOptionsWizardPage.cpp
@@ -10,7 +10,7 @@
#include "Main/GraphicUserInterface.h"
#include "VolumeFormatOptionsWizardPage.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
VolumeFormatOptionsWizardPage::VolumeFormatOptionsWizardPage (wxPanel* parent, uint64 volumeSize, uint32 sectorSize, bool enableQuickFormatButton, bool disableNoneFilesystem, bool disable32bitFilesystems)
: VolumeFormatOptionsWizardPageBase (parent)
diff --git a/src/Main/Forms/VolumeFormatOptionsWizardPage.h b/src/Main/Forms/VolumeFormatOptionsWizardPage.h
index ae724c6..0937135 100644
--- a/src/Main/Forms/VolumeFormatOptionsWizardPage.h
+++ b/src/Main/Forms/VolumeFormatOptionsWizardPage.h
@@ -12,7 +12,7 @@
#include "Forms.h"
#include "Core/VolumeCreator.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class VolumeFormatOptionsWizardPage : public VolumeFormatOptionsWizardPageBase
{
diff --git a/src/Main/Forms/VolumeLocationWizardPage.cpp b/src/Main/Forms/VolumeLocationWizardPage.cpp
index c399282..07748f7 100644
--- a/src/Main/Forms/VolumeLocationWizardPage.cpp
+++ b/src/Main/Forms/VolumeLocationWizardPage.cpp
@@ -11,7 +11,7 @@
#include "Main/VolumeHistory.h"
#include "VolumeLocationWizardPage.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
VolumeLocationWizardPage::VolumeLocationWizardPage (wxPanel* parent, VolumeHostType::Enum hostType, bool selectExisting)
: VolumeLocationWizardPageBase (parent),
diff --git a/src/Main/Forms/VolumeLocationWizardPage.h b/src/Main/Forms/VolumeLocationWizardPage.h
index 8634f23..34e115a 100644
--- a/src/Main/Forms/VolumeLocationWizardPage.h
+++ b/src/Main/Forms/VolumeLocationWizardPage.h
@@ -11,7 +11,7 @@
#include "Forms.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class VolumeLocationWizardPage : public VolumeLocationWizardPageBase
{
diff --git a/src/Main/Forms/VolumePasswordPanel.cpp b/src/Main/Forms/VolumePasswordPanel.cpp
index 25767f9..54bef90 100644
--- a/src/Main/Forms/VolumePasswordPanel.cpp
+++ b/src/Main/Forms/VolumePasswordPanel.cpp
@@ -12,7 +12,7 @@
#include "VolumePasswordPanel.h"
#include "SecurityTokenKeyfilesDialog.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
VolumePasswordPanel::VolumePasswordPanel (wxWindow* parent, shared_ptr <VolumePassword> password, shared_ptr <KeyfileList> keyfiles, bool enableCache, bool enablePassword, bool enableKeyfiles, bool enableConfirmation, bool enablePkcs5Prf, const wxString &passwordLabel)
: VolumePasswordPanelBase (parent), Keyfiles (new KeyfileList)
diff --git a/src/Main/Forms/VolumePasswordPanel.h b/src/Main/Forms/VolumePasswordPanel.h
index 8488cbd..3ab7f95 100644
--- a/src/Main/Forms/VolumePasswordPanel.h
+++ b/src/Main/Forms/VolumePasswordPanel.h
@@ -13,7 +13,7 @@
#include "Platform/Functor.h"
#include "Main/Main.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class VolumePasswordPanel : public VolumePasswordPanelBase
{
diff --git a/src/Main/Forms/VolumePasswordWizardPage.cpp b/src/Main/Forms/VolumePasswordWizardPage.cpp
index fd4eaf2..1034c22 100644
--- a/src/Main/Forms/VolumePasswordWizardPage.cpp
+++ b/src/Main/Forms/VolumePasswordWizardPage.cpp
@@ -10,7 +10,7 @@
#include "Main/GraphicUserInterface.h"
#include "VolumePasswordWizardPage.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
VolumePasswordWizardPage::VolumePasswordWizardPage (wxPanel* parent, shared_ptr <VolumePassword> password, shared_ptr <KeyfileList> keyfiles, bool enableConfirmation)
: VolumePasswordWizardPageBase (parent), ConfirmationMode (enableConfirmation)
diff --git a/src/Main/Forms/VolumePasswordWizardPage.h b/src/Main/Forms/VolumePasswordWizardPage.h
index d26cc01..8aaf30d 100644
--- a/src/Main/Forms/VolumePasswordWizardPage.h
+++ b/src/Main/Forms/VolumePasswordWizardPage.h
@@ -12,7 +12,7 @@
#include "Forms.h"
#include "VolumePasswordPanel.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class VolumePasswordWizardPage : public VolumePasswordWizardPageBase
{
diff --git a/src/Main/Forms/VolumePropertiesDialog.cpp b/src/Main/Forms/VolumePropertiesDialog.cpp
index c5fa2dd..c995618 100644
--- a/src/Main/Forms/VolumePropertiesDialog.cpp
+++ b/src/Main/Forms/VolumePropertiesDialog.cpp
@@ -11,7 +11,7 @@
#include "Main/GraphicUserInterface.h"
#include "VolumePropertiesDialog.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
VolumePropertiesDialog::VolumePropertiesDialog (wxWindow* parent, const VolumeInfo &volumeInfo)
: VolumePropertiesDialogBase (parent)
diff --git a/src/Main/Forms/VolumePropertiesDialog.h b/src/Main/Forms/VolumePropertiesDialog.h
index d651b6b..ff9ac3e 100644
--- a/src/Main/Forms/VolumePropertiesDialog.h
+++ b/src/Main/Forms/VolumePropertiesDialog.h
@@ -12,7 +12,7 @@
#include "Forms.h"
#include "Main/Main.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class VolumePropertiesDialog : public VolumePropertiesDialogBase
{
diff --git a/src/Main/Forms/VolumeSizeWizardPage.cpp b/src/Main/Forms/VolumeSizeWizardPage.cpp
index 42abfbe..ffd26f6 100644
--- a/src/Main/Forms/VolumeSizeWizardPage.cpp
+++ b/src/Main/Forms/VolumeSizeWizardPage.cpp
@@ -10,7 +10,7 @@
#include "Main/GraphicUserInterface.h"
#include "VolumeSizeWizardPage.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
VolumeSizeWizardPage::VolumeSizeWizardPage (wxPanel* parent, const VolumePath &volumePath, uint32 sectorSize, const wxString &freeSpaceText)
: VolumeSizeWizardPageBase (parent),
diff --git a/src/Main/Forms/VolumeSizeWizardPage.h b/src/Main/Forms/VolumeSizeWizardPage.h
index d6f1942..515dbc7 100644
--- a/src/Main/Forms/VolumeSizeWizardPage.h
+++ b/src/Main/Forms/VolumeSizeWizardPage.h
@@ -11,7 +11,7 @@
#include "Forms.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class VolumeSizeWizardPage : public VolumeSizeWizardPageBase
{
diff --git a/src/Main/Forms/WizardFrame.cpp b/src/Main/Forms/WizardFrame.cpp
index 9941be8..ecc1aba 100644
--- a/src/Main/Forms/WizardFrame.cpp
+++ b/src/Main/Forms/WizardFrame.cpp
@@ -11,7 +11,7 @@
#include "Main/Resources.h"
#include "WizardFrame.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
WizardFrame::WizardFrame (wxWindow* parent)
: WizardFrameBase (parent),
@@ -20,7 +20,7 @@ namespace TrueCrypt
MaxStaticTextWidth (-1),
WorkInProgress (false)
{
- SetIcon (Resources::GetTrueCryptIcon());
+ SetIcon (Resources::GetVeraCryptIcon());
PageTitleStaticText->SetFont (wxFont (
#ifdef TC_WINDOWS
diff --git a/src/Main/Forms/WizardFrame.h b/src/Main/Forms/WizardFrame.h
index d9f9ceb..726f5cd 100644
--- a/src/Main/Forms/WizardFrame.h
+++ b/src/Main/Forms/WizardFrame.h
@@ -12,7 +12,7 @@
#include "Forms.h"
#include "Main/Main.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class WizardFrame : public WizardFrameBase
{
diff --git a/src/Main/Forms/WizardPage.h b/src/Main/Forms/WizardPage.h
index e00b860..ef34154 100644
--- a/src/Main/Forms/WizardPage.h
+++ b/src/Main/Forms/WizardPage.h
@@ -11,7 +11,7 @@
#include "Main/Main.h"
-namespace TrueCrypt
+namespace VeraCrypt
{
class WizardPage : public wxPanel
{