diff options
Diffstat (limited to 'src/Main/Forms')
60 files changed, 63 insertions, 63 deletions
diff --git a/src/Main/Forms/AboutDialog.cpp b/src/Main/Forms/AboutDialog.cpp index c8384457..9eaa4eb1 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 94cca8bb..658e777b 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 a2c1418d..fd51aa65 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 3cd61511..b127295f 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 05d0143c..2a46f1ab 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 cc147602..fd46181d 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 86db68a1..4c5173c1 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 df0b6184..69aba123 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 d321add2..c05ee5b2 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 1c8b0d95..cc60cba7 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 3e6fa6cc..ab27826d 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 3466ac98..0333926e 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 7592b3c9..b31f68ec 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 7ab940a6..85b67bb7 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 286ba476..5ce0e110 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 a3938b03..e27ffc4d 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 c217d40a..ce88ab09 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 bc4748f2..4f184909 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 267f8554..2bcdf2f9 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 722cc8ba..753c7579 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 506e008a..4f329d2f 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 c7617453..f2b8af6e 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 8029965d..c17e8194 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 609ed83a..03a475a8 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 3443ea3b..7c329292 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 5b775abc..e4c308e6 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 f4fea7a6..69d821c2 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 c5ef8097..9adb5412 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 ed728254..cc6e20e6 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 11891dbb..e240db6b 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 163a06fb..50c9c300 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 412d7c44..d094203c 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 113d9872..2bd24c60 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 541edd66..bd410462 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 44e45db8..a17afbfc 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 8a951bcb..a77ba0ff 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 5978b0b1..a0930726 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 2fd78349..6070aae2 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 1299e22b..a96d5038 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 2ea8b0dc..a8337739 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 43536eca..750ef801 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 12b11591..e80292e2 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 a33b3623..449da6c8 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 127880a1..bd3fa7ea 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 fb2a8ddd..abbf64cb 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 656c7626..89069078 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 ae724c66..0937135d 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 c3992827..07748f77 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 8634f239..34e115ab 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 25767f96..54bef90f 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 8488cbd1..3ab7f95a 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 fd4eaf2c..1034c220 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 d26cc010..8aaf30d6 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 c5fa2dd8..c9956187 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 d651b6b5..ff9ac3e6 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 42abfbe6..ffd26f66 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 d6f19428..515dbc73 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 9941be81..ecc1aba8 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 d9f9ceb0..726f5cd3 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 e00b8605..ef34154f 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 { |