"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/Main/Forms/MountOptionsDialog.cpp" between
VeraCrypt_1.22_Source.tar.bz2 and VeraCrypt_1.23_Source.tar.bz2

About: VeraCrypt is a free disk encryption software (based on TrueCrypt).

MountOptionsDialog.cpp  (VeraCrypt_1.22_Source.tar.bz2):MountOptionsDialog.cpp  (VeraCrypt_1.23_Source.tar.bz2)
skipping to change at line 20 skipping to change at line 20
code distribution packages. code distribution packages.
*/ */
#include "System.h" #include "System.h"
#include "Main/Main.h" #include "Main/Main.h"
#include "Main/GraphicUserInterface.h" #include "Main/GraphicUserInterface.h"
#include "MountOptionsDialog.h" #include "MountOptionsDialog.h"
namespace VeraCrypt namespace VeraCrypt
{ {
#ifdef TC_MACOSX
bool MountOptionsDialog::ProcessEvent(wxEvent& event)
{
if(GraphicUserInterface::HandlePasswordEntryCustomEvent (event))
return true;
else
return MountOptionsDialogBase::ProcessEvent(event);
}
#endif
MountOptionsDialog::MountOptionsDialog (wxWindow *parent, MountOptions &o ptions, const wxString &title, bool disableMountOptions) MountOptionsDialog::MountOptionsDialog (wxWindow *parent, MountOptions &o ptions, const wxString &title, bool disableMountOptions)
: MountOptionsDialogBase (parent, wxID_ANY, wxString() : MountOptionsDialogBase (parent, wxID_ANY, wxString()
#ifdef __WXGTK__ // GTK apparently needs wxRESIZE_BORDER to support dynamic resi zing #ifdef __WXGTK__ // GTK apparently needs wxRESIZE_BORDER to support dynamic resi zing
, wxDefaultPosition, wxSize (-1,-1), wxDEFAULT_DIALOG_STYLE | wxR ESIZE_BORDER , wxDefaultPosition, wxSize (-1,-1), wxDEFAULT_DIALOG_STYLE | wxR ESIZE_BORDER
#endif #endif
), Options (options) ), Options (options)
{ {
if (!title.empty()) if (!title.empty())
this->SetTitle (title); this->SetTitle (title);
else if (options.Path && !options.Path->IsEmpty()) else if (options.Path && !options.Path->IsEmpty())
this->SetTitle (StringFormatter (LangString["ENTER_PASSWO RD_FOR"], wstring (*options.Path))); this->SetTitle (StringFormatter (LangString["ENTER_PASSWO RD_FOR"], wstring (*options.Path)));
else else
this->SetTitle (LangString["ENTER_TC_VOL_PASSWORD"]); this->SetTitle (LangString["ENTER_TC_VOL_PASSWORD"]);
if (disableMountOptions) if (disableMountOptions)
OptionsButton->Show (false); OptionsButton->Show (false);
#ifdef TC_MACOSX
GraphicUserInterface::InstallPasswordEntryCustomKeyboardShortcuts
(this);
#endif
PasswordPanel = new VolumePasswordPanel (this, &options, options. Password, disableMountOptions, options.Keyfiles, !disableMountOptions, true, tru e, false, true, true); PasswordPanel = new VolumePasswordPanel (this, &options, options. Password, disableMountOptions, options.Keyfiles, !disableMountOptions, true, tru e, false, true, true);
PasswordPanel->SetCacheCheckBoxValidator (wxGenericValidator (&Op tions.CachePassword)); PasswordPanel->SetCacheCheckBoxValidator (wxGenericValidator (&Op tions.CachePassword));
if (options.Path && options.Path->HasTrueCryptExtension() && !dis ableMountOptions if (options.Path && options.Path->HasTrueCryptExtension() && !dis ableMountOptions
&& !options.TrueCryptMode && (options.Pim <= 0)) && !options.TrueCryptMode && (options.Pim <= 0))
{ {
PasswordPanel->SetTrueCryptMode (true); PasswordPanel->SetTrueCryptMode (true);
} }
PasswordSizer->Add (PasswordPanel, 1, wxALL | wxEXPAND); PasswordSizer->Add (PasswordPanel, 1, wxALL | wxEXPAND);
skipping to change at line 68 skipping to change at line 83
PartitionInSystemEncryptionScopeCheckBox->SetValidator (wxGeneric Validator (&Options.PartitionInSystemEncryptionScope)); PartitionInSystemEncryptionScopeCheckBox->SetValidator (wxGeneric Validator (&Options.PartitionInSystemEncryptionScope));
TransferDataToWindow(); TransferDataToWindow();
if (Options.MountPoint && !Options.MountPoint->IsEmpty()) if (Options.MountPoint && !Options.MountPoint->IsEmpty())
MountPointTextCtrl->SetValue (wstring (*Options.MountPoi nt)); MountPointTextCtrl->SetValue (wstring (*Options.MountPoi nt));
FilesystemOptionsTextCtrl->SetValue (Options.FilesystemOptions); FilesystemOptionsTextCtrl->SetValue (Options.FilesystemOptions);
ReadOnlyCheckBox->SetValue (Options.Protection == VolumeProtectio n::ReadOnly); ReadOnlyCheckBox->SetValue (Options.Protection == VolumeProtectio n::ReadOnly);
BackupHeaderCheckBox->SetValidator (wxGenericValidator (&Options. UseBackupHeaders));
ProtectionCheckBox->SetValue (Options.Protection == VolumeProtect ion::HiddenVolumeReadOnly); ProtectionCheckBox->SetValue (Options.Protection == VolumeProtect ion::HiddenVolumeReadOnly);
OptionsButtonLabel = OptionsButton->GetLabel(); OptionsButtonLabel = OptionsButton->GetLabel();
OptionsButton->SetLabel (OptionsButtonLabel + L" >"); OptionsButton->SetLabel (OptionsButtonLabel + L" >");
OptionsPanel->Show (false); OptionsPanel->Show (false);
ProtectionPasswordPanel = new VolumePasswordPanel (OptionsPanel, &options, options.ProtectionPassword, true, options.ProtectionKeyfiles, false, t rue, true, false, true, true, _("P&assword to hidden volume:")); ProtectionPasswordPanel = new VolumePasswordPanel (OptionsPanel, &options, options.ProtectionPassword, true, options.ProtectionKeyfiles, false, t rue, true, false, true, true, _("P&assword to hidden volume:"));
ProtectionPasswordSizer->Add (ProtectionPasswordPanel, 1, wxALL | wxEXPAND); ProtectionPasswordSizer->Add (ProtectionPasswordPanel, 1, wxALL | wxEXPAND);
UpdateDialog(); UpdateDialog();
 End of changes. 3 change blocks. 
0 lines changed or deleted 17 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)