diff --git a/EAPMethods/EAPTTLS/EAPTTLS.vcxproj b/EAPMethods/EAPTTLS/EAPTTLS.vcxproj index a3f0d25..e0a9c94 100644 --- a/EAPMethods/EAPTTLS/EAPTTLS.vcxproj +++ b/EAPMethods/EAPTTLS/EAPTTLS.vcxproj @@ -79,18 +79,18 @@ - - - - + + + + - - - + + + diff --git a/EAPMethods/EAPTTLS/EAPTTLS.vcxproj.filters b/EAPMethods/EAPTTLS/EAPTTLS.vcxproj.filters index fb406e4..6359577 100644 --- a/EAPMethods/EAPTTLS/EAPTTLS.vcxproj.filters +++ b/EAPMethods/EAPTTLS/EAPTTLS.vcxproj.filters @@ -18,10 +18,7 @@ Header Files - - Header Files - - + Header Files @@ -30,10 +27,13 @@ Header Files - + Header Files - + + Header Files + + Header Files @@ -44,16 +44,16 @@ Source Files - - Source Files - - - Source Files - Source Files - + + Source Files + + + Source Files + + Source Files @@ -63,7 +63,7 @@ - + Source Files diff --git a/EAPMethods/EAPTTLS/StdAfx.h b/EAPMethods/EAPTTLS/StdAfx.h index f08fbf8..25861be 100644 Binary files a/EAPMethods/EAPTTLS/StdAfx.h and b/EAPMethods/EAPTTLS/StdAfx.h differ diff --git a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj index a60e218..0de4b61 100644 --- a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj +++ b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj @@ -79,32 +79,30 @@ - - - - - + + + + + - - - + + - - + + - - - - - - - - - + + + + + + + + - - + + Create Create @@ -125,10 +123,9 @@ - - - - + + + diff --git a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters index fe235d7..6a0781e 100644 --- a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters +++ b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters @@ -27,78 +27,72 @@ Header Files - - Header Files - - - Header Files - - + Header Files Header Files - - Header Files\wx - - - Header Files\wx - - + Header Files - + Header Files - + + Header Files\wx + + + Header Files\wx + + + Header Files\wx + + Header Files - - Header Files\wx + + Header Files - - Header Files\wx + + Header Files Source Files - - Source Files - - - Source Files - - - Source Files - Source Files - + + Source Files\wx + + + Source Files\wx + + + Source Files\wx + + Source Files - + Source Files - - Source Files\wx - - - Source Files\wx - - + Source Files - - Source Files\wx + + Source Files - - Source Files\wx + + Source Files - + + Source Files + + Source Files @@ -111,16 +105,13 @@ Source Files - + Resource Files\wx - + Resource Files\wx - - Resource Files\wx - - + Resource Files\wx diff --git a/EAPMethods/EAPTTLSUI/StdAfx.h b/EAPMethods/EAPTTLSUI/StdAfx.h index 6f68a58..fae4a76 100644 Binary files a/EAPMethods/EAPTTLSUI/StdAfx.h and b/EAPMethods/EAPTTLSUI/StdAfx.h differ diff --git a/EAPMethods/include/EAPMethods.h b/EAPMethods/include/EAP.h similarity index 99% rename from EAPMethods/include/EAPMethods.h rename to EAPMethods/include/EAP.h index 58d48ec..6b45f08 100644 Binary files a/EAPMethods/include/EAPMethods.h and b/EAPMethods/include/EAP.h differ diff --git a/EAPMethods/include/EAPSerialize.h b/EAPMethods/include/EAPSerial.h similarity index 100% rename from EAPMethods/include/EAPSerialize.h rename to EAPMethods/include/EAPSerial.h diff --git a/EAPMethods/include/EAPTLSUI.h b/EAPMethods/include/EAPTLSUI.h deleted file mode 100644 index 3a6b624..0000000 Binary files a/EAPMethods/include/EAPTLSUI.h and /dev/null differ diff --git a/EAPMethods/include/EAPMethodsUI.h b/EAPMethods/include/EAP_UI.h similarity index 78% rename from EAPMethods/include/EAPMethodsUI.h rename to EAPMethods/include/EAP_UI.h index caa663d..14f91e1 100644 Binary files a/EAPMethods/include/EAPMethodsUI.h and b/EAPMethods/include/EAP_UI.h differ diff --git a/EAPMethods/include/PAP.h b/EAPMethods/include/PAP.h index 7c9126e..92709cf 100644 Binary files a/EAPMethods/include/PAP.h and b/EAPMethods/include/PAP.h differ diff --git a/EAPMethods/include/EAPTLS.h b/EAPMethods/include/TLS.h similarity index 99% rename from EAPMethods/include/EAPTLS.h rename to EAPMethods/include/TLS.h index ff29c46..1dda441 100644 Binary files a/EAPMethods/include/EAPTLS.h and b/EAPMethods/include/TLS.h differ diff --git a/EAPMethods/include/TLS_UI.h b/EAPMethods/include/TLS_UI.h new file mode 100644 index 0000000..e1dbd7e Binary files /dev/null and b/EAPMethods/include/TLS_UI.h differ diff --git a/EAPMethods/include/EAPTTLS.h b/EAPMethods/include/TTLS.h similarity index 98% rename from EAPMethods/include/EAPTTLS.h rename to EAPMethods/include/TTLS.h index beeefce..18595fd 100644 Binary files a/EAPMethods/include/EAPTTLS.h and b/EAPMethods/include/TTLS.h differ diff --git a/EAPMethods/include/EAPTTLSUI.h b/EAPMethods/include/TTLS_UI.h similarity index 90% rename from EAPMethods/include/EAPTTLSUI.h rename to EAPMethods/include/TTLS_UI.h index 5e23d1c..f04ca73 100644 Binary files a/EAPMethods/include/EAPTTLSUI.h and b/EAPMethods/include/TTLS_UI.h differ diff --git a/EAPMethods/res/wxEAPMethods.cpp b/EAPMethods/res/wxEAPMethods.cpp deleted file mode 100644 index 441bb73..0000000 --- a/EAPMethods/res/wxEAPMethods.cpp +++ /dev/null @@ -1,72 +0,0 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 17 2015) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#include - -#include "wxEAPMethods.h" - -/////////////////////////////////////////////////////////////////////////// - -wxEAPConfigBase::wxEAPConfigBase( 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* sz_content; - sz_content = new wxBoxSizer( wxVERTICAL ); - - m_banner = new wxEAPBannerPanel( this ); - - sz_content->Add( m_banner, 0, wxEXPAND|wxBOTTOM, 5 ); - - m_providers = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - - sz_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(); - - sz_content->Add( m_buttons, 0, wxEXPAND|wxALL, 5 ); - - - this->SetSizer( sz_content ); - this->Layout(); - sz_content->Fit( this ); - - this->Centre( wxBOTH ); -} - -wxEAPConfigBase::~wxEAPConfigBase() -{ -} - -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_WINDOW ) ); - this->SetMinSize( wxSize( -1,48 ) ); - - wxBoxSizer* sc_content; - sc_content = new wxBoxSizer( wxVERTICAL ); - - m_product_name = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); - m_product_name->Wrap( -1 ); - m_product_name->SetFont( wxFont( 14, 70, 90, 90, false, wxEmptyString ) ); - - sc_content->Add( m_product_name, 0, wxALL|wxEXPAND, 5 ); - - - this->SetSizer( sc_content ); - this->Layout(); - sc_content->Fit( this ); -} - -wxEAPBannerPanelBase::~wxEAPBannerPanelBase() -{ -} diff --git a/EAPMethods/res/wxEAPMethods.fbp b/EAPMethods/res/wxEAPMethods.fbp deleted file mode 100644 index 6ee7834..0000000 --- a/EAPMethods/res/wxEAPMethods.fbp +++ /dev/null @@ -1,436 +0,0 @@ - - - - - ; - C++ - 1 - source_name - 0 - 0 - . - UTF-8 - table - wxEAPMethods - 1000 - none - 1 - EAPMethods - - . - #include <StdAfx.h> - 1 - 1 - 1 - 1 - UI - 1 - 1 - - 0 - wxAUI_MGR_DEFAULT - - wxBOTH - - 1 - 1 - impl_virtual - - - - 0 - wxID_ANY - - - wxEAPConfigBase - - - wxDEFAULT_DIALOG_STYLE - ; - EAP Method Configuration - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - sz_content - wxVERTICAL - none - - 5 - wxEXPAND|wxBOTTOM - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - wxEAPBannerPanel - 1 - m_banner = new wxEAPBannerPanel( this ); - - 1 - wxEAPBannerPanel *m_banner; - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - class wxEAPBannerPanel; - - 0 - - - 0 - - 1 - m_banner - 1 - - - protected - 1 - - Resizable - - 1 - -1,-1 - ; ../include/EAPMethodsUI.h - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxALL - 1 - - 1 - 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxALL - 0 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_buttons - protected - - - - - - - - - - - - - - 0 - wxAUI_MGR_DEFAULT - wxSYS_COLOUR_WINDOW - - 1 - 1 - impl_virtual - - - 0 - wxID_ANY - - -1,48 - wxEAPBannerPanelBase - - -1,-1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - sc_content - wxVERTICAL - none - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - ,90,90,14,70,0 - 0 - 0 - wxID_ANY - - - 0 - - - 0 - - 1 - m_product_name - 1 - - - protected - 1 - - Resizable - 1 - - wxALIGN_RIGHT - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EAPMethods/res/wxEAPMethods.h b/EAPMethods/res/wxEAPMethods.h deleted file mode 100644 index 9e5a37f..0000000 --- a/EAPMethods/res/wxEAPMethods.h +++ /dev/null @@ -1,67 +0,0 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 17 2015) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#ifndef __WXEAPMETHODS_H__ -#define __WXEAPMETHODS_H__ - -#include -#include -#include -class wxEAPBannerPanel; -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/////////////////////////////////////////////////////////////////////////// - -/////////////////////////////////////////////////////////////////////////////// -/// Class wxEAPConfigBase -/////////////////////////////////////////////////////////////////////////////// -class wxEAPConfigBase : public wxDialog -{ - private: - - protected: - wxEAPBannerPanel *m_banner; - wxNotebook* m_providers; - wxStdDialogButtonSizer* m_buttons; - wxButton* m_buttonsOK; - wxButton* m_buttonsCancel; - - public: - - wxEAPConfigBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("EAP Method Configuration"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); - ~wxEAPConfigBase(); - -}; - -/////////////////////////////////////////////////////////////////////////////// -/// Class wxEAPBannerPanelBase -/////////////////////////////////////////////////////////////////////////////// -class wxEAPBannerPanelBase : public wxPanel -{ - private: - - protected: - wxStaticText* m_product_name; - - public: - - wxEAPBannerPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = 0 ); - ~wxEAPBannerPanelBase(); - -}; - -#endif //__WXEAPMETHODS_H__ diff --git a/EAPMethods/res/wxEAP_UI.cpp b/EAPMethods/res/wxEAP_UI.cpp new file mode 100644 index 0000000..d6cbab5 --- /dev/null +++ b/EAPMethods/res/wxEAP_UI.cpp @@ -0,0 +1,199 @@ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Jun 17 2015) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#include + +#include "wxEAP_UI.h" + +/////////////////////////////////////////////////////////////////////////// + +wxEAPConfigBase::wxEAPConfigBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) +{ + this->SetSizeHints( wxDefaultSize, wxDefaultSize ); + this->SetExtraStyle( wxWS_EX_VALIDATE_RECURSIVELY ); + + wxBoxSizer* sz_content; + sz_content = new wxBoxSizer( wxVERTICAL ); + + m_banner = new wxEAPBannerPanel( this ); + + sz_content->Add( m_banner, 0, wxEXPAND|wxBOTTOM, 5 ); + + m_providers = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); + + sz_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(); + + sz_content->Add( m_buttons, 0, wxEXPAND|wxALL, 5 ); + + + this->SetSizer( sz_content ); + this->Layout(); + sz_content->Fit( this ); + + this->Centre( wxBOTH ); +} + +wxEAPConfigBase::~wxEAPConfigBase() +{ +} + +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_WINDOW ) ); + this->SetMinSize( wxSize( -1,48 ) ); + + wxBoxSizer* sc_content; + sc_content = new wxBoxSizer( wxVERTICAL ); + + m_product_name = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); + m_product_name->Wrap( -1 ); + m_product_name->SetFont( wxFont( 14, 70, 90, 90, false, wxEmptyString ) ); + + sc_content->Add( m_product_name, 0, wxALL|wxEXPAND, 5 ); + + + this->SetSizer( sc_content ); + this->Layout(); + sc_content->Fit( this ); +} + +wxEAPBannerPanelBase::~wxEAPBannerPanelBase() +{ +} + +wxCredentialsConfigPanelBase::wxCredentialsConfigPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) +{ + wxStaticBoxSizer* sb_credentials; + sb_credentials = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Client Credentials") ), wxVERTICAL ); + + wxBoxSizer* sb_credentials_horiz; + sb_credentials_horiz = new wxBoxSizer( wxHORIZONTAL ); + + m_credentials_icon = new wxStaticBitmap( 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( sb_credentials->GetStaticBox(), wxID_ANY, _("Manage your credentials to identify you during the connection attempt."), wxDefaultPosition, wxDefaultSize, 0 ); + m_credentials_label->Wrap( 446 ); + sb_credentials_vert->Add( m_credentials_label, 0, wxALL|wxEXPAND, 5 ); + + m_allow_save = new wxCheckBox( sb_credentials->GetStaticBox(), wxID_ANY, _("Allow credentials to be &remembered in Credential Manager"), wxDefaultPosition, wxDefaultSize, 0 ); + m_allow_save->SetHelpText( _("Check if you would like to allow saving credentials to Windows Credential Manager") ); + + sb_credentials_vert->Add( m_allow_save, 0, wxALL, 5 ); + + wxBoxSizer* sb_cred_store_btn; + sb_cred_store_btn = new wxBoxSizer( wxHORIZONTAL ); + + m_cred_store_set = new wxButton( sb_credentials->GetStaticBox(), wxID_ANY, _("&Set Credentials..."), wxDefaultPosition, wxDefaultSize, 0 ); + m_cred_store_set->SetToolTip( _("Adds a new certificate authority from the file to the list") ); + + sb_cred_store_btn->Add( m_cred_store_set, 0, wxRIGHT|wxLEFT, 5 ); + + m_cred_store_clear = new wxButton( sb_credentials->GetStaticBox(), wxID_ANY, _("&Clear Credentials"), wxDefaultPosition, wxDefaultSize, 0 ); + m_cred_store_clear->SetToolTip( _("Removes selected certificate authorities from the list") ); + + sb_cred_store_btn->Add( m_cred_store_clear, 0, wxLEFT, 5 ); + + + sb_credentials_vert->Add( sb_cred_store_btn, 0, wxALIGN_RIGHT|wxALL, 5 ); + + + sb_credentials_horiz->Add( sb_credentials_vert, 1, wxEXPAND, 5 ); + + + sb_credentials->Add( sb_credentials_horiz, 1, wxEXPAND, 5 ); + + + this->SetSizer( sb_credentials ); + this->Layout(); + + // Connect Events + m_allow_save->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( wxCredentialsConfigPanelBase::OnAllowSave ), NULL, this ); + m_cred_store_set->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxCredentialsConfigPanelBase::OnCredentialsSet ), NULL, this ); + m_cred_store_clear->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxCredentialsConfigPanelBase::OnCredentialsClear ), NULL, this ); +} + +wxCredentialsConfigPanelBase::~wxCredentialsConfigPanelBase() +{ + // Disconnect Events + m_allow_save->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( wxCredentialsConfigPanelBase::OnAllowSave ), NULL, this ); + m_cred_store_set->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxCredentialsConfigPanelBase::OnCredentialsSet ), NULL, this ); + m_cred_store_clear->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxCredentialsConfigPanelBase::OnCredentialsClear ), NULL, this ); + +} + +wxPasswordCredentialsPanelBase::wxPasswordCredentialsPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) +{ + wxStaticBoxSizer* sb_credentials; + sb_credentials = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Session Credentials") ), wxVERTICAL ); + + wxBoxSizer* sb_credentials_horiz; + sb_credentials_horiz = new wxBoxSizer( wxHORIZONTAL ); + + m_credentials_icon = new wxStaticBitmap( 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( sb_credentials->GetStaticBox(), wxID_ANY, _("Please provide your user ID and password."), wxDefaultPosition, wxDefaultSize, 0 ); + m_credentials_label->Wrap( 446 ); + sb_credentials_vert->Add( m_credentials_label, 0, wxALL|wxEXPAND, 5 ); + + wxGridSizer* sb_credentials_tbl; + sb_credentials_tbl = new wxGridSizer( 0, 2, 0, 0 ); + + m_identity_label = new wxStaticText( sb_credentials->GetStaticBox(), wxID_ANY, _("User ID:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_identity_label->Wrap( -1 ); + sb_credentials_tbl->Add( m_identity_label, 1, wxEXPAND, 5 ); + + m_identity = new wxTextCtrl( sb_credentials->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_identity->SetToolTip( _("Enter your user name here (user@domain.org, DOMAINUser, etc.)") ); + + sb_credentials_tbl->Add( m_identity, 2, wxEXPAND, 5 ); + + m_password_label = new wxStaticText( sb_credentials->GetStaticBox(), wxID_ANY, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_password_label->Wrap( -1 ); + sb_credentials_tbl->Add( m_password_label, 1, wxEXPAND, 5 ); + + m_password = new wxTextCtrl( 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, 5 ); + + + sb_credentials_vert->Add( sb_credentials_tbl, 0, wxEXPAND|wxALL, 5 ); + + m_remember = new wxCheckBox( sb_credentials->GetStaticBox(), wxID_ANY, _("&Remember my credentials"), wxDefaultPosition, wxDefaultSize, 0 ); + m_remember->SetHelpText( _("Check if you would like to save the credentials to Windows Credential Manager") ); + + sb_credentials_vert->Add( m_remember, 0, wxALL|wxEXPAND, 5 ); + + + sb_credentials_horiz->Add( sb_credentials_vert, 1, wxEXPAND, 5 ); + + + sb_credentials->Add( sb_credentials_horiz, 0, wxEXPAND, 5 ); + + + this->SetSizer( sb_credentials ); + this->Layout(); +} + +wxPasswordCredentialsPanelBase::~wxPasswordCredentialsPanelBase() +{ +} diff --git a/EAPMethods/res/wxEAP_UI.fbp b/EAPMethods/res/wxEAP_UI.fbp new file mode 100644 index 0000000..17af4a3 --- /dev/null +++ b/EAPMethods/res/wxEAP_UI.fbp @@ -0,0 +1,1657 @@ + + + + + ; + C++ + 1 + source_name + 0 + 0 + . + UTF-8 + connect + wxEAP_UI + 1000 + none + 1 + wxEAP_UI + + . + #include <StdAfx.h> + 1 + 1 + 1 + 1 + UI + 1 + 1 + + 0 + wxAUI_MGR_DEFAULT + + wxBOTH + + 1 + 1 + impl_virtual + + + + 0 + wxID_ANY + + + wxEAPConfigBase + + + wxDEFAULT_DIALOG_STYLE + ; + EAP Method Configuration + + wxWS_EX_VALIDATE_RECURSIVELY + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + sz_content + wxVERTICAL + none + + 5 + wxEXPAND|wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + wxEAPBannerPanel + 1 + m_banner = new wxEAPBannerPanel( this ); + + 1 + wxEAPBannerPanel *m_banner; + 0 + Dock + 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxALL + 1 + + 1 + 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxALL + 0 + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + m_buttons + protected + + + + + + + + + + + + + + 0 + wxAUI_MGR_DEFAULT + wxSYS_COLOUR_WINDOW + + 1 + 1 + impl_virtual + + + 0 + wxID_ANY + + -1,48 + wxEAPBannerPanelBase + + -1,-1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + sc_content + wxVERTICAL + none + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + ,90,90,14,70,0 + 0 + 0 + wxID_ANY + + + 0 + + + 0 + + 1 + m_product_name + 1 + + + protected + 1 + + Resizable + 1 + + wxALIGN_RIGHT + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + wxAUI_MGR_DEFAULT + + + 1 + 1 + impl_virtual + + + 0 + wxID_ANY + + + wxCredentialsConfigPanelBase + + 500,-1 + + + + + wxTAB_TRAVERSAL + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + wxID_ANY + Client Credentials + + sb_credentials + wxVERTICAL + none + + + 5 + wxEXPAND + 1 + + + sb_credentials_horiz + wxHORIZONTAL + none + + 5 + wxALL + 0 + + 1 + 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + + sb_credentials_vert + wxVERTICAL + none + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Manage your credentials to identify you during the connection attempt. + + 0 + + + 0 + + 1 + m_credentials_label + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + 446 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + Check if you would like to allow saving credentials to Windows Credential Manager + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Allow credentials to be &remembered in Credential Manager + + 0 + + + 0 + + 1 + m_allow_save + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + OnAllowSave + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_RIGHT|wxALL + 0 + + + sb_cred_store_btn + wxHORIZONTAL + none + + 5 + wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + &Set Credentials... + + 0 + + + 0 + + 1 + m_cred_store_set + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Adds a new certificate authority from the file to the list + + wxFILTER_NONE + wxDefaultValidator + + + + + OnCredentialsSet + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + &Clear Credentials + + 0 + + + 0 + + 1 + m_cred_store_clear + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Removes selected certificate authorities from the list + + wxFILTER_NONE + wxDefaultValidator + + + + + OnCredentialsClear + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + wxAUI_MGR_DEFAULT + + + 1 + 1 + impl_virtual + + + 0 + wxID_ANY + + + wxPasswordCredentialsPanelBase + + 500,-1 + + + + + wxTAB_TRAVERSAL + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + wxID_ANY + Session Credentials + + sb_credentials + wxVERTICAL + none + + + 5 + wxEXPAND + 0 + + + sb_credentials_horiz + wxHORIZONTAL + none + + 5 + wxALL + 0 + + 1 + 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + + sb_credentials_vert + wxVERTICAL + none + + 5 + wxALL|wxEXPAND + 0 + + 1 + 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 + + + + + 446 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxALL + 0 + + 2 + 0 + + sb_credentials_tbl + none + 0 + 0 + + 5 + wxEXPAND + 1 + + 1 + 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 2 + + 1 + 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, DOMAINUser, etc.) + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + 1 + 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 2 + + 1 + 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + Check if you would like to save the credentials to Windows Credential Manager + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + &Remember my credentials + + 0 + + + 0 + + 1 + m_remember + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/EAPMethods/res/wxEAP_UI.h b/EAPMethods/res/wxEAP_UI.h new file mode 100644 index 0000000..b26b12f --- /dev/null +++ b/EAPMethods/res/wxEAP_UI.h @@ -0,0 +1,124 @@ +/////////////////////////////////////////////////////////////////////////// +// 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 wxEAPBannerPanel; +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +/// Class wxEAPConfigBase +/////////////////////////////////////////////////////////////////////////////// +class wxEAPConfigBase : public wxDialog +{ + private: + + protected: + wxEAPBannerPanel *m_banner; + wxNotebook* m_providers; + wxStdDialogButtonSizer* m_buttons; + wxButton* m_buttonsOK; + wxButton* m_buttonsCancel; + + public: + + wxEAPConfigBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("EAP Method Configuration"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); + ~wxEAPConfigBase(); + +}; + +/////////////////////////////////////////////////////////////////////////////// +/// Class wxEAPBannerPanelBase +/////////////////////////////////////////////////////////////////////////////// +class wxEAPBannerPanelBase : public wxPanel +{ + private: + + protected: + wxStaticText* m_product_name; + + public: + + wxEAPBannerPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = 0 ); + ~wxEAPBannerPanelBase(); + +}; + +/////////////////////////////////////////////////////////////////////////////// +/// Class wxCredentialsConfigPanelBase +/////////////////////////////////////////////////////////////////////////////// +class wxCredentialsConfigPanelBase : public wxPanel +{ + private: + + protected: + wxStaticBitmap* m_credentials_icon; + wxStaticText* m_credentials_label; + wxCheckBox* m_allow_save; + wxButton* m_cred_store_set; + wxButton* m_cred_store_clear; + + // Virtual event handlers, overide them in your derived class + virtual void OnAllowSave( wxCommandEvent& event ) { event.Skip(); } + virtual void OnCredentialsSet( wxCommandEvent& event ) { event.Skip(); } + virtual void OnCredentialsClear( wxCommandEvent& event ) { event.Skip(); } + + + public: + + wxCredentialsConfigPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); + ~wxCredentialsConfigPanelBase(); + +}; + +/////////////////////////////////////////////////////////////////////////////// +/// Class wxPasswordCredentialsPanelBase +/////////////////////////////////////////////////////////////////////////////// +class wxPasswordCredentialsPanelBase : public wxPanel +{ + private: + + protected: + wxStaticBitmap* m_credentials_icon; + wxStaticText* m_credentials_label; + wxStaticText* m_identity_label; + wxTextCtrl* m_identity; + wxStaticText* m_password_label; + wxTextCtrl* m_password; + wxCheckBox* m_remember; + + public: + + wxPasswordCredentialsPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); + ~wxPasswordCredentialsPanelBase(); + +}; + +#endif //__WXEAP_UI_H__ diff --git a/EAPMethods/res/wxEAPTLS.cpp b/EAPMethods/res/wxTLS_UI.cpp similarity index 68% rename from EAPMethods/res/wxEAPTLS.cpp rename to EAPMethods/res/wxTLS_UI.cpp index 64927de..6749e7b 100644 --- a/EAPMethods/res/wxEAPTLS.cpp +++ b/EAPMethods/res/wxTLS_UI.cpp @@ -7,16 +7,10 @@ #include -#include "wxEAPTLS.h" +#include "wxTLS_UI.h" /////////////////////////////////////////////////////////////////////////// -BEGIN_EVENT_TABLE( wxEAPTLSConfigPanelBase, wxPanel ) - EVT_LISTBOX_DCLICK( wxID_ANY, wxEAPTLSConfigPanelBase::_wxFB_OnRootCADClick ) - EVT_BUTTON( wxID_ANY, wxEAPTLSConfigPanelBase::_wxFB_OnRootCAAdd ) - EVT_BUTTON( wxID_ANY, wxEAPTLSConfigPanelBase::_wxFB_OnRootCARemove ) -END_EVENT_TABLE() - wxEAPTLSConfigPanelBase::wxEAPTLSConfigPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) { wxStaticBoxSizer* sb_server_trust; @@ -42,7 +36,7 @@ wxEAPTLSConfigPanelBase::wxEAPTLSConfigPanelBase( wxWindow* parent, wxWindowID i m_root_ca_lbl->Wrap( -1 ); sb_root_ca->Add( m_root_ca_lbl, 0, wxEXPAND|wxBOTTOM, 5 ); - m_root_ca = new wxListBox( sb_server_trust->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_MULTIPLE|wxLB_SORT ); + m_root_ca = new wxListBox( sb_server_trust->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SORT ); m_root_ca->SetToolTip( _("List of certificate authorities server's certificate must be issued by") ); sb_root_ca->Add( m_root_ca, 1, wxEXPAND|wxBOTTOM, 5 ); @@ -50,10 +44,15 @@ wxEAPTLSConfigPanelBase::wxEAPTLSConfigPanelBase( wxWindow* parent, wxWindowID i wxBoxSizer* sb_root_ca_btn; sb_root_ca_btn = new wxBoxSizer( wxHORIZONTAL ); - m_root_ca_add = new wxButton( sb_server_trust->GetStaticBox(), wxID_ANY, _("Add CA"), wxDefaultPosition, wxDefaultSize, 0 ); - m_root_ca_add->SetToolTip( _("Adds a new certificate authority to the list") ); + m_root_ca_add_store = new wxButton( sb_server_trust->GetStaticBox(), wxID_ANY, _("Add CA from Store..."), wxDefaultPosition, wxDefaultSize, 0 ); + m_root_ca_add_store->SetToolTip( _("Adds a new certificate authority from the certificate store to the list") ); - sb_root_ca_btn->Add( m_root_ca_add, 0, wxRIGHT, 5 ); + sb_root_ca_btn->Add( m_root_ca_add_store, 0, wxRIGHT, 5 ); + + m_root_ca_add_file = new wxButton( sb_server_trust->GetStaticBox(), wxID_ANY, _("Add CA from File..."), wxDefaultPosition, wxDefaultSize, 0 ); + m_root_ca_add_file->SetToolTip( _("Adds a new certificate authority from the file to the list") ); + + sb_root_ca_btn->Add( m_root_ca_add_file, 0, wxRIGHT|wxLEFT, 5 ); m_root_ca_remove = new wxButton( sb_server_trust->GetStaticBox(), wxID_ANY, _("&Remove CA"), wxDefaultPosition, wxDefaultSize, 0 ); m_root_ca_remove->SetToolTip( _("Removes selected certificate authorities from the list") ); @@ -94,8 +93,18 @@ wxEAPTLSConfigPanelBase::wxEAPTLSConfigPanelBase( wxWindow* parent, wxWindowID i this->SetSizer( sb_server_trust ); this->Layout(); + + // Connect Events + m_root_ca->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCADClick ), NULL, this ); + m_root_ca_add_file->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCAAddFile ), NULL, this ); + m_root_ca_remove->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCARemove ), NULL, this ); } wxEAPTLSConfigPanelBase::~wxEAPTLSConfigPanelBase() { + // Disconnect Events + m_root_ca->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCADClick ), NULL, this ); + m_root_ca_add_file->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCAAddFile ), NULL, this ); + m_root_ca_remove->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCARemove ), NULL, this ); + } diff --git a/EAPMethods/res/wxEAPTLS.fbp b/EAPMethods/res/wxTLS_UI.fbp similarity index 88% rename from EAPMethods/res/wxEAPTLS.fbp rename to EAPMethods/res/wxTLS_UI.fbp index eef3c2b..ad75595 100644 --- a/EAPMethods/res/wxEAPTLS.fbp +++ b/EAPMethods/res/wxTLS_UI.fbp @@ -10,12 +10,12 @@ 0 . UTF-8 - table - wxEAPTLS + connect + wxTLS_UI 1000 none 1 - EAPTLS + TLS_UI . #include <StdAfx.h> @@ -410,7 +410,7 @@ Resizable 1 - wxLB_MULTIPLE|wxLB_SORT + wxLB_SORT 0 List of certificate authorities server's certificate must be issued by @@ -457,10 +457,98 @@ sb_root_ca_btn wxHORIZONTAL none - + 5 wxRIGHT 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Add CA from Store... + + 0 + + + 0 + + 1 + m_root_ca_add_store + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Adds a new certificate authority from the certificate store to the list + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxRIGHT|wxLEFT + 0 1 1 @@ -490,7 +578,7 @@ 0 0 wxID_ANY - Add CA + Add CA from File... 0 @@ -498,7 +586,7 @@ 0 1 - m_root_ca_add + m_root_ca_add_file 1 @@ -511,7 +599,7 @@ 0 - Adds a new certificate authority to the list + Adds a new certificate authority from the file to the list wxFILTER_NONE wxDefaultValidator @@ -519,7 +607,7 @@ - OnRootCAAdd + OnRootCAAddFile diff --git a/EAPMethods/res/wxEAPTLS.h b/EAPMethods/res/wxTLS_UI.h similarity index 77% rename from EAPMethods/res/wxEAPTLS.h rename to EAPMethods/res/wxTLS_UI.h index 06537b2..2e57cc2 100644 --- a/EAPMethods/res/wxEAPTLS.h +++ b/EAPMethods/res/wxTLS_UI.h @@ -5,8 +5,8 @@ // PLEASE DO "NOT" EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __WXEAPTLS_H__ -#define __WXEAPTLS_H__ +#ifndef __WXTLS_UI_H__ +#define __WXTLS_UI_H__ #include #include @@ -35,21 +35,15 @@ /////////////////////////////////////////////////////////////////////////////// class wxEAPTLSConfigPanelBase : public wxPanel { - DECLARE_EVENT_TABLE() private: - - // Private event handlers - void _wxFB_OnRootCADClick( wxCommandEvent& event ){ OnRootCADClick( event ); } - void _wxFB_OnRootCAAdd( wxCommandEvent& event ){ OnRootCAAdd( event ); } - void _wxFB_OnRootCARemove( wxCommandEvent& event ){ OnRootCARemove( event ); } - protected: wxStaticBitmap* m_server_trust_icon; wxStaticText* m_server_trust_label; wxStaticText* m_root_ca_lbl; wxListBox* m_root_ca; - wxButton* m_root_ca_add; + wxButton* m_root_ca_add_store; + wxButton* m_root_ca_add_file; wxButton* m_root_ca_remove; wxStaticText* m_server_names_label; wxTextCtrl* m_server_names; @@ -57,7 +51,7 @@ class wxEAPTLSConfigPanelBase : public wxPanel // Virtual event handlers, overide them in your derived class virtual void OnRootCADClick( wxCommandEvent& event ) { event.Skip(); } - virtual void OnRootCAAdd( wxCommandEvent& event ) { event.Skip(); } + virtual void OnRootCAAddFile( wxCommandEvent& event ) { event.Skip(); } virtual void OnRootCARemove( wxCommandEvent& event ) { event.Skip(); } @@ -68,4 +62,4 @@ class wxEAPTLSConfigPanelBase : public wxPanel }; -#endif //__WXEAPTLS_H__ +#endif //__WXTLS_UI_H__ diff --git a/EAPMethods/res/wxEAPTTLS.cpp b/EAPMethods/res/wxTTLS_UI.cpp similarity index 87% rename from EAPMethods/res/wxEAPTTLS.cpp rename to EAPMethods/res/wxTTLS_UI.cpp index 33627fa..ea00db4 100644 --- a/EAPMethods/res/wxEAPTTLS.cpp +++ b/EAPMethods/res/wxTTLS_UI.cpp @@ -7,16 +7,10 @@ #include -#include "wxEAPTTLS.h" +#include "wxTTLS_UI.h" /////////////////////////////////////////////////////////////////////////// -BEGIN_EVENT_TABLE( wxEAPTTLSConfigPanelBase, wxPanel ) - EVT_RADIOBUTTON( wxID_ANY, wxEAPTTLSConfigPanelBase::_wxFB_OnOuterIdentitySame ) - EVT_RADIOBUTTON( wxID_ANY, wxEAPTTLSConfigPanelBase::_wxFB_OnOuterIdentityEmpty ) - EVT_RADIOBUTTON( wxID_ANY, wxEAPTTLSConfigPanelBase::_wxFB_OnOuterIdentityCustom ) -END_EVENT_TABLE() - wxEAPTTLSConfigPanelBase::wxEAPTTLSConfigPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) { wxStaticBoxSizer* sb_outer_identity; @@ -76,8 +70,14 @@ wxEAPTTLSConfigPanelBase::wxEAPTTLSConfigPanelBase( wxWindow* parent, wxWindowID this->SetSizer( sb_outer_identity ); this->Layout(); + + // Connect Events + m_outer_identity_custom->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( wxEAPTTLSConfigPanelBase::OnOuterIdentityCustom ), NULL, this ); } wxEAPTTLSConfigPanelBase::~wxEAPTTLSConfigPanelBase() { + // Disconnect Events + m_outer_identity_custom->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( wxEAPTTLSConfigPanelBase::OnOuterIdentityCustom ), NULL, this ); + } diff --git a/EAPMethods/res/wxEAPTTLS.fbp b/EAPMethods/res/wxTTLS_UI.fbp similarity index 98% rename from EAPMethods/res/wxEAPTTLS.fbp rename to EAPMethods/res/wxTTLS_UI.fbp index 29114fd..d654a3d 100644 --- a/EAPMethods/res/wxEAPTTLS.fbp +++ b/EAPMethods/res/wxTTLS_UI.fbp @@ -10,12 +10,12 @@ 0 . UTF-8 - table - wxEAPTTLS + connect + wxTTLS_UI 1000 none 1 - EAPTTLS + TTLS_UI . #include <StdAfx.h> @@ -356,7 +356,7 @@ - OnOuterIdentitySame + @@ -444,7 +444,7 @@ - OnOuterIdentityEmpty + diff --git a/EAPMethods/res/wxEAPTTLS.h b/EAPMethods/res/wxTTLS_UI.h similarity index 72% rename from EAPMethods/res/wxEAPTTLS.h rename to EAPMethods/res/wxTTLS_UI.h index bb19d33..2f7e513 100644 --- a/EAPMethods/res/wxEAPTTLS.h +++ b/EAPMethods/res/wxTTLS_UI.h @@ -5,8 +5,8 @@ // PLEASE DO "NOT" EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __WXEAPTTLS_H__ -#define __WXEAPTTLS_H__ +#ifndef __WXTTLS_UI_H__ +#define __WXTTLS_UI_H__ #include #include @@ -34,14 +34,7 @@ /////////////////////////////////////////////////////////////////////////////// class wxEAPTTLSConfigPanelBase : public wxPanel { - DECLARE_EVENT_TABLE() private: - - // Private event handlers - void _wxFB_OnOuterIdentitySame( wxCommandEvent& event ){ OnOuterIdentitySame( event ); } - void _wxFB_OnOuterIdentityEmpty( wxCommandEvent& event ){ OnOuterIdentityEmpty( event ); } - void _wxFB_OnOuterIdentityCustom( wxCommandEvent& event ){ OnOuterIdentityCustom( event ); } - protected: wxStaticBitmap* m_outer_identity_icon; @@ -52,8 +45,6 @@ class wxEAPTTLSConfigPanelBase : public wxPanel wxTextCtrl* m_outer_identity_custom_val; // Virtual event handlers, overide them in your derived class - virtual void OnOuterIdentitySame( wxCommandEvent& event ) { event.Skip(); } - virtual void OnOuterIdentityEmpty( wxCommandEvent& event ) { event.Skip(); } virtual void OnOuterIdentityCustom( wxCommandEvent& event ) { event.Skip(); } @@ -64,4 +55,4 @@ class wxEAPTTLSConfigPanelBase : public wxPanel }; -#endif //__WXEAPTTLS_H__ +#endif //__WXTTLS_UI_H__ diff --git a/EAPMethods/res/wxpass.cpp b/EAPMethods/res/wxpass.cpp deleted file mode 100644 index df4944b..0000000 --- a/EAPMethods/res/wxpass.cpp +++ /dev/null @@ -1,74 +0,0 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 17 2015) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#include - -#include "wxpass.h" - -/////////////////////////////////////////////////////////////////////////// - -wxPasswordCredentialsBase::wxPasswordCredentialsBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) -{ - wxStaticBoxSizer* sb_credentials; - sb_credentials = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Session Credentials") ), wxVERTICAL ); - - wxBoxSizer* sb_credentials_horiz; - sb_credentials_horiz = new wxBoxSizer( wxHORIZONTAL ); - - m_credentials_icon = new wxStaticBitmap( 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( sb_credentials->GetStaticBox(), wxID_ANY, _("Please provide your user ID and password."), wxDefaultPosition, wxDefaultSize, 0 ); - m_credentials_label->Wrap( 446 ); - sb_credentials_vert->Add( m_credentials_label, 0, wxALL|wxEXPAND, 5 ); - - wxGridSizer* sb_credentials_tbl; - sb_credentials_tbl = new wxGridSizer( 0, 2, 0, 0 ); - - m_identity_label = new wxStaticText( sb_credentials->GetStaticBox(), wxID_ANY, _("User ID:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_identity_label->Wrap( -1 ); - sb_credentials_tbl->Add( m_identity_label, 1, wxEXPAND, 5 ); - - m_identity = new wxTextCtrl( sb_credentials->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_identity->SetToolTip( _("Enter your user name here (user@domain.org, DOMAINUser, etc.)") ); - - sb_credentials_tbl->Add( m_identity, 2, wxEXPAND, 5 ); - - m_password_label = new wxStaticText( sb_credentials->GetStaticBox(), wxID_ANY, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_password_label->Wrap( -1 ); - sb_credentials_tbl->Add( m_password_label, 1, wxEXPAND, 5 ); - - m_password = new wxTextCtrl( 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, 5 ); - - - sb_credentials_vert->Add( sb_credentials_tbl, 0, wxEXPAND|wxALL, 5 ); - - m_remember = new wxCheckBox( sb_credentials->GetStaticBox(), wxID_ANY, _("&Remember my credentials"), wxDefaultPosition, wxDefaultSize, 0 ); - m_remember->SetHelpText( _("Check if you would like to save the credentials to Windows Credential Manager") ); - - sb_credentials_vert->Add( m_remember, 0, wxALL|wxEXPAND, 5 ); - - - sb_credentials_horiz->Add( sb_credentials_vert, 1, wxEXPAND, 5 ); - - - sb_credentials->Add( sb_credentials_horiz, 0, wxEXPAND, 5 ); - - - this->SetSizer( sb_credentials ); - this->Layout(); -} - -wxPasswordCredentialsBase::~wxPasswordCredentialsBase() -{ -} diff --git a/EAPMethods/res/wxpass.fbp b/EAPMethods/res/wxpass.fbp deleted file mode 100644 index 61b0315..0000000 --- a/EAPMethods/res/wxpass.fbp +++ /dev/null @@ -1,728 +0,0 @@ - - - - - ; - C++ - 1 - source_name - 0 - 0 - . - UTF-8 - table - wxpass - 1000 - none - 1 - pass - - . - #include <StdAfx.h> - 1 - 1 - 1 - 1 - UI - 1 - 1 - - 0 - wxAUI_MGR_DEFAULT - - - 1 - 1 - impl_virtual - - - 0 - wxID_ANY - - - wxPasswordCredentialsBase - - 500,-1 - - - - - wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - wxID_ANY - Session Credentials - - sb_credentials - wxVERTICAL - none - - - 5 - wxEXPAND - 0 - - - sb_credentials_horiz - wxHORIZONTAL - none - - 5 - wxALL - 0 - - 1 - 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - - sb_credentials_vert - wxVERTICAL - none - - 5 - wxALL|wxEXPAND - 0 - - 1 - 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 - - - - - 446 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxALL - 0 - - 2 - 0 - - sb_credentials_tbl - none - 0 - 0 - - 5 - wxEXPAND - 1 - - 1 - 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 2 - - 1 - 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, DOMAINUser, etc.) - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - 1 - 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 2 - - 1 - 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - Check if you would like to save the credentials to Windows Credential Manager - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - &Remember my credentials - - 0 - - - 0 - - 1 - m_remember - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EAPMethods/res/wxpass.h b/EAPMethods/res/wxpass.h deleted file mode 100644 index c07cce4..0000000 --- a/EAPMethods/res/wxpass.h +++ /dev/null @@ -1,55 +0,0 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 17 2015) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#ifndef __WXPASS_H__ -#define __WXPASS_H__ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/////////////////////////////////////////////////////////////////////////// - -/////////////////////////////////////////////////////////////////////////////// -/// Class wxPasswordCredentialsBase -/////////////////////////////////////////////////////////////////////////////// -class wxPasswordCredentialsBase : public wxPanel -{ - private: - - protected: - wxStaticBitmap* m_credentials_icon; - wxStaticText* m_credentials_label; - wxStaticText* m_identity_label; - wxTextCtrl* m_identity; - wxStaticText* m_password_label; - wxTextCtrl* m_password; - wxCheckBox* m_remember; - - public: - - wxPasswordCredentialsBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); - ~wxPasswordCredentialsBase(); - -}; - -#endif //__WXPASS_H__ diff --git a/EAPMethods/src/EAPMethods.cpp b/EAPMethods/src/EAP.cpp similarity index 100% rename from EAPMethods/src/EAPMethods.cpp rename to EAPMethods/src/EAP.cpp diff --git a/EAPMethods/src/EAPMethodsUI.cpp b/EAPMethods/src/EAPMethodsUI.cpp deleted file mode 100644 index 19b4450..0000000 Binary files a/EAPMethods/src/EAPMethodsUI.cpp and /dev/null differ diff --git a/EAPMethods/src/EAPTLSUI.cpp b/EAPMethods/src/EAPTLSUI.cpp deleted file mode 100644 index 12a5245..0000000 Binary files a/EAPMethods/src/EAPTLSUI.cpp and /dev/null differ diff --git a/EAPMethods/src/EAP_UI.cpp b/EAPMethods/src/EAP_UI.cpp new file mode 100644 index 0000000..37be2c0 Binary files /dev/null and b/EAPMethods/src/EAP_UI.cpp differ diff --git a/EAPMethods/src/MainUI.cpp b/EAPMethods/src/Main_UI.cpp similarity index 100% rename from EAPMethods/src/MainUI.cpp rename to EAPMethods/src/Main_UI.cpp diff --git a/EAPMethods/src/EAPTLS.cpp b/EAPMethods/src/TLS.cpp similarity index 100% rename from EAPMethods/src/EAPTLS.cpp rename to EAPMethods/src/TLS.cpp diff --git a/EAPMethods/src/TLS_UI.cpp b/EAPMethods/src/TLS_UI.cpp new file mode 100644 index 0000000..e5908fb Binary files /dev/null and b/EAPMethods/src/TLS_UI.cpp differ diff --git a/EAPMethods/src/EAPTTLS.cpp b/EAPMethods/src/TTLS.cpp similarity index 97% rename from EAPMethods/src/EAPTTLS.cpp rename to EAPMethods/src/TTLS.cpp index 740b455..b6eed43 100644 Binary files a/EAPMethods/src/EAPTTLS.cpp and b/EAPMethods/src/TTLS.cpp differ diff --git a/EAPMethods/src/EAPTTLSUI.cpp b/EAPMethods/src/TTLS_UI.cpp similarity index 69% rename from EAPMethods/src/EAPTTLSUI.cpp rename to EAPMethods/src/TTLS_UI.cpp index 4477fa5..15674d5 100644 Binary files a/EAPMethods/src/EAPTTLSUI.cpp and b/EAPMethods/src/TTLS_UI.cpp differ