From dd805e71990ee768ab775fd6e2916da8f994b493 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 3 Sep 2018 13:49:55 +0200 Subject: [PATCH] Upgrade to wxWidgets 3.1.1 and wxFormBuilder 3.8.1 --- README.md | 12 +- include/Common.props | 2 +- include/Win32.props | 2 +- include/x64.props | 2 +- lib/EAPBase_UI/res/wxEAP_UI.cpp | 1346 +++---- lib/EAPBase_UI/res/wxEAP_UI.fbp | 6022 +++++++++++++++---------------- lib/EAPBase_UI/res/wxEAP_UI.h | 636 ++-- 7 files changed, 4010 insertions(+), 4012 deletions(-) diff --git a/README.md b/README.md index 3aa0c98..fc4ade3 100644 --- a/README.md +++ b/README.md @@ -54,22 +54,22 @@ Binaries are available for download [here](https://github.com/Amebis/GEANTLink/r - _MsiDb.Exe_ and other command line utilities for MSI packaging distributed as a part of Microsoft Windows SDK (installed with Visual Studio). Add SDK's `Bin` folder to the system path. ### wxWidgets -GÉANTLink is using wxWidgets v3.0.2 static libraries. Unfortunately, only dynamic libraries (DLL) variant is available as a binary download. Therefore static libraries needs to be compiled from [source](https://github.com/wxWidgets/wxWidgets). +GÉANTLink is using wxWidgets v3.1.1 static libraries. Unfortunately, only dynamic libraries (DLL) variant is available as a binary download. Therefore static libraries needs to be compiled from [source](https://github.com/wxWidgets/wxWidgets). #### Compiling wxWidgets Win32 static libraries 1. Start _Visual Studio Command Prompt (2010)_ 2. Change working folder to `build\msw` -3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0` -4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 BUILD=release` +3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=100` +4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=100 BUILD=release` #### Compiling wxWidgets x64 static libraries 1. Start _Visual Studio x64 Cross Tools Command Prompt (2010)_ 2. Change working folder to `build\msw` -3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 TARGET_CPU=X64` -4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 TARGET_CPU=X64 BUILD=release` +3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=100 TARGET_CPU=X64` +4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 COMPILER_VERSION=100 TARGET_CPU=X64 BUILD=release` #### Specifying wxWidgets path -GÉANTLink compilation references wxWidgets libraries using `WXWIN` environment variable. Please set it to wxWidgets folder (i.e. `C:\SDK\wxWidgets\3.0.2`). +GÉANTLink compilation references wxWidgets libraries using `WXWIN` environment variable. Please set it to wxWidgets folder (i.e. `C:\SDK\wxWidgets\3.1.1`). ### Digital Signing of Build Outputs In order to have the build process digitally sign output files, one should provide the following: diff --git a/include/Common.props b/include/Common.props index 3e6d223..cbae63c 100644 --- a/include/Common.props +++ b/include/Common.props @@ -32,7 +32,7 @@ Level4 - _WIN32_WINNT=0x0600;ISOLATION_AWARE_ENABLED=1;SECURITY_WIN32;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;EAP_TLS=1;%(PreprocessorDefinitions) + _WIN32_WINNT=0x0600;ISOLATION_AWARE_ENABLED=1;SECURITY_WIN32;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;EAP_TLS=1;wxMSVC_VERSION=$(PlatformToolsetVersion);%(PreprocessorDefinitions) Use StdAfx.h ProgramDatabase diff --git a/include/Win32.props b/include/Win32.props index cbc5062..8bcf70e 100644 --- a/include/Win32.props +++ b/include/Win32.props @@ -24,7 +24,7 @@ - $(WXWIN)\lib\vc_lib;$(LibraryPath) + $(WXWIN)\lib\vc$(PlatformToolsetVersion)_lib;$(LibraryPath) diff --git a/include/x64.props b/include/x64.props index 1454ab4..59e52df 100644 --- a/include/x64.props +++ b/include/x64.props @@ -24,7 +24,7 @@ - $(WXWIN)\lib\vc_x64_lib;$(LibraryPath) + $(WXWIN)\lib\vc$(PlatformToolsetVersion)_x64_lib;$(LibraryPath) diff --git a/lib/EAPBase_UI/res/wxEAP_UI.cpp b/lib/EAPBase_UI/res/wxEAP_UI.cpp index ea70d69..962bb87 100644 --- a/lib/EAPBase_UI/res/wxEAP_UI.cpp +++ b/lib/EAPBase_UI/res/wxEAP_UI.cpp @@ -1,673 +1,673 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 17 2015) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#include - -#include "wxEAP_UI.h" - -/////////////////////////////////////////////////////////////////////////// - -wxEAPConfigDialogBase::wxEAPConfigDialogBase( 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* sb_content; - sb_content = new wxBoxSizer( wxVERTICAL ); - - m_banner = new wxEAPBannerPanel( this ); - - sb_content->Add( m_banner, 0, wxEXPAND|wxBOTTOM, 5 ); - - m_providers = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - m_providers->SetExtraStyle( wxWS_EX_VALIDATE_RECURSIVELY ); - - - sb_content->Add( m_providers, 1, wxEXPAND|wxALL, 10 ); - - wxBoxSizer* sb_bottom_horiz; - sb_bottom_horiz = new wxBoxSizer( wxHORIZONTAL ); - - wxBoxSizer* sb_bottom_horiz_inner; - sb_bottom_horiz_inner = new wxBoxSizer( wxHORIZONTAL ); - - m_prov_add = new wxButton( this, wxID_ANY, _("+"), wxDefaultPosition, wxSize( 30,-1 ), 0 ); - m_prov_add->SetToolTip( _("Adds new provider") ); - - sb_bottom_horiz_inner->Add( m_prov_add, 0, wxALL, 5 ); - - m_prov_remove = new wxButton( this, wxID_ANY, _("-"), wxDefaultPosition, wxSize( 30,-1 ), 0 ); - m_prov_remove->SetToolTip( _("Removes selected provider") ); - - sb_bottom_horiz_inner->Add( m_prov_remove, 0, wxALL, 5 ); - - m_prov_advanced = new wxButton( this, wxID_ANY, _("Advanced..."), wxDefaultPosition, wxDefaultSize, 0 ); - m_prov_advanced->SetToolTip( _("Opens dialog with provider settings") ); - - sb_bottom_horiz_inner->Add( m_prov_advanced, 0, wxALL, 5 ); - - - sb_bottom_horiz->Add( sb_bottom_horiz_inner, 1, wxEXPAND, 5 ); - - m_buttons = new wxStdDialogButtonSizer(); - m_buttonsOK = new wxButton( this, wxID_OK ); - m_buttons->AddButton( m_buttonsOK ); - m_buttonsCancel = new wxButton( this, wxID_CANCEL ); - m_buttons->AddButton( m_buttonsCancel ); - m_buttons->Realize(); - - sb_bottom_horiz->Add( m_buttons, 0, wxEXPAND|wxALL, 5 ); - - - sb_content->Add( sb_bottom_horiz, 0, wxEXPAND, 5 ); - - - this->SetSizer( sb_content ); - this->Layout(); - sb_content->Fit( this ); - - // Connect Events - this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxEAPConfigDialogBase::OnInitDialog ) ); - this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxEAPConfigDialogBase::OnUpdateUI ) ); - m_prov_add->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPConfigDialogBase::OnProvAdd ), NULL, this ); - m_prov_remove->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPConfigDialogBase::OnProvRemove ), NULL, this ); - m_prov_advanced->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPConfigDialogBase::OnProvAdvanced ), NULL, this ); -} - -wxEAPConfigDialogBase::~wxEAPConfigDialogBase() -{ - // Disconnect Events - this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxEAPConfigDialogBase::OnInitDialog ) ); - this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxEAPConfigDialogBase::OnUpdateUI ) ); - m_prov_add->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPConfigDialogBase::OnProvAdd ), NULL, this ); - m_prov_remove->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPConfigDialogBase::OnProvRemove ), NULL, this ); - m_prov_advanced->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPConfigDialogBase::OnProvAdvanced ), NULL, this ); - -} - -wxEAPGeneralDialogBase::wxEAPGeneralDialogBase( 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* sb_content; - sb_content = new wxBoxSizer( wxVERTICAL ); - - m_banner = new wxEAPBannerPanel( this ); - - sb_content->Add( m_banner, 0, wxEXPAND|wxBOTTOM, 5 ); - - m_panels = new wxBoxSizer( wxVERTICAL ); - - - sb_content->Add( m_panels, 1, wxEXPAND|wxALL, 5 ); - - m_buttons = new wxStdDialogButtonSizer(); - m_buttonsOK = new wxButton( this, wxID_OK ); - m_buttons->AddButton( m_buttonsOK ); - m_buttonsCancel = new wxButton( this, wxID_CANCEL ); - m_buttons->AddButton( m_buttonsCancel ); - m_buttons->Realize(); - - sb_content->Add( m_buttons, 0, wxEXPAND|wxALL, 5 ); - - - this->SetSizer( sb_content ); - this->Layout(); - sb_content->Fit( this ); - - // Connect Events - this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxEAPGeneralDialogBase::OnInitDialog ) ); -} - -wxEAPGeneralDialogBase::~wxEAPGeneralDialogBase() -{ - // Disconnect Events - this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxEAPGeneralDialogBase::OnInitDialog ) ); - -} - -wxEAPCredentialsConnectionDialogBase::wxEAPCredentialsConnectionDialogBase( 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* sb_content; - sb_content = new wxBoxSizer( wxVERTICAL ); - - m_banner = new wxEAPBannerPanel( this ); - - sb_content->Add( m_banner, 0, wxEXPAND|wxBOTTOM, 5 ); - - m_providers = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - m_providers->SetExtraStyle( wxWS_EX_VALIDATE_RECURSIVELY ); - - - sb_content->Add( m_providers, 1, wxEXPAND | wxALL, 5 ); - - m_buttons = new wxStdDialogButtonSizer(); - m_buttonsOK = new wxButton( this, wxID_OK ); - m_buttons->AddButton( m_buttonsOK ); - m_buttonsCancel = new wxButton( this, wxID_CANCEL ); - m_buttons->AddButton( m_buttonsCancel ); - m_buttons->Realize(); - - sb_content->Add( m_buttons, 0, wxEXPAND|wxALL, 5 ); - - - this->SetSizer( sb_content ); - this->Layout(); - sb_content->Fit( this ); - - // Connect Events - this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxEAPCredentialsConnectionDialogBase::OnInitDialog ) ); -} - -wxEAPCredentialsConnectionDialogBase::~wxEAPCredentialsConnectionDialogBase() -{ - // Disconnect Events - this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxEAPCredentialsConnectionDialogBase::OnInitDialog ) ); - -} - -wxEAPBannerPanelBase::wxEAPBannerPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) -{ - this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_HIGHLIGHT ) ); - this->SetMinSize( wxSize( -1,48 ) ); - - wxBoxSizer* sb_content; - sb_content = new wxBoxSizer( wxVERTICAL ); - - m_title = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); - m_title->Wrap( -1 ); - m_title->SetFont( wxFont( 18, 70, 90, 90, false, wxEmptyString ) ); - m_title->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) ); - - sb_content->Add( m_title, 0, wxALL|wxEXPAND, 5 ); - - - this->SetSizer( sb_content ); - this->Layout(); - sb_content->Fit( this ); -} - -wxEAPBannerPanelBase::~wxEAPBannerPanelBase() -{ -} - -wxEAPNotePanelBase::wxEAPNotePanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) -{ - this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_INFOBK ) ); - - wxBoxSizer* sb_note_horiz; - sb_note_horiz = new wxBoxSizer( wxHORIZONTAL ); - - m_note_icon = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - sb_note_horiz->Add( m_note_icon, 0, wxALL, 5 ); - - m_note_vert = new wxBoxSizer( wxVERTICAL ); - - m_note_label = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_note_label->Wrap( 449 ); - m_note_vert->Add( m_note_label, 0, wxALL|wxEXPAND, 5 ); - - - sb_note_horiz->Add( m_note_vert, 1, wxEXPAND, 5 ); - - - this->SetSizer( sb_note_horiz ); - this->Layout(); -} - -wxEAPNotePanelBase::~wxEAPNotePanelBase() -{ -} - -wxEAPCredentialsConfigPanelBase::wxEAPCredentialsConfigPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) -{ - m_sb_credentials = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("%s User Credentials") ), wxVERTICAL ); - - wxBoxSizer* sb_credentials_horiz; - sb_credentials_horiz = new wxBoxSizer( wxHORIZONTAL ); - - m_credentials_icon = new wxStaticBitmap( m_sb_credentials->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - sb_credentials_horiz->Add( m_credentials_icon, 0, wxALL, 5 ); - - wxBoxSizer* sb_credentials_vert; - sb_credentials_vert = new wxBoxSizer( wxVERTICAL ); - - m_credentials_label = new wxStaticText( m_sb_credentials->GetStaticBox(), wxID_ANY, _("Select the source where your credentials used to connect are stored."), wxDefaultPosition, wxDefaultSize, 0 ); - m_credentials_label->Wrap( 440 ); - sb_credentials_vert->Add( m_credentials_label, 0, wxALL|wxEXPAND, 5 ); - - m_storage = new wxRadioButton( m_sb_credentials->GetStaticBox(), wxID_ANY, _("Use credentials from Credential &Manager"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); - m_storage->SetToolTip( _("Select this option if you would like to use credentials stored in Windows Credential Manager") ); - - sb_credentials_vert->Add( m_storage, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - - wxBoxSizer* sb_storage; - sb_storage = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer* sb_storage_identity; - sb_storage_identity = new wxBoxSizer( wxHORIZONTAL ); - - m_storage_identity_label = new wxStaticText( m_sb_credentials->GetStaticBox(), wxID_ANY, _("Identity:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_storage_identity_label->Wrap( -1 ); - sb_storage_identity->Add( m_storage_identity_label, 0, 0, 5 ); - - m_storage_identity = new wxStaticText( m_sb_credentials->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_storage_identity->Wrap( -1 ); - m_storage_identity->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - m_storage_identity->SetToolTip( _("Your present credentials stored in Windows Credential Manager") ); - - sb_storage_identity->Add( m_storage_identity, 1, wxEXPAND|wxLEFT, 5 ); - - - sb_storage->Add( sb_storage_identity, 1, wxEXPAND, 5 ); - - wxBoxSizer* sb_buttons_storage; - sb_buttons_storage = new wxBoxSizer( wxHORIZONTAL ); - - m_storage_clear = new wxButton( m_sb_credentials->GetStaticBox(), wxID_ANY, _("&Clear Credentials"), wxDefaultPosition, wxDefaultSize, 0 ); - m_storage_clear->SetToolTip( _("Click to clear your credentials from Credential Manager.\nNote: You will be prompted to enter credentials when connecting.") ); - - sb_buttons_storage->Add( m_storage_clear, 0, wxRIGHT, 5 ); - - m_storage_set = new wxButton( m_sb_credentials->GetStaticBox(), wxID_ANY, _("&Set Credentials..."), wxDefaultPosition, wxDefaultSize, 0 ); - m_storage_set->SetToolTip( _("Click here to set or modify your credentials") ); - - sb_buttons_storage->Add( m_storage_set, 0, wxLEFT, 5 ); - - - sb_storage->Add( sb_buttons_storage, 0, wxALIGN_RIGHT|wxTOP, 5 ); - - - sb_credentials_vert->Add( sb_storage, 0, wxEXPAND|wxALL, 5 ); - - m_config = new wxRadioButton( m_sb_credentials->GetStaticBox(), wxID_ANY, _("Use credentials from &profile configuration"), wxDefaultPosition, wxDefaultSize, 0 ); - m_config->SetToolTip( _("Select this option if you would like to store credentials as a part of profile configuration") ); - - sb_credentials_vert->Add( m_config, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - - wxBoxSizer* sb_config; - sb_config = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer* sb_config_identity; - sb_config_identity = new wxBoxSizer( wxHORIZONTAL ); - - m_config_identity_label = new wxStaticText( m_sb_credentials->GetStaticBox(), wxID_ANY, _("Identity:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_config_identity_label->Wrap( -1 ); - sb_config_identity->Add( m_config_identity_label, 0, 0, 5 ); - - m_config_identity = new wxStaticText( m_sb_credentials->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_config_identity->Wrap( -1 ); - m_config_identity->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); - m_config_identity->SetToolTip( _("Profile configuration credentials") ); - - sb_config_identity->Add( m_config_identity, 1, wxEXPAND|wxLEFT, 5 ); - - - sb_config->Add( sb_config_identity, 1, wxEXPAND, 5 ); - - wxBoxSizer* sb_buttons_config; - sb_buttons_config = new wxBoxSizer( wxHORIZONTAL ); - - m_config_set = new wxButton( m_sb_credentials->GetStaticBox(), wxID_ANY, _("&Set Credentials..."), wxDefaultPosition, wxDefaultSize, 0 ); - m_config_set->SetToolTip( _("Click here to set or modify your credentials") ); - - sb_buttons_config->Add( m_config_set, 0, 0, 5 ); - - - sb_config->Add( sb_buttons_config, 0, wxALIGN_RIGHT|wxTOP, 5 ); - - - sb_credentials_vert->Add( sb_config, 0, wxEXPAND|wxALL, 5 ); - - - sb_credentials_horiz->Add( sb_credentials_vert, 1, wxEXPAND, 5 ); - - - m_sb_credentials->Add( sb_credentials_horiz, 1, wxEXPAND, 5 ); - - - this->SetSizer( m_sb_credentials ); - this->Layout(); - m_timer_storage.SetOwner( this, wxID_ANY ); - - // Connect Events - this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxEAPCredentialsConfigPanelBase::OnUpdateUI ) ); - m_storage_clear->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPCredentialsConfigPanelBase::OnClearStorage ), NULL, this ); - m_storage_set->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPCredentialsConfigPanelBase::OnSetStorage ), NULL, this ); - m_config_set->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPCredentialsConfigPanelBase::OnSetConfig ), NULL, this ); - this->Connect( wxID_ANY, wxEVT_TIMER, wxTimerEventHandler( wxEAPCredentialsConfigPanelBase::OnTimerStorage ) ); -} - -wxEAPCredentialsConfigPanelBase::~wxEAPCredentialsConfigPanelBase() -{ - // Disconnect Events - this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxEAPCredentialsConfigPanelBase::OnUpdateUI ) ); - m_storage_clear->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPCredentialsConfigPanelBase::OnClearStorage ), NULL, this ); - m_storage_set->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPCredentialsConfigPanelBase::OnSetStorage ), NULL, this ); - m_config_set->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPCredentialsConfigPanelBase::OnSetConfig ), NULL, this ); - this->Disconnect( wxID_ANY, wxEVT_TIMER, wxTimerEventHandler( wxEAPCredentialsConfigPanelBase::OnTimerStorage ) ); - -} - -wxPasswordCredentialsPanelBase::wxPasswordCredentialsPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxEAPCredentialsPanelBase( parent, id, pos, size, style ) -{ - m_sb_credentials = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("User ID and Password") ), wxVERTICAL ); - - wxBoxSizer* sb_credentials_horiz; - sb_credentials_horiz = new wxBoxSizer( wxHORIZONTAL ); - - m_credentials_icon = new wxStaticBitmap( m_sb_credentials->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - sb_credentials_horiz->Add( m_credentials_icon, 0, wxALL, 5 ); - - m_sb_credentials_vert = new wxBoxSizer( wxVERTICAL ); - - m_credentials_label = new wxStaticText( m_sb_credentials->GetStaticBox(), wxID_ANY, _("Please provide your user ID and password."), wxDefaultPosition, wxDefaultSize, 0 ); - m_credentials_label->Wrap( 440 ); - m_sb_credentials_vert->Add( m_credentials_label, 0, wxALL|wxEXPAND, 5 ); - - wxFlexGridSizer* sb_credentials_tbl; - sb_credentials_tbl = new wxFlexGridSizer( 0, 2, 5, 5 ); - sb_credentials_tbl->AddGrowableCol( 1 ); - sb_credentials_tbl->SetFlexibleDirection( wxBOTH ); - sb_credentials_tbl->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - m_identity_label = new wxStaticText( m_sb_credentials->GetStaticBox(), wxID_ANY, _("User ID:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_identity_label->Wrap( -1 ); - sb_credentials_tbl->Add( m_identity_label, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - m_identity = new wxTextCtrl( m_sb_credentials->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_identity->SetToolTip( _("Enter your user name here (user@domain.org, DOMAIN\\User, etc.)") ); - - sb_credentials_tbl->Add( m_identity, 2, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); - - m_password_label = new wxStaticText( m_sb_credentials->GetStaticBox(), wxID_ANY, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_password_label->Wrap( -1 ); - sb_credentials_tbl->Add( m_password_label, 0, wxALIGN_CENTER_VERTICAL, 5 ); - - m_password = new wxTextCtrl( m_sb_credentials->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); - m_password->SetToolTip( _("Enter your password here") ); - - sb_credentials_tbl->Add( m_password, 2, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); - - - m_sb_credentials_vert->Add( sb_credentials_tbl, 0, wxEXPAND|wxALL, 5 ); - - - sb_credentials_horiz->Add( m_sb_credentials_vert, 1, wxEXPAND, 5 ); - - - m_sb_credentials->Add( sb_credentials_horiz, 0, wxEXPAND, 5 ); - - - this->SetSizer( m_sb_credentials ); - this->Layout(); - - // Connect Events - m_password->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( wxPasswordCredentialsPanelBase::OnPasswordText ), NULL, this ); -} - -wxPasswordCredentialsPanelBase::~wxPasswordCredentialsPanelBase() -{ - // Disconnect Events - m_password->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( wxPasswordCredentialsPanelBase::OnPasswordText ), NULL, this ); - -} - -wxEAPProviderContactInfoPanelBase::wxEAPProviderContactInfoPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) -{ - wxStaticBoxSizer* sb_provider_contact; - sb_provider_contact = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Your Organization") ), wxVERTICAL ); - - wxBoxSizer* sb_provider_contact_horiz; - sb_provider_contact_horiz = new wxBoxSizer( wxHORIZONTAL ); - - m_provider_contact_icon = new wxStaticBitmap( sb_provider_contact->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - sb_provider_contact_horiz->Add( m_provider_contact_icon, 0, wxALL, 5 ); - - wxBoxSizer* sb_provider_contact_vert; - sb_provider_contact_vert = new wxBoxSizer( wxVERTICAL ); - - m_provider_contact_label = new wxStaticText( sb_provider_contact->GetStaticBox(), wxID_ANY, _("Describe your organization to customize user prompts. When organization is introduced, end-users find program messages easier to understand and act."), wxDefaultPosition, wxDefaultSize, 0 ); - m_provider_contact_label->Wrap( 440 ); - sb_provider_contact_vert->Add( m_provider_contact_label, 0, wxALL|wxEXPAND, 5 ); - - wxBoxSizer* sb_provider_name; - sb_provider_name = new wxBoxSizer( wxVERTICAL ); - - m_provider_name_label = new wxStaticText( sb_provider_contact->GetStaticBox(), wxID_ANY, _("Your organization &name:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_provider_name_label->Wrap( -1 ); - sb_provider_name->Add( m_provider_name_label, 0, wxBOTTOM, 5 ); - - m_provider_name = new wxTextCtrl( sb_provider_contact->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_provider_name->SetToolTip( _("Your organization name as it will appear on helpdesk contact notifications") ); - - sb_provider_name->Add( m_provider_name, 0, wxEXPAND|wxBOTTOM, 5 ); - - m_provider_name_note = new wxStaticText( sb_provider_contact->GetStaticBox(), wxID_ANY, _("(Keep it short, please)"), wxDefaultPosition, wxDefaultSize, 0 ); - m_provider_name_note->Wrap( -1 ); - sb_provider_name->Add( m_provider_name_note, 0, wxALIGN_RIGHT, 5 ); - - - sb_provider_contact_vert->Add( sb_provider_name, 0, wxEXPAND|wxALL, 5 ); - - wxBoxSizer* sb_provider_helpdesk; - sb_provider_helpdesk = new wxBoxSizer( wxVERTICAL ); - - m_provider_helpdesk_label = new wxStaticText( sb_provider_contact->GetStaticBox(), wxID_ANY, _("Helpdesk contact &information:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_provider_helpdesk_label->Wrap( -1 ); - sb_provider_helpdesk->Add( m_provider_helpdesk_label, 0, wxBOTTOM, 5 ); - - wxFlexGridSizer* sb_provider_helpdesk_inner; - sb_provider_helpdesk_inner = new wxFlexGridSizer( 0, 2, 0, 0 ); - sb_provider_helpdesk_inner->AddGrowableCol( 1 ); - sb_provider_helpdesk_inner->SetFlexibleDirection( wxBOTH ); - sb_provider_helpdesk_inner->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - m_provider_web_icon = new wxStaticText( sb_provider_contact->GetStaticBox(), wxID_ANY, _("¶"), wxDefaultPosition, wxDefaultSize, 0 ); - m_provider_web_icon->Wrap( -1 ); - m_provider_web_icon->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxT("Wingdings") ) ); - - sb_provider_helpdesk_inner->Add( m_provider_web_icon, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); - - m_provider_web = new wxTextCtrl( sb_provider_contact->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_provider_web->SetToolTip( _("Your helpdesk website address") ); - - sb_provider_helpdesk_inner->Add( m_provider_web, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 ); - - m_provider_email_icon = new wxStaticText( sb_provider_contact->GetStaticBox(), wxID_ANY, _("*"), wxDefaultPosition, wxDefaultSize, 0 ); - m_provider_email_icon->Wrap( -1 ); - m_provider_email_icon->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxT("Wingdings") ) ); - - sb_provider_helpdesk_inner->Add( m_provider_email_icon, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); - - m_provider_email = new wxTextCtrl( sb_provider_contact->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_provider_email->SetToolTip( _("Your helpdesk e-mail address") ); - - sb_provider_helpdesk_inner->Add( m_provider_email, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 ); - - m_provider_phone_icon = new wxStaticText( sb_provider_contact->GetStaticBox(), wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 ); - m_provider_phone_icon->Wrap( -1 ); - m_provider_phone_icon->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxT("Wingdings") ) ); - - sb_provider_helpdesk_inner->Add( m_provider_phone_icon, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - - m_provider_phone = new wxTextCtrl( sb_provider_contact->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_provider_phone->SetToolTip( _("Your helpdesk phone number") ); - - sb_provider_helpdesk_inner->Add( m_provider_phone, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); - - - sb_provider_helpdesk->Add( sb_provider_helpdesk_inner, 0, wxEXPAND, 5 ); - - - sb_provider_contact_vert->Add( sb_provider_helpdesk, 0, wxEXPAND|wxALL, 5 ); - - - sb_provider_contact_horiz->Add( sb_provider_contact_vert, 1, wxEXPAND, 5 ); - - - sb_provider_contact->Add( sb_provider_contact_horiz, 1, wxEXPAND, 5 ); - - - this->SetSizer( sb_provider_contact ); - this->Layout(); -} - -wxEAPProviderContactInfoPanelBase::~wxEAPProviderContactInfoPanelBase() -{ -} - -wxEAPProviderIDPanelBase::wxEAPProviderIDPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) -{ - wxStaticBoxSizer* sb_provider_id; - sb_provider_id = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Provider Unique Identifier") ), wxVERTICAL ); - - wxBoxSizer* sb_provider_id_horiz; - sb_provider_id_horiz = new wxBoxSizer( wxHORIZONTAL ); - - m_provider_id_icon = new wxStaticBitmap( sb_provider_id->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - sb_provider_id_horiz->Add( m_provider_id_icon, 0, wxALL, 5 ); - - wxBoxSizer* sb_provider_id_vert; - sb_provider_id_vert = new wxBoxSizer( wxVERTICAL ); - - m_provider_id_label_outer = new wxStaticText( sb_provider_id->GetStaticBox(), wxID_ANY, _("Assign your organization a unique ID to allow sharing the same credential set across different network profiles."), wxDefaultPosition, wxDefaultSize, 0 ); - m_provider_id_label_outer->Wrap( 440 ); - sb_provider_id_vert->Add( m_provider_id_label_outer, 0, wxALL|wxEXPAND, 5 ); - - wxBoxSizer* sb_provider_namespace; - sb_provider_namespace = new wxBoxSizer( wxVERTICAL ); - - m_provider_namespace_label = new wxStaticText( sb_provider_id->GetStaticBox(), wxID_ANY, _("&Namespace:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_provider_namespace_label->Wrap( -1 ); - sb_provider_namespace->Add( m_provider_namespace_label, 0, wxBOTTOM, 5 ); - - wxString m_provider_namespaceChoices[] = { _("urn:RFC4282:realm"), _("urn:uuid") }; - int m_provider_namespaceNChoices = sizeof( m_provider_namespaceChoices ) / sizeof( wxString ); - m_provider_namespace = new wxChoice( sb_provider_id->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_provider_namespaceNChoices, m_provider_namespaceChoices, 0 ); - m_provider_namespace->SetSelection( 0 ); - sb_provider_namespace->Add( m_provider_namespace, 0, wxEXPAND, 5 ); - - - sb_provider_id_vert->Add( sb_provider_namespace, 0, wxEXPAND|wxALL, 5 ); - - wxBoxSizer* sb_provider_id_inner; - sb_provider_id_inner = new wxBoxSizer( wxVERTICAL ); - - m_provider_id_label = new wxStaticText( sb_provider_id->GetStaticBox(), wxID_ANY, _("Provider unique &identifier:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_provider_id_label->Wrap( -1 ); - sb_provider_id_inner->Add( m_provider_id_label, 0, wxBOTTOM, 5 ); - - m_provider_id = new wxTextCtrl( sb_provider_id->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_provider_id->SetToolTip( _("Your organization ID to assign same credentials from other profiles") ); - - sb_provider_id_inner->Add( m_provider_id, 0, wxEXPAND, 5 ); - - - sb_provider_id_vert->Add( sb_provider_id_inner, 0, wxEXPAND|wxALL, 5 ); - - - sb_provider_id_horiz->Add( sb_provider_id_vert, 1, wxEXPAND, 5 ); - - - sb_provider_id->Add( sb_provider_id_horiz, 1, wxEXPAND, 5 ); - - - this->SetSizer( sb_provider_id ); - this->Layout(); -} - -wxEAPProviderIDPanelBase::~wxEAPProviderIDPanelBase() -{ -} - -wxEAPProviderLockPanelBase::wxEAPProviderLockPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) -{ - wxStaticBoxSizer* sb_provider_lock; - sb_provider_lock = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Configuration Lock") ), wxVERTICAL ); - - wxBoxSizer* sb_provider_lock_horiz; - sb_provider_lock_horiz = new wxBoxSizer( wxHORIZONTAL ); - - m_provider_lock_icon = new wxStaticBitmap( sb_provider_lock->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - sb_provider_lock_horiz->Add( m_provider_lock_icon, 0, wxALL, 5 ); - - wxBoxSizer* sb_provider_lock_vert; - sb_provider_lock_vert = new wxBoxSizer( wxVERTICAL ); - - m_provider_lock_label = new wxStaticText( sb_provider_lock->GetStaticBox(), wxID_ANY, _("Your configuration can be locked to prevent accidental modification by end-users. Users will only be allowed to enter credentials."), wxDefaultPosition, wxDefaultSize, 0 ); - m_provider_lock_label->Wrap( 440 ); - sb_provider_lock_vert->Add( m_provider_lock_label, 0, wxALL|wxEXPAND, 5 ); - - wxBoxSizer* sb_provider_lock_inner; - sb_provider_lock_inner = new wxBoxSizer( wxVERTICAL ); - - m_provider_lock = new wxCheckBox( sb_provider_lock->GetStaticBox(), wxID_ANY, _("&Lock this configuration and prevent any further modification via user interface."), wxDefaultPosition, wxDefaultSize, 0 ); - sb_provider_lock_inner->Add( m_provider_lock, 0, wxEXPAND|wxBOTTOM, 5 ); - - m_provider_lock_note = new wxStaticText( sb_provider_lock->GetStaticBox(), wxID_ANY, _("(Warning: Once locked, you can not revert using this dialog!)"), wxDefaultPosition, wxDefaultSize, 0 ); - m_provider_lock_note->Wrap( -1 ); - sb_provider_lock_inner->Add( m_provider_lock_note, 0, wxALIGN_RIGHT, 5 ); - - - sb_provider_lock_vert->Add( sb_provider_lock_inner, 0, wxEXPAND|wxALL, 5 ); - - - sb_provider_lock_horiz->Add( sb_provider_lock_vert, 1, wxEXPAND, 5 ); - - - sb_provider_lock->Add( sb_provider_lock_horiz, 1, wxEXPAND, 5 ); - - - this->SetSizer( sb_provider_lock ); - this->Layout(); -} - -wxEAPProviderLockPanelBase::~wxEAPProviderLockPanelBase() -{ -} - -wxEAPProviderSelectDialogBase::wxEAPProviderSelectDialogBase( 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* sb_content; - sb_content = new wxBoxSizer( wxVERTICAL ); - - m_banner = new wxEAPBannerPanel( this ); - - sb_content->Add( m_banner, 0, wxEXPAND|wxBOTTOM, 5 ); - - m_providers = new wxBoxSizer( wxVERTICAL ); - - m_providers->SetMinSize( wxSize( 350,-1 ) ); - - sb_content->Add( m_providers, 1, wxEXPAND|wxALL, 5 ); - - m_buttons = new wxStdDialogButtonSizer(); - m_buttonsCancel = new wxButton( this, wxID_CANCEL ); - m_buttons->AddButton( m_buttonsCancel ); - m_buttons->Realize(); - - sb_content->Add( m_buttons, 0, wxEXPAND|wxALL, 5 ); - - - this->SetSizer( sb_content ); - this->Layout(); - sb_content->Fit( this ); - - // Connect Events - this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxEAPProviderSelectDialogBase::OnInitDialog ) ); -} - -wxEAPProviderSelectDialogBase::~wxEAPProviderSelectDialogBase() -{ - // Disconnect Events - this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxEAPProviderSelectDialogBase::OnInitDialog ) ); - -} +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Aug 8 2018) +// http://www.wxformbuilder.org/ +// +// PLEASE DO *NOT* EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#include + +#include "wxEAP_UI.h" + +/////////////////////////////////////////////////////////////////////////// + +wxEAPConfigDialogBase::wxEAPConfigDialogBase( 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* sb_content; + sb_content = new wxBoxSizer( wxVERTICAL ); + + m_banner = new wxEAPBannerPanel( this ); + + sb_content->Add( m_banner, 0, wxEXPAND|wxBOTTOM, 5 ); + + m_providers = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); + m_providers->SetExtraStyle( wxWS_EX_VALIDATE_RECURSIVELY ); + + + sb_content->Add( m_providers, 1, wxEXPAND|wxALL, 10 ); + + wxBoxSizer* sb_bottom_horiz; + sb_bottom_horiz = new wxBoxSizer( wxHORIZONTAL ); + + wxBoxSizer* sb_bottom_horiz_inner; + sb_bottom_horiz_inner = new wxBoxSizer( wxHORIZONTAL ); + + m_prov_add = new wxButton( this, wxID_ANY, _("+"), wxDefaultPosition, wxSize( 30,-1 ), 0 ); + m_prov_add->SetToolTip( _("Adds new provider") ); + + sb_bottom_horiz_inner->Add( m_prov_add, 0, wxALL, 5 ); + + m_prov_remove = new wxButton( this, wxID_ANY, _("-"), wxDefaultPosition, wxSize( 30,-1 ), 0 ); + m_prov_remove->SetToolTip( _("Removes selected provider") ); + + sb_bottom_horiz_inner->Add( m_prov_remove, 0, wxALL, 5 ); + + m_prov_advanced = new wxButton( this, wxID_ANY, _("Advanced..."), wxDefaultPosition, wxDefaultSize, 0 ); + m_prov_advanced->SetToolTip( _("Opens dialog with provider settings") ); + + sb_bottom_horiz_inner->Add( m_prov_advanced, 0, wxALL, 5 ); + + + sb_bottom_horiz->Add( sb_bottom_horiz_inner, 1, wxEXPAND, 5 ); + + m_buttons = new wxStdDialogButtonSizer(); + m_buttonsOK = new wxButton( this, wxID_OK ); + m_buttons->AddButton( m_buttonsOK ); + m_buttonsCancel = new wxButton( this, wxID_CANCEL ); + m_buttons->AddButton( m_buttonsCancel ); + m_buttons->Realize(); + + sb_bottom_horiz->Add( m_buttons, 0, wxEXPAND|wxALL, 5 ); + + + sb_content->Add( sb_bottom_horiz, 0, wxEXPAND, 5 ); + + + this->SetSizer( sb_content ); + this->Layout(); + sb_content->Fit( this ); + + // Connect Events + this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxEAPConfigDialogBase::OnInitDialog ) ); + this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxEAPConfigDialogBase::OnUpdateUI ) ); + m_prov_add->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPConfigDialogBase::OnProvAdd ), NULL, this ); + m_prov_remove->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPConfigDialogBase::OnProvRemove ), NULL, this ); + m_prov_advanced->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPConfigDialogBase::OnProvAdvanced ), NULL, this ); +} + +wxEAPConfigDialogBase::~wxEAPConfigDialogBase() +{ + // Disconnect Events + this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxEAPConfigDialogBase::OnInitDialog ) ); + this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxEAPConfigDialogBase::OnUpdateUI ) ); + m_prov_add->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPConfigDialogBase::OnProvAdd ), NULL, this ); + m_prov_remove->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPConfigDialogBase::OnProvRemove ), NULL, this ); + m_prov_advanced->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPConfigDialogBase::OnProvAdvanced ), NULL, this ); + +} + +wxEAPGeneralDialogBase::wxEAPGeneralDialogBase( 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* sb_content; + sb_content = new wxBoxSizer( wxVERTICAL ); + + m_banner = new wxEAPBannerPanel( this ); + + sb_content->Add( m_banner, 0, wxEXPAND|wxBOTTOM, 5 ); + + m_panels = new wxBoxSizer( wxVERTICAL ); + + + sb_content->Add( m_panels, 1, wxEXPAND|wxALL, 5 ); + + m_buttons = new wxStdDialogButtonSizer(); + m_buttonsOK = new wxButton( this, wxID_OK ); + m_buttons->AddButton( m_buttonsOK ); + m_buttonsCancel = new wxButton( this, wxID_CANCEL ); + m_buttons->AddButton( m_buttonsCancel ); + m_buttons->Realize(); + + sb_content->Add( m_buttons, 0, wxEXPAND|wxALL, 5 ); + + + this->SetSizer( sb_content ); + this->Layout(); + sb_content->Fit( this ); + + // Connect Events + this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxEAPGeneralDialogBase::OnInitDialog ) ); +} + +wxEAPGeneralDialogBase::~wxEAPGeneralDialogBase() +{ + // Disconnect Events + this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxEAPGeneralDialogBase::OnInitDialog ) ); + +} + +wxEAPCredentialsConnectionDialogBase::wxEAPCredentialsConnectionDialogBase( 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* sb_content; + sb_content = new wxBoxSizer( wxVERTICAL ); + + m_banner = new wxEAPBannerPanel( this ); + + sb_content->Add( m_banner, 0, wxEXPAND|wxBOTTOM, 5 ); + + m_providers = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); + m_providers->SetExtraStyle( wxWS_EX_VALIDATE_RECURSIVELY ); + + + sb_content->Add( m_providers, 1, wxEXPAND | wxALL, 5 ); + + m_buttons = new wxStdDialogButtonSizer(); + m_buttonsOK = new wxButton( this, wxID_OK ); + m_buttons->AddButton( m_buttonsOK ); + m_buttonsCancel = new wxButton( this, wxID_CANCEL ); + m_buttons->AddButton( m_buttonsCancel ); + m_buttons->Realize(); + + sb_content->Add( m_buttons, 0, wxEXPAND|wxALL, 5 ); + + + this->SetSizer( sb_content ); + this->Layout(); + sb_content->Fit( this ); + + // Connect Events + this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxEAPCredentialsConnectionDialogBase::OnInitDialog ) ); +} + +wxEAPCredentialsConnectionDialogBase::~wxEAPCredentialsConnectionDialogBase() +{ + // Disconnect Events + this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxEAPCredentialsConnectionDialogBase::OnInitDialog ) ); + +} + +wxEAPBannerPanelBase::wxEAPBannerPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) +{ + this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_HIGHLIGHT ) ); + this->SetMinSize( wxSize( -1,48 ) ); + + wxBoxSizer* sb_content; + sb_content = new wxBoxSizer( wxVERTICAL ); + + m_title = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); + m_title->Wrap( -1 ); + m_title->SetFont( wxFont( 18, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); + m_title->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) ); + + sb_content->Add( m_title, 0, wxALL|wxEXPAND, 5 ); + + + this->SetSizer( sb_content ); + this->Layout(); + sb_content->Fit( this ); +} + +wxEAPBannerPanelBase::~wxEAPBannerPanelBase() +{ +} + +wxEAPNotePanelBase::wxEAPNotePanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) +{ + this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_INFOBK ) ); + + wxBoxSizer* sb_note_horiz; + sb_note_horiz = new wxBoxSizer( wxHORIZONTAL ); + + m_note_icon = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + sb_note_horiz->Add( m_note_icon, 0, wxALL, 5 ); + + m_note_vert = new wxBoxSizer( wxVERTICAL ); + + m_note_label = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_note_label->Wrap( 449 ); + m_note_vert->Add( m_note_label, 0, wxALL|wxEXPAND, 5 ); + + + sb_note_horiz->Add( m_note_vert, 1, wxEXPAND, 5 ); + + + this->SetSizer( sb_note_horiz ); + this->Layout(); +} + +wxEAPNotePanelBase::~wxEAPNotePanelBase() +{ +} + +wxEAPCredentialsConfigPanelBase::wxEAPCredentialsConfigPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) +{ + m_sb_credentials = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("%s User Credentials") ), wxVERTICAL ); + + wxBoxSizer* sb_credentials_horiz; + sb_credentials_horiz = new wxBoxSizer( wxHORIZONTAL ); + + m_credentials_icon = new wxStaticBitmap( m_sb_credentials->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + sb_credentials_horiz->Add( m_credentials_icon, 0, wxALL, 5 ); + + wxBoxSizer* sb_credentials_vert; + sb_credentials_vert = new wxBoxSizer( wxVERTICAL ); + + m_credentials_label = new wxStaticText( m_sb_credentials->GetStaticBox(), wxID_ANY, _("Select the source where your credentials used to connect are stored."), wxDefaultPosition, wxDefaultSize, 0 ); + m_credentials_label->Wrap( 440 ); + sb_credentials_vert->Add( m_credentials_label, 0, wxALL|wxEXPAND, 5 ); + + m_storage = new wxRadioButton( m_sb_credentials->GetStaticBox(), wxID_ANY, _("Use credentials from Credential &Manager"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); + m_storage->SetToolTip( _("Select this option if you would like to use credentials stored in Windows Credential Manager") ); + + sb_credentials_vert->Add( m_storage, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + + wxBoxSizer* sb_storage; + sb_storage = new wxBoxSizer( wxVERTICAL ); + + wxBoxSizer* sb_storage_identity; + sb_storage_identity = new wxBoxSizer( wxHORIZONTAL ); + + m_storage_identity_label = new wxStaticText( m_sb_credentials->GetStaticBox(), wxID_ANY, _("Identity:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_storage_identity_label->Wrap( -1 ); + sb_storage_identity->Add( m_storage_identity_label, 0, 0, 5 ); + + m_storage_identity = new wxStaticText( m_sb_credentials->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_storage_identity->Wrap( -1 ); + m_storage_identity->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); + m_storage_identity->SetToolTip( _("Your present credentials stored in Windows Credential Manager") ); + + sb_storage_identity->Add( m_storage_identity, 1, wxEXPAND|wxLEFT, 5 ); + + + sb_storage->Add( sb_storage_identity, 1, wxEXPAND, 5 ); + + wxBoxSizer* sb_buttons_storage; + sb_buttons_storage = new wxBoxSizer( wxHORIZONTAL ); + + m_storage_clear = new wxButton( m_sb_credentials->GetStaticBox(), wxID_ANY, _("&Clear Credentials"), wxDefaultPosition, wxDefaultSize, 0 ); + m_storage_clear->SetToolTip( _("Click to clear your credentials from Credential Manager.\nNote: You will be prompted to enter credentials when connecting.") ); + + sb_buttons_storage->Add( m_storage_clear, 0, wxRIGHT, 5 ); + + m_storage_set = new wxButton( m_sb_credentials->GetStaticBox(), wxID_ANY, _("&Set Credentials..."), wxDefaultPosition, wxDefaultSize, 0 ); + m_storage_set->SetToolTip( _("Click here to set or modify your credentials") ); + + sb_buttons_storage->Add( m_storage_set, 0, wxLEFT, 5 ); + + + sb_storage->Add( sb_buttons_storage, 0, wxALIGN_RIGHT|wxTOP, 5 ); + + + sb_credentials_vert->Add( sb_storage, 0, wxEXPAND|wxALL, 5 ); + + m_config = new wxRadioButton( m_sb_credentials->GetStaticBox(), wxID_ANY, _("Use credentials from &profile configuration"), wxDefaultPosition, wxDefaultSize, 0 ); + m_config->SetToolTip( _("Select this option if you would like to store credentials as a part of profile configuration") ); + + sb_credentials_vert->Add( m_config, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + + wxBoxSizer* sb_config; + sb_config = new wxBoxSizer( wxVERTICAL ); + + wxBoxSizer* sb_config_identity; + sb_config_identity = new wxBoxSizer( wxHORIZONTAL ); + + m_config_identity_label = new wxStaticText( m_sb_credentials->GetStaticBox(), wxID_ANY, _("Identity:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_config_identity_label->Wrap( -1 ); + sb_config_identity->Add( m_config_identity_label, 0, 0, 5 ); + + m_config_identity = new wxStaticText( m_sb_credentials->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_config_identity->Wrap( -1 ); + m_config_identity->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); + m_config_identity->SetToolTip( _("Profile configuration credentials") ); + + sb_config_identity->Add( m_config_identity, 1, wxEXPAND|wxLEFT, 5 ); + + + sb_config->Add( sb_config_identity, 1, wxEXPAND, 5 ); + + wxBoxSizer* sb_buttons_config; + sb_buttons_config = new wxBoxSizer( wxHORIZONTAL ); + + m_config_set = new wxButton( m_sb_credentials->GetStaticBox(), wxID_ANY, _("&Set Credentials..."), wxDefaultPosition, wxDefaultSize, 0 ); + m_config_set->SetToolTip( _("Click here to set or modify your credentials") ); + + sb_buttons_config->Add( m_config_set, 0, 0, 5 ); + + + sb_config->Add( sb_buttons_config, 0, wxALIGN_RIGHT|wxTOP, 5 ); + + + sb_credentials_vert->Add( sb_config, 0, wxEXPAND|wxALL, 5 ); + + + sb_credentials_horiz->Add( sb_credentials_vert, 1, wxEXPAND, 5 ); + + + m_sb_credentials->Add( sb_credentials_horiz, 1, wxEXPAND, 5 ); + + + this->SetSizer( m_sb_credentials ); + this->Layout(); + m_timer_storage.SetOwner( this, wxID_ANY ); + + // Connect Events + this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxEAPCredentialsConfigPanelBase::OnUpdateUI ) ); + m_storage_clear->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPCredentialsConfigPanelBase::OnClearStorage ), NULL, this ); + m_storage_set->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPCredentialsConfigPanelBase::OnSetStorage ), NULL, this ); + m_config_set->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPCredentialsConfigPanelBase::OnSetConfig ), NULL, this ); + this->Connect( wxID_ANY, wxEVT_TIMER, wxTimerEventHandler( wxEAPCredentialsConfigPanelBase::OnTimerStorage ) ); +} + +wxEAPCredentialsConfigPanelBase::~wxEAPCredentialsConfigPanelBase() +{ + // Disconnect Events + this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxEAPCredentialsConfigPanelBase::OnUpdateUI ) ); + m_storage_clear->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPCredentialsConfigPanelBase::OnClearStorage ), NULL, this ); + m_storage_set->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPCredentialsConfigPanelBase::OnSetStorage ), NULL, this ); + m_config_set->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPCredentialsConfigPanelBase::OnSetConfig ), NULL, this ); + this->Disconnect( wxID_ANY, wxEVT_TIMER, wxTimerEventHandler( wxEAPCredentialsConfigPanelBase::OnTimerStorage ) ); + +} + +wxPasswordCredentialsPanelBase::wxPasswordCredentialsPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxEAPCredentialsPanelBase( parent, id, pos, size, style, name ) +{ + m_sb_credentials = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("User ID and Password") ), wxVERTICAL ); + + wxBoxSizer* sb_credentials_horiz; + sb_credentials_horiz = new wxBoxSizer( wxHORIZONTAL ); + + m_credentials_icon = new wxStaticBitmap( m_sb_credentials->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + sb_credentials_horiz->Add( m_credentials_icon, 0, wxALL, 5 ); + + m_sb_credentials_vert = new wxBoxSizer( wxVERTICAL ); + + m_credentials_label = new wxStaticText( m_sb_credentials->GetStaticBox(), wxID_ANY, _("Please provide your user ID and password."), wxDefaultPosition, wxDefaultSize, 0 ); + m_credentials_label->Wrap( 440 ); + m_sb_credentials_vert->Add( m_credentials_label, 0, wxALL|wxEXPAND, 5 ); + + wxFlexGridSizer* sb_credentials_tbl; + sb_credentials_tbl = new wxFlexGridSizer( 0, 2, 5, 5 ); + sb_credentials_tbl->AddGrowableCol( 1 ); + sb_credentials_tbl->SetFlexibleDirection( wxBOTH ); + sb_credentials_tbl->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + m_identity_label = new wxStaticText( m_sb_credentials->GetStaticBox(), wxID_ANY, _("User ID:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_identity_label->Wrap( -1 ); + sb_credentials_tbl->Add( m_identity_label, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + m_identity = new wxTextCtrl( m_sb_credentials->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_identity->SetToolTip( _("Enter your user name here (user@domain.org, DOMAIN\\User, etc.)") ); + + sb_credentials_tbl->Add( m_identity, 2, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + + m_password_label = new wxStaticText( m_sb_credentials->GetStaticBox(), wxID_ANY, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_password_label->Wrap( -1 ); + sb_credentials_tbl->Add( m_password_label, 0, wxALIGN_CENTER_VERTICAL, 5 ); + + m_password = new wxTextCtrl( m_sb_credentials->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); + m_password->SetToolTip( _("Enter your password here") ); + + sb_credentials_tbl->Add( m_password, 2, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + + + m_sb_credentials_vert->Add( sb_credentials_tbl, 0, wxEXPAND|wxALL, 5 ); + + + sb_credentials_horiz->Add( m_sb_credentials_vert, 1, wxEXPAND, 5 ); + + + m_sb_credentials->Add( sb_credentials_horiz, 0, wxEXPAND, 5 ); + + + this->SetSizer( m_sb_credentials ); + this->Layout(); + + // Connect Events + m_password->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( wxPasswordCredentialsPanelBase::OnPasswordText ), NULL, this ); +} + +wxPasswordCredentialsPanelBase::~wxPasswordCredentialsPanelBase() +{ + // Disconnect Events + m_password->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( wxPasswordCredentialsPanelBase::OnPasswordText ), NULL, this ); + +} + +wxEAPProviderContactInfoPanelBase::wxEAPProviderContactInfoPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) +{ + wxStaticBoxSizer* sb_provider_contact; + sb_provider_contact = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Your Organization") ), wxVERTICAL ); + + wxBoxSizer* sb_provider_contact_horiz; + sb_provider_contact_horiz = new wxBoxSizer( wxHORIZONTAL ); + + m_provider_contact_icon = new wxStaticBitmap( sb_provider_contact->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + sb_provider_contact_horiz->Add( m_provider_contact_icon, 0, wxALL, 5 ); + + wxBoxSizer* sb_provider_contact_vert; + sb_provider_contact_vert = new wxBoxSizer( wxVERTICAL ); + + m_provider_contact_label = new wxStaticText( sb_provider_contact->GetStaticBox(), wxID_ANY, _("Describe your organization to customize user prompts. When organization is introduced, end-users find program messages easier to understand and act."), wxDefaultPosition, wxDefaultSize, 0 ); + m_provider_contact_label->Wrap( 440 ); + sb_provider_contact_vert->Add( m_provider_contact_label, 0, wxALL|wxEXPAND, 5 ); + + wxBoxSizer* sb_provider_name; + sb_provider_name = new wxBoxSizer( wxVERTICAL ); + + m_provider_name_label = new wxStaticText( sb_provider_contact->GetStaticBox(), wxID_ANY, _("Your organization &name:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_provider_name_label->Wrap( -1 ); + sb_provider_name->Add( m_provider_name_label, 0, wxBOTTOM, 5 ); + + m_provider_name = new wxTextCtrl( sb_provider_contact->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_provider_name->SetToolTip( _("Your organization name as it will appear on helpdesk contact notifications") ); + + sb_provider_name->Add( m_provider_name, 0, wxEXPAND|wxBOTTOM, 5 ); + + m_provider_name_note = new wxStaticText( sb_provider_contact->GetStaticBox(), wxID_ANY, _("(Keep it short, please)"), wxDefaultPosition, wxDefaultSize, 0 ); + m_provider_name_note->Wrap( -1 ); + sb_provider_name->Add( m_provider_name_note, 0, wxALIGN_RIGHT, 5 ); + + + sb_provider_contact_vert->Add( sb_provider_name, 0, wxEXPAND|wxALL, 5 ); + + wxBoxSizer* sb_provider_helpdesk; + sb_provider_helpdesk = new wxBoxSizer( wxVERTICAL ); + + m_provider_helpdesk_label = new wxStaticText( sb_provider_contact->GetStaticBox(), wxID_ANY, _("Helpdesk contact &information:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_provider_helpdesk_label->Wrap( -1 ); + sb_provider_helpdesk->Add( m_provider_helpdesk_label, 0, wxBOTTOM, 5 ); + + wxFlexGridSizer* sb_provider_helpdesk_inner; + sb_provider_helpdesk_inner = new wxFlexGridSizer( 0, 2, 0, 0 ); + sb_provider_helpdesk_inner->AddGrowableCol( 1 ); + sb_provider_helpdesk_inner->SetFlexibleDirection( wxBOTH ); + sb_provider_helpdesk_inner->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + m_provider_web_icon = new wxStaticText( sb_provider_contact->GetStaticBox(), wxID_ANY, _("¶"), wxDefaultPosition, wxDefaultSize, 0 ); + m_provider_web_icon->Wrap( -1 ); + m_provider_web_icon->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("Wingdings") ) ); + + sb_provider_helpdesk_inner->Add( m_provider_web_icon, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); + + m_provider_web = new wxTextCtrl( sb_provider_contact->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_provider_web->SetToolTip( _("Your helpdesk website address") ); + + sb_provider_helpdesk_inner->Add( m_provider_web, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 ); + + m_provider_email_icon = new wxStaticText( sb_provider_contact->GetStaticBox(), wxID_ANY, _("*"), wxDefaultPosition, wxDefaultSize, 0 ); + m_provider_email_icon->Wrap( -1 ); + m_provider_email_icon->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("Wingdings") ) ); + + sb_provider_helpdesk_inner->Add( m_provider_email_icon, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); + + m_provider_email = new wxTextCtrl( sb_provider_contact->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_provider_email->SetToolTip( _("Your helpdesk e-mail address") ); + + sb_provider_helpdesk_inner->Add( m_provider_email, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 ); + + m_provider_phone_icon = new wxStaticText( sb_provider_contact->GetStaticBox(), wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 ); + m_provider_phone_icon->Wrap( -1 ); + m_provider_phone_icon->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxT("Wingdings") ) ); + + sb_provider_helpdesk_inner->Add( m_provider_phone_icon, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); + + m_provider_phone = new wxTextCtrl( sb_provider_contact->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_provider_phone->SetToolTip( _("Your helpdesk phone number") ); + + sb_provider_helpdesk_inner->Add( m_provider_phone, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + + + sb_provider_helpdesk->Add( sb_provider_helpdesk_inner, 0, wxEXPAND, 5 ); + + + sb_provider_contact_vert->Add( sb_provider_helpdesk, 0, wxEXPAND|wxALL, 5 ); + + + sb_provider_contact_horiz->Add( sb_provider_contact_vert, 1, wxEXPAND, 5 ); + + + sb_provider_contact->Add( sb_provider_contact_horiz, 1, wxEXPAND, 5 ); + + + this->SetSizer( sb_provider_contact ); + this->Layout(); +} + +wxEAPProviderContactInfoPanelBase::~wxEAPProviderContactInfoPanelBase() +{ +} + +wxEAPProviderIDPanelBase::wxEAPProviderIDPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) +{ + wxStaticBoxSizer* sb_provider_id; + sb_provider_id = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Provider Unique Identifier") ), wxVERTICAL ); + + wxBoxSizer* sb_provider_id_horiz; + sb_provider_id_horiz = new wxBoxSizer( wxHORIZONTAL ); + + m_provider_id_icon = new wxStaticBitmap( sb_provider_id->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + sb_provider_id_horiz->Add( m_provider_id_icon, 0, wxALL, 5 ); + + wxBoxSizer* sb_provider_id_vert; + sb_provider_id_vert = new wxBoxSizer( wxVERTICAL ); + + m_provider_id_label_outer = new wxStaticText( sb_provider_id->GetStaticBox(), wxID_ANY, _("Assign your organization a unique ID to allow sharing the same credential set across different network profiles."), wxDefaultPosition, wxDefaultSize, 0 ); + m_provider_id_label_outer->Wrap( 440 ); + sb_provider_id_vert->Add( m_provider_id_label_outer, 0, wxALL|wxEXPAND, 5 ); + + wxBoxSizer* sb_provider_namespace; + sb_provider_namespace = new wxBoxSizer( wxVERTICAL ); + + m_provider_namespace_label = new wxStaticText( sb_provider_id->GetStaticBox(), wxID_ANY, _("&Namespace:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_provider_namespace_label->Wrap( -1 ); + sb_provider_namespace->Add( m_provider_namespace_label, 0, wxBOTTOM, 5 ); + + wxString m_provider_namespaceChoices[] = { _("urn:RFC4282:realm"), _("urn:uuid") }; + int m_provider_namespaceNChoices = sizeof( m_provider_namespaceChoices ) / sizeof( wxString ); + m_provider_namespace = new wxChoice( sb_provider_id->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_provider_namespaceNChoices, m_provider_namespaceChoices, 0 ); + m_provider_namespace->SetSelection( 0 ); + sb_provider_namespace->Add( m_provider_namespace, 0, wxEXPAND, 5 ); + + + sb_provider_id_vert->Add( sb_provider_namespace, 0, wxEXPAND|wxALL, 5 ); + + wxBoxSizer* sb_provider_id_inner; + sb_provider_id_inner = new wxBoxSizer( wxVERTICAL ); + + m_provider_id_label = new wxStaticText( sb_provider_id->GetStaticBox(), wxID_ANY, _("Provider unique &identifier:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_provider_id_label->Wrap( -1 ); + sb_provider_id_inner->Add( m_provider_id_label, 0, wxBOTTOM, 5 ); + + m_provider_id = new wxTextCtrl( sb_provider_id->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_provider_id->SetToolTip( _("Your organization ID to assign same credentials from other profiles") ); + + sb_provider_id_inner->Add( m_provider_id, 0, wxEXPAND, 5 ); + + + sb_provider_id_vert->Add( sb_provider_id_inner, 0, wxEXPAND|wxALL, 5 ); + + + sb_provider_id_horiz->Add( sb_provider_id_vert, 1, wxEXPAND, 5 ); + + + sb_provider_id->Add( sb_provider_id_horiz, 1, wxEXPAND, 5 ); + + + this->SetSizer( sb_provider_id ); + this->Layout(); +} + +wxEAPProviderIDPanelBase::~wxEAPProviderIDPanelBase() +{ +} + +wxEAPProviderLockPanelBase::wxEAPProviderLockPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) +{ + wxStaticBoxSizer* sb_provider_lock; + sb_provider_lock = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Configuration Lock") ), wxVERTICAL ); + + wxBoxSizer* sb_provider_lock_horiz; + sb_provider_lock_horiz = new wxBoxSizer( wxHORIZONTAL ); + + m_provider_lock_icon = new wxStaticBitmap( sb_provider_lock->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + sb_provider_lock_horiz->Add( m_provider_lock_icon, 0, wxALL, 5 ); + + wxBoxSizer* sb_provider_lock_vert; + sb_provider_lock_vert = new wxBoxSizer( wxVERTICAL ); + + m_provider_lock_label = new wxStaticText( sb_provider_lock->GetStaticBox(), wxID_ANY, _("Your configuration can be locked to prevent accidental modification by end-users. Users will only be allowed to enter credentials."), wxDefaultPosition, wxDefaultSize, 0 ); + m_provider_lock_label->Wrap( 440 ); + sb_provider_lock_vert->Add( m_provider_lock_label, 0, wxALL|wxEXPAND, 5 ); + + wxBoxSizer* sb_provider_lock_inner; + sb_provider_lock_inner = new wxBoxSizer( wxVERTICAL ); + + m_provider_lock = new wxCheckBox( sb_provider_lock->GetStaticBox(), wxID_ANY, _("&Lock this configuration and prevent any further modification via user interface."), wxDefaultPosition, wxDefaultSize, 0 ); + sb_provider_lock_inner->Add( m_provider_lock, 0, wxEXPAND|wxBOTTOM, 5 ); + + m_provider_lock_note = new wxStaticText( sb_provider_lock->GetStaticBox(), wxID_ANY, _("(Warning: Once locked, you can not revert using this dialog!)"), wxDefaultPosition, wxDefaultSize, 0 ); + m_provider_lock_note->Wrap( -1 ); + sb_provider_lock_inner->Add( m_provider_lock_note, 0, wxALIGN_RIGHT, 5 ); + + + sb_provider_lock_vert->Add( sb_provider_lock_inner, 0, wxEXPAND|wxALL, 5 ); + + + sb_provider_lock_horiz->Add( sb_provider_lock_vert, 1, wxEXPAND, 5 ); + + + sb_provider_lock->Add( sb_provider_lock_horiz, 1, wxEXPAND, 5 ); + + + this->SetSizer( sb_provider_lock ); + this->Layout(); +} + +wxEAPProviderLockPanelBase::~wxEAPProviderLockPanelBase() +{ +} + +wxEAPProviderSelectDialogBase::wxEAPProviderSelectDialogBase( 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* sb_content; + sb_content = new wxBoxSizer( wxVERTICAL ); + + m_banner = new wxEAPBannerPanel( this ); + + sb_content->Add( m_banner, 0, wxEXPAND|wxBOTTOM, 5 ); + + m_providers = new wxBoxSizer( wxVERTICAL ); + + m_providers->SetMinSize( wxSize( 350,-1 ) ); + + sb_content->Add( m_providers, 1, wxEXPAND|wxALL, 5 ); + + m_buttons = new wxStdDialogButtonSizer(); + m_buttonsCancel = new wxButton( this, wxID_CANCEL ); + m_buttons->AddButton( m_buttonsCancel ); + m_buttons->Realize(); + + sb_content->Add( m_buttons, 0, wxEXPAND|wxALL, 5 ); + + + this->SetSizer( sb_content ); + this->Layout(); + sb_content->Fit( this ); + + // Connect Events + this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxEAPProviderSelectDialogBase::OnInitDialog ) ); +} + +wxEAPProviderSelectDialogBase::~wxEAPProviderSelectDialogBase() +{ + // Disconnect Events + this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxEAPProviderSelectDialogBase::OnInitDialog ) ); + +} diff --git a/lib/EAPBase_UI/res/wxEAP_UI.fbp b/lib/EAPBase_UI/res/wxEAP_UI.fbp index 9d38348..be808d8 100644 --- a/lib/EAPBase_UI/res/wxEAP_UI.fbp +++ b/lib/EAPBase_UI/res/wxEAP_UI.fbp @@ -1,6 +1,6 @@ - + ; C++ @@ -16,7 +16,7 @@ none 1 wxEAP_UI - + . #include <StdAfx.h> 1 @@ -29,67 +29,67 @@ 0 wxAUI_MGR_DEFAULT - - - + + + 1 1 impl_virtual - - - + + + 0 wxID_ANY - - + + wxEAPConfigDialogBase - - + + wxDEFAULT_DIALOG_STYLE - + EAP Connection Configuration - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + OnInitDialog - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + OnUpdateUI - + sb_content wxVERTICAL none @@ -102,19 +102,19 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 wxEAPBannerPanel 1 m_banner = new wxEAPBannerPanel( this ); - + 1 wxEAPBannerPanel *m_banner; 0 @@ -122,60 +122,60 @@ 0 Left 1 - + 1 - + 0 0 wxID_ANY class wxEAPBannerPanel; - + 0 - - + + 0 - + 1 m_banner 1 - - + + protected 1 - + Resizable - + 1 -1,-1 ; ../include/EAP_UI.h 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -187,79 +187,79 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_providers 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - + wxWS_EX_VALIDATE_RECURSIVELY - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -267,7 +267,7 @@ wxEXPAND 0 - + sb_bottom_horiz wxHORIZONTAL none @@ -276,7 +276,7 @@ wxEXPAND 1 - + sb_bottom_horiz_inner wxHORIZONTAL none @@ -289,17 +289,17 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 0 @@ -307,65 +307,65 @@ 0 Left 1 - + 1 - + 0 0 wxID_ANY + - + 0 - - + + 0 - + 1 m_prov_add 1 - - + + protected 1 - + Resizable 1 30,-1 - - + + 0 Adds new provider - + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnProvAdd - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -377,17 +377,17 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 0 @@ -395,65 +395,65 @@ 0 Left 1 - + 1 - + 0 0 wxID_ANY - - + 0 - - + + 0 - + 1 m_prov_remove 1 - - + + protected 1 - + Resizable 1 30,-1 - - + + 0 Removes selected provider - + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnProvRemove - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -465,17 +465,17 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 0 @@ -483,65 +483,65 @@ 0 Left 1 - + 1 - + 0 0 wxID_ANY Advanced... - + 0 - - + + 0 - + 1 m_prov_advanced 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 Opens dialog with provider settings - + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnProvAdvanced - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -559,17 +559,17 @@ 1 0 0 - + m_buttons protected - - - - - - - - + + + + + + + + @@ -579,67 +579,67 @@ 0 wxAUI_MGR_DEFAULT - - - + + + 1 1 impl_virtual - - - + + + 0 wxID_ANY - - + + wxEAPGeneralDialogBase - - + + wxDEFAULT_DIALOG_STYLE - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + OnInitDialog - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + sb_content wxVERTICAL none @@ -652,19 +652,19 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 wxEAPBannerPanel 1 m_banner = new wxEAPBannerPanel( this ); - + 1 wxEAPBannerPanel *m_banner; 0 @@ -672,60 +672,60 @@ 0 Left 1 - + 1 - + 0 0 wxID_ANY class wxEAPBannerPanel; - + 0 - - + + 0 - + 1 m_banner 1 - - + + protected 1 - + Resizable - + 1 -1,-1 ; ../include/EAP_UI.h 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -733,7 +733,7 @@ wxEXPAND|wxALL 1 - + m_panels wxVERTICAL protected @@ -752,17 +752,17 @@ 1 0 0 - + m_buttons protected - - - - - - - - + + + + + + + + @@ -770,67 +770,67 @@ 0 wxAUI_MGR_DEFAULT - - - + + + 1 1 impl_virtual - - - + + + 0 wxID_ANY - - + + wxEAPCredentialsConnectionDialogBase - - + + wxDEFAULT_DIALOG_STYLE - + EAP Credentials - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + OnInitDialog - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + sb_content wxVERTICAL none @@ -843,19 +843,19 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 wxEAPBannerPanel 1 m_banner = new wxEAPBannerPanel( this ); - + 1 wxEAPBannerPanel *m_banner; 0 @@ -863,60 +863,60 @@ 0 Left 1 - + 1 - + 0 0 wxID_ANY class wxEAPBannerPanel; - + 0 - - + + 0 - + 1 m_banner 1 - - + + protected 1 - + Resizable - + 1 -1,-1 ; ../include/EAP_UI.h 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -928,79 +928,79 @@ 1 1 1 - - - - - - - - + + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_providers 1 - - + + public 1 - + Resizable 1 - - - + + + 0 - + wxWS_EX_VALIDATE_RECURSIVELY - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1016,17 +1016,17 @@ 1 0 0 - + m_buttons protected - - - - - - - - + + + + + + + + @@ -1035,56 +1035,56 @@ 0 wxAUI_MGR_DEFAULT wxSYS_COLOUR_HIGHLIGHT - + 1 1 impl_virtual - - + + 0 wxID_ANY - + -1,48 wxEAPBannerPanelBase - + -1,-1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + sb_content wxVERTICAL none @@ -1097,17 +1097,17 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock @@ -1120,55 +1120,55 @@ 0 0 wxID_ANY - - + + 0 - - + + 0 - + 1 m_title 1 - - + + public 1 - + Resizable 1 - + wxALIGN_RIGHT - + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1177,56 +1177,56 @@ 0 wxAUI_MGR_DEFAULT wxSYS_COLOUR_INFOBK - + 1 1 impl_virtual - - + + 0 wxID_ANY - - + + wxEAPNotePanelBase - + 500,-1 - - - - - wxSIMPLE_BORDER|wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + wxTAB_TRAVERSAL|wxBORDER_SIMPLE + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + sb_note_horiz wxHORIZONTAL none @@ -1239,76 +1239,76 @@ 1 1 1 - - - - - - + + + + + + Load From Icon Resource; ; [32; 32] - + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_note_icon 1 - - + + protected 1 - + Resizable 1 - - + + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1316,7 +1316,7 @@ wxEXPAND 1 - + m_note_vert wxVERTICAL protected @@ -1329,78 +1329,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - - + + 0 - - + + 0 - + 1 m_note_label 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + 449 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1410,69 +1410,69 @@ 0 wxAUI_MGR_DEFAULT - - + + 1 1 impl_virtual - - + + 0 wxID_ANY - - + + wxEAPCredentialsConfigPanelBase - + 500,-1 - - - - + + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnUpdateUI wxID_ANY %s User Credentials - + m_sb_credentials wxVERTICAL protected - + 5 wxEXPAND 1 - + sb_credentials_horiz wxHORIZONTAL none @@ -1485,76 +1485,76 @@ 1 1 1 - - - - - - + + + + + + Load From Icon Resource; ; [32; 32] - + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_credentials_icon 1 - - + + protected 1 - + Resizable 1 - - + + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1562,7 +1562,7 @@ wxEXPAND 1 - + sb_credentials_vert wxVERTICAL none @@ -1575,78 +1575,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Select the source where your credentials used to connect are stored. - + 0 - - + + 0 - + 1 m_credentials_label 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + 440 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1658,83 +1658,83 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Use credentials from Credential &Manager - + 0 - - + + 0 - + 1 m_storage 1 - - + + protected 1 - + Resizable 1 - + wxRB_GROUP - + 0 Select this option if you would like to use credentials stored in Windows Credential Manager - + wxFILTER_NONE wxDefaultValidator - + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1742,7 +1742,7 @@ wxEXPAND|wxALL 0 - + sb_storage wxVERTICAL none @@ -1751,91 +1751,91 @@ wxEXPAND 1 - + sb_storage_identity wxHORIZONTAL none 5 - + 0 1 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Identity: - + 0 - - + + 0 - + 1 m_storage_identity_label 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1847,78 +1847,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 ,90,92,-1,70,0 0 0 wxID_ANY - - + + 0 - - + + 0 - + 1 m_storage_identity 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 Your present credentials stored in Windows Credential Manager - - - + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -1928,7 +1928,7 @@ wxALIGN_RIGHT|wxTOP 0 - + sb_buttons_storage wxHORIZONTAL none @@ -1941,17 +1941,17 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 0 @@ -1959,65 +1959,65 @@ 0 Left 1 - + 1 - + 0 0 wxID_ANY &Clear Credentials - + 0 - - + + 0 - + 1 m_storage_clear 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 Click to clear your credentials from Credential Manager. Note: You will be prompted to enter credentials when connecting. - + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnClearStorage - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2029,17 +2029,17 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 0 @@ -2047,65 +2047,65 @@ 0 Left 1 - + 1 - + 0 0 wxID_ANY &Set Credentials... - + 0 - - + + 0 - + 1 m_storage_set 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 Click here to set or modify your credentials - + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnSetStorage - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2121,83 +2121,83 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Use credentials from &profile configuration - + 0 - - + + 0 - + 1 m_config 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 Select this option if you would like to store credentials as a part of profile configuration - + wxFILTER_NONE wxDefaultValidator - + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2205,7 +2205,7 @@ wxEXPAND|wxALL 0 - + sb_config wxVERTICAL none @@ -2214,91 +2214,91 @@ wxEXPAND 1 - + sb_config_identity wxHORIZONTAL none 5 - + 0 1 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Identity: - + 0 - - + + 0 - + 1 m_config_identity_label 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2310,78 +2310,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 ,90,92,-1,70,0 0 0 wxID_ANY - - + + 0 - - + + 0 - + 1 m_config_identity 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 Profile configuration credentials - - - + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2391,30 +2391,30 @@ wxALIGN_RIGHT|wxTOP 0 - + sb_buttons_config wxHORIZONTAL none 5 - + 0 1 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 0 @@ -2422,65 +2422,65 @@ 0 Left 1 - + 1 - + 0 0 wxID_ANY &Set Credentials... - + 0 - - + + 0 - + 1 m_config_set 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 Click here to set or modify your credentials - + wxFILTER_NONE wxDefaultValidator - - - - + + + + OnSetConfig - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2505,69 +2505,69 @@ 0 wxAUI_MGR_DEFAULT - - + + 1 1 impl_virtual - - + + 0 wxID_ANY - - + + wxPasswordCredentialsPanelBase - + 500,-1 wxEAPCredentialsPanelBase; ../include/wxEAP_UIBase.h - - - + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + wxID_ANY User ID and Password - + m_sb_credentials wxVERTICAL protected - + 5 wxEXPAND 0 - + sb_credentials_horiz wxHORIZONTAL none @@ -2580,76 +2580,76 @@ 1 1 1 - - - - - - + + + + + + Load From Icon Resource; ; [32; 32] - + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_credentials_icon 1 - - + + protected 1 - + Resizable 1 - - + + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2657,7 +2657,7 @@ wxEXPAND 1 - + m_sb_credentials_vert wxVERTICAL protected @@ -2670,78 +2670,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Please provide your user ID and password. - + 0 - - + + 0 - + 1 m_credentials_label 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + 440 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2752,9 +2752,9 @@ 2 wxBOTH 1 - + 5 - + sb_credentials_tbl wxFLEX_GROWMODE_SPECIFIED none @@ -2769,78 +2769,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY User ID: - + 0 - - + + 0 - + 1 m_identity_label 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -2852,86 +2852,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - - + + + 0 - + 1 m_identity 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 Enter your user name here (user@domain.org, DOMAIN\User, etc.) - + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2943,78 +2943,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Password: - + 0 - - + + 0 - + 1 m_password_label 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -3026,86 +3026,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - - + + + 0 - + 1 m_password 1 - - + + protected 1 - + Resizable 1 - + wxTE_PASSWORD - + 0 Enter your password here - + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + OnPasswordText - - - - + + + + @@ -3119,69 +3119,69 @@ 0 wxAUI_MGR_DEFAULT - - + + 1 1 impl_virtual - - + + 0 wxID_ANY - - + + wxEAPProviderContactInfoPanelBase - + 500,-1 - - - - + + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + wxID_ANY Your Organization - + sb_provider_contact wxVERTICAL none - + 5 wxEXPAND 1 - + sb_provider_contact_horiz wxHORIZONTAL none @@ -3194,76 +3194,76 @@ 1 1 1 - - - - - - + + + + + + Load From Icon Resource; ; [32; 32] - + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_provider_contact_icon 1 - - + + protected 1 - + Resizable 1 - - + + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3271,7 +3271,7 @@ wxEXPAND 1 - + sb_provider_contact_vert wxVERTICAL none @@ -3284,78 +3284,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Describe your organization to customize user prompts. When organization is introduced, end-users find program messages easier to understand and act. - + 0 - - + + 0 - + 1 m_provider_contact_label 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + 440 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -3363,7 +3363,7 @@ wxEXPAND|wxALL 0 - + sb_provider_name wxVERTICAL none @@ -3376,78 +3376,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Your organization &name: - + 0 - - + + 0 - + 1 m_provider_name_label 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -3459,86 +3459,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - - + + + 0 - + 1 m_provider_name 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 Your organization name as it will appear on helpdesk contact notifications - + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3550,78 +3550,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY (Keep it short, please) - + 0 - - + + 0 - + 1 m_provider_name_note 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -3631,7 +3631,7 @@ wxEXPAND|wxALL 0 - + sb_provider_helpdesk wxVERTICAL none @@ -3644,78 +3644,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Helpdesk contact &information: - + 0 - - + + 0 - + 1 m_provider_helpdesk_label 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -3726,9 +3726,9 @@ 2 wxBOTH 1 - + 0 - + sb_provider_helpdesk_inner wxFLEX_GROWMODE_SPECIFIED none @@ -3743,78 +3743,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 Wingdings,90,90,-1,70,0 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_provider_web_icon 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -3826,86 +3826,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - - + + + 0 - + 1 m_provider_web 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 Your helpdesk website address - + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3917,78 +3917,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 Wingdings,90,90,-1,70,0 0 0 wxID_ANY * - + 0 - - + + 0 - + 1 m_provider_email_icon 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -4000,86 +4000,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - - + + + 0 - + 1 m_provider_email 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 Your helpdesk e-mail address - + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4091,78 +4091,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 Wingdings,90,90,-1,70,0 0 0 wxID_ANY ) - + 0 - - + + 0 - + 1 m_provider_phone_icon 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -4174,86 +4174,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - - + + + 0 - + 1 m_provider_phone 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 Your helpdesk phone number - + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4269,69 +4269,69 @@ 0 wxAUI_MGR_DEFAULT - - + + 1 1 impl_virtual - - + + 0 wxID_ANY - - + + wxEAPProviderIDPanelBase - + 500,-1 - - - - + + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + wxID_ANY Provider Unique Identifier - + sb_provider_id wxVERTICAL none - + 5 wxEXPAND 1 - + sb_provider_id_horiz wxHORIZONTAL none @@ -4344,76 +4344,76 @@ 1 1 1 - - - - - - + + + + + + Load From Icon Resource; ; [32; 32] - + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_provider_id_icon 1 - - + + protected 1 - + Resizable 1 - - + + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4421,7 +4421,7 @@ wxEXPAND 1 - + sb_provider_id_vert wxVERTICAL none @@ -4434,78 +4434,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Assign your organization a unique ID to allow sharing the same credential set across different network profiles. - + 0 - - + + 0 - + 1 m_provider_id_label_outer 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + 440 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -4513,7 +4513,7 @@ wxEXPAND|wxALL 0 - + sb_provider_namespace wxVERTICAL none @@ -4526,78 +4526,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY &Namespace: - + 0 - - + + 0 - + 1 m_provider_namespace_label 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -4609,83 +4609,83 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 "urn:RFC4282:realm" "urn:uuid" 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_provider_namespace 1 - - + + protected 1 - + Resizable 0 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4695,7 +4695,7 @@ wxEXPAND|wxALL 0 - + sb_provider_id_inner wxVERTICAL none @@ -4708,78 +4708,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Provider unique &identifier: - + 0 - - + + 0 - + 1 m_provider_id_label 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -4791,86 +4791,86 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - - + + + 0 - + 1 m_provider_id 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 Your organization ID to assign same credentials from other profiles - + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4884,69 +4884,69 @@ 0 wxAUI_MGR_DEFAULT - - + + 1 1 impl_virtual - - + + 0 wxID_ANY - - + + wxEAPProviderLockPanelBase - + 500,-1 - - - - + + + + wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + wxID_ANY Configuration Lock - + sb_provider_lock wxVERTICAL none - + 5 wxEXPAND 1 - + sb_provider_lock_horiz wxHORIZONTAL none @@ -4959,76 +4959,76 @@ 1 1 1 - - - - - - + + + + + + Load From Icon Resource; ; [32; 32] - + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY - + 0 - - + + 0 - + 1 m_provider_lock_icon 1 - - + + protected 1 - + Resizable 1 - - + + 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5036,7 +5036,7 @@ wxEXPAND 1 - + sb_provider_lock_vert wxVERTICAL none @@ -5049,78 +5049,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY Your configuration can be locked to prevent accidental modification by end-users. Users will only be allowed to enter credentials. - + 0 - - + + 0 - + 1 m_provider_lock_label 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + 440 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -5128,7 +5128,7 @@ wxEXPAND|wxALL 0 - + sb_provider_lock_inner wxVERTICAL none @@ -5141,83 +5141,83 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY &Lock this configuration and prevent any further modification via user interface. - + 0 - - + + 0 - + 1 m_provider_lock 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - + + wxFILTER_NONE wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5229,78 +5229,78 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 1 - + 1 0 Dock 0 Left 1 - + 1 - + 0 0 wxID_ANY (Warning: Once locked, you can not revert using this dialog!) - + 0 - - + + 0 - + 1 m_provider_lock_note 1 - - + + protected 1 - + Resizable 1 - - - + + + 0 - - - - + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -5314,67 +5314,67 @@ 0 wxAUI_MGR_DEFAULT - - - + + + 1 1 impl_virtual - - - + + + 0 wxID_ANY - - + + wxEAPProviderSelectDialogBase - - + + wxDEFAULT_DIALOG_STYLE - + EAP Identity Provider - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + OnInitDialog - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + sb_content wxVERTICAL none @@ -5387,19 +5387,19 @@ 1 1 1 - - - - - - - + + + + + + + 1 0 wxEAPBannerPanel 1 m_banner = new wxEAPBannerPanel( this ); - + 1 wxEAPBannerPanel *m_banner; 0 @@ -5407,60 +5407,60 @@ 0 Left 1 - + 1 - + 0 0 wxID_ANY class wxEAPBannerPanel; - + 0 - - + + 0 - + 1 m_banner 1 - - + + protected 1 - + Resizable - + 1 -1,-1 ; ../include/EAP_UI.h 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5487,17 +5487,17 @@ 0 0 0 - + m_buttons protected - - - - - - - - + + + + + + + + diff --git a/lib/EAPBase_UI/res/wxEAP_UI.h b/lib/EAPBase_UI/res/wxEAP_UI.h index 183ebdc..d9d39a8 100644 --- a/lib/EAPBase_UI/res/wxEAP_UI.h +++ b/lib/EAPBase_UI/res/wxEAP_UI.h @@ -1,319 +1,317 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 17 2015) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#ifndef __WXEAP_UI_H__ -#define __WXEAP_UI_H__ - -#include -#include -#include -class wxEAPCredentialsPanelBase; - -#include "../include/wxEAP_UIBase.h" -class wxEAPBannerPanel; -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/////////////////////////////////////////////////////////////////////////// - -/////////////////////////////////////////////////////////////////////////////// -/// Class wxEAPConfigDialogBase -/////////////////////////////////////////////////////////////////////////////// -class wxEAPConfigDialogBase : public wxDialog -{ - private: - - protected: - wxEAPBannerPanel *m_banner; - wxNotebook* m_providers; - wxButton* m_prov_add; - wxButton* m_prov_remove; - wxButton* m_prov_advanced; - wxStdDialogButtonSizer* m_buttons; - wxButton* m_buttonsOK; - wxButton* m_buttonsCancel; - - // Virtual event handlers, overide them in your derived class - virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); } - virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); } - virtual void OnProvAdd( wxCommandEvent& event ) { event.Skip(); } - virtual void OnProvRemove( wxCommandEvent& event ) { event.Skip(); } - virtual void OnProvAdvanced( wxCommandEvent& event ) { event.Skip(); } - - - public: - - wxEAPConfigDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("EAP Connection Configuration"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); - ~wxEAPConfigDialogBase(); - -}; - -/////////////////////////////////////////////////////////////////////////////// -/// Class wxEAPGeneralDialogBase -/////////////////////////////////////////////////////////////////////////////// -class wxEAPGeneralDialogBase : public wxDialog -{ - private: - - protected: - wxEAPBannerPanel *m_banner; - wxBoxSizer* m_panels; - wxStdDialogButtonSizer* m_buttons; - wxButton* m_buttonsOK; - wxButton* m_buttonsCancel; - - // Virtual event handlers, overide them in your derived class - virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); } - - - public: - - wxEAPGeneralDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); - ~wxEAPGeneralDialogBase(); - -}; - -/////////////////////////////////////////////////////////////////////////////// -/// Class wxEAPCredentialsConnectionDialogBase -/////////////////////////////////////////////////////////////////////////////// -class wxEAPCredentialsConnectionDialogBase : public wxDialog -{ - private: - - protected: - wxEAPBannerPanel *m_banner; - wxStdDialogButtonSizer* m_buttons; - wxButton* m_buttonsOK; - wxButton* m_buttonsCancel; - - // Virtual event handlers, overide them in your derived class - virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); } - - - public: - wxNotebook* m_providers; - - wxEAPCredentialsConnectionDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("EAP Credentials"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); - ~wxEAPCredentialsConnectionDialogBase(); - -}; - -/////////////////////////////////////////////////////////////////////////////// -/// Class wxEAPBannerPanelBase -/////////////////////////////////////////////////////////////////////////////// -class wxEAPBannerPanelBase : public wxPanel -{ - private: - - protected: - - public: - wxStaticText* m_title; - - wxEAPBannerPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = 0 ); - ~wxEAPBannerPanelBase(); - -}; - -/////////////////////////////////////////////////////////////////////////////// -/// Class wxEAPNotePanelBase -/////////////////////////////////////////////////////////////////////////////// -class wxEAPNotePanelBase : public wxPanel -{ - private: - - protected: - wxStaticBitmap* m_note_icon; - wxBoxSizer* m_note_vert; - wxStaticText* m_note_label; - - public: - - wxEAPNotePanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxSIMPLE_BORDER|wxTAB_TRAVERSAL ); - ~wxEAPNotePanelBase(); - -}; - -/////////////////////////////////////////////////////////////////////////////// -/// Class wxEAPCredentialsConfigPanelBase -/////////////////////////////////////////////////////////////////////////////// -class wxEAPCredentialsConfigPanelBase : public wxPanel -{ - private: - - protected: - wxStaticBoxSizer* m_sb_credentials; - wxStaticBitmap* m_credentials_icon; - wxStaticText* m_credentials_label; - wxRadioButton* m_storage; - wxStaticText* m_storage_identity_label; - wxStaticText* m_storage_identity; - wxButton* m_storage_clear; - wxButton* m_storage_set; - wxRadioButton* m_config; - wxStaticText* m_config_identity_label; - wxStaticText* m_config_identity; - wxButton* m_config_set; - wxTimer m_timer_storage; - - // Virtual event handlers, overide them in your derived class - virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); } - virtual void OnClearStorage( wxCommandEvent& event ) { event.Skip(); } - virtual void OnSetStorage( wxCommandEvent& event ) { event.Skip(); } - virtual void OnSetConfig( wxCommandEvent& event ) { event.Skip(); } - virtual void OnTimerStorage( wxTimerEvent& event ) { event.Skip(); } - - - public: - - wxEAPCredentialsConfigPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); - ~wxEAPCredentialsConfigPanelBase(); - -}; - -/////////////////////////////////////////////////////////////////////////////// -/// Class wxPasswordCredentialsPanelBase -/////////////////////////////////////////////////////////////////////////////// -class wxPasswordCredentialsPanelBase : public wxEAPCredentialsPanelBase -{ - private: - - protected: - wxStaticBoxSizer* m_sb_credentials; - wxStaticBitmap* m_credentials_icon; - wxBoxSizer* m_sb_credentials_vert; - wxStaticText* m_credentials_label; - wxStaticText* m_identity_label; - wxTextCtrl* m_identity; - wxStaticText* m_password_label; - wxTextCtrl* m_password; - - // Virtual event handlers, overide them in your derived class - virtual void OnPasswordText( wxCommandEvent& event ) { event.Skip(); } - - - public: - - wxPasswordCredentialsPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); - ~wxPasswordCredentialsPanelBase(); - -}; - -/////////////////////////////////////////////////////////////////////////////// -/// Class wxEAPProviderContactInfoPanelBase -/////////////////////////////////////////////////////////////////////////////// -class wxEAPProviderContactInfoPanelBase : public wxPanel -{ - private: - - protected: - wxStaticBitmap* m_provider_contact_icon; - wxStaticText* m_provider_contact_label; - wxStaticText* m_provider_name_label; - wxTextCtrl* m_provider_name; - wxStaticText* m_provider_name_note; - wxStaticText* m_provider_helpdesk_label; - wxStaticText* m_provider_web_icon; - wxTextCtrl* m_provider_web; - wxStaticText* m_provider_email_icon; - wxTextCtrl* m_provider_email; - wxStaticText* m_provider_phone_icon; - wxTextCtrl* m_provider_phone; - - public: - - wxEAPProviderContactInfoPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); - ~wxEAPProviderContactInfoPanelBase(); - -}; - -/////////////////////////////////////////////////////////////////////////////// -/// Class wxEAPProviderIDPanelBase -/////////////////////////////////////////////////////////////////////////////// -class wxEAPProviderIDPanelBase : public wxPanel -{ - private: - - protected: - wxStaticBitmap* m_provider_id_icon; - wxStaticText* m_provider_id_label_outer; - wxStaticText* m_provider_namespace_label; - wxChoice* m_provider_namespace; - wxStaticText* m_provider_id_label; - wxTextCtrl* m_provider_id; - - public: - - wxEAPProviderIDPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); - ~wxEAPProviderIDPanelBase(); - -}; - -/////////////////////////////////////////////////////////////////////////////// -/// Class wxEAPProviderLockPanelBase -/////////////////////////////////////////////////////////////////////////////// -class wxEAPProviderLockPanelBase : public wxPanel -{ - private: - - protected: - wxStaticBitmap* m_provider_lock_icon; - wxStaticText* m_provider_lock_label; - wxCheckBox* m_provider_lock; - wxStaticText* m_provider_lock_note; - - public: - - wxEAPProviderLockPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); - ~wxEAPProviderLockPanelBase(); - -}; - -/////////////////////////////////////////////////////////////////////////////// -/// Class wxEAPProviderSelectDialogBase -/////////////////////////////////////////////////////////////////////////////// -class wxEAPProviderSelectDialogBase : public wxDialog -{ - private: - - protected: - wxEAPBannerPanel *m_banner; - wxBoxSizer* m_providers; - wxStdDialogButtonSizer* m_buttons; - wxButton* m_buttonsCancel; - - // Virtual event handlers, overide them in your derived class - virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); } - - - public: - - wxEAPProviderSelectDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("EAP Identity Provider"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); - ~wxEAPProviderSelectDialogBase(); - -}; - -#endif //__WXEAP_UI_H__ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Aug 8 2018) +// http://www.wxformbuilder.org/ +// +// PLEASE DO *NOT* EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#ifndef __WXEAP_UI_H__ +#define __WXEAP_UI_H__ + +#include +#include +#include +#include "../include/wxEAP_UIBase.h" +class wxEAPBannerPanel; +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +/// Class wxEAPConfigDialogBase +/////////////////////////////////////////////////////////////////////////////// +class wxEAPConfigDialogBase : public wxDialog +{ + private: + + protected: + wxEAPBannerPanel *m_banner; + wxNotebook* m_providers; + wxButton* m_prov_add; + wxButton* m_prov_remove; + wxButton* m_prov_advanced; + wxStdDialogButtonSizer* m_buttons; + wxButton* m_buttonsOK; + wxButton* m_buttonsCancel; + + // Virtual event handlers, overide them in your derived class + virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); } + virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); } + virtual void OnProvAdd( wxCommandEvent& event ) { event.Skip(); } + virtual void OnProvRemove( wxCommandEvent& event ) { event.Skip(); } + virtual void OnProvAdvanced( wxCommandEvent& event ) { event.Skip(); } + + + public: + + wxEAPConfigDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("EAP Connection Configuration"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); + ~wxEAPConfigDialogBase(); + +}; + +/////////////////////////////////////////////////////////////////////////////// +/// Class wxEAPGeneralDialogBase +/////////////////////////////////////////////////////////////////////////////// +class wxEAPGeneralDialogBase : public wxDialog +{ + private: + + protected: + wxEAPBannerPanel *m_banner; + wxBoxSizer* m_panels; + wxStdDialogButtonSizer* m_buttons; + wxButton* m_buttonsOK; + wxButton* m_buttonsCancel; + + // Virtual event handlers, overide them in your derived class + virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); } + + + public: + + wxEAPGeneralDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); + ~wxEAPGeneralDialogBase(); + +}; + +/////////////////////////////////////////////////////////////////////////////// +/// Class wxEAPCredentialsConnectionDialogBase +/////////////////////////////////////////////////////////////////////////////// +class wxEAPCredentialsConnectionDialogBase : public wxDialog +{ + private: + + protected: + wxEAPBannerPanel *m_banner; + wxStdDialogButtonSizer* m_buttons; + wxButton* m_buttonsOK; + wxButton* m_buttonsCancel; + + // Virtual event handlers, overide them in your derived class + virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); } + + + public: + wxNotebook* m_providers; + + wxEAPCredentialsConnectionDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("EAP Credentials"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); + ~wxEAPCredentialsConnectionDialogBase(); + +}; + +/////////////////////////////////////////////////////////////////////////////// +/// Class wxEAPBannerPanelBase +/////////////////////////////////////////////////////////////////////////////// +class wxEAPBannerPanelBase : public wxPanel +{ + private: + + protected: + + public: + wxStaticText* m_title; + + wxEAPBannerPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = 0, const wxString& name = wxEmptyString ); + ~wxEAPBannerPanelBase(); + +}; + +/////////////////////////////////////////////////////////////////////////////// +/// Class wxEAPNotePanelBase +/////////////////////////////////////////////////////////////////////////////// +class wxEAPNotePanelBase : public wxPanel +{ + private: + + protected: + wxStaticBitmap* m_note_icon; + wxBoxSizer* m_note_vert; + wxStaticText* m_note_label; + + public: + + wxEAPNotePanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL|wxBORDER_SIMPLE, const wxString& name = wxEmptyString ); + ~wxEAPNotePanelBase(); + +}; + +/////////////////////////////////////////////////////////////////////////////// +/// Class wxEAPCredentialsConfigPanelBase +/////////////////////////////////////////////////////////////////////////////// +class wxEAPCredentialsConfigPanelBase : public wxPanel +{ + private: + + protected: + wxStaticBoxSizer* m_sb_credentials; + wxStaticBitmap* m_credentials_icon; + wxStaticText* m_credentials_label; + wxRadioButton* m_storage; + wxStaticText* m_storage_identity_label; + wxStaticText* m_storage_identity; + wxButton* m_storage_clear; + wxButton* m_storage_set; + wxRadioButton* m_config; + wxStaticText* m_config_identity_label; + wxStaticText* m_config_identity; + wxButton* m_config_set; + wxTimer m_timer_storage; + + // Virtual event handlers, overide them in your derived class + virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); } + virtual void OnClearStorage( wxCommandEvent& event ) { event.Skip(); } + virtual void OnSetStorage( wxCommandEvent& event ) { event.Skip(); } + virtual void OnSetConfig( wxCommandEvent& event ) { event.Skip(); } + virtual void OnTimerStorage( wxTimerEvent& event ) { event.Skip(); } + + + public: + + wxEAPCredentialsConfigPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); + ~wxEAPCredentialsConfigPanelBase(); + +}; + +/////////////////////////////////////////////////////////////////////////////// +/// Class wxPasswordCredentialsPanelBase +/////////////////////////////////////////////////////////////////////////////// +class wxPasswordCredentialsPanelBase : public wxEAPCredentialsPanelBase +{ + private: + + protected: + wxStaticBoxSizer* m_sb_credentials; + wxStaticBitmap* m_credentials_icon; + wxBoxSizer* m_sb_credentials_vert; + wxStaticText* m_credentials_label; + wxStaticText* m_identity_label; + wxTextCtrl* m_identity; + wxStaticText* m_password_label; + wxTextCtrl* m_password; + + // Virtual event handlers, overide them in your derived class + virtual void OnPasswordText( wxCommandEvent& event ) { event.Skip(); } + + + public: + + wxPasswordCredentialsPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); + ~wxPasswordCredentialsPanelBase(); + +}; + +/////////////////////////////////////////////////////////////////////////////// +/// Class wxEAPProviderContactInfoPanelBase +/////////////////////////////////////////////////////////////////////////////// +class wxEAPProviderContactInfoPanelBase : public wxPanel +{ + private: + + protected: + wxStaticBitmap* m_provider_contact_icon; + wxStaticText* m_provider_contact_label; + wxStaticText* m_provider_name_label; + wxTextCtrl* m_provider_name; + wxStaticText* m_provider_name_note; + wxStaticText* m_provider_helpdesk_label; + wxStaticText* m_provider_web_icon; + wxTextCtrl* m_provider_web; + wxStaticText* m_provider_email_icon; + wxTextCtrl* m_provider_email; + wxStaticText* m_provider_phone_icon; + wxTextCtrl* m_provider_phone; + + public: + + wxEAPProviderContactInfoPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); + ~wxEAPProviderContactInfoPanelBase(); + +}; + +/////////////////////////////////////////////////////////////////////////////// +/// Class wxEAPProviderIDPanelBase +/////////////////////////////////////////////////////////////////////////////// +class wxEAPProviderIDPanelBase : public wxPanel +{ + private: + + protected: + wxStaticBitmap* m_provider_id_icon; + wxStaticText* m_provider_id_label_outer; + wxStaticText* m_provider_namespace_label; + wxChoice* m_provider_namespace; + wxStaticText* m_provider_id_label; + wxTextCtrl* m_provider_id; + + public: + + wxEAPProviderIDPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); + ~wxEAPProviderIDPanelBase(); + +}; + +/////////////////////////////////////////////////////////////////////////////// +/// Class wxEAPProviderLockPanelBase +/////////////////////////////////////////////////////////////////////////////// +class wxEAPProviderLockPanelBase : public wxPanel +{ + private: + + protected: + wxStaticBitmap* m_provider_lock_icon; + wxStaticText* m_provider_lock_label; + wxCheckBox* m_provider_lock; + wxStaticText* m_provider_lock_note; + + public: + + wxEAPProviderLockPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); + ~wxEAPProviderLockPanelBase(); + +}; + +/////////////////////////////////////////////////////////////////////////////// +/// Class wxEAPProviderSelectDialogBase +/////////////////////////////////////////////////////////////////////////////// +class wxEAPProviderSelectDialogBase : public wxDialog +{ + private: + + protected: + wxEAPBannerPanel *m_banner; + wxBoxSizer* m_providers; + wxStdDialogButtonSizer* m_buttons; + wxButton* m_buttonsCancel; + + // Virtual event handlers, overide them in your derived class + virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); } + + + public: + + wxEAPProviderSelectDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("EAP Identity Provider"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); + ~wxEAPProviderSelectDialogBase(); + +}; + +#endif //__WXEAP_UI_H__