From ba1e9c8f4d6d65a5d5a73f1721bf2b03e42aa50e Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Sat, 28 Feb 2015 17:01:39 +0100
Subject: Linux/MacOSX: A configuration option for default hash and default
 TrueCrypt mode used for mounting volumes (Menu Settings -> Default Mount
 Parameters). Implement priority of command line arguments over default
 values.

---
 src/Main/Forms/Forms.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 src/Main/Forms/Forms.h

(limited to 'src/Main/Forms/Forms.h')

diff --git a/src/Main/Forms/Forms.h b/src/Main/Forms/Forms.h
old mode 100644
new mode 100755
index 9e8a02b0..24097686
--- a/src/Main/Forms/Forms.h
+++ b/src/Main/Forms/Forms.h
@@ -119,6 +119,7 @@ namespace VeraCrypt
 			virtual void OnWipeCacheButtonClick( wxCommandEvent& event ) { event.Skip(); }
 			virtual void OnHotkeysMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
 			virtual void OnDefaultKeyfilesMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
+			virtual void OnDefaultMountParametersMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
 			virtual void OnSecurityTokenPreferencesMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
 			virtual void OnPreferencesMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
 			virtual void OnUserGuideMenuItemSelected( wxCommandEvent& event ) { event.Skip(); }
@@ -550,10 +551,12 @@ namespace VeraCrypt
 			wxCheckBox* PreserveTimestampsCheckBox;
 			wxCheckBox* WipeCacheOnCloseCheckBox;
 			wxCheckBox* WipeCacheOnAutoDismountCheckBox;
-			wxPanel* DefaultMountOptionsPage;
 			wxCheckBox* MountReadOnlyCheckBox;
 			wxCheckBox* MountRemovableCheckBox;
 			wxCheckBox* CachePasswordsCheckBox;
+			wxCheckBox* TrueCryptModeCheckBox;
+			wxStaticText* Pkcs5PrfStaticText;
+			wxChoice* Pkcs5PrfChoice;
 			wxStaticBoxSizer* FilesystemSizer;
 			wxTextCtrl* FilesystemOptionsTextCtrl;
 			wxPanel* BackgroundTaskPanel;
@@ -613,6 +616,7 @@ namespace VeraCrypt
 			
 		
 		public:
+			wxPanel* DefaultMountOptionsPage;
 			wxPanel* DefaultKeyfilesPage;
 			wxPanel* SecurityTokensPage;
 			wxPanel* HotkeysPage;
-- 
cgit v1.2.3