From ba74b9d5b84c9e8ce692489985ae331386359cb0 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Sun, 23 Jul 2023 21:45:16 +0200 Subject: Linux/macOS:Add EMV option checkbox to the fbp file. Remove TrueCrypt checkboxes. We also update to wxFormBuilder 3.10.1 --- src/Main/Forms/Forms.cpp | 2674 +++++++------ src/Main/Forms/Forms.h | 590 +-- src/Main/Forms/TrueCrypt.fbp | 8730 ++++-------------------------------------- 3 files changed, 2295 insertions(+), 9699 deletions(-) diff --git a/src/Main/Forms/Forms.cpp b/src/Main/Forms/Forms.cpp index e92b970e..d2e7bf68 100644 --- a/src/Main/Forms/Forms.cpp +++ b/src/Main/Forms/Forms.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 20 2018) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -15,442 +15,442 @@ 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( _("IDM_CREATE_VOLUME") ) , wxEmptyString, wxITEM_NORMAL ); VolumesMenu->Append( CreateNewVolumeMenuItem ); - + VolumesMenu->AppendSeparator(); - + MountVolumeMenuItem = new wxMenuItem( VolumesMenu, wxID_ANY, wxString( _("IDM_MOUNT_VOLUME") ) , wxEmptyString, wxITEM_NORMAL ); VolumesMenu->Append( MountVolumeMenuItem ); - + wxMenuItem* AutoMountDevicesMenuItem; AutoMountDevicesMenuItem = new wxMenuItem( VolumesMenu, wxID_ANY, wxString( _("IDM_MOUNTALL") ) , wxEmptyString, wxITEM_NORMAL ); VolumesMenu->Append( AutoMountDevicesMenuItem ); - + VolumesMenu->AppendSeparator(); - + DismountVolumeMenuItem = new wxMenuItem( VolumesMenu, wxID_ANY, wxString( _("IDM_UNMOUNT_VOLUME") ) , wxEmptyString, wxITEM_NORMAL ); VolumesMenu->Append( DismountVolumeMenuItem ); - + DismountAllMenuItem = new wxMenuItem( VolumesMenu, wxID_ANY, wxString( _("IDM_UNMOUNTALL") ) , wxEmptyString, wxITEM_NORMAL ); VolumesMenu->Append( DismountAllMenuItem ); - + VolumesMenu->AppendSeparator(); - + wxMenuItem* ChangePasswordMenuItem; ChangePasswordMenuItem = new wxMenuItem( VolumesMenu, wxID_ANY, wxString( _("IDM_CHANGE_PASSWORD") ) , wxEmptyString, wxITEM_NORMAL ); VolumesMenu->Append( ChangePasswordMenuItem ); - + wxMenuItem* ChangePkcs5PrfMenuItem; ChangePkcs5PrfMenuItem = new wxMenuItem( VolumesMenu, wxID_ANY, wxString( _("IDM_CHANGE_HEADER_KEY_DERIV_ALGO") ) , wxEmptyString, wxITEM_NORMAL ); VolumesMenu->Append( ChangePkcs5PrfMenuItem ); - + wxMenuItem* ChangeKeyfilesMenuItem; ChangeKeyfilesMenuItem = new wxMenuItem( VolumesMenu, wxID_ANY, wxString( _("IDD_PCDM_ADD_REMOVE_VOL_KEYFILES") ) , wxEmptyString, wxITEM_NORMAL ); VolumesMenu->Append( ChangeKeyfilesMenuItem ); - + wxMenuItem* RemoveKeyfilesMenuItem; RemoveKeyfilesMenuItem = new wxMenuItem( VolumesMenu, wxID_ANY, wxString( _("IDM_REMOVE_ALL_KEYFILES_FROM_VOL") ) , wxEmptyString, wxITEM_NORMAL ); VolumesMenu->Append( RemoveKeyfilesMenuItem ); - + VolumesMenu->AppendSeparator(); - + VolumePropertiesMenuItem = new wxMenuItem( VolumesMenu, wxID_ANY, wxString( _("IDC_VOLUME_PROPERTIES") ) , wxEmptyString, wxITEM_NORMAL ); VolumesMenu->Append( VolumePropertiesMenuItem ); - - MainMenuBar->Append( VolumesMenu, _("MENU_VOLUMES") ); - + + MainMenuBar->Append( VolumesMenu, _("MENU_VOLUMES") ); + FavoritesMenu = new wxMenu(); AddToFavoritesMenuItem = new wxMenuItem( FavoritesMenu, wxID_ANY, wxString( _("IDM_ADD_VOLUME_TO_FAVORITES") ) , wxEmptyString, wxITEM_NORMAL ); FavoritesMenu->Append( AddToFavoritesMenuItem ); - + AddAllMountedToFavoritesMenuItem = new wxMenuItem( FavoritesMenu, wxID_ANY, wxString( _("IDM_ADD_ALL_VOLUME_TO_FAVORITES") ) , wxEmptyString, wxITEM_NORMAL ); FavoritesMenu->Append( AddAllMountedToFavoritesMenuItem ); - + wxMenuItem* OrganizeFavoritesMenuItem; OrganizeFavoritesMenuItem = new wxMenuItem( FavoritesMenu, wxID_ANY, wxString( _("IDM_ORGANIZE_FAVORITES") ) , wxEmptyString, wxITEM_NORMAL ); FavoritesMenu->Append( OrganizeFavoritesMenuItem ); - + FavoritesMenu->AppendSeparator(); - + wxMenuItem* MountAllFavoritesMenuItem; MountAllFavoritesMenuItem = new wxMenuItem( FavoritesMenu, wxID_ANY, wxString( _("IDM_MOUNT_FAVORITE_VOLUMES") ) , wxEmptyString, wxITEM_NORMAL ); FavoritesMenu->Append( MountAllFavoritesMenuItem ); - + FavoritesMenu->AppendSeparator(); - - MainMenuBar->Append( FavoritesMenu, _("MENU_FAVORITES") ); - + + MainMenuBar->Append( FavoritesMenu, _("MENU_FAVORITES") ); + ToolsMenu = new wxMenu(); wxMenuItem* BenchmarkMenuItem; BenchmarkMenuItem = new wxMenuItem( ToolsMenu, wxID_ANY, wxString( _("IDM_BENCHMARK") ) , wxEmptyString, wxITEM_NORMAL ); ToolsMenu->Append( BenchmarkMenuItem ); - + wxMenuItem* EncryptionTestMenuItem; EncryptionTestMenuItem = new wxMenuItem( ToolsMenu, wxID_ANY, wxString( _("IDM_TEST_VECTORS") ) , wxEmptyString, wxITEM_NORMAL ); ToolsMenu->Append( EncryptionTestMenuItem ); - + ToolsMenu->AppendSeparator(); - + wxMenuItem* VolumeCreationWizardMenuItem; VolumeCreationWizardMenuItem = new wxMenuItem( ToolsMenu, wxID_ANY, wxString( _("IDM_VOLUME_WIZARD") ) , wxEmptyString, wxITEM_NORMAL ); ToolsMenu->Append( VolumeCreationWizardMenuItem ); - + ToolsMenu->AppendSeparator(); - + BackupVolumeHeadersMenuItem = new wxMenuItem( ToolsMenu, wxID_ANY, wxString( _("IDM_BACKUP_VOL_HEADER") ) , wxEmptyString, wxITEM_NORMAL ); ToolsMenu->Append( BackupVolumeHeadersMenuItem ); - + RestoreVolumeHeaderMenuItem = new wxMenuItem( ToolsMenu, wxID_ANY, wxString( _("IDM_RESTORE_VOL_HEADER") ) , wxEmptyString, wxITEM_NORMAL ); ToolsMenu->Append( RestoreVolumeHeaderMenuItem ); - + ToolsMenu->AppendSeparator(); - + wxMenuItem* CreateKeyfileMenuItem; CreateKeyfileMenuItem = new wxMenuItem( ToolsMenu, wxID_ANY, wxString( _("IDM_KEYFILE_GENERATOR") ) , wxEmptyString, wxITEM_NORMAL ); ToolsMenu->Append( CreateKeyfileMenuItem ); - + wxMenuItem* ManageSecurityTokenKeyfilesMenuItem; ManageSecurityTokenKeyfilesMenuItem = new wxMenuItem( ToolsMenu, wxID_ANY, wxString( _("IDM_MANAGE_TOKEN_KEYFILES") ) , wxEmptyString, wxITEM_NORMAL ); ToolsMenu->Append( ManageSecurityTokenKeyfilesMenuItem ); - + wxMenuItem* CloseAllSecurityTokenSessionsMenuItem; CloseAllSecurityTokenSessionsMenuItem = new wxMenuItem( ToolsMenu, wxID_ANY, wxString( _("IDM_CLOSE_ALL_TOKEN_SESSIONS") ) , wxEmptyString, wxITEM_NORMAL ); ToolsMenu->Append( CloseAllSecurityTokenSessionsMenuItem ); - + ToolsMenu->AppendSeparator(); - + WipeCachedPasswordsMenuItem = new wxMenuItem( ToolsMenu, wxID_ANY, wxString( _("IDM_WIPE_CACHE") ) , wxEmptyString, wxITEM_NORMAL ); ToolsMenu->Append( WipeCachedPasswordsMenuItem ); - - MainMenuBar->Append( ToolsMenu, _("MENU_TOOLS") ); - + + MainMenuBar->Append( ToolsMenu, _("MENU_TOOLS") ); + SettingsMenu = new wxMenu(); HotkeysMenuItem = new wxMenuItem( SettingsMenu, wxID_ANY, wxString( _("IDM_HOTKEY_SETTINGS") ) , wxEmptyString, wxITEM_NORMAL ); SettingsMenu->Append( HotkeysMenuItem ); - + wxMenuItem* DefaultKeyfilesMenuItem; DefaultKeyfilesMenuItem = new wxMenuItem( SettingsMenu, wxID_ANY, wxString( _("IDM_DEFAULT_KEYFILES") ) , wxEmptyString, wxITEM_NORMAL ); SettingsMenu->Append( DefaultKeyfilesMenuItem ); - + wxMenuItem* DefaultMountParametersMenuItem; DefaultMountParametersMenuItem = new wxMenuItem( SettingsMenu, wxID_ANY, wxString( _("IDM_DEFAULT_MOUNT_PARAMETERS") ) , wxEmptyString, wxITEM_NORMAL ); SettingsMenu->Append( DefaultMountParametersMenuItem ); - + wxMenuItem* SecurityTokenPreferencesMenuItem; SecurityTokenPreferencesMenuItem = new wxMenuItem( SettingsMenu, wxID_ANY, wxString( _("IDM_TOKEN_PREFERENCES") ) , wxEmptyString, wxITEM_NORMAL ); SettingsMenu->Append( SecurityTokenPreferencesMenuItem ); - + SettingsMenu->AppendSeparator(); - + PreferencesMenuItem = new wxMenuItem( SettingsMenu, wxID_PREFERENCES, wxString( _("IDM_PREFERENCES") ) , wxEmptyString, wxITEM_NORMAL ); SettingsMenu->Append( PreferencesMenuItem ); - - MainMenuBar->Append( SettingsMenu, _("MENU_SETTINGS") ); - + + MainMenuBar->Append( SettingsMenu, _("MENU_SETTINGS") ); + HelpMenu = new wxMenu(); wxMenuItem* UserGuideMenuItem; UserGuideMenuItem = new wxMenuItem( HelpMenu, wxID_HELP, wxString( _("IDM_HELP") ) , wxEmptyString, wxITEM_NORMAL ); HelpMenu->Append( UserGuideMenuItem ); - + wxMenuItem* OnlineHelpMenuItem; OnlineHelpMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("IDM_ONLINE_HELP") ) , wxEmptyString, wxITEM_NORMAL ); HelpMenu->Append( OnlineHelpMenuItem ); - + wxMenuItem* BeginnersTutorialMenuItem; BeginnersTutorialMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("IDM_ONLINE_TUTORIAL") ) , wxEmptyString, wxITEM_NORMAL ); HelpMenu->Append( BeginnersTutorialMenuItem ); - + wxMenuItem* FaqMenuItem; FaqMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("IDM_FAQ") ) , wxEmptyString, wxITEM_NORMAL ); HelpMenu->Append( FaqMenuItem ); - + HelpMenu->AppendSeparator(); - + wxMenuItem* WebsiteMenuItem; WebsiteMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("IDM_WEBSITE") ) , wxEmptyString, wxITEM_NORMAL ); HelpMenu->Append( WebsiteMenuItem ); - + wxMenuItem* DownloadsMenuItem; DownloadsMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("IDM_TC_DOWNLOADS") ) , wxEmptyString, wxITEM_NORMAL ); HelpMenu->Append( DownloadsMenuItem ); - + wxMenuItem* NewsMenuItem; NewsMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("IDM_NEWS") ) , wxEmptyString, wxITEM_NORMAL ); HelpMenu->Append( NewsMenuItem ); - + wxMenuItem* VersionHistoryMenuItem; VersionHistoryMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("IDM_VERSION_HISTORY") ) , wxEmptyString, wxITEM_NORMAL ); HelpMenu->Append( VersionHistoryMenuItem ); - + HelpMenu->AppendSeparator(); - + wxMenuItem* DonateMenuItem; DonateMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("IDM_DONATE") ) , wxEmptyString, wxITEM_NORMAL ); HelpMenu->Append( DonateMenuItem ); - + wxMenuItem* ContactMenuItem; ContactMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("IDM_CONTACT") ) , wxEmptyString, wxITEM_NORMAL ); HelpMenu->Append( ContactMenuItem ); - + wxMenuItem* LegalNoticesMenuItem; LegalNoticesMenuItem = new wxMenuItem( HelpMenu, wxID_ANY, wxString( _("IDM_LICENSE") ) , wxEmptyString, wxITEM_NORMAL ); HelpMenu->Append( LegalNoticesMenuItem ); - + wxMenuItem* AboutMenuItem; AboutMenuItem = new wxMenuItem( HelpMenu, wxID_ABOUT, wxString( _("ABOUTBOX") ) , wxEmptyString, wxITEM_NORMAL ); HelpMenu->Append( AboutMenuItem ); - - MainMenuBar->Append( HelpMenu, _("MENU_HELP") ); - + + MainMenuBar->Append( HelpMenu, _("MENU_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( sbSizer1->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_VRULES|wxSUNKEN_BORDER ); + + SlotListCtrl = new wxListCtrl( sbSizer1->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_VRULES|wxBORDER_SUNKEN ); 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( LowStaticBoxSizer->GetStaticBox(), wxID_ANY, _("IDC_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( LowStaticBoxSizer->GetStaticBox(), wxID_ANY, _("IDC_VOLUME_PROPERTIES"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer18->Add( VolumePropertiesButton, 1, wxALL|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( LowStaticBoxSizer->GetStaticBox(), wxID_ANY, _("HK_WIPE_CACHE"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer19->Add( WipeCacheButton, 1, wxALL|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( LowStaticBoxSizer->GetStaticBox(), wxID_ANY, _("IDT_VOLUME") ), wxVERTICAL ); - + VolumeGridBagSizer = new wxGridBagSizer( 0, 0 ); VolumeGridBagSizer->SetFlexibleDirection( wxBOTH ); VolumeGridBagSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - LogoBitmap = new wxStaticBitmap( VolumeStaticBoxSizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER ); + + LogoBitmap = new wxStaticBitmap( VolumeStaticBoxSizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN ); LogoBitmap->SetMinSize( wxSize( 42,52 ) ); - + VolumeGridBagSizer->Add( LogoBitmap, wxGBPosition( 0, 0 ), wxGBSpan( 2, 1 ), wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - VolumePathComboBox = new wxComboBox( VolumeStaticBoxSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN ); + + VolumePathComboBox = new wxComboBox( VolumeStaticBoxSizer->GetStaticBox(), 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( VolumeStaticBoxSizer->GetStaticBox(), wxID_ANY, _("IDC_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( VolumeStaticBoxSizer->GetStaticBox(), wxID_ANY, _("IDC_NO_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( VolumeStaticBoxSizer->GetStaticBox(), wxID_ANY, _("IDC_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( VolumeStaticBoxSizer->GetStaticBox(), wxID_ANY, _("IDC_SELECT_DEVICE"), 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|wxALL, 5 ); - - + + LowStaticBoxSizer->Add( 0, 0, 0, 0, 5 ); - + wxGridSizer* gSizer2; gSizer2 = new wxGridSizer( 1, 4, 0, 0 ); - + wxStaticBoxSizer* sbSizer4; sbSizer4 = new wxStaticBoxSizer( new wxStaticBox( LowStaticBoxSizer->GetStaticBox(), wxID_ANY, wxEmptyString ), wxVERTICAL ); - - sbSizer4->SetMinSize( wxSize( 139,-1 ) ); + + sbSizer4->SetMinSize( wxSize( 139,-1 ) ); VolumeButton = new wxButton( sbSizer4->GetStaticBox(), wxID_ANY, _("MOUNT_BUTTON"), wxDefaultPosition, wxDefaultSize, 0 ); + VolumeButton->SetDefault(); - VolumeButton->SetMinSize( wxSize( -1,32 ) ); - + sbSizer4->Add( VolumeButton, 1, wxEXPAND|wxALL, 2 ); - - + + gSizer2->Add( sbSizer4, 1, wxEXPAND, 0 ); - + wxStaticBoxSizer* sbSizer41; sbSizer41 = new wxStaticBoxSizer( new wxStaticBox( LowStaticBoxSizer->GetStaticBox(), wxID_ANY, wxEmptyString ), wxVERTICAL ); - - sbSizer41->SetMinSize( wxSize( 139,-1 ) ); + + sbSizer41->SetMinSize( wxSize( 139,-1 ) ); MountAllDevicesButton = new wxButton( sbSizer41->GetStaticBox(), wxID_ANY, _("IDC_MOUNTALL"), wxDefaultPosition, wxDefaultSize, 0 ); MountAllDevicesButton->SetMinSize( wxSize( -1,32 ) ); - + sbSizer41->Add( MountAllDevicesButton, 1, wxEXPAND|wxALL, 2 ); - - + + gSizer2->Add( sbSizer41, 1, wxEXPAND, 5 ); - + wxStaticBoxSizer* sbSizer42; sbSizer42 = new wxStaticBoxSizer( new wxStaticBox( LowStaticBoxSizer->GetStaticBox(), wxID_ANY, wxEmptyString ), wxVERTICAL ); - - sbSizer42->SetMinSize( wxSize( 139,-1 ) ); + + sbSizer42->SetMinSize( wxSize( 139,-1 ) ); DismountAllButton = new wxButton( sbSizer42->GetStaticBox(), wxID_ANY, _("IDC_UNMOUNTALL"), wxDefaultPosition, wxDefaultSize, 0 ); DismountAllButton->SetMinSize( wxSize( -1,32 ) ); - + sbSizer42->Add( DismountAllButton, 1, wxEXPAND|wxALL, 2 ); - - + + gSizer2->Add( sbSizer42, 1, wxEXPAND, 5 ); - + wxStaticBoxSizer* sbSizer43; sbSizer43 = new wxStaticBoxSizer( new wxStaticBox( LowStaticBoxSizer->GetStaticBox(), wxID_ANY, wxEmptyString ), wxVERTICAL ); - - sbSizer43->SetMinSize( wxSize( 139,-1 ) ); + + sbSizer43->SetMinSize( wxSize( 139,-1 ) ); ExitButton = new wxButton( sbSizer43->GetStaticBox(), wxID_ANY, _("IDC_EXIT"), wxDefaultPosition, wxDefaultSize, 0 ); ExitButton->SetMinSize( wxSize( -1,32 ) ); - + sbSizer43->Add( ExitButton, 1, wxEXPAND|wxALL, 2 ); - - + + gSizer2->Add( sbSizer43, 1, wxEXPAND, 5 ); - - + + LowStaticBoxSizer->Add( gSizer2, 0, wxEXPAND|wxALL, 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 ) ); - this->Connect( CreateNewVolumeMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnCreateVolumeButtonClick ) ); - this->Connect( MountVolumeMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnMountVolumeMenuItemSelected ) ); - this->Connect( AutoMountDevicesMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnMountAllDevicesButtonClick ) ); - this->Connect( DismountVolumeMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnDismountVolumeMenuItemSelected ) ); - this->Connect( DismountAllMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnDismountAllButtonClick ) ); - this->Connect( ChangePasswordMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnChangePasswordMenuItemSelected ) ); - this->Connect( ChangePkcs5PrfMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnChangePkcs5PrfMenuItemSelected ) ); - this->Connect( ChangeKeyfilesMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnChangeKeyfilesMenuItemSelected ) ); - this->Connect( RemoveKeyfilesMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnRemoveKeyfilesMenuItemSelected ) ); - this->Connect( VolumePropertiesMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnVolumePropertiesButtonClick ) ); - this->Connect( AddToFavoritesMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnAddToFavoritesMenuItemSelected ) ); - this->Connect( AddAllMountedToFavoritesMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnAddAllMountedToFavoritesMenuItemSelected ) ); - this->Connect( OrganizeFavoritesMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnOrganizeFavoritesMenuItemSelected ) ); - this->Connect( MountAllFavoritesMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnMountAllFavoritesMenuItemSelected ) ); - this->Connect( BenchmarkMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnBenchmarkMenuItemSelected ) ); - this->Connect( EncryptionTestMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnEncryptionTestMenuItemSelected ) ); - this->Connect( VolumeCreationWizardMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnCreateVolumeButtonClick ) ); - this->Connect( BackupVolumeHeadersMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnBackupVolumeHeadersMenuItemSelected ) ); - this->Connect( RestoreVolumeHeaderMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnRestoreVolumeHeaderMenuItemSelected ) ); - this->Connect( CreateKeyfileMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnCreateKeyfileMenuItemSelected ) ); - this->Connect( ManageSecurityTokenKeyfilesMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnManageSecurityTokenKeyfilesMenuItemSelected ) ); - this->Connect( CloseAllSecurityTokenSessionsMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnCloseAllSecurityTokenSessionsMenuItemSelected ) ); - this->Connect( WipeCachedPasswordsMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnWipeCacheButtonClick ) ); - this->Connect( HotkeysMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnHotkeysMenuItemSelected ) ); - this->Connect( DefaultKeyfilesMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnDefaultKeyfilesMenuItemSelected ) ); - this->Connect( DefaultMountParametersMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnDefaultMountParametersMenuItemSelected ) ); - this->Connect( SecurityTokenPreferencesMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnSecurityTokenPreferencesMenuItemSelected ) ); - this->Connect( PreferencesMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnPreferencesMenuItemSelected ) ); - this->Connect( UserGuideMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnUserGuideMenuItemSelected ) ); - this->Connect( OnlineHelpMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnOnlineHelpMenuItemSelected ) ); - this->Connect( BeginnersTutorialMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnBeginnersTutorialMenuItemSelected ) ); - this->Connect( FaqMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnFaqMenuItemSelected ) ); - this->Connect( WebsiteMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnWebsiteMenuItemSelected ) ); - this->Connect( DownloadsMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnDownloadsMenuItemSelected ) ); - this->Connect( NewsMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnNewsMenuItemSelected ) ); - this->Connect( VersionHistoryMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnVersionHistoryMenuItemSelected ) ); - this->Connect( DonateMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnDonateMenuItemSelected ) ); - this->Connect( ContactMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnContactMenuItemSelected ) ); - this->Connect( LegalNoticesMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnLegalNoticesMenuItemSelected ) ); - this->Connect( AboutMenuItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnAboutMenuItemSelected ) ); + VolumesMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnCreateVolumeButtonClick ), this, CreateNewVolumeMenuItem->GetId()); + VolumesMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnMountVolumeMenuItemSelected ), this, MountVolumeMenuItem->GetId()); + VolumesMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnMountAllDevicesButtonClick ), this, AutoMountDevicesMenuItem->GetId()); + VolumesMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnDismountVolumeMenuItemSelected ), this, DismountVolumeMenuItem->GetId()); + VolumesMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnDismountAllButtonClick ), this, DismountAllMenuItem->GetId()); + VolumesMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnChangePasswordMenuItemSelected ), this, ChangePasswordMenuItem->GetId()); + VolumesMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnChangePkcs5PrfMenuItemSelected ), this, ChangePkcs5PrfMenuItem->GetId()); + VolumesMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnChangeKeyfilesMenuItemSelected ), this, ChangeKeyfilesMenuItem->GetId()); + VolumesMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnRemoveKeyfilesMenuItemSelected ), this, RemoveKeyfilesMenuItem->GetId()); + VolumesMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnVolumePropertiesButtonClick ), this, VolumePropertiesMenuItem->GetId()); + FavoritesMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnAddToFavoritesMenuItemSelected ), this, AddToFavoritesMenuItem->GetId()); + FavoritesMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnAddAllMountedToFavoritesMenuItemSelected ), this, AddAllMountedToFavoritesMenuItem->GetId()); + FavoritesMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnOrganizeFavoritesMenuItemSelected ), this, OrganizeFavoritesMenuItem->GetId()); + FavoritesMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnMountAllFavoritesMenuItemSelected ), this, MountAllFavoritesMenuItem->GetId()); + ToolsMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnBenchmarkMenuItemSelected ), this, BenchmarkMenuItem->GetId()); + ToolsMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnEncryptionTestMenuItemSelected ), this, EncryptionTestMenuItem->GetId()); + ToolsMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnCreateVolumeButtonClick ), this, VolumeCreationWizardMenuItem->GetId()); + ToolsMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnBackupVolumeHeadersMenuItemSelected ), this, BackupVolumeHeadersMenuItem->GetId()); + ToolsMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnRestoreVolumeHeaderMenuItemSelected ), this, RestoreVolumeHeaderMenuItem->GetId()); + ToolsMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnCreateKeyfileMenuItemSelected ), this, CreateKeyfileMenuItem->GetId()); + ToolsMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnManageSecurityTokenKeyfilesMenuItemSelected ), this, ManageSecurityTokenKeyfilesMenuItem->GetId()); + ToolsMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnCloseAllSecurityTokenSessionsMenuItemSelected ), this, CloseAllSecurityTokenSessionsMenuItem->GetId()); + ToolsMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnWipeCacheButtonClick ), this, WipeCachedPasswordsMenuItem->GetId()); + SettingsMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnHotkeysMenuItemSelected ), this, HotkeysMenuItem->GetId()); + SettingsMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnDefaultKeyfilesMenuItemSelected ), this, DefaultKeyfilesMenuItem->GetId()); + SettingsMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnDefaultMountParametersMenuItemSelected ), this, DefaultMountParametersMenuItem->GetId()); + SettingsMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnSecurityTokenPreferencesMenuItemSelected ), this, SecurityTokenPreferencesMenuItem->GetId()); + SettingsMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnPreferencesMenuItemSelected ), this, PreferencesMenuItem->GetId()); + HelpMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnUserGuideMenuItemSelected ), this, UserGuideMenuItem->GetId()); + HelpMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnOnlineHelpMenuItemSelected ), this, OnlineHelpMenuItem->GetId()); + HelpMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnBeginnersTutorialMenuItemSelected ), this, BeginnersTutorialMenuItem->GetId()); + HelpMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnFaqMenuItemSelected ), this, FaqMenuItem->GetId()); + HelpMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnWebsiteMenuItemSelected ), this, WebsiteMenuItem->GetId()); + HelpMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnDownloadsMenuItemSelected ), this, DownloadsMenuItem->GetId()); + HelpMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnNewsMenuItemSelected ), this, NewsMenuItem->GetId()); + HelpMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnVersionHistoryMenuItemSelected ), this, VersionHistoryMenuItem->GetId()); + HelpMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnDonateMenuItemSelected ), this, DonateMenuItem->GetId()); + HelpMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnContactMenuItemSelected ), this, ContactMenuItem->GetId()); + HelpMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnLegalNoticesMenuItemSelected ), this, LegalNoticesMenuItem->GetId()); + HelpMenu->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnAboutMenuItemSelected ), this, AboutMenuItem->GetId()); SlotListCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( MainFrameBase::OnListItemActivated ), NULL, this ); SlotListCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( MainFrameBase::OnListItemDeselected ), NULL, this ); SlotListCtrl->Connect( wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, wxListEventHandler( MainFrameBase::OnListItemRightClick ), NULL, this ); @@ -474,46 +474,6 @@ MainFrameBase::~MainFrameBase() // Disconnect Events this->Disconnect( wxEVT_ACTIVATE, wxActivateEventHandler( MainFrameBase::OnActivate ) ); this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainFrameBase::OnClose ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnCreateVolumeButtonClick ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnMountVolumeMenuItemSelected ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnMountAllDevicesButtonClick ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnDismountVolumeMenuItemSelected ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnDismountAllButtonClick ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnChangePasswordMenuItemSelected ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnChangePkcs5PrfMenuItemSelected ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnChangeKeyfilesMenuItemSelected ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnRemoveKeyfilesMenuItemSelected ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnVolumePropertiesButtonClick ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnAddToFavoritesMenuItemSelected ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnAddAllMountedToFavoritesMenuItemSelected ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnOrganizeFavoritesMenuItemSelected ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnMountAllFavoritesMenuItemSelected ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnBenchmarkMenuItemSelected ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnEncryptionTestMenuItemSelected ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnCreateVolumeButtonClick ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnBackupVolumeHeadersMenuItemSelected ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnRestoreVolumeHeaderMenuItemSelected ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnCreateKeyfileMenuItemSelected ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnManageSecurityTokenKeyfilesMenuItemSelected ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnCloseAllSecurityTokenSessionsMenuItemSelected ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnWipeCacheButtonClick ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnHotkeysMenuItemSelected ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnDefaultKeyfilesMenuItemSelected ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnDefaultMountParametersMenuItemSelected ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnSecurityTokenPreferencesMenuItemSelected ) ); - this->Disconnect( wxID_PREFERENCES, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnPreferencesMenuItemSelected ) ); - this->Disconnect( wxID_HELP, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnUserGuideMenuItemSelected ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnOnlineHelpMenuItemSelected ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnBeginnersTutorialMenuItemSelected ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnFaqMenuItemSelected ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnWebsiteMenuItemSelected ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnDownloadsMenuItemSelected ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnNewsMenuItemSelected ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnVersionHistoryMenuItemSelected ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnDonateMenuItemSelected ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnContactMenuItemSelected ) ); - this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnLegalNoticesMenuItemSelected ) ); - this->Disconnect( wxID_ABOUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainFrameBase::OnAboutMenuItemSelected ) ); SlotListCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( MainFrameBase::OnListItemActivated ), NULL, this ); SlotListCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( MainFrameBase::OnListItemDeselected ), NULL, this ); SlotListCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, wxListEventHandler( MainFrameBase::OnListItemRightClick ), NULL, this ); @@ -530,98 +490,97 @@ 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( sbSizer27->GetStaticBox(), 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( sbSizer27->GetStaticBox(), wxID_ANY, _("Page Title"), wxDefaultPosition, wxDefaultSize, 0 ); PageTitleStaticText->Wrap( -1 ); - PageTitleStaticText->SetFont( wxFont( 16, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, 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, _("IDHELP"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer70->Add( HelpButton, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - + + bSizer70->Add( 2, 0, 0, wxLEFT, 5 ); - + PreviousButton = new wxButton( MainPanel, wxID_ANY, _("PREV"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer70->Add( PreviousButton, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - + NextButton = new wxButton( MainPanel, wxID_ANY, _("NEXT"), wxDefaultPosition, wxDefaultSize, 0|wxWANTS_CHARS ); + NextButton->SetDefault(); - bSizer70->Add( NextButton, 0, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 ); - - + + bSizer70->Add( 2, 0, 0, wxLEFT, 5 ); - + CancelButton = new wxButton( MainPanel, wxID_CANCEL, _("IDCANCEL"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer70->Add( CancelButton, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - - + + bSizer64->Add( bSizer70, 0, wxEXPAND|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 ) ); @@ -642,126 +601,124 @@ 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 ); + + CreditsTextCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxBORDER_SUNKEN ); 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, _("IDOK"), wxDefaultPosition, wxDefaultSize, 0 ); + 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 ); } @@ -770,51 +727,48 @@ 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 ); - + wxFlexGridSizer* fgSizer9; fgSizer9 = new wxFlexGridSizer( 3, 2, 0, 0 ); fgSizer9->AddGrowableCol( 1 ); fgSizer9->SetFlexibleDirection( wxHORIZONTAL ); fgSizer9->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_staticText70 = new wxStaticText( this, wxID_ANY, _("IDT_BENCHMARK"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText70->Wrap( -1 ); - fgSizer9->Add( m_staticText70, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + wxString BenchmarkChoiceChoices[] = { _("ENCRYPTION_ALGORITHM"), _("PKCS5_PRF"), _("IDT_HASH_ALGO") }; int BenchmarkChoiceNChoices = sizeof( BenchmarkChoiceChoices ) / sizeof( wxString ); BenchmarkChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, BenchmarkChoiceNChoices, BenchmarkChoiceChoices, 0 ); BenchmarkChoice->SetSelection( 0 ); fgSizer9->Add( BenchmarkChoice, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_bufferSizeLabel = new wxStaticText( this, wxID_ANY, _("IDT_BUFFER_SIZE"), wxDefaultPosition, wxDefaultSize, 0 ); m_bufferSizeLabel->Wrap( -1 ); - fgSizer9->Add( m_bufferSizeLabel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); - + wxArrayString BufferSizeChoiceChoices; BufferSizeChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, BufferSizeChoiceChoices, 0 ); BufferSizeChoice->SetSelection( 0 ); fgSizer9->Add( BufferSizeChoice, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - + m_volumePimLabel = new wxStaticText( this, wxID_ANY, _("IDT_PIM"), wxDefaultPosition, wxDefaultSize, 0 ); m_volumePimLabel->Wrap( -1 ); - fgSizer9->Add( m_volumePimLabel, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + VolumePimText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); #ifdef __WXGTK__ if ( !VolumePimText->HasFlag( wxTE_MULTILINE ) ) @@ -825,53 +779,52 @@ BenchmarkDialogBase::BenchmarkDialogBase( wxWindow* parent, wxWindowID id, const VolumePimText->SetMaxLength( 7 ); #endif fgSizer9->Add( VolumePimText, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - - + + bSizer154->Add( fgSizer9, 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 ); + + BenchmarkListCtrl = new wxListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxBORDER_SUNKEN ); bSizer156->Add( BenchmarkListCtrl, 1, wxALL|wxEXPAND, 5 ); - + RightSizer = new wxBoxSizer( wxVERTICAL ); - + BenchmarkButton = new wxButton( this, wxID_OK, _("IDC_PERFORM_BENCHMARK"), wxDefaultPosition, wxDefaultSize, 0 ); + BenchmarkButton->SetDefault(); - RightSizer->Add( BenchmarkButton, 0, wxALL|wxEXPAND, 5 ); - + wxButton* CancelButton; CancelButton = new wxButton( this, wxID_CANCEL, _("IDCLOSE"), wxDefaultPosition, wxDefaultSize, 0 ); RightSizer->Add( CancelButton, 0, wxALL|wxEXPAND, 5 ); - - - RightSizer->Add( 0, 0, 0, wxEXPAND|wxTOP|wxBOTTOM, 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 BenchmarkChoice->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( BenchmarkDialogBase::OnBenchmarkChoiceSelected ), NULL, this ); BenchmarkButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BenchmarkDialogBase::OnBenchmarkButtonClick ), NULL, this ); @@ -882,68 +835,68 @@ BenchmarkDialogBase::~BenchmarkDialogBase() // Disconnect Events BenchmarkChoice->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( BenchmarkDialogBase::OnBenchmarkChoiceSelected ), NULL, this ); 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( this->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, _("IDT_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, _("IDT_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, _("IDOK"), wxDefaultPosition, wxDefaultSize, 0 ); + OKButton->SetDefault(); - bSizer33->Add( OKButton, 0, wxALL|wxEXPAND, 5 ); - + CancelButton = new wxButton( this, wxID_CANCEL, _("IDCANCEL"), 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 ); } @@ -952,50 +905,50 @@ 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( this->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 ); + + DeviceListCtrl = new wxListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_VRULES|wxBORDER_SUNKEN ); bSizer4->Add( DeviceListCtrl, 1, wxALL|wxEXPAND, 5 ); - - + + bSizer3->Add( bSizer4, 1, wxEXPAND|wxALL, 5 ); - + wxBoxSizer* bSizer166; bSizer166 = new wxBoxSizer( wxHORIZONTAL ); - - + + bSizer166->Add( 0, 0, 1, wxEXPAND, 5 ); - + CancelButton = new wxButton( this, wxID_CANCEL, _("IDCANCEL"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer166->Add( CancelButton, 0, wxALL, 5 ); - + OKButton = new wxButton( this, wxID_OK, _("IDOK"), wxDefaultPosition, wxDefaultSize, 0 ); + OKButton->SetDefault(); - bSizer166->Add( OKButton, 0, wxALL, 5 ); - - + + bSizer3->Add( bSizer166, 0, wxALL|wxEXPAND, 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 ); @@ -1010,154 +963,148 @@ DeviceSelectionDialogBase::~DeviceSelectionDialogBase() DeviceListCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( DeviceSelectionDialogBase::OnListItemDeselected ), NULL, this ); DeviceListCtrl->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( DeviceSelectionDialogBase::OnListItemSelected ), NULL, this ); OKButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DeviceSelectionDialogBase::OnOKButtonClick ), 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, _("IDT_CIPHER"), 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, _("IDT_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, _("IDT_TEST_KEY") ), wxVERTICAL ); - + KeyTextCtrl = new wxTextCtrl( sbSizer38->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); KeyTextCtrl->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("Courier") ) ); - + sbSizer38->Add( KeyTextCtrl, 1, wxALL|wxEXPAND, 5 ); - + wxBoxSizer* bSizer135; bSizer135 = new wxBoxSizer( wxHORIZONTAL ); - + wxStaticText* m_staticText43; m_staticText43 = new wxStaticText( sbSizer38->GetStaticBox(), wxID_ANY, _("IDT_KEY"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText43->Wrap( -1 ); - bSizer135->Add( m_staticText43, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - + KeySizeStaticText = new wxStaticText( sbSizer38->GetStaticBox(), 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, _("IDT_XTS_MODE") ), wxVERTICAL ); - + wxStaticText* m_staticText45; m_staticText45 = new wxStaticText( sbSizer39->GetStaticBox(), wxID_ANY, _("IDT_SECONDARY_KEY"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText45->Wrap( -1 ); - sbSizer39->Add( m_staticText45, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + SecondaryKeyTextCtrl = new wxTextCtrl( sbSizer39->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); SecondaryKeyTextCtrl->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("Courier") ) ); - + sbSizer39->Add( SecondaryKeyTextCtrl, 0, wxEXPAND|wxALL, 5 ); - + wxStaticText* m_staticText46; m_staticText46 = new wxStaticText( sbSizer39->GetStaticBox(), wxID_ANY, _("IDT_TEST_DATA_UNIT_NUMBER"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText46->Wrap( -1 ); - sbSizer39->Add( m_staticText46, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + DataUnitNumberTextCtrl = new wxTextCtrl( sbSizer39->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); sbSizer39->Add( DataUnitNumberTextCtrl, 0, wxALL, 5 ); - + wxStaticText* m_staticText47; m_staticText47 = new wxStaticText( sbSizer39->GetStaticBox(), wxID_ANY, _("IDT_TEST_BLOCK_NUMBER"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText47->Wrap( -1 ); - sbSizer39->Add( m_staticText47, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - + BlockNumberTextCtrl = new wxTextCtrl( sbSizer39->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); sbSizer39->Add( BlockNumberTextCtrl, 0, wxALL, 5 ); - - + + bSizer133->Add( sbSizer39, 1, wxEXPAND|wxALL, 5 ); - + wxStaticBoxSizer* sbSizer40; sbSizer40 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("IDT_TEST_PLAINTEXT") ), wxVERTICAL ); - + PlainTextTextCtrl = new wxTextCtrl( sbSizer40->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); PlainTextTextCtrl->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, 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, _("IDT_TEST_CIPHERTEXT") ), wxVERTICAL ); - + CipherTextTextCtrl = new wxTextCtrl( sbSizer41->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); CipherTextTextCtrl->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, 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, _("IDC_AUTO"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer136->Add( AutoTestAllButton, 0, wxALL, 5 ); - + ResetButton = new wxButton( this, wxID_ANY, _("IDC_RESET"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer136->Add( ResetButton, 0, wxALL, 5 ); - + CloseButton = new wxButton( this, wxID_CANCEL, _("IDCLOSE"), 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 ); @@ -1176,80 +1123,80 @@ 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 ); + + FavoritesListCtrl = new wxListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_VRULES|wxBORDER_SUNKEN ); bSizer58->Add( FavoritesListCtrl, 1, wxALL|wxEXPAND, 5 ); - + wxGridSizer* gSizer5; gSizer5 = new wxGridSizer( 1, 4, 0, 0 ); - + MoveUpButton = new wxButton( this, wxID_ANY, _("IDC_FAVORITE_MOVE_UP"), wxDefaultPosition, wxDefaultSize, 0 ); gSizer5->Add( MoveUpButton, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 ); - + MoveDownButton = new wxButton( this, wxID_ANY, _("IDC_FAVORITE_MOVE_DOWN"), wxDefaultPosition, wxDefaultSize, 0 ); gSizer5->Add( MoveDownButton, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 ); - + RemoveButton = new wxButton( this, wxID_ANY, _("IDC_KEYREMOVE"), wxDefaultPosition, wxDefaultSize, 0 ); gSizer5->Add( RemoveButton, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 ); - + RemoveAllButton = new wxButton( this, wxID_ANY, _("IDC_KEYREMOVEALL"), 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, _("IDOK"), wxDefaultPosition, wxDefaultSize, 0 ); + OKButton->SetDefault(); - bSizer59->Add( OKButton, 0, wxALL, 5 ); - + CancelButton = new wxButton( this, wxID_CANCEL, _("IDCANCEL"), 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 ); @@ -1270,94 +1217,92 @@ 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( this->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, _("IDOK"), wxDefaultPosition, wxDefaultSize, 0 ); + OKButton->SetDefault(); - bSizer22->Add( OKButton, 0, wxALL|wxEXPAND, 5 ); - + CancelButton = new wxButton( this, wxID_CANCEL, _("IDCANCEL"), 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, _("IDC_LINK_KEYFILES_INFO"), 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, _("IDC_GENERATE_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 ); @@ -1368,165 +1313,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, _("IDT_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( sbSizer43->GetStaticBox(), wxID_ANY, _("IDT_RANDOM_POOL"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText52->Wrap( -1 ); - bSizer147->Add( m_staticText52, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - + RandomPoolStaticText = new wxStaticText( sbSizer43->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); RandomPoolStaticText->Wrap( -1 ); - RandomPoolStaticText->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("Courier New") ) ); - + bSizer147->Add( RandomPoolStaticText, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - + ShowRandomPoolCheckBox = new wxCheckBox( sbSizer43->GetStaticBox(), wxID_ANY, _("IDC_DISPLAY_POOL_CONTENTS"), 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( sbSizer43->GetStaticBox(), wxID_ANY, _("IDT_ENTROPY_BAR") ), wxVERTICAL ); - + CollectedEntropy = new wxGauge( sbSizer45->GetStaticBox(), 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( sbSizer43->GetStaticBox(), wxID_ANY, _("IDT_KEYFILE_GENERATOR_NOTE"), 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, _("IDT_NUMBER_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, _("IDT_KEYFILES_SIZE"), 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, _("IDC_KEYFILES_RANDOM_SIZE"), wxDefaultPosition, wxDefaultSize, 0 ); fgSizer8->Add( RandomSizeCheckBox, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + m_staticText65 = new wxStaticText( this, wxID_ANY, _("IDT_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, 1, wxALL|wxEXPAND, 5 ); - + wxBoxSizer* bSizer146; bSizer146 = new wxBoxSizer( wxHORIZONTAL ); - + GenerateButton = new wxButton( this, wxID_ANY, _("IDC_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, _("IDCLOSE"), 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 ); @@ -1543,32 +1481,32 @@ 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, _("IDOK"), wxDefaultPosition, wxDefaultSize, 0 ); + 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 ); @@ -1582,167 +1520,165 @@ MountOptionsDialogBase::MountOptionsDialogBase( wxWindow* parent, wxWindowID id, { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); this->SetExtraStyle( this->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, _("IDOK"), wxDefaultPosition, wxDefaultSize, 0 ); + OKButton->SetDefault(); - bSizer9->Add( OKButton, 0, wxALL|wxEXPAND, 5 ); - + CancelButton = new wxButton( this, wxID_CANCEL, _("IDCANCEL"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer9->Add( CancelButton, 0, wxALL|wxEXPAND, 5 ); - - + + bSizer9->Add( 0, 0, 1, wxTOP|wxEXPAND, 5 ); - + OptionsButton = new wxButton( this, wxID_ANY, _("IDT_FORMAT_OPTIONS"), 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( OptionsSizer->GetStaticBox(), wxID_ANY, _("IDC_MOUNT_READONLY"), wxDefaultPosition, wxDefaultSize, 0 ); OptionsSizer->Add( ReadOnlyCheckBox, 0, wxALL, 5 ); - + RemovableCheckBox = new wxCheckBox( OptionsSizer->GetStaticBox(), wxID_ANY, _("IDC_MOUNT_REMOVABLE"), wxDefaultPosition, wxDefaultSize, 0 ); OptionsSizer->Add( RemovableCheckBox, 0, wxALL, 5 ); - + BackupHeaderCheckBox = new wxCheckBox( OptionsSizer->GetStaticBox(), wxID_ANY, _("IDC_USE_EMBEDDED_HEADER_BAK"), wxDefaultPosition, wxDefaultSize, 0 ); OptionsSizer->Add( BackupHeaderCheckBox, 0, wxALL, 5 ); - + PartitionInSystemEncryptionScopeCheckBox = new wxCheckBox( OptionsSizer->GetStaticBox(), wxID_ANY, _("LINUX_MOUNT_SYSTEM_ENC_PREBOOT"), wxDefaultPosition, wxDefaultSize, 0 ); OptionsSizer->Add( PartitionInSystemEncryptionScopeCheckBox, 0, wxALL, 5 ); - + ProtectionSizer = new wxStaticBoxSizer( new wxStaticBox( OptionsSizer->GetStaticBox(), wxID_ANY, _("IDT_HIDDEN_VOL_PROTECTION") ), wxVERTICAL ); - + ProtectionCheckBox = new wxCheckBox( ProtectionSizer->GetStaticBox(), wxID_ANY, _("IDC_PROTECT_HIDDEN_VOL"), wxDefaultPosition, wxDefaultSize, 0 ); ProtectionSizer->Add( ProtectionCheckBox, 0, wxALL, 5 ); - + ProtectionPasswordSizer = new wxBoxSizer( wxVERTICAL ); - - + + ProtectionSizer->Add( ProtectionPasswordSizer, 1, wxEXPAND|wxLEFT, 5 ); - + ProtectionHyperlinkCtrl = new wxHyperlinkCtrl( ProtectionSizer->GetStaticBox(), wxID_ANY, _("IDC_LINK_HIDVOL_PROTECTION_INFO"), 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( OptionsSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); wxStaticBoxSizer* sbSizer28; sbSizer28 = new wxStaticBoxSizer( new wxStaticBox( m_panel8, wxID_ANY, _("IDT_FILESYSTEM") ), wxVERTICAL ); - + wxBoxSizer* bSizer54; bSizer54 = new wxBoxSizer( wxVERTICAL ); - + wxBoxSizer* bSizer55; bSizer55 = new wxBoxSizer( wxVERTICAL ); - + NoFilesystemCheckBox = new wxCheckBox( sbSizer28->GetStaticBox(), wxID_ANY, _("LINUX_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( sbSizer28->GetStaticBox(), wxID_ANY, _("LINUX_MOUNT_AT_DIR"), 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( sbSizer28->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); FilesystemOptionsSizer->Add( MountPointTextCtrl, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxALL|wxEXPAND, 5 ); - + MountPointButton = new wxButton( sbSizer28->GetStaticBox(), wxID_ANY, _("LINUX_SELECT"), wxDefaultPosition, wxDefaultSize, 0 ); FilesystemOptionsSizer->Add( MountPointButton, wxGBPosition( 1, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - + FilesystemOptionsStaticText = new wxStaticText( sbSizer28->GetStaticBox(), wxID_ANY, _("IDT_LINUX_PREF_TAB_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( sbSizer28->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); FilesystemOptionsSizer->Add( FilesystemOptionsTextCtrl, wxGBPosition( 2, 1 ), wxGBSpan( 1, 2 ), 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 ); @@ -1765,78 +1701,76 @@ 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( sbSizer42->GetStaticBox(), wxID_ANY, _("IDT_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( sbSizer42->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, SecurityTokenChoiceChoices, 0 ); SecurityTokenChoice->SetSelection( 0 ); fgSizer7->Add( SecurityTokenChoice, 0, wxALL|wxEXPAND, 5 ); - + wxStaticText* m_staticText48; m_staticText48 = new wxStaticText( sbSizer42->GetStaticBox(), wxID_ANY, _("IDT_TOKEN_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( sbSizer42->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer7->Add( KeyfileNameTextCtrl, 0, wxEXPAND|wxALL, 5 ); - - + + sbSizer42->Add( fgSizer7, 1, wxEXPAND|wxTOP, 5 ); - - + + bSizer144->Add( sbSizer42, 1, wxEXPAND|wxALL, 5 ); - + wxBoxSizer* bSizer167; bSizer167 = new wxBoxSizer( wxHORIZONTAL ); - - + + bSizer167->Add( 0, 0, 1, wxEXPAND, 5 ); - + CancelButton = new wxButton( this, wxID_CANCEL, _("IDCANCEL"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer167->Add( CancelButton, 0, wxALL, 5 ); - + OKButton = new wxButton( this, wxID_OK, _("IDOK"), wxDefaultPosition, wxDefaultSize, 0 ); + OKButton->SetDefault(); - bSizer167->Add( OKButton, 0, wxALL, 5 ); - - + + bSizer144->Add( bSizer167, 0, wxEXPAND, 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 ); OKButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( NewSecurityTokenKeyfileDialogBase::OnOKButtonClick ), NULL, this ); @@ -1847,94 +1781,93 @@ NewSecurityTokenKeyfileDialogBase::~NewSecurityTokenKeyfileDialogBase() // Disconnect Events KeyfileNameTextCtrl->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( NewSecurityTokenKeyfileDialogBase::OnKeyfileNameChanged ), NULL, this ); OKButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( NewSecurityTokenKeyfileDialogBase::OnOKButtonClick ), 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( this->GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY ); - + bSizer32 = new wxBoxSizer( wxVERTICAL ); - + wxBoxSizer* bSizer178; bSizer178 = 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, _("IDT_AUTO_DISMOUNT") ), wxVERTICAL ); - + wxStaticBoxSizer* sbSizer13; sbSizer13 = new wxStaticBoxSizer( new wxStaticBox( AutoDismountSizer->GetStaticBox(), wxID_ANY, _("LINUX_DISMOUNT_ALL_WHEN") ), wxVERTICAL ); - + DismountOnLogOffCheckBox = new wxCheckBox( sbSizer13->GetStaticBox(), wxID_ANY, _("IDC_PREF_DISMOUNT_LOGOFF"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizer13->Add( DismountOnLogOffCheckBox, 0, wxALL, 5 ); - + DismountOnScreenSaverCheckBox = new wxCheckBox( sbSizer13->GetStaticBox(), wxID_ANY, _("IDC_PREF_DISMOUNT_SCREENSAVER"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizer13->Add( DismountOnScreenSaverCheckBox, 0, wxALL, 5 ); - + DismountOnPowerSavingCheckBox = new wxCheckBox( sbSizer13->GetStaticBox(), wxID_ANY, _("LINUX_ENTERING_POVERSAWING"), 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( AutoDismountSizer->GetStaticBox(), wxID_ANY, _("IDC_PREF_DISMOUNT_INACTIVE"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer34->Add( DismountOnInactivityCheckBox, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - + DismountOnInactivitySpinCtrl = new wxSpinCtrl( AutoDismountSizer->GetStaticBox(), 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( AutoDismountSizer->GetStaticBox(), 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( AutoDismountSizer->GetStaticBox(), wxID_ANY, _("IDC_PREF_FORCE_AUTO_DISMOUNT"), wxDefaultPosition, wxDefaultSize, 0 ); AutoDismountSizer->Add( ForceAutoDismountCheckBox, 0, wxALL, 5 ); - - + + bSizer33->Add( AutoDismountSizer, 0, wxEXPAND|wxALL, 5 ); - + FilesystemSecuritySizer = new wxStaticBoxSizer( new wxStaticBox( SecurityPage, wxID_ANY, _("LINUX_PREF_TAB_MOUNT_OPTIONS_FS") ), wxVERTICAL ); - + PreserveTimestampsCheckBox = new wxCheckBox( FilesystemSecuritySizer->GetStaticBox(), wxID_ANY, _("IDC_PRESERVE_TIMESTAMPS"), 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, _("IDT_PW_CACHE_OPTIONS") ), wxVERTICAL ); - + WipeCacheOnCloseCheckBox = new wxCheckBox( sbSizer14->GetStaticBox(), wxID_ANY, _("IDC_PREF_WIPE_CACHE_ON_EXIT"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizer14->Add( WipeCacheOnCloseCheckBox, 0, wxALL, 5 ); - + WipeCacheOnAutoDismountCheckBox = new wxCheckBox( sbSizer14->GetStaticBox(), wxID_ANY, _("IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT"), 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 ); @@ -1942,71 +1875,66 @@ 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, _("IDT_DEFAULT_MOUNT_OPTIONS") ), wxVERTICAL ); - + MountReadOnlyCheckBox = new wxCheckBox( sbSizer15->GetStaticBox(), wxID_ANY, _("IDC_PREF_MOUNT_READONLY"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizer15->Add( MountReadOnlyCheckBox, 0, wxALL, 5 ); - + MountRemovableCheckBox = new wxCheckBox( sbSizer15->GetStaticBox(), wxID_ANY, _("IDC_PREF_MOUNT_REMOVABLE"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizer15->Add( MountRemovableCheckBox, 0, wxALL, 5 ); - + CachePasswordsCheckBox = new wxCheckBox( sbSizer15->GetStaticBox(), wxID_ANY, _("IDC_TRAV_CACHE_PASSWORDS"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizer15->Add( CachePasswordsCheckBox, 0, wxALL, 5 ); - - TrueCryptModeCheckBox = new wxCheckBox( sbSizer15->GetStaticBox(), wxID_ANY, _("IDC_TRUECRYPT_MODE"), wxDefaultPosition, wxDefaultSize, 0 ); - sbSizer15->Add( TrueCryptModeCheckBox, 0, wxALL, 5 ); - + wxBoxSizer* bSizer163; bSizer163 = new wxBoxSizer( wxHORIZONTAL ); - + Pkcs5PrfStaticText = new wxStaticText( sbSizer15->GetStaticBox(), wxID_ANY, _("PKCS5_PRF"), wxDefaultPosition, wxDefaultSize, 0 ); Pkcs5PrfStaticText->Wrap( -1 ); - bSizer163->Add( Pkcs5PrfStaticText, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - + wxArrayString Pkcs5PrfChoiceChoices; Pkcs5PrfChoice = new wxChoice( sbSizer15->GetStaticBox(), 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, _("LINUX_PREF_TAB_MOUNT_OPTIONS_FS") ), 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( FilesystemSizer->GetStaticBox(), wxID_ANY, _("IDT_LINUX_PREF_TAB_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( FilesystemSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer3->Add( FilesystemOptionsTextCtrl, 0, wxALL|wxEXPAND, 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 ); @@ -2014,41 +1942,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, _("IDT_TASKBAR_ICON") ), wxVERTICAL ); - + BackgroundTaskEnabledCheckBox = new wxCheckBox( sbSizer18->GetStaticBox(), wxID_ANY, _("IDC_PREF_BKG_TASK_ENABLE"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizer18->Add( BackgroundTaskEnabledCheckBox, 0, wxALL, 5 ); - + CloseBackgroundTaskOnNoVolumesCheckBox = new wxCheckBox( sbSizer18->GetStaticBox(), wxID_ANY, _("IDC_CLOSE_BKG_TASK_WHEN_NOVOL"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizer18->Add( CloseBackgroundTaskOnNoVolumesCheckBox, 0, wxALL, 5 ); - + wxStaticBoxSizer* sbSizer26; sbSizer26 = new wxStaticBoxSizer( new wxStaticBox( sbSizer18->GetStaticBox(), wxID_ANY, _("TASKICON_PREF_MENU_ITEMS") ), wxVERTICAL ); - + BackgroundTaskMenuMountItemsEnabledCheckBox = new wxCheckBox( sbSizer26->GetStaticBox(), wxID_ANY, _("HK_MOUNT_FAVORITE_VOLUMES"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizer26->Add( BackgroundTaskMenuMountItemsEnabledCheckBox, 0, wxALL, 5 ); - + BackgroundTaskMenuOpenItemsEnabledCheckBox = new wxCheckBox( sbSizer26->GetStaticBox(), wxID_ANY, _("TASKICON_PREF_OPEN_VOL"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizer26->Add( BackgroundTaskMenuOpenItemsEnabledCheckBox, 0, wxALL, 5 ); - + BackgroundTaskMenuDismountItemsEnabledCheckBox = new wxCheckBox( sbSizer26->GetStaticBox(), wxID_ANY, _("TASKICON_PREF_DISMOUNT_VOL"), 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 ); @@ -2056,47 +1984,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, _("LINUX_LOGIN_ACTION") ), wxVERTICAL ); - + StartOnLogonCheckBox = new wxCheckBox( LogOnSizer->GetStaticBox(), wxID_ANY, _("IDC_PREF_LOGON_START"), wxDefaultPosition, wxDefaultSize, 0 ); LogOnSizer->Add( StartOnLogonCheckBox, 0, wxALL, 5 ); - + MountFavoritesOnLogonCheckBox = new wxCheckBox( LogOnSizer->GetStaticBox(), wxID_ANY, _("HK_MOUNT_FAVORITE_VOLUMES"), wxDefaultPosition, wxDefaultSize, 0 ); LogOnSizer->Add( MountFavoritesOnLogonCheckBox, 0, wxALL, 5 ); - + MountDevicesOnLogonCheckBox = new wxCheckBox( LogOnSizer->GetStaticBox(), wxID_ANY, _("IDC_PREF_LOGON_MOUNT_DEVICES"), wxDefaultPosition, wxDefaultSize, 0 ); LogOnSizer->Add( MountDevicesOnLogonCheckBox, 0, wxALL, 5 ); - - + + bSizer37->Add( LogOnSizer, 0, wxALL|wxEXPAND, 5 ); - + ExplorerSizer = new wxStaticBoxSizer( new wxStaticBox( SystemIntegrationPage, wxID_ANY, _("LINUX_PREF_TAB_SYSTEM_INTEGRATION_EXPLORER") ), wxVERTICAL ); - + OpenExplorerWindowAfterMountCheckBox = new wxCheckBox( ExplorerSizer->GetStaticBox(), wxID_ANY, _("IDC_PREF_OPEN_EXPLORER"), wxDefaultPosition, wxDefaultSize, 0 ); ExplorerSizer->Add( OpenExplorerWindowAfterMountCheckBox, 0, wxALL, 5 ); - + CloseExplorerWindowsOnDismountCheckBox = new wxCheckBox( ExplorerSizer->GetStaticBox(), wxID_ANY, _("LINUX_CLOSE_EXPL_ON_DISMOUNT"), wxDefaultPosition, wxDefaultSize, 0 ); ExplorerSizer->Add( CloseExplorerWindowsOnDismountCheckBox, 0, wxALL, 5 ); - - + + bSizer37->Add( ExplorerSizer, 0, wxEXPAND|wxALL, 5 ); - + KernelServicesSizer = new wxStaticBoxSizer( new wxStaticBox( SystemIntegrationPage, wxID_ANY, _("LINUX_PREF_KERNEL_SERVICES") ), wxVERTICAL ); - + NoKernelCryptoCheckBox = new wxCheckBox( KernelServicesSizer->GetStaticBox(), wxID_ANY, _("LINUX_PREF_KERNEL_CRYPT"), 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 ); @@ -2104,43 +2032,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, _("IDT_ACCELERATION_OPTIONS") ), wxVERTICAL ); - + wxBoxSizer* bSizer158; bSizer158 = new wxBoxSizer( wxHORIZONTAL ); - + wxStaticText* m_staticText57; m_staticText57 = new wxStaticText( sbSizer44->GetStaticBox(), wxID_ANY, _("IDT_HW_AES_SUPPORTED_BY_CPU"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText57->Wrap( -1 ); - bSizer158->Add( m_staticText57, 0, wxALL, 5 ); - - AesHwCpuSupportedStaticText = new wxStaticText( sbSizer44->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0|wxSUNKEN_BORDER ); + + AesHwCpuSupportedStaticText = new wxStaticText( sbSizer44->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0|wxBORDER_SUNKEN ); 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( sbSizer44->GetStaticBox(), wxID_ANY, _("IDC_ENABLE_HARDWARE_ENCRYPTION_NEG"), 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 ); @@ -2148,28 +2074,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, _("IDD_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, _("IDC_KEYFILES_ENABLE"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer43->Add( UseKeyfilesCheckBox, 0, wxALL, 5 ); - - + + bSizer40->Add( bSizer43, 1, wxEXPAND|wxALL, 5 ); - - + + DefaultKeyfilesPage->SetSizer( bSizer40 ); DefaultKeyfilesPage->Layout(); bSizer40->Fit( DefaultKeyfilesPage ); @@ -2177,35 +2103,35 @@ 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, _("IDT_PKCS11_LIB_PATH") ), wxVERTICAL ); - + wxBoxSizer* bSizer129; bSizer129 = new wxBoxSizer( wxHORIZONTAL ); - + Pkcs11ModulePathTextCtrl = new wxTextCtrl( sbSizer36->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); bSizer129->Add( Pkcs11ModulePathTextCtrl, 1, wxALL, 5 ); - + SelectPkcs11ModuleButton = new wxButton( sbSizer36->GetStaticBox(), wxID_ANY, _("IDC_SELECT_PKCS11_MODULE"), 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, _("IDT_SECURITY_OPTIONS") ), wxVERTICAL ); - + CloseSecurityTokenSessionsAfterMountCheckBox = new wxCheckBox( sbSizer37->GetStaticBox(), wxID_ANY, _("IDC_CLOSE_TOKEN_SESSION_AFTER_MOUNT"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizer37->Add( CloseSecurityTokenSessionsAfterMountCheckBox, 0, wxALL, 5 ); - + bSizer128->Add( sbSizer37, 0, wxEXPAND|wxALL, 5 ); wxStaticBoxSizer* sbSizer38; @@ -2214,11 +2140,13 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c EMVSupportEnabledCheckBox = new wxCheckBox( sbSizer38->GetStaticBox(), wxID_ANY, _("IDC_ENABLE_EMV_SUPPORT"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizer38->Add( EMVSupportEnabledCheckBox, 0, wxALL, 5 ); - bSizer128->Add( sbSizer38, 0, wxEXPAND|wxALL, 5 ); + + bSizer128->Add( sbSizer38, 0, wxALL|wxEXPAND, 5 ); + bSizer127->Add( bSizer128, 1, wxEXPAND|wxALL, 5 ); - - + + SecurityTokensPage->SetSizer( bSizer127 ); SecurityTokensPage->Layout(); bSizer127->Fit( SecurityTokensPage ); @@ -2226,117 +2154,116 @@ 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, _("LINUX_SYSTEM_HOTKEYS") ), wxVERTICAL ); - - HotkeyListCtrl = new wxListCtrl( sbSizer21->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_VRULES|wxSUNKEN_BORDER ); + + HotkeyListCtrl = new wxListCtrl( sbSizer21->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_VRULES|wxBORDER_SUNKEN ); sbSizer21->Add( HotkeyListCtrl, 1, wxALL|wxEXPAND, 5 ); - + wxStaticBoxSizer* sbSizer23; sbSizer23 = new wxStaticBoxSizer( new wxStaticBox( sbSizer21->GetStaticBox(), 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( sbSizer23->GetStaticBox(), wxID_ANY, _("IDT_HOTKEY_KEY"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText10->Wrap( -1 ); - fgSizer4->Add( m_staticText10, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxBOTTOM|wxLEFT, 5 ); - + HotkeyTextCtrl = new wxTextCtrl( sbSizer23->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgSizer4->Add( HotkeyTextCtrl, 0, wxALL|wxEXPAND, 5 ); - + AssignHotkeyButton = new wxButton( sbSizer23->GetStaticBox(), wxID_ANY, _("IDC_HOTKEY_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( sbSizer23->GetStaticBox(), wxID_ANY, _("VK_CONTROL"), wxDefaultPosition, wxDefaultSize, 0 ); gSizer4->Add( HotkeyControlCheckBox, 0, wxALL, 5 ); - + HotkeyShiftCheckBox = new wxCheckBox( sbSizer23->GetStaticBox(), wxID_ANY, _("VK_SHIFT"), wxDefaultPosition, wxDefaultSize, 0 ); gSizer4->Add( HotkeyShiftCheckBox, 0, wxALL, 5 ); - + HotkeyAltCheckBox = new wxCheckBox( sbSizer23->GetStaticBox(), wxID_ANY, _("VK_ALT"), wxDefaultPosition, wxDefaultSize, 0 ); gSizer4->Add( HotkeyAltCheckBox, 0, wxALL, 5 ); - + HotkeyWinCheckBox = new wxCheckBox( sbSizer23->GetStaticBox(), wxID_ANY, _("VK_WIN"), wxDefaultPosition, wxDefaultSize, 0 ); gSizer4->Add( HotkeyWinCheckBox, 0, wxALL, 5 ); - - + + fgSizer4->Add( gSizer4, 1, wxEXPAND, 5 ); - + RemoveHotkeyButton = new wxButton( sbSizer23->GetStaticBox(), wxID_ANY, _("IDC_KEYREMOVE"), 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( sbSizer21->GetStaticBox(), wxID_ANY, _("IDT_FORMAT_OPTIONS") ), wxVERTICAL ); - + BeepAfterHotkeyMountDismountCheckBox = new wxCheckBox( sbSizer24->GetStaticBox(), wxID_ANY, _("LINUX_SOUND_NOTIFICATION"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizer24->Add( BeepAfterHotkeyMountDismountCheckBox, 0, wxALL, 5 ); - + DisplayMessageAfterHotkeyDismountCheckBox = new wxCheckBox( sbSizer24->GetStaticBox(), wxID_ANY, _("LINUX_CONFIRM_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, _("LINUX_HOTKEYS"), false ); - + bSizer178->Add( PreferencesNotebook, 1, wxEXPAND | wxALL, 5 ); - + wxBoxSizer* bSizer182; bSizer182 = new wxBoxSizer( wxHORIZONTAL ); - - + + bSizer182->Add( 0, 0, 1, wxEXPAND, 5 ); - + OKButton = new wxButton( this, wxID_OK, _("IDOK"), wxDefaultPosition, wxDefaultSize, 0 ); + OKButton->SetDefault(); - bSizer182->Add( OKButton, 0, wxALL, 5 ); - + CancelButton = new wxButton( this, wxID_CANCEL, _("IDCANCEL"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer182->Add( CancelButton, 0, wxALL, 5 ); - - + + bSizer178->Add( bSizer182, 0, wxALL|wxEXPAND, 5 ); - - + + bSizer32->Add( bSizer178, 1, wxEXPAND, 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 ); @@ -2371,120 +2298,116 @@ PreferencesDialogBase::~PreferencesDialogBase() AssignHotkeyButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PreferencesDialogBase::OnAssignHotkeyButtonClick ), NULL, this ); RemoveHotkeyButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PreferencesDialogBase::OnRemoveHotkeyButtonClick ), NULL, this ); OKButton->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, _("IDT_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( sbSizer43->GetStaticBox(), wxID_ANY, _("IDT_RANDOM_POOL"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText52->Wrap( -1 ); - bSizer147->Add( m_staticText52, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); - + RandomPoolStaticText = new wxStaticText( sbSizer43->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); RandomPoolStaticText->Wrap( -1 ); - RandomPoolStaticText->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("Courier New") ) ); - + bSizer147->Add( RandomPoolStaticText, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - + ShowRandomPoolCheckBox = new wxCheckBox( sbSizer43->GetStaticBox(), wxID_ANY, _("IDC_DISPLAY_POOL_CONTENTS"), 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( sbSizer43->GetStaticBox(), wxID_ANY, _("IDT_ENTROPY_BAR") ), wxVERTICAL ); - + CollectedEntropy = new wxGauge( sbSizer45->GetStaticBox(), 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( sbSizer43->GetStaticBox(), wxID_ANY, _("IDT_RANDOM_POOL_ENRICHMENT_NOTE"), 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(); - 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 ); @@ -2497,69 +2420,69 @@ 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( this->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 ); + + SecurityTokenKeyfileListCtrl = new wxListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_VRULES|wxBORDER_SUNKEN ); bSizer142->Add( SecurityTokenKeyfileListCtrl, 1, wxALL|wxEXPAND, 5 ); - + wxBoxSizer* bSizer141; bSizer141 = new wxBoxSizer( wxHORIZONTAL ); - + ExportButton = new wxButton( this, wxID_ANY, _("IDC_EXPORT"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer141->Add( ExportButton, 0, wxALL, 5 ); - + DeleteButton = new wxButton( this, wxID_ANY, _("VKEY_2E"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer141->Add( DeleteButton, 0, wxALL, 5 ); - - + + bSizer141->Add( 0, 0, 1, wxEXPAND|wxLEFT, 5 ); - + ImportButton = new wxButton( this, wxID_ANY, _("IDC_IMPORT_KEYFILE"), 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, _("IDOK"), wxDefaultPosition, wxDefaultSize, 0 ); + OKButton->SetDefault(); - bSizer139->Add( OKButton, 0, wxALL, 5 ); - + CancelButton = new wxButton( this, wxID_CANCEL, _("IDCANCEL"), 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 ); @@ -2580,47 +2503,47 @@ 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 ); + + PropertiesListCtrl = new wxListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_VRULES|wxBORDER_SUNKEN ); bSizer50->Add( PropertiesListCtrl, 1, wxALL|wxEXPAND, 5 ); - + wxBoxSizer* bSizer169; bSizer169 = new wxBoxSizer( wxHORIZONTAL ); - - + + bSizer169->Add( 0, 0, 1, wxEXPAND, 5 ); - + OKButton = new wxButton( this, wxID_OK, _("IDOK"), wxDefaultPosition, wxDefaultSize, 0 ); + OKButton->SetDefault(); - bSizer169->Add( OKButton, 0, wxALL, 5 ); - - + + bSizer169->Add( 0, 0, 1, wxEXPAND, 5 ); - - + + bSizer50->Add( bSizer169, 0, wxALL|wxEXPAND, 5 ); - - + + bSizer49->Add( bSizer50, 1, wxEXPAND|wxALL, 5 ); - - + + this->SetSizer( bSizer49 ); this->Layout(); bSizer49->Fit( this ); - + // Connect Events OKButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( VolumePropertiesDialogBase::OnOKButtonClick ), NULL, this ); } @@ -2629,93 +2552,92 @@ VolumePropertiesDialogBase::~VolumePropertiesDialogBase() { // Disconnect Events OKButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( VolumePropertiesDialogBase::OnOKButtonClick ), NULL, this ); - + } EncryptionOptionsWizardPageBase::EncryptionOptionsWizardPageBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : WizardPage( parent, id, pos, size, style, name ) { 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_LV") ), wxVERTICAL ); - + wxBoxSizer* bSizer96; bSizer96 = new wxBoxSizer( wxHORIZONTAL ); - + wxArrayString EncryptionAlgorithmChoiceChoices; EncryptionAlgorithmChoice = new wxChoice( sbSizer29->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, EncryptionAlgorithmChoiceChoices, 0 ); EncryptionAlgorithmChoice->SetSelection( 0 ); bSizer96->Add( EncryptionAlgorithmChoice, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - + TestButton = new wxButton( sbSizer29->GetStaticBox(), wxID_ANY, _("TEST"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer96->Add( TestButton, 0, wxALL|wxEXPAND, 5 ); - - + + sbSizer29->Add( bSizer96, 0, wxEXPAND, 5 ); - + EncryptionAlgorithmStaticText = new wxStaticText( sbSizer29->GetStaticBox(), 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( sbSizer29->GetStaticBox(), wxID_ANY, _("IDC_LINK_MORE_INFO_ABOUT_CIPHER"), 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( sbSizer29->GetStaticBox(), wxID_ANY, _("IDC_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, _("IDT_HASH_ALGO") ), wxHORIZONTAL ); - + wxArrayString HashChoiceChoices; HashChoice = new wxChoice( sbSizer30->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, HashChoiceChoices, 0 ); HashChoice->SetSelection( 0 ); sbSizer30->Add( HashChoice, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - + HashHyperlink = new wxHyperlinkCtrl( sbSizer30->GetStaticBox(), wxID_ANY, _("IDC_LINK_HASH_INFO"), 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 ); @@ -2732,25 +2654,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, const wxString& name ) : WizardPage( parent, id, pos, size, style, name ) { 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 ); @@ -2760,54 +2681,54 @@ InfoWizardPageBase::~InfoWizardPageBase() { } -KeyfilesPanelBase::KeyfilesPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) +KeyfilesPanelBase::KeyfilesPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) { 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 ); + + KeyfilesListCtrl = new wxListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxBORDER_SUNKEN ); bSizer21->Add( KeyfilesListCtrl, 1, wxEXPAND|wxALL, 5 ); - + wxBoxSizer* bSizer137; bSizer137 = new wxBoxSizer( wxHORIZONTAL ); - + AddFilesButton = new wxButton( this, wxID_ANY, _("IDC_KEYADD"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer137->Add( AddFilesButton, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 ); - + AddDirectoryButton = new wxButton( this, wxID_ANY, _("IDC_ADD_KEYFILE_PATH"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer137->Add( AddDirectoryButton, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 ); - + AddSecurityTokenSignatureButton = new wxButton( this, wxID_ANY, _("IDC_TOKEN_FILES_ADD"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer137->Add( AddSecurityTokenSignatureButton, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 ); - + RemoveButton = new wxButton( this, wxID_ANY, _("IDC_KEYREMOVE"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer137->Add( RemoveButton, 0, wxEXPAND|wxTOP|wxBOTTOM|wxLEFT, 5 ); - + RemoveAllButton = new wxButton( this, wxID_ANY, _("IDC_KEYREMOVEALL"), 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 ); @@ -2830,44 +2751,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, const wxString& name ) : WizardPage( parent, id, pos, size, style, name ) { 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, _("IDC_ABORT_BUTTON"), 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 ); } @@ -2876,44 +2796,43 @@ 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, const wxString& name ) : WizardPage( parent, id, pos, size, style, name ) { 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 ); bSizer70->Add( DirectoryTextCtrl, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - + BrowseButton = new wxButton( this, wxID_ANY, _("IDC_BROWSE_FILES"), 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 ); @@ -2924,39 +2843,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, const wxString& name ) : WizardPage( parent, id, pos, size, style, name ) { 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 ); @@ -2970,207 +2888,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( sbSizer31->GetStaticBox(), wxID_ANY, _("IDT_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( sbSizer31->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); RandomPoolSampleStaticText->Wrap( -1 ); - RandomPoolSampleStaticText->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("Courier New") ) ); - + bSizer126->Add( RandomPoolSampleStaticText, 0, wxEXPAND|wxTOP|wxRIGHT, 7 ); - + DisplayKeysCheckBox = new wxCheckBox( sbSizer31->GetStaticBox(), wxID_ANY, _("IDC_DISPLAY_POOL_CONTENTS"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer126->Add( DisplayKeysCheckBox, 0, wxEXPAND|wxRIGHT, 5 ); - - + + fgSizer5->Add( bSizer126, 1, wxEXPAND, 5 ); - + wxStaticText* m_staticText28; m_staticText28 = new wxStaticText( sbSizer31->GetStaticBox(), wxID_ANY, _("IDT_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( sbSizer31->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); HeaderKeySampleStaticText->Wrap( -1 ); - HeaderKeySampleStaticText->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("Courier New") ) ); - + fgSizer5->Add( HeaderKeySampleStaticText, 0, wxEXPAND|wxTOP|wxRIGHT, 2 ); - + wxStaticText* m_staticText29; m_staticText29 = new wxStaticText( sbSizer31->GetStaticBox(), wxID_ANY, _("IDT_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( sbSizer31->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); MasterKeySampleStaticText->Wrap( -1 ); - MasterKeySampleStaticText->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("Courier New") ) ); - + fgSizer5->Add( MasterKeySampleStaticText, 0, wxEXPAND|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, _("IDT_ENTROPY_BAR") ), wxVERTICAL ); - + CollectedEntropy = new wxGauge( sbSizer45->GetStaticBox(), 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( sbSizer32->GetStaticBox(), wxID_ANY, 100, wxDefaultPosition, wxDefaultSize, wxGA_HORIZONTAL|wxGA_SMOOTH ); bSizer106->Add( ProgressGauge, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); - + AbortButton = new wxButton( sbSizer32->GetStaticBox(), wxID_ANY, _("IDC_ABORT_BUTTON"), 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( sbSizer32->GetStaticBox(), wxID_ANY, _("IDT_DONE"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText31->Wrap( -1 ); - bSizer108->Add( m_staticText31, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); - - m_panel12 = new wxPanel( sbSizer32->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxSUNKEN_BORDER ); + + m_panel12 = new wxPanel( sbSizer32->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxBORDER_SUNKEN ); 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, wxEXPAND|wxALL, 3 ); - - + + m_panel12->SetSizer( bSizer115 ); m_panel12->Layout(); bSizer115->Fit( m_panel12 ); bSizer108->Add( m_panel12, 1, wxEXPAND|wxALL, 5 ); - - + + gSizer6->Add( bSizer108, 1, wxEXPAND, 5 ); - + wxBoxSizer* bSizer1081; bSizer1081 = new wxBoxSizer( wxHORIZONTAL ); - + m_staticText311 = new wxStaticText( sbSizer32->GetStaticBox(), wxID_ANY, _("IDT_SPEED"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText311->Wrap( -1 ); - bSizer1081->Add( m_staticText311, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); - - m_panel121 = new wxPanel( sbSizer32->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER ); + + m_panel121 = new wxPanel( sbSizer32->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN ); 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|wxEXPAND, 3 ); - - + + m_panel121->SetSizer( bSizer1151 ); m_panel121->Layout(); bSizer1151->Fit( m_panel121 ); bSizer1081->Add( m_panel121, 1, wxALL|wxEXPAND, 5 ); - - + + gSizer6->Add( bSizer1081, 1, wxEXPAND, 5 ); - + wxBoxSizer* bSizer1082; bSizer1082 = new wxBoxSizer( wxHORIZONTAL ); - + m_staticText312 = new wxStaticText( sbSizer32->GetStaticBox(), wxID_ANY, _("IDT_LEFT"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText312->Wrap( -1 ); - bSizer1082->Add( m_staticText312, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); - - m_panel122 = new wxPanel( sbSizer32->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER|wxTAB_TRAVERSAL ); + + m_panel122 = new wxPanel( sbSizer32->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL|wxBORDER_SUNKEN ); 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|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, 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 ); @@ -3181,81 +3086,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, const wxString& name ) : WizardPage( parent, id, pos, size, style, name ) { 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, _("IDC_SELECT_FILE"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer90->Add( SelectFileButton, 0, wxALL|wxEXPAND, 5 ); - + SelectDeviceButton = new wxButton( this, wxID_ANY, _("IDC_SELECT_DEVICE"), 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, _("IDC_NO_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 ); @@ -3270,66 +3174,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, const wxString& name ) : WizardPage( parent, id, pos, size, style, name ) { wxBoxSizer* bSizer124; bSizer124 = new wxBoxSizer( wxVERTICAL ); - + wxBoxSizer* bSizer125; bSizer125 = new wxBoxSizer( wxVERTICAL ); - + wxStaticBoxSizer* sbSizer33; sbSizer33 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("IDT_FORMAT_OPTIONS") ), wxVERTICAL ); - + wxFlexGridSizer* fgSizer6; fgSizer6 = new wxFlexGridSizer( 2, 2, 0, 0 ); fgSizer6->SetFlexibleDirection( wxBOTH ); fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_staticText43 = new wxStaticText( sbSizer33->GetStaticBox(), wxID_ANY, _("IDT_FILESYSTEM"), 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( sbSizer33->GetStaticBox(), 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, _("IDT_FORMAT_OPTIONS") ), wxVERTICAL ); - + QuickFormatCheckBox = new wxCheckBox( sbSizer34->GetStaticBox(), wxID_ANY, _("IDC_QUICKFORMAT"), 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 ); @@ -3340,24 +3242,23 @@ 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 ) +VolumePasswordPanelBase::VolumePasswordPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) { 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, _("IDT_NEW_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 ); #ifdef __WXGTK__ if ( !PasswordTextCtrl->HasFlag( wxTE_MULTILINE ) ) @@ -3368,14 +3269,13 @@ VolumePasswordPanelBase::VolumePasswordPanelBase( wxWindow* parent, wxWindowID i PasswordTextCtrl->SetMaxLength( 1 ); #endif PasswordTextCtrl->SetMinSize( wxSize( 232,-1 ) ); - + GridBagSizer->Add( PasswordTextCtrl, wxGBPosition( 1, 1 ), wxGBSpan( 1, 2 ), wxBOTTOM|wxEXPAND, 5 ); - + ConfirmPasswordStaticText = new wxStaticText( this, wxID_ANY, _("IDT_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 ); #ifdef __WXGTK__ if ( !ConfirmPasswordTextCtrl->HasFlag( wxTE_MULTILINE ) ) @@ -3386,14 +3286,13 @@ VolumePasswordPanelBase::VolumePasswordPanelBase( wxWindow* parent, wxWindowID i ConfirmPasswordTextCtrl->SetMaxLength( 1 ); #endif ConfirmPasswordTextCtrl->SetMinSize( wxSize( 232,-1 ) ); - + GridBagSizer->Add( ConfirmPasswordTextCtrl, wxGBPosition( 2, 1 ), wxGBSpan( 1, 2 ), wxBOTTOM|wxEXPAND, 5 ); - + VolumePimStaticText = new wxStaticText( this, wxID_ANY, _("IDT_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 ); #ifdef __WXGTK__ if ( !VolumePimTextCtrl->HasFlag( wxTE_MULTILINE ) ) @@ -3404,72 +3303,66 @@ VolumePasswordPanelBase::VolumePasswordPanelBase( wxWindow* parent, wxWindowID i VolumePimTextCtrl->SetMaxLength( 7 ); #endif GridBagSizer->Add( VolumePimTextCtrl, wxGBPosition( 3, 1 ), wxGBSpan( 1, 1 ), wxBOTTOM|wxEXPAND, 5 ); - + VolumePimHelpStaticText = new wxStaticText( this, wxID_ANY, _("IDC_PIM_HELP"), 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, _("IDC_NEW_PIM_ENABLE"), 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, _("IDC_CACHE"), 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, _("IDC_SHOW_PASSWORD_MO"), 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, _("IDC_KEYFILES_ENABLE_HIDVOL_PROT"), wxDefaultPosition, wxDefaultSize, 0 ); GridBagSizer->Add( UseKeyfilesCheckBox, wxGBPosition( 7, 1 ), wxGBSpan( 1, 1 ), wxTOP|wxRIGHT|wxLEFT, 5 ); - + KeyfilesButton = new wxButton( this, wxID_ANY, _("IDC_KEYFILES_HIDVOL_PROT"), 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, _("IDT_NEW_PKCS5_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, _("IDC_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, _("IDT_WIPE_MODE"), wxDefaultPosition, wxDefaultSize, 0 ); HeaderWipeCountText->Wrap( -1 ); - GridBagSizer->Add( HeaderWipeCountText, wxGBPosition( 10, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT, 5 ); - + wxString HeaderWipeCountChoices[] = { _("WIPE_MODE_1_RAND"), _("WIPE_MODE_3_DOD_5220"), _("WIPE_MODE_7_DOD_5220"), _("WIPE_MODE_35_GUTMANN"), _("WIPE_MODE_256") }; 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 ); @@ -3480,7 +3373,6 @@ VolumePasswordPanelBase::VolumePasswordPanelBase( wxWindow* parent, wxWindowID i KeyfilesButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( VolumePasswordPanelBase::OnKeyfilesButtonClick ), NULL, this ); KeyfilesButton->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( VolumePasswordPanelBase::OnKeyfilesButtonRightDown ), NULL, this ); KeyfilesButton->Connect( wxEVT_RIGHT_UP, wxMouseEventHandler( VolumePasswordPanelBase::OnKeyfilesButtonRightClick ), NULL, this ); - TrueCryptModeCheckBox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( VolumePasswordPanelBase::OnTrueCryptModeChecked ), NULL, this ); } VolumePasswordPanelBase::~VolumePasswordPanelBase() @@ -3495,32 +3387,30 @@ VolumePasswordPanelBase::~VolumePasswordPanelBase() KeyfilesButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( VolumePasswordPanelBase::OnKeyfilesButtonClick ), NULL, this ); 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, const wxString& name ) : WizardPage( parent, id, pos, size, style, name ) { 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 ); @@ -3534,19 +3424,18 @@ 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, _("IDT_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 ); #ifdef __WXGTK__ if ( !VolumePimTextCtrl->HasFlag( wxTE_MULTILINE ) ) @@ -3557,40 +3446,38 @@ VolumePimWizardPageBase::VolumePimWizardPageBase( wxWindow* parent, wxWindowID i VolumePimTextCtrl->SetMaxLength( 7 ); #endif PimSizer->Add( VolumePimTextCtrl, 0, wxALL, 5 ); - + VolumePimHelpStaticText = new wxStaticText( this, wxID_ANY, _("IDC_PIM_HELP"), 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, _("IDC_SHOW_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 ); @@ -3601,64 +3488,62 @@ 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, const wxString& name ) : WizardPage( parent, id, pos, size, style, name ) { 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 ); 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 ); - + UseAllFreeSpaceCheckBox = new wxCheckBox( this, wxID_ANY, _("IDC_USE_ALL_FREE_SPACE"), wxDefaultPosition, wxDefaultSize, 0 ); bSizer99->Add( UseAllFreeSpaceCheckBox, 0, wxALL|wxEXPAND, 5 ); - - + + bSizer99->Add( 0, 0, 0, wxBOTTOM|wxEXPAND|wxTOP, 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 ); @@ -3671,32 +3556,31 @@ VolumeSizeWizardPageBase::~VolumeSizeWizardPageBase() VolumeSizeTextCtrl->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( VolumeSizeWizardPageBase::OnVolumeSizeTextChanged ), NULL, this ); VolumeSizePrefixChoice->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( VolumeSizeWizardPageBase::OnVolumeSizePrefixSelected ), NULL, this ); UseAllFreeSpaceCheckBox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( VolumeSizeWizardPageBase::OnUseAllFreeSpaceCheckBoxClick ), 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 = new wxStaticText( this, wxID_ANY, _("MyLabel"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL ); WaitStaticText->Wrap( -1 ); - - bSizer160->Add( WaitStaticText, 0,wxALL|wxEXPAND, 5 ); - + bSizer160->Add( WaitStaticText, 0, 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 ) ); @@ -3707,5 +3591,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 60937550..96a03c79 100644 --- a/src/Main/Forms/Forms.h +++ b/src/Main/Forms/Forms.h @@ -1,12 +1,11 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 20 2018) +// C++ code generated with wxFormBuilder (version 3.10.1-0-g8feb16b3) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __FORMS_H__ -#define __FORMS_H__ +#pragma once #include #include @@ -50,10 +49,10 @@ namespace VeraCrypt /////////////////////////////////////////////////////////////////////////////// /// Class MainFrameBase /////////////////////////////////////////////////////////////////////////////// - class MainFrameBase : public wxFrame + class MainFrameBase : public wxFrame { private: - + protected: wxMenuBar* MainMenuBar; wxMenu* VolumesMenu; @@ -91,8 +90,8 @@ namespace VeraCrypt wxButton* MountAllDevicesButton; wxButton* DismountAllButton; wxButton* ExitButton; - - // Virtual event handlers, overide them in your derived class + + // Virtual event handlers, override them in your derived class virtual void OnActivate( wxActivateEvent& event ) { event.Skip(); } virtual void OnClose( wxCloseEvent& event ) { event.Skip(); } virtual void OnCreateVolumeButtonClick( wxCommandEvent& event ) { event.Skip(); } @@ -145,23 +144,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,8 +171,8 @@ namespace VeraCrypt wxButton* PreviousButton; wxButton* NextButton; wxButton* CancelButton; - - // Virtual event handlers, overide them in your derived class + + // Virtual event handlers, override them in your derived class virtual void OnActivate( wxActivateEvent& event ) { event.Skip(); } virtual void OnClose( wxCloseEvent& event ) { event.Skip(); } virtual void OnMouseMotion( wxMouseEvent& event ) { event.Skip(); } @@ -181,23 +180,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,25 +207,26 @@ namespace VeraCrypt wxTextCtrl* CreditsTextCtrl; wxStaticLine* m_staticline4; wxStaticLine* m_staticline5; - - // Virtual event handlers, overide them in your derived class + + // Virtual event handlers, override 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: wxStaticText* m_staticText70; wxChoice* BenchmarkChoice; @@ -238,26 +238,27 @@ namespace VeraCrypt wxBoxSizer* RightSizer; wxButton* BenchmarkButton; wxStaticText* BenchmarkNoteStaticText; - - // Virtual event handlers, overide them in your derived class + + // Virtual event handlers, override them in your derived class virtual void OnBenchmarkChoiceSelected( wxCommandEvent& event ) { event.Skip(); } virtual void OnBenchmarkButtonClick( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - BenchmarkDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("IDD_BENCHMARK_DLG"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); + + BenchmarkDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("IDD_BENCHMARK_DLG"), 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; @@ -265,51 +266,53 @@ namespace VeraCrypt wxBoxSizer* NewPasswordPanelSizer; wxButton* OKButton; wxButton* CancelButton; - - // Virtual event handlers, overide them in your derived class + + // Virtual event handlers, override 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; wxButton* CancelButton; wxButton* OKButton; - - // Virtual event handlers, overide them in your derived class + + // Virtual event handlers, override 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(); } virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - DeviceSelectionDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("IDD_RAWDEVICES_DLG"), 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 = _("IDD_RAWDEVICES_DLG"), 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; @@ -325,30 +328,31 @@ namespace VeraCrypt wxButton* AutoTestAllButton; wxButton* ResetButton; wxButton* CloseButton; - - // Virtual event handlers, overide them in your derived class + + // Virtual event handlers, override them in your derived class virtual void OnEncryptionAlgorithmSelected( wxCommandEvent& event ) { event.Skip(); } virtual void OnXtsModeCheckBoxClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnEncryptButtonClick( wxCommandEvent& event ) { event.Skip(); } 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 = _("IDD_CIPHER_TEST_DLG"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); + + EncryptionTestDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("IDD_CIPHER_TEST_DLG"), 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; @@ -357,8 +361,8 @@ namespace VeraCrypt wxButton* RemoveAllButton; wxButton* OKButton; wxButton* CancelButton; - - // Virtual event handlers, overide them in your derived class + + // Virtual event handlers, override them in your derived class virtual void OnListItemDeselected( wxListEvent& event ) { event.Skip(); } virtual void OnListItemSelected( wxListEvent& event ) { event.Skip(); } virtual void OnMoveUpButtonClick( wxCommandEvent& event ) { event.Skip(); } @@ -366,22 +370,23 @@ 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 = _("IDD_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 = _("IDD_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; @@ -392,26 +397,27 @@ namespace VeraCrypt wxStaticText* KeyfilesNoteStaticText; wxHyperlinkCtrl* KeyfilesHyperlink; wxButton* CreateKeyfileButtton; - - // Virtual event handlers, overide them in your derived class + + // Virtual event handlers, override 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_TOKEN_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_TOKEN_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; @@ -429,46 +435,48 @@ namespace VeraCrypt wxTextCtrl* KeyfilesBaseName; wxPanel* m_panel19; wxButton* GenerateButton; - - // Virtual event handlers, overide them in your derived class + + // Virtual event handlers, override 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 = _("LEGAL_NOTICES_DLG_TITLE"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); + + LegalNoticesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("LEGAL_NOTICES_DLG_TITLE"), 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; @@ -495,8 +503,8 @@ namespace VeraCrypt wxButton* MountPointButton; wxStaticText* FilesystemOptionsStaticText; wxTextCtrl* FilesystemOptionsTextCtrl; - - // Virtual event handlers, overide them in your derived class + + // Virtual event handlers, override them in your derived class virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); } virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnOptionsButtonClick( wxCommandEvent& event ) { event.Skip(); } @@ -505,47 +513,49 @@ 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 = _("IDD_PASSWORD_DLG"), 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 = _("IDD_PASSWORD_DLG"), 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; wxButton* CancelButton; wxButton* OKButton; - - // Virtual event handlers, overide them in your derived class + + // Virtual event handlers, override them in your derived class virtual void OnKeyfileNameChanged( wxCommandEvent& event ) { event.Skip(); } virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - NewSecurityTokenKeyfileDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("IDD_TOKEN_PREFERENCES"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE ); + + NewSecurityTokenKeyfileDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("IDD_TOKEN_PREFERENCES"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE ); + ~NewSecurityTokenKeyfileDialogBase(); - + }; - + /////////////////////////////////////////////////////////////////////////////// /// Class PreferencesDialogBase /////////////////////////////////////////////////////////////////////////////// - class PreferencesDialogBase : public wxDialog + class PreferencesDialogBase : public wxDialog { private: - + protected: wxBoxSizer* bSizer32; wxNotebook* PreferencesNotebook; @@ -564,7 +574,6 @@ namespace VeraCrypt wxCheckBox* MountReadOnlyCheckBox; wxCheckBox* MountRemovableCheckBox; wxCheckBox* CachePasswordsCheckBox; - wxCheckBox* TrueCryptModeCheckBox; wxStaticText* Pkcs5PrfStaticText; wxChoice* Pkcs5PrfChoice; wxStaticBoxSizer* FilesystemSizer; @@ -606,8 +615,8 @@ namespace VeraCrypt wxCheckBox* DisplayMessageAfterHotkeyDismountCheckBox; wxButton* OKButton; wxButton* CancelButton; - - // Virtual event handlers, overide them in your derived class + + // Virtual event handlers, override them in your derived class virtual void OnClose( wxCloseEvent& event ) { event.Skip(); } virtual void OnDismountOnScreenSaverCheckBoxClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnDismountOnPowerSavingCheckBoxClick( wxCommandEvent& event ) { event.Skip(); } @@ -622,26 +631,27 @@ namespace VeraCrypt virtual void OnAssignHotkeyButtonClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnRemoveHotkeyButtonClick( 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 = _("IDD_PREFERENCES_DLG"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE ); + + PreferencesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("IDD_PREFERENCES_DLG"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE ); + ~PreferencesDialogBase(); - + }; - + /////////////////////////////////////////////////////////////////////////////// /// Class RandomPoolEnrichmentDialogBase /////////////////////////////////////////////////////////////////////////////// - class RandomPoolEnrichmentDialogBase : public wxDialog + class RandomPoolEnrichmentDialogBase : public wxDialog { private: - + protected: wxBoxSizer* MainSizer; wxChoice* HashChoice; @@ -650,27 +660,28 @@ namespace VeraCrypt wxGauge* CollectedEntropy; wxStaticText* MouseStaticText; wxButton* ContinueButton; - - // Virtual event handlers, overide them in your derived class + + // Virtual event handlers, override 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 = _("IDD_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 = _("IDD_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; @@ -678,8 +689,8 @@ namespace VeraCrypt wxButton* ImportButton; wxButton* OKButton; wxButton* CancelButton; - - // Virtual event handlers, overide them in your derived class + + // Virtual event handlers, override 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(); } @@ -687,44 +698,46 @@ 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 = _("IDD_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 = _("IDD_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; wxButton* OKButton; - - // Virtual event handlers, overide them in your derived class + + // Virtual event handlers, override them in your derived class virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); } - - + + public: - - VolumePropertiesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("IDD_VOLUME_PROPERTIES"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE ); + + VolumePropertiesDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("IDD_VOLUME_PROPERTIES"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE ); + ~VolumePropertiesDialogBase(); - + }; - + /////////////////////////////////////////////////////////////////////////////// /// Class EncryptionOptionsWizardPageBase /////////////////////////////////////////////////////////////////////////////// class EncryptionOptionsWizardPageBase : public WizardPage { private: - + protected: wxChoice* EncryptionAlgorithmChoice; wxButton* TestButton; @@ -733,47 +746,49 @@ namespace VeraCrypt wxButton* BenchmarkButton; wxChoice* HashChoice; wxHyperlinkCtrl* HashHyperlink; - - // Virtual event handlers, overide them in your derived class + + // Virtual event handlers, override 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, const wxString& name = wxEmptyString ); + ~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, const wxString& name = wxEmptyString ); + ~InfoWizardPageBase(); - + }; - + /////////////////////////////////////////////////////////////////////////////// /// Class KeyfilesPanelBase /////////////////////////////////////////////////////////////////////////////// - class KeyfilesPanelBase : public wxPanel + class KeyfilesPanelBase : public wxPanel { private: - + protected: wxListCtrl* KeyfilesListCtrl; wxButton* AddFilesButton; @@ -781,8 +796,8 @@ namespace VeraCrypt wxButton* AddSecurityTokenSignatureButton; wxButton* RemoveButton; wxButton* RemoveAllButton; - - // Virtual event handlers, overide them in your derived class + + // Virtual event handlers, override them in your derived class virtual void OnListItemDeselected( wxListEvent& event ) { event.Skip(); } virtual void OnListItemSelected( wxListEvent& event ) { event.Skip(); } virtual void OnListSizeChanged( wxSizeEvent& event ) { event.Skip(); } @@ -791,89 +806,93 @@ 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, const wxString& name = wxEmptyString ); + ~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 event handlers, override 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, const wxString& name = wxEmptyString ); + ~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 event handlers, override 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, const wxString& name = wxEmptyString ); + ~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, const wxString& name = wxEmptyString ); + ~SingleChoiceWizardPageBase(); - + }; - + /////////////////////////////////////////////////////////////////////////////// /// Class VolumeCreationProgressWizardPageBase /////////////////////////////////////////////////////////////////////////////// class VolumeCreationProgressWizardPageBase : public WizardPage { private: - + protected: wxBoxSizer* KeySamplesUpperSizer; wxBoxSizer* KeySamplesUpperInnerSizer; @@ -894,79 +913,82 @@ namespace VeraCrypt wxPanel* m_panel122; wxStaticText* TimeLeftStaticText; wxStaticText* InfoStaticText; - - // Virtual event handlers, overide them in your derived class + + // Virtual event handlers, override 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, const wxString& name = wxEmptyString ); + ~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 event handlers, override 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, const wxString& name = wxEmptyString ); + ~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 event handlers, override 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, const wxString& name = wxEmptyString ); + ~VolumeFormatOptionsWizardPageBase(); - + }; - + /////////////////////////////////////////////////////////////////////////////// /// Class VolumePasswordPanelBase /////////////////////////////////////////////////////////////////////////////// - class VolumePasswordPanelBase : public wxPanel + class VolumePasswordPanelBase : public wxPanel { private: - + protected: wxGridBagSizer* GridBagSizer; wxStaticText* PasswordStaticText; @@ -984,12 +1006,11 @@ namespace VeraCrypt wxBoxSizer* Pkcs5PrfSizer; wxStaticText* Pkcs5PrfStaticText; wxChoice* Pkcs5PrfChoice; - wxCheckBox* TrueCryptModeCheckBox; wxStaticText* HeaderWipeCountText; wxChoice* HeaderWipeCount; wxBoxSizer* PasswordPlaceholderSizer; - - // Virtual event handlers, overide them in your derived class + + // Virtual event handlers, override them in your derived class virtual void OnTextChanged( wxCommandEvent& event ) { event.Skip(); } virtual void OnPimChanged( wxCommandEvent& event ) { event.Skip(); } virtual void OnUsePimCheckBoxClick( wxCommandEvent& event ) { event.Skip(); } @@ -998,41 +1019,42 @@ namespace VeraCrypt virtual void OnKeyfilesButtonClick( wxCommandEvent& event ) { event.Skip(); } 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, const wxString& name = wxEmptyString ); + ~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, const wxString& name = wxEmptyString ); + ~VolumePasswordWizardPageBase(); - + }; - + /////////////////////////////////////////////////////////////////////////////// /// Class VolumePimWizardPageBase /////////////////////////////////////////////////////////////////////////////// class VolumePimWizardPageBase : public WizardPage { private: - + protected: wxBoxSizer* PimPanelSizer; wxBoxSizer* PimSizer; @@ -1041,69 +1063,71 @@ namespace VeraCrypt wxStaticText* VolumePimHelpStaticText; wxCheckBox* DisplayPimCheckBox; wxStaticText* InfoStaticText; - - // Virtual event handlers, overide them in your derived class + + // Virtual event handlers, override 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, const wxString& name = wxEmptyString ); + ~VolumePimWizardPageBase(); - + }; - + /////////////////////////////////////////////////////////////////////////////// /// Class VolumeSizeWizardPageBase /////////////////////////////////////////////////////////////////////////////// class VolumeSizeWizardPageBase : public WizardPage { private: - + protected: wxTextCtrl* VolumeSizeTextCtrl; wxChoice* VolumeSizePrefixChoice; wxCheckBox* UseAllFreeSpaceCheckBox; wxStaticText* FreeSpaceStaticText; wxStaticText* InfoStaticText; - - // Virtual event handlers, overide them in your derived class + + // Virtual event handlers, override them in your derived class virtual void OnVolumeSizeTextChanged( wxCommandEvent& event ) { event.Skip(); } virtual void OnVolumeSizePrefixSelected( wxCommandEvent& event ) { event.Skip(); } virtual void OnUseAllFreeSpaceCheckBoxClick( 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, const wxString& name = wxEmptyString ); + ~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 event handlers, override 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/TrueCrypt.fbp b/src/Main/Forms/TrueCrypt.fbp index 523600a5..498b6f83 100644 --- a/src/Main/Forms/TrueCrypt.fbp +++ b/src/Main/Forms/TrueCrypt.fbp @@ -1,6 +1,6 @@ - + ; international.h C++ @@ -14,6 +14,7 @@ Forms 1000 none + 1 VeraCrypt @@ -25,6 +26,7 @@ 1 1 UI + 0 1 0 @@ -50,45 +52,13 @@ VeraCrypt + 0 wxTAB_TRAVERSAL 1 OnActivate - - - - - - - - OnClose - - - - - - - - - - - - - - - - - - - - - - - - - @@ -110,29 +80,6 @@ - - - - - - - - - - - - - - - - - - - - - - - MENU_VOLUMES VolumesMenu @@ -150,7 +97,6 @@ OnCreateVolumeButtonClick - m_separator1 @@ -169,7 +115,6 @@ OnMountVolumeMenuItemSelected - @@ -184,7 +129,6 @@ OnMountAllDevicesButtonClick - m_separator2 @@ -203,7 +147,6 @@ OnDismountVolumeMenuItemSelected - @@ -218,7 +161,6 @@ OnDismountAllButtonClick - m_separator3 @@ -237,7 +179,6 @@ OnChangePasswordMenuItemSelected - @@ -252,7 +193,6 @@ OnChangePkcs5PrfMenuItemSelected - @@ -267,7 +207,6 @@ OnChangeKeyfilesMenuItemSelected - @@ -282,7 +221,6 @@ OnRemoveKeyfilesMenuItemSelected - m_separator4 @@ -301,7 +239,6 @@ OnVolumePropertiesButtonClick - @@ -321,7 +258,6 @@ OnAddToFavoritesMenuItemSelected - @@ -336,7 +272,6 @@ OnAddAllMountedToFavoritesMenuItemSelected - @@ -351,7 +286,6 @@ OnOrganizeFavoritesMenuItemSelected - m_separator5 @@ -370,7 +304,6 @@ OnMountAllFavoritesMenuItemSelected - m_separator6 @@ -394,7 +327,6 @@ OnBenchmarkMenuItemSelected - @@ -409,7 +341,6 @@ OnEncryptionTestMenuItemSelected - m_separator7 @@ -428,7 +359,6 @@ OnCreateVolumeButtonClick - m_separator8 @@ -447,7 +377,6 @@ OnBackupVolumeHeadersMenuItemSelected - @@ -462,7 +391,6 @@ OnRestoreVolumeHeaderMenuItemSelected - m_separator9 @@ -481,7 +409,6 @@ OnCreateKeyfileMenuItemSelected - @@ -496,7 +423,6 @@ OnManageSecurityTokenKeyfilesMenuItemSelected - @@ -511,7 +437,6 @@ OnCloseAllSecurityTokenSessionsMenuItemSelected - m_separator10 @@ -530,7 +455,6 @@ OnWipeCacheButtonClick - @@ -550,7 +474,6 @@ OnHotkeysMenuItemSelected - @@ -565,7 +488,6 @@ OnDefaultKeyfilesMenuItemSelected - @@ -580,7 +502,6 @@ OnDefaultMountParametersMenuItemSelected - @@ -595,7 +516,6 @@ OnSecurityTokenPreferencesMenuItemSelected - m_separator11 @@ -614,7 +534,6 @@ OnPreferencesMenuItemSelected - @@ -634,7 +553,6 @@ OnUserGuideMenuItemSelected - @@ -649,7 +567,6 @@ OnOnlineHelpMenuItemSelected - @@ -664,7 +581,6 @@ OnBeginnersTutorialMenuItemSelected - @@ -679,7 +595,6 @@ OnFaqMenuItemSelected - m_separator12 @@ -698,7 +613,6 @@ OnWebsiteMenuItemSelected - @@ -713,7 +627,6 @@ OnDownloadsMenuItemSelected - @@ -728,7 +641,6 @@ OnNewsMenuItemSelected - @@ -743,7 +655,6 @@ OnVersionHistoryMenuItemSelected - m_separator13 @@ -762,7 +673,6 @@ OnDonateMenuItemSelected - @@ -777,7 +687,6 @@ OnContactMenuItemSelected - @@ -792,7 +701,6 @@ OnLegalNoticesMenuItemSelected - @@ -807,7 +715,6 @@ OnAboutMenuItemSelected - @@ -871,29 +778,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - bSizer2 @@ -920,7 +804,6 @@ wxVERTICAL 1 none - 5 wxALL|wxEXPAND @@ -980,50 +863,11 @@ - wxSUNKEN_BORDER - - - - - - - - - - - - - - - - - - - - - - - + wxBORDER_SUNKEN OnListItemActivated OnListItemDeselected - - OnListItemRightClick OnListItemSelected - - - - - - - - - - - - - - @@ -1040,7 +884,6 @@ wxVERTICAL 1 protected - 2 wxEXPAND|wxTOP @@ -1086,27 +929,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY IDC_CREATE_VOLUME + 0 0 @@ -1122,6 +971,8 @@ protected 1 + + Resizable 1 @@ -1137,29 +988,6 @@ OnCreateVolumeButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -1186,27 +1014,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY IDC_VOLUME_PROPERTIES + 0 0 @@ -1222,6 +1056,8 @@ protected 1 + + Resizable 1 @@ -1237,29 +1073,6 @@ OnVolumePropertiesButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -1286,27 +1099,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY HK_WIPE_CACHE + 0 0 @@ -1322,6 +1141,8 @@ protected 1 + + Resizable 1 @@ -1337,29 +1158,6 @@ OnWipeCacheButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -1388,7 +1186,6 @@ wxVERTICAL 1 protected - 4 wxEXPAND|wxALL @@ -1462,30 +1259,8 @@ - wxSUNKEN_BORDER - - - - - - - - + wxBORDER_SUNKEN OnLogoBitmapClick - - - - - - - - - - - - - - @@ -1554,34 +1329,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1609,27 +1356,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY IDC_SELECT_FILE + 0 0 @@ -1645,6 +1398,8 @@ protected 1 + + Resizable 1 @@ -1660,29 +1415,6 @@ OnSelectFileButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -1752,30 +1484,7 @@ - OnNoHistoryCheckBoxClick - - - - - - - - - - - - - - - - - - - - - - @@ -1803,27 +1512,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY IDC_VOLUME_TOOLS + 0 0 @@ -1839,6 +1554,8 @@ protected 1 + + Resizable 1 @@ -1854,29 +1571,6 @@ OnVolumeToolsButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -1906,27 +1600,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY IDC_SELECT_DEVICE + 0 0 @@ -1942,6 +1642,8 @@ protected 1 + + Resizable 1 @@ -1957,29 +1659,6 @@ OnSelectDeviceButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -2022,7 +1701,6 @@ wxVERTICAL 1 none - 2 wxEXPAND|wxALL @@ -2036,27 +1714,33 @@ + 0 + 1 0 1 1 + 1 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY MOUNT_BUTTON + 0 0 @@ -2072,6 +1756,8 @@ protected 1 + + Resizable 1 @@ -2087,29 +1773,6 @@ OnVolumeButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -2126,7 +1789,6 @@ wxVERTICAL 1 none - 2 wxEXPAND|wxALL @@ -2140,27 +1802,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY IDC_MOUNTALL + 0 0 @@ -2176,6 +1844,8 @@ protected 1 + + Resizable 1 @@ -2191,29 +1861,6 @@ OnMountAllDevicesButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -2230,7 +1877,6 @@ wxVERTICAL 1 none - 2 wxEXPAND|wxALL @@ -2244,27 +1890,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY IDC_UNMOUNTALL + 0 0 @@ -2280,6 +1932,8 @@ protected 1 + + Resizable 1 @@ -2295,29 +1949,6 @@ OnDismountAllButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -2334,7 +1965,6 @@ wxVERTICAL 1 none - 2 wxEXPAND|wxALL @@ -2348,27 +1978,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY IDC_EXIT + 0 0 @@ -2384,6 +2020,8 @@ protected 1 + + Resizable 1 @@ -2399,29 +2037,6 @@ OnExitButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -2460,45 +2075,13 @@ + 0 wxTAB_TRAVERSAL 1 OnActivate - - - - - - - - OnClose - - - - - - - - - - - - - - - - - - - - - - - - - MainSizer @@ -2559,29 +2142,7 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - OnMouseMotion - - - - - - - - - bSizer63 @@ -2608,7 +2169,6 @@ wxHORIZONTAL 1 none - 5 wxALL|wxEXPAND @@ -2665,29 +2225,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -2767,29 +2304,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -2841,27 +2355,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_HELP IDHELP + 0 0 @@ -2877,6 +2397,8 @@ protected 1 + + Resizable 1 @@ -2892,29 +2414,6 @@ OnHelpButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -2940,27 +2439,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY PREV + 0 0 @@ -2976,6 +2481,8 @@ protected 1 + + Resizable 1 @@ -2991,29 +2498,6 @@ OnPreviousButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -3029,27 +2513,33 @@ + 0 + 1 0 1 1 + 1 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY NEXT + 0 0 @@ -3065,6 +2555,8 @@ protected 1 + + Resizable 1 @@ -3080,29 +2572,6 @@ wxWANTS_CHARS OnNextButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -3128,27 +2597,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_CANCEL IDCANCEL + 0 0 @@ -3164,6 +2639,8 @@ protected 1 + + Resizable 1 @@ -3179,29 +2656,6 @@ OnCancelButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -3236,45 +2690,10 @@ + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer116 @@ -3353,29 +2772,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - bSizer121 @@ -3456,29 +2852,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -3565,29 +2938,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -3659,29 +3009,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -3755,30 +3082,7 @@ - - - OnWebsiteHyperlinkClick - - - - - - - - - - - - - - - - - - - - @@ -3841,29 +3145,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -3927,34 +3208,7 @@ - wxSUNKEN_BORDER - - - - - - - - - - - - - - - - - - - - - - - - - - - + wxBORDER_SUNKEN @@ -4023,29 +3277,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -4104,29 +3335,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -4161,27 +3369,33 @@ + 0 + 1 0 1 1 + 1 0 + Dock 0 Left 1 1 + 0 0 wxID_OK IDOK + 0 0 @@ -4197,6 +3411,8 @@ none 1 + + Resizable 1 @@ -4211,30 +3427,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -4276,45 +3468,10 @@ IDD_BENCHMARK_DLG + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer153 @@ -4404,29 +3561,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -4491,30 +3625,7 @@ - OnBenchmarkChoiceSelected - - - - - - - - - - - - - - - - - - - - - - @@ -4576,29 +3687,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -4663,30 +3751,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -4748,29 +3812,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -4835,33 +3876,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4922,29 +3936,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -5015,50 +4006,7 @@ - wxSUNKEN_BORDER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + wxBORDER_SUNKEN @@ -5083,27 +4031,33 @@ + 0 + 1 0 1 1 + 1 0 + Dock 0 Left 1 1 + 0 0 wxID_OK IDC_PERFORM_BENCHMARK + 0 0 @@ -5119,6 +4073,8 @@ protected 1 + + Resizable 1 @@ -5134,29 +4090,6 @@ OnBenchmarkButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -5172,27 +4105,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_CANCEL IDCLOSE + 0 0 @@ -5208,6 +4147,8 @@ none 1 + + Resizable 1 @@ -5222,30 +4163,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -5317,29 +4234,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -5373,45 +4267,10 @@ + 0 wxWS_EX_VALIDATE_RECURSIVELY - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer30 @@ -5447,7 +4306,6 @@ wxVERTICAL 1 protected - 5 wxALIGN_LEFT @@ -5473,7 +4331,6 @@ wxVERTICAL 1 protected - 5 wxALIGN_LEFT @@ -5511,27 +4368,33 @@ + 0 + 1 0 1 1 + 1 0 + Dock 0 Left 1 1 + 0 0 wxID_OK IDOK + 0 0 @@ -5547,6 +4410,8 @@ protected 1 + + Resizable 1 @@ -5562,29 +4427,6 @@ OnOKButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -5600,27 +4442,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_CANCEL IDCANCEL + 0 0 @@ -5636,6 +4484,8 @@ protected 1 + + Resizable 1 @@ -5650,30 +4500,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -5705,45 +4531,10 @@ IDD_RAWDEVICES_DLG + 0 wxWS_EX_VALIDATE_RECURSIVELY - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer3 @@ -5817,50 +4608,10 @@ - wxSUNKEN_BORDER - - - - - - - - - - - - - - - - - - - - - - - + wxBORDER_SUNKEN OnListItemActivated OnListItemDeselected - - - OnListItemSelected - - - - - - - - - - - - - - @@ -5897,27 +4648,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_CANCEL IDCANCEL + 0 0 @@ -5933,6 +4690,8 @@ protected 1 + + Resizable 1 @@ -5947,30 +4706,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -5986,27 +4721,33 @@ + 0 + 1 0 1 1 + 1 0 + Dock 0 Left 1 1 + 0 0 wxID_OK IDOK + 0 0 @@ -6022,6 +4763,8 @@ protected 1 + + Resizable 1 @@ -6037,29 +4780,6 @@ OnOKButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -6089,45 +4809,10 @@ IDD_CIPHER_TEST_DLG + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer132 @@ -6210,29 +4895,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -6297,30 +4959,7 @@ - OnEncryptionAlgorithmSelected - - - - - - - - - - - - - - - - - - - - - - @@ -6385,30 +5024,7 @@ - OnXtsModeCheckBoxClick - - - - - - - - - - - - - - - - - - - - - - @@ -6425,7 +5041,6 @@ wxVERTICAL 1 none - 5 wxALL|wxEXPAND @@ -6488,33 +5103,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6585,29 +5173,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -6669,29 +5234,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -6710,7 +5252,6 @@ wxVERTICAL 1 none - 5 wxTOP|wxRIGHT|wxLEFT @@ -6770,29 +5311,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -6857,33 +5375,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6945,29 +5436,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -7032,33 +5500,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7120,29 +5561,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -7207,33 +5625,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7250,7 +5641,6 @@ wxVERTICAL 1 none - 5 wxALL|wxEXPAND @@ -7313,33 +5703,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7356,7 +5719,6 @@ wxVERTICAL 1 none - 5 wxALL|wxEXPAND @@ -7419,33 +5781,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7472,27 +5807,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY ENCRYPT + 0 0 @@ -7508,6 +5849,8 @@ protected 1 + + Resizable 1 @@ -7523,29 +5866,6 @@ OnEncryptButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -7561,27 +5881,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY DECRYPT + 0 0 @@ -7597,6 +5923,8 @@ protected 1 + + Resizable 1 @@ -7612,29 +5940,6 @@ OnDecryptButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -7650,27 +5955,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY IDC_AUTO + 0 0 @@ -7686,6 +5997,8 @@ protected 1 + + Resizable 1 @@ -7701,29 +6014,6 @@ OnAutoTestAllButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -7739,27 +6029,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY IDC_RESET + 0 0 @@ -7775,6 +6071,8 @@ protected 1 + + Resizable 1 @@ -7790,29 +6088,6 @@ OnResetButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -7828,27 +6103,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_CANCEL IDCLOSE + 0 0 @@ -7864,6 +6145,8 @@ protected 1 + + Resizable 1 @@ -7878,30 +6161,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -7933,45 +6192,10 @@ IDD_FAVORITE_VOLUMES + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer57 @@ -8054,50 +6278,9 @@ - wxSUNKEN_BORDER - - - - - - - - - - - - - - - - - - - - - - - - + wxBORDER_SUNKEN OnListItemDeselected - - - OnListItemSelected - - - - - - - - - - - - - - @@ -8125,27 +6308,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY IDC_FAVORITE_MOVE_UP + 0 0 @@ -8161,6 +6350,8 @@ protected 1 + + Resizable 1 @@ -8176,29 +6367,6 @@ OnMoveUpButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -8214,27 +6382,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY IDC_FAVORITE_MOVE_DOWN + 0 0 @@ -8250,6 +6424,8 @@ protected 1 + + Resizable 1 @@ -8265,29 +6441,6 @@ OnMoveDownButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -8303,27 +6456,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY IDC_KEYREMOVE + 0 0 @@ -8339,6 +6498,8 @@ protected 1 + + Resizable 1 @@ -8354,29 +6515,6 @@ OnRemoveButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -8392,27 +6530,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY IDC_KEYREMOVEALL + 0 0 @@ -8428,6 +6572,8 @@ protected 1 + + Resizable 1 @@ -8443,29 +6589,6 @@ OnRemoveAllButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -8522,27 +6645,33 @@ + 0 + 1 0 1 1 + 1 0 + Dock 0 Left 1 1 + 0 0 wxID_OK IDOK + 0 0 @@ -8558,6 +6687,8 @@ protected 1 + + Resizable 1 @@ -8573,29 +6704,6 @@ OnOKButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -8611,27 +6719,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_CANCEL IDCANCEL + 0 0 @@ -8647,6 +6761,8 @@ protected 1 + + Resizable 1 @@ -8661,30 +6777,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -8716,45 +6808,10 @@ SELECT_TOKEN_KEYFILES + 0 wxWS_EX_VALIDATE_RECURSIVELY - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer26 @@ -8802,27 +6859,33 @@ + 0 + 1 0 1 1 + 1 0 + Dock 0 Left 1 1 + 0 0 wxID_OK IDOK + 0 0 @@ -8838,6 +6901,8 @@ protected 1 + + Resizable 1 @@ -8852,30 +6917,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -8891,27 +6932,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_CANCEL IDCANCEL + 0 0 @@ -8927,6 +6974,8 @@ protected 1 + + Resizable 1 @@ -8941,30 +6990,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -9026,29 +7051,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -9129,29 +7131,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -9213,29 +7192,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -9294,29 +7250,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -9398,30 +7331,7 @@ - - - OnKeyfilesHyperlinkClick - - - - - - - - - - - - - - - - - - - - @@ -9437,27 +7347,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY IDC_GENERATE_KEYFILE + 0 0 @@ -9473,6 +7389,8 @@ protected 1 + + Resizable 1 @@ -9488,29 +7406,6 @@ OnCreateKeyfileButttonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -9542,45 +7437,11 @@ + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - OnMouseMotion - - - - - - - - - MainSizer @@ -9673,29 +7534,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -9760,30 +7598,7 @@ - OnHashSelected - - - - - - - - - - - - - - - - - - - - - - @@ -9810,7 +7625,6 @@ wxVERTICAL 1 none - 5 wxEXPAND|wxTOP @@ -9879,29 +7693,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -9963,29 +7754,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -10050,30 +7818,7 @@ - OnShowRandomPoolCheckBoxClicked - - - - - - - - - - - - - - - - - - - - - - @@ -10100,7 +7845,6 @@ wxVERTICAL 1 none - 5 wxALL|wxEXPAND @@ -10163,29 +7907,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -10259,29 +7980,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -10380,29 +8078,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -10465,32 +8140,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -10548,29 +8197,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - @@ -10632,29 +8258,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -10717,32 +8320,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -10807,30 +8384,7 @@ - OnRandomSizeCheckBoxClicked - - - - - - - - - - - - - - - - - - - - - - @@ -10892,29 +8446,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -10979,33 +8510,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -11063,29 +8567,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - @@ -11114,27 +8595,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY IDC_GENERATE_AND_SAVE_KEYFILE + 0 0 @@ -11150,6 +8637,8 @@ protected 1 + + Resizable 1 @@ -11165,29 +8654,6 @@ OnGenerateButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -11213,27 +8679,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_CANCEL IDCLOSE + 0 0 @@ -11249,6 +8721,8 @@ none 1 + + Resizable 1 @@ -11263,30 +8737,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -11318,45 +8768,10 @@ LEGAL_NOTICES_DLG_TITLE + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer114 @@ -11433,33 +8848,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -11475,27 +8863,33 @@ + 0 + 1 0 1 1 + 1 0 + Dock 0 Left 1 1 + 0 0 wxID_OK IDOK + 0 0 @@ -11511,6 +8905,8 @@ none 1 + + Resizable 1 @@ -11525,30 +8921,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -11578,45 +8950,11 @@ IDD_PASSWORD_DLG + 0 wxWS_EX_VALIDATE_RECURSIVELY - - - - - - - - - - - - - - - OnInitDialog - - - - - - - - - - - - - - - - - - - - MainSizer @@ -11673,27 +9011,33 @@ + 0 + 1 0 1 1 + 1 0 + Dock 0 Left 1 1 + 0 0 wxID_OK IDOK + 0 0 @@ -11709,6 +9053,8 @@ protected 1 + + Resizable 1 @@ -11724,29 +9070,6 @@ OnOKButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -11762,27 +9085,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_CANCEL IDCANCEL + 0 0 @@ -11798,6 +9127,8 @@ protected 1 + + Resizable 1 @@ -11812,30 +9143,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -11861,27 +9168,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY IDT_FORMAT_OPTIONS + 0 0 @@ -11897,6 +9210,8 @@ protected 1 + + Resizable 1 @@ -11912,29 +9227,6 @@ OnOptionsButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -12005,29 +9297,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - wxID_ANY @@ -12036,7 +9305,6 @@ wxVERTICAL 1 protected - 5 wxTOP @@ -12109,30 +9377,7 @@ - OnReadOnlyCheckBoxClick - - - - - - - - - - - - - - - - - - - - - - @@ -12197,30 +9442,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -12285,30 +9506,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -12373,30 +9570,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -12411,7 +9584,6 @@ wxVERTICAL 1 protected - 5 wxALL @@ -12474,30 +9646,7 @@ - OnProtectionCheckBoxClick - - - - - - - - - - - - - - - - - - - - - - @@ -12572,30 +9721,7 @@ - - - OnProtectionHyperlinkClick - - - - - - - - - - - - - - - - - - - - @@ -12664,29 +9790,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - wxID_ANY IDT_FILESYSTEM @@ -12695,7 +9798,6 @@ wxVERTICAL 1 none - 5 wxEXPAND|wxBOTTOM @@ -12776,30 +9878,7 @@ - OnNoFilesystemCheckBoxClick - - - - - - - - - - - - - - - - - - - - - - @@ -12895,29 +9974,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -12985,33 +10041,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -13030,27 +10059,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY LINUX_SELECT + 0 0 @@ -13066,6 +10101,8 @@ protected 1 + + Resizable 1 @@ -13081,29 +10118,6 @@ OnMountPointButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -13168,29 +10182,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -13258,33 +10249,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -13328,45 +10292,10 @@ IDD_TOKEN_PREFERENCES + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer143 @@ -13393,7 +10322,6 @@ wxVERTICAL 1 none - 5 wxEXPAND|wxTOP @@ -13469,29 +10397,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -13556,30 +10461,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -13641,29 +10522,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -13728,33 +10586,7 @@ - - - - - - - - - - - - - - - - - - - - - - OnKeyfileNameChanged - - - - @@ -13793,27 +10625,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_CANCEL IDCANCEL + 0 0 @@ -13829,6 +10667,8 @@ protected 1 + + Resizable 1 @@ -13843,30 +10683,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -13882,27 +10698,33 @@ + 0 + 1 0 1 1 + 1 0 + Dock 0 Left 1 1 + 0 0 wxID_OK IDOK + 0 0 @@ -13918,6 +10740,8 @@ protected 1 + + Resizable 1 @@ -13933,29 +10757,6 @@ OnOKButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -13987,45 +10788,11 @@ IDD_PREFERENCES_DLG + 0 wxWS_EX_VALIDATE_RECURSIVELY - - - - - - - - - OnClose - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer32 @@ -14097,31 +10864,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - LINUX_PREF_TAB_SECURITY @@ -14177,29 +10919,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - bSizer44 @@ -14226,7 +10945,6 @@ wxVERTICAL 1 protected - 5 wxEXPAND|wxALL @@ -14239,7 +10957,6 @@ wxVERTICAL 1 none - 5 wxALL @@ -14302,30 +11019,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -14390,30 +11083,7 @@ - OnDismountOnScreenSaverCheckBoxClick - - - - - - - - - - - - - - - - - - - - - - @@ -14478,30 +11148,7 @@ - OnDismountOnPowerSavingCheckBoxClick - - - - - - - - - - - - - - - - - - - - - - @@ -14577,30 +11224,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -14663,32 +11286,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -14750,29 +11347,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -14839,30 +11413,7 @@ - OnForceAutoDismountCheckBoxClick - - - - - - - - - - - - - - - - - - - - - - @@ -14879,7 +11430,6 @@ wxVERTICAL 1 protected - 5 wxALL @@ -14942,30 +11492,7 @@ - OnPreserveTimestampsCheckBoxClick - - - - - - - - - - - - - - - - - - - - - - @@ -14982,7 +11509,6 @@ wxVERTICAL 1 none - 5 wxALL @@ -15045,30 +11571,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -15133,30 +11635,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -15221,29 +11699,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - bSizer46 @@ -15270,7 +11725,6 @@ wxVERTICAL 1 none - 5 wxALL @@ -15333,30 +11787,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -15421,30 +11851,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -15509,118 +11915,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - IDC_TRUECRYPT_MODE - - 0 - - - 0 - - 1 - TrueCryptModeCheckBox - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -15691,29 +11985,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -15778,30 +12049,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -15820,7 +12067,6 @@ wxVERTICAL 1 protected - 5 wxEXPAND @@ -15896,29 +12142,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -15983,33 +12206,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -16076,29 +12272,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - bSizer61 @@ -16125,7 +12298,6 @@ wxVERTICAL 1 none - 5 wxALL @@ -16188,30 +12360,7 @@ - OnBackgroundTaskEnabledCheckBoxClick - - - - - - - - - - - - - - - - - - - - - - @@ -16276,30 +12425,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -16314,7 +12439,6 @@ wxVERTICAL 1 none - 5 wxALL @@ -16377,30 +12501,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -16465,30 +12565,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -16553,30 +12629,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -16643,29 +12695,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - bSizer49 @@ -16692,7 +12721,6 @@ wxVERTICAL 1 protected - 5 wxALL @@ -16755,30 +12783,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -16843,30 +12847,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -16931,30 +12911,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -16971,7 +12927,6 @@ wxVERTICAL 1 protected - 5 wxALL @@ -17034,30 +12989,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -17122,30 +13053,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -17162,7 +13069,6 @@ wxVERTICAL 1 protected - 5 wxALL @@ -17225,30 +13131,7 @@ - OnNoKernelCryptoCheckBoxClick - - - - - - - - - - - - - - - - - - - - - - @@ -17313,29 +13196,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - bSizer151 @@ -17362,7 +13222,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -17431,29 +13290,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -17513,31 +13349,8 @@ - wxSUNKEN_BORDER + wxBORDER_SUNKEN -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -17614,30 +13427,7 @@ - OnNoHardwareCryptoCheckBoxClick - - - - - - - - - - - - - - - - - - - - - - @@ -17702,29 +13492,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - bSizer40 @@ -17751,7 +13518,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -17827,30 +13593,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -17913,29 +13655,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - bSizer127 @@ -17962,7 +13681,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -18034,33 +13752,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -18076,27 +13767,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY IDC_SELECT_PKCS11_MODULE + 0 0 @@ -18112,6 +13809,8 @@ protected 1 + + Resizable 1 @@ -18127,29 +13826,6 @@ OnSelectPkcs11ModuleButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -18168,7 +13844,6 @@ wxVERTICAL 1 none - 5 wxALL @@ -18231,30 +13906,84 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + 5 + wxALL|wxEXPAND + 0 + + wxID_ANY + IDT_EMV_OPTIONS + + sbSizer38 + wxVERTICAL + 1 + none + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + IDC_ENABLE_EMV_SUPPORT + + 0 + + + 0 + + 1 + EMVSupportEnabledCheckBox + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + @@ -18319,29 +14048,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - bSizer51 @@ -18368,7 +14074,6 @@ wxVERTICAL 1 none - 5 wxALL|wxEXPAND @@ -18428,50 +14133,9 @@ - wxSUNKEN_BORDER - - - - - - - - - - - - - - - - - - - - - - - - + wxBORDER_SUNKEN OnHotkeyListItemDeselected - - - OnHotkeyListItemSelected - - - - - - - - - - - - - - @@ -18486,7 +14150,6 @@ wxVERTICAL 1 none - 5 wxALIGN_RIGHT @@ -18562,29 +14225,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -18649,33 +14289,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -18691,27 +14304,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY IDC_HOTKEY_ASSIGN + 0 0 @@ -18727,6 +14346,8 @@ protected 1 + + Resizable 1 @@ -18742,29 +14363,6 @@ OnAssignHotkeyButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -18851,30 +14449,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -18939,30 +14513,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -19027,30 +14577,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -19115,30 +14641,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -19156,27 +14658,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY IDC_KEYREMOVE + 0 0 @@ -19192,6 +14700,8 @@ protected 1 + + Resizable 1 @@ -19207,29 +14717,6 @@ OnRemoveHotkeyButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -19248,7 +14735,6 @@ wxVERTICAL 1 none - 5 wxALL @@ -19311,30 +14797,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -19399,30 +14861,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -19468,27 +14906,33 @@ + 0 + 1 0 1 1 + 1 0 + Dock 0 Left 1 1 + 0 0 wxID_OK IDOK + 0 0 @@ -19504,6 +14948,8 @@ protected 1 + + Resizable 1 @@ -19519,29 +14965,6 @@ OnOKButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -19557,27 +14980,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_CANCEL IDCANCEL + 0 0 @@ -19593,6 +15022,8 @@ protected 1 + + Resizable 1 @@ -19607,30 +15038,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -19662,45 +15069,11 @@ IDD_RANDOM_POOL_ENRICHMENT + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - OnMouseMotion - - - - - - - - - MainSizer @@ -19793,29 +15166,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -19880,30 +15230,7 @@ - OnHashSelected - - - - - - - - - - - - - - - - - - - - - - @@ -19930,7 +15257,6 @@ wxVERTICAL 1 none - 5 wxEXPAND|wxTOP @@ -19999,29 +15325,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -20083,29 +15386,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -20170,30 +15450,7 @@ - OnShowRandomPoolCheckBoxClicked - - - - - - - - - - - - - - - - - - - - - - @@ -20220,7 +15477,6 @@ wxVERTICAL 1 none - 5 wxALL|wxEXPAND @@ -20283,29 +15539,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -20379,29 +15612,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -20448,27 +15658,33 @@ + 0 + 1 0 1 1 + 1 0 + Dock 0 Left 1 1 + 0 0 wxID_OK CONTINUE + 0 0 @@ -20484,6 +15700,8 @@ protected 1 + + Resizable 1 @@ -20498,30 +15716,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -20563,45 +15757,10 @@ IDD_KEYFILES + 0 wxWS_EX_VALIDATE_RECURSIVELY - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer3 @@ -20684,50 +15843,10 @@ - wxSUNKEN_BORDER - - - - - - - - - - - - - - - - - - - - - - - + wxBORDER_SUNKEN OnListItemActivated OnListItemDeselected - - - OnListItemSelected - - - - - - - - - - - - - - @@ -20752,27 +15871,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY IDC_EXPORT + 0 0 @@ -20788,6 +15913,8 @@ protected 1 + + Resizable 1 @@ -20803,29 +15930,6 @@ OnExportButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -20841,27 +15945,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY VKEY_2E + 0 0 @@ -20877,6 +15987,8 @@ protected 1 + + Resizable 1 @@ -20892,29 +16004,6 @@ OnDeleteButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -20940,27 +16029,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY IDC_IMPORT_KEYFILE + 0 0 @@ -20976,6 +16071,8 @@ protected 1 + + Resizable 1 @@ -20991,29 +16088,6 @@ OnImportButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -21042,27 +16116,33 @@ + 0 + 1 0 1 1 + 1 0 + Dock 0 Left 1 1 + 0 0 wxID_OK IDOK + 0 0 @@ -21078,6 +16158,8 @@ protected 1 + + Resizable 1 @@ -21093,29 +16175,6 @@ OnOKButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -21131,27 +16190,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_CANCEL IDCANCEL + 0 0 @@ -21167,6 +16232,8 @@ protected 1 + + Resizable 1 @@ -21181,30 +16248,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -21236,45 +16279,10 @@ IDD_VOLUME_PROPERTIES + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer49 @@ -21348,50 +16356,7 @@ - wxSUNKEN_BORDER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + wxBORDER_SUNKEN @@ -21426,27 +16391,33 @@ + 0 + 1 0 1 1 + 1 0 + Dock 0 Left 1 1 + 0 0 wxID_OK IDOK + 0 0 @@ -21462,6 +16433,8 @@ protected 1 + + Resizable 1 @@ -21477,29 +16450,6 @@ OnOKButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -21537,39 +16487,10 @@ -1,-1 WizardPage; WizardPage.h + 0 wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer93 @@ -21605,7 +16526,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -21677,30 +16597,7 @@ - OnEncryptionAlgorithmSelected - - - - - - - - - - - - - - - - - - - - - - @@ -21716,27 +16613,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY TEST + 0 0 @@ -21752,6 +16655,8 @@ protected 1 + + Resizable 1 @@ -21767,29 +16672,6 @@ OnTestButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -21853,29 +16735,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -21948,30 +16807,7 @@ - - - OnEncryptionAlgorithmHyperlinkClick - - - - - - - - - - - - - - - - - - - - @@ -21997,27 +16833,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY IDC_BENCHMARK + 0 0 @@ -22033,6 +16875,8 @@ protected 1 + + Resizable 1 @@ -22048,29 +16892,6 @@ OnBenchmarkButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -22089,7 +16910,6 @@ wxHORIZONTAL 1 none - 5 wxALL|wxALIGN_CENTER_VERTICAL @@ -22152,30 +16972,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -22239,30 +17035,7 @@ - - - OnHashHyperlinkClick - - - - - - - - - - - - - - - - - - - - @@ -22292,39 +17065,10 @@ -1,-1 WizardPage; WizardPage.h + 0 wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer71 @@ -22398,29 +17142,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -22446,39 +17167,10 @@ -1,-1 + 0 wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer19 @@ -22561,50 +17253,10 @@ - wxSUNKEN_BORDER - - - - - - - - - - - - - - - - - - - - - - - - + wxBORDER_SUNKEN OnListItemDeselected - - - OnListItemSelected - - - - - - - - - - - - OnListSizeChanged - @@ -22629,27 +17281,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY IDC_KEYADD + 0 0 @@ -22665,6 +17323,8 @@ protected 1 + + Resizable 1 @@ -22680,29 +17340,6 @@ OnAddFilesButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -22718,27 +17355,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY IDC_ADD_KEYFILE_PATH + 0 0 @@ -22754,6 +17397,8 @@ protected 1 + + Resizable 1 @@ -22769,29 +17414,6 @@ OnAddDirectoryButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -22807,27 +17429,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY IDC_TOKEN_FILES_ADD + 0 0 @@ -22843,6 +17471,8 @@ protected 1 + + Resizable 1 @@ -22858,29 +17488,6 @@ OnAddSecurityTokenSignatureButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -22896,27 +17503,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY IDC_KEYREMOVE + 0 0 @@ -22932,6 +17545,8 @@ protected 1 + + Resizable 1 @@ -22947,29 +17562,6 @@ OnRemoveButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -22985,27 +17577,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY IDC_KEYREMOVEALL + 0 0 @@ -23021,6 +17619,8 @@ protected 1 + + Resizable 1 @@ -23036,29 +17636,6 @@ OnRemoveAllButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -23088,39 +17665,10 @@ -1,-1 WizardPage; WizardPage.h + 0 wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer81 @@ -23206,29 +17754,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -23244,27 +17769,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 0 1 + 0 0 wxID_ANY IDC_ABORT_BUTTON + 0 0 @@ -23280,6 +17811,8 @@ protected 1 + + Resizable 1 @@ -23295,29 +17828,6 @@ OnAbortButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -23381,29 +17891,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -23429,39 +17916,10 @@ -1,-1 WizardPage; WizardPage.h + 0 wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer68 @@ -23547,33 +18005,7 @@ - - - - - - - - - - - - - - - - - - - - - - OnDirectoryTextChanged - - - - @@ -23589,27 +18021,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY IDC_BROWSE_FILES + 0 0 @@ -23625,6 +18063,8 @@ protected 1 + + Resizable 1 @@ -23640,29 +18080,6 @@ OnBrowseButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -23726,29 +18143,6 @@ 300 - - - - - - - - - - - - - - - - - - - - - - - @@ -23774,39 +18168,10 @@ -1,-1 WizardPage; WizardPage.h + 0 wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer71 @@ -23912,29 +18277,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -23960,39 +18302,10 @@ -1,-1 WizardPage; WizardPage.h + 0 wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer104 @@ -24019,7 +18332,6 @@ wxVERTICAL 1 none - 30 wxEXPAND @@ -24117,29 +18429,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -24210,29 +18499,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -24297,30 +18563,7 @@ - OnDisplayKeysCheckBoxClick - - - - - - - - - - - - - - - - - - - - - - @@ -24384,29 +18627,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -24468,29 +18688,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -24552,29 +18749,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -24636,29 +18810,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -24677,7 +18828,6 @@ wxVERTICAL 1 none - 5 wxALL|wxEXPAND @@ -24740,29 +18890,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -24779,7 +18906,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -24851,29 +18977,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -24889,27 +18992,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY IDC_ABORT_BUTTON + 0 0 @@ -24925,6 +19034,8 @@ protected 1 + + Resizable 1 @@ -24940,29 +19051,6 @@ OnAbortButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -25047,29 +19135,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -25126,30 +19191,7 @@ - wxSUNKEN_BORDER - - - - - - - - - - - - - - - - - - - - - - - + wxBORDER_SUNKEN bSizer115 @@ -25214,29 +19256,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -25312,29 +19331,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -25391,30 +19387,7 @@ - wxSUNKEN_BORDER - - - - - - - - - - - - - - - - - - - - - - - + wxBORDER_SUNKEN bSizer1151 @@ -25479,29 +19452,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -25577,29 +19527,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -25656,30 +19583,7 @@ - wxSUNKEN_BORDER|wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - + wxTAB_TRAVERSAL|wxBORDER_SUNKEN bSizer1152 @@ -25744,29 +19648,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -25837,29 +19718,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -25885,39 +19743,10 @@ -1,-1 WizardPage; WizardPage.h + 0 wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer86 @@ -26032,34 +19861,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - OnVolumePathTextChanged - - @@ -26084,27 +19886,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY IDC_SELECT_FILE + 0 0 @@ -26120,6 +19928,8 @@ protected 1 + + Resizable 1 @@ -26135,29 +19945,6 @@ OnSelectFileButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -26173,27 +19960,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY IDC_SELECT_DEVICE + 0 0 @@ -26209,6 +20002,8 @@ protected 1 + + Resizable 1 @@ -26224,29 +20019,6 @@ OnSelectDeviceButtonClick - - - - - - - - - - - - - - - - - - - - - - - @@ -26334,30 +20106,7 @@ - OnNoHistoryCheckBoxClick - - - - - - - - - - - - - - - - - - - - - - @@ -26435,29 +20184,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -26483,39 +20209,10 @@ -1,-1 WizardPage; WizardPage.h + 0 wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer124 @@ -26542,7 +20239,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -26618,29 +20314,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -26705,30 +20378,7 @@ - OnFilesystemTypeSelected - - - - - - - - - - - - - - - - - - - - - - @@ -26747,7 +20397,6 @@ wxVERTICAL 1 none - 5 wxALL @@ -26810,30 +20459,7 @@ - OnQuickFormatCheckBoxClick - - - - - - - - - - - - - - - - - - - - - - @@ -26907,29 +20533,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -26955,49 +20558,20 @@ -1,-1 + 0 wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + bSizer7 wxVERTICAL none - + 5 wxALL|wxEXPAND 1 - + 0,0 wxBOTH 1 @@ -27008,14 +20582,14 @@ wxFLEX_GROWMODE_SPECIFIED protected 0 - + 5 1 0 wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxBOTTOM|wxRIGHT 1 1 - + 1 1 1 @@ -27070,39 +20644,16 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - + 5 2 1 wxBOTTOM|wxEXPAND 1 1 - + 1 1 1 @@ -27160,43 +20711,17 @@ - - - - - - - - - - - - - - - - - - - - - - OnTextChanged - - - - - + 5 1 0 wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT 2 1 - + 1 1 1 @@ -27251,39 +20776,16 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - + 5 2 1 wxBOTTOM|wxEXPAND 2 1 - + 1 1 1 @@ -27341,36 +20843,10 @@ - - - - - - - - - - - - - - - - - - - - - - OnTextChanged - - - - - + 5 1 0 @@ -27432,29 +20908,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -27522,33 +20975,7 @@ - - - - - - - - - - - - - - - - - - - - - - OnPimChanged - - - - @@ -27613,29 +21040,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -27645,7 +21049,7 @@ wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL 4 1 - + 1 1 1 @@ -27703,30 +21107,7 @@ - OnUsePimCheckBoxClick - - - - - - - - - - - - - - - - - - - - - - @@ -27794,40 +21175,16 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + 5 2 1 wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL 6 1 - + 1 1 1 @@ -27885,40 +21242,17 @@ - OnDisplayPasswordCheckBoxClick - - - - - - - - - - - - - - - - - - - - - - - + 5 1 1 wxTOP|wxRIGHT|wxLEFT 7 1 - + 1 1 1 @@ -27976,40 +21310,17 @@ - OnUseKeyfilesCheckBoxClick - - - - - - - - - - - - - - - - - - - - - - - + 5 1 2 wxALIGN_RIGHT|wxALIGN_BOTTOM|wxLEFT 7 1 - + 1 1 1 @@ -28018,27 +21329,33 @@ + 0 + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY IDC_KEYFILES_HIDVOL_PROT + 0 0 @@ -28054,6 +21371,8 @@ protected 1 + + Resizable 1 @@ -28069,53 +21388,32 @@ OnKeyfilesButtonClick - - - - - - - - - - - - - - - - - - OnKeyfilesButtonRightDown OnKeyfilesButtonRightClick - - - - + 5 1 1 wxEXPAND|wxTOP|wxBOTTOM 8 1 - + Pkcs5PrfSizer wxVERTICAL protected - + 5 1 0 wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT 9 1 - + 1 1 1 @@ -28170,39 +21468,16 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - + 5 1 1 wxALIGN_CENTER_VERTICAL|wxLEFT 9 1 - + 1 1 1 @@ -28260,121 +21535,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - 1 - 2 - wxALIGN_CENTER_VERTICAL|wxLEFT - 9 - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - IDC_TRUECRYPT_MODE - - 0 - - - 0 - - 1 - TrueCryptModeCheckBox - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - OnTrueCryptModeChecked - - - - - - - - - - - - - - - - - - - - - - @@ -28384,7 +21544,7 @@ wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT 10 1 - + 1 1 1 @@ -28439,39 +21599,16 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - + 5 1 1 wxALL 10 1 - + 1 1 1 @@ -28529,40 +21666,16 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + 5 2 1 wxTOP|wxEXPAND 11 1 - + PasswordPlaceholderSizer wxVERTICAL @@ -28592,39 +21705,10 @@ -1,-1 WizardPage; WizardPage.h + 0 wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer101 @@ -28709,29 +21793,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -28757,39 +21818,10 @@ -1,-1 WizardPage; WizardPage.h + 0 wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer101 @@ -28881,29 +21913,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -28968,33 +21977,7 @@ - - - - - - - - - - - - - - - - - - - - - - OnPimChanged - - - - @@ -29056,29 +22039,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -29154,30 +22114,7 @@ - OnDisplayPimCheckBoxClick - - - - - - - - - - - - - - - - - - - - - - @@ -29243,29 +22180,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -29291,39 +22205,10 @@ -1,-1 WizardPage; WizardPage.h + 0 wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer98 @@ -29419,33 +22304,7 @@ - - - - - - - - - - - - - - - - - - - - - - OnVolumeSizeTextChanged - - - - @@ -29510,30 +22369,7 @@ - OnVolumeSizePrefixSelected - - - - - - - - - - - - - - - - - - - - - - @@ -29610,30 +22446,7 @@ - OnUseAllFreeSpaceCheckBoxClick - - - - - - - - - - - - - - - - - - - - - - @@ -29705,29 +22518,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -29799,29 +22589,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -29851,45 +22618,12 @@ VeraCrypt + 0 - - - - - - - - - OnWaitDialogClose - - - - - OnWaitDialogInit - - - - - - - - - - - - - - - - - - - - bSizer160 @@ -29946,7 +22680,7 @@ Resizable 1 - wxALIGN_CENTRE + wxALIGN_CENTER_HORIZONTAL 0 @@ -29954,29 +22688,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - @@ -30041,29 +22752,6 @@ - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3