diff --git a/EventMonitor/res/wxEventMonitor_UI.cpp b/EventMonitor/res/wxEventMonitor_UI.cpp index 3f25b08..75478a0 100644 --- a/EventMonitor/res/wxEventMonitor_UI.cpp +++ b/EventMonitor/res/wxEventMonitor_UI.cpp @@ -1,32 +1,32 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 17 2015) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#include "PCH.h" - -#include "../ETWLog.h" - -#include "wxEventMonitor_UI.h" - -/////////////////////////////////////////////////////////////////////////// - -wxEventMonitorLogPanelBase::wxEventMonitorLogPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) -{ - wxBoxSizer* bSizerMain; - bSizerMain = new wxBoxSizer( wxVERTICAL ); - - m_log = new wxETWListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_VIRTUAL|wxNO_BORDER, wxDefaultValidator, wxT("EventMonitorLog") ); - bSizerMain->Add( m_log, 1, wxEXPAND, FromDIP(5) ); - - - this->SetSizer( bSizerMain ); - this->Layout(); - bSizerMain->Fit( this ); -} - -wxEventMonitorLogPanelBase::~wxEventMonitorLogPanelBase() -{ -} +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Oct 26 2018) +// http://www.wxformbuilder.org/ +// +// PLEASE DO *NOT* EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#include "PCH.h" + +#include "../ETWLog.h" + +#include "wxEventMonitor_UI.h" + +/////////////////////////////////////////////////////////////////////////// + +wxEventMonitorLogPanelBase::wxEventMonitorLogPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name ) +{ + wxBoxSizer* bSizerMain; + bSizerMain = new wxBoxSizer( wxVERTICAL ); + + m_log = new wxETWListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_VIRTUAL|wxBORDER_NONE, wxDefaultValidator, wxT("EventMonitorLog") ); + bSizerMain->Add( m_log, 1, wxEXPAND, FromDIP(5) ); + + + this->SetSizer( bSizerMain ); + this->Layout(); + bSizerMain->Fit( this ); +} + +wxEventMonitorLogPanelBase::~wxEventMonitorLogPanelBase() +{ +} diff --git a/EventMonitor/res/wxEventMonitor_UI.fbp b/EventMonitor/res/wxEventMonitor_UI.fbp index 08980cc..18639fd 100644 --- a/EventMonitor/res/wxEventMonitor_UI.fbp +++ b/EventMonitor/res/wxEventMonitor_UI.fbp @@ -1,6 +1,6 @@ - + C++ @@ -14,6 +14,7 @@ wxEventMonitor_UI 1000 none + 1 wxEventMonitor_UI @@ -48,36 +49,6 @@ EventMonitorLogPanel wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bSizerMain @@ -142,50 +113,7 @@ EventMonitorLog - wxNO_BORDER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + wxBORDER_NONE diff --git a/EventMonitor/res/wxEventMonitor_UI.h b/EventMonitor/res/wxEventMonitor_UI.h index d992516..1a06bf4 100644 --- a/EventMonitor/res/wxEventMonitor_UI.h +++ b/EventMonitor/res/wxEventMonitor_UI.h @@ -1,44 +1,42 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 17 2015) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#ifndef __WXEVENTMONITOR_UI_H__ -#define __WXEVENTMONITOR_UI_H__ - -#include -#include -#include -class wxETWListCtrl; - -#include -#include -#include -#include -#include -#include -#include -#include - -/////////////////////////////////////////////////////////////////////////// - -/////////////////////////////////////////////////////////////////////////////// -/// Class wxEventMonitorLogPanelBase -/////////////////////////////////////////////////////////////////////////////// -class wxEventMonitorLogPanelBase : public wxPanel -{ - private: - - protected: - - public: - wxETWListCtrl* m_log; - - wxEventMonitorLogPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxT("EventMonitorLogPanel") ); - ~wxEventMonitorLogPanelBase(); - -}; - -#endif //__WXEVENTMONITOR_UI_H__ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Oct 26 2018) +// http://www.wxformbuilder.org/ +// +// PLEASE DO *NOT* EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#pragma once + +#include +#include +#include +class wxETWListCtrl; + +#include +#include +#include +#include +#include +#include +#include +#include + +/////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +/// Class wxEventMonitorLogPanelBase +/////////////////////////////////////////////////////////////////////////////// +class wxEventMonitorLogPanelBase : public wxPanel +{ + private: + + protected: + + public: + wxETWListCtrl* m_log; + + wxEventMonitorLogPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxT("EventMonitorLogPanel") ); + ~wxEventMonitorLogPanelBase(); + +}; + diff --git a/lib/EAPBase_UI/res/wxEAP_UI.cpp b/lib/EAPBase_UI/res/wxEAP_UI.cpp index f37949c..fe793f7 100644 --- a/lib/EAPBase_UI/res/wxEAP_UI.cpp +++ b/lib/EAPBase_UI/res/wxEAP_UI.cpp @@ -1,5 +1,5 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Aug 8 2018) +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -14,61 +14,61 @@ 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, FromDIP(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, FromDIP(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, FromDIP(wxSize( 30,-1 )), 0 ); m_prov_add->SetToolTip( _("Adds new provider") ); - + sb_bottom_horiz_inner->Add( m_prov_add, 0, wxALL, FromDIP(5) ); - + m_prov_remove = new wxButton( this, wxID_ANY, _("-"), wxDefaultPosition, FromDIP(wxSize( 30,-1 )), 0 ); m_prov_remove->SetToolTip( _("Removes selected provider") ); - + sb_bottom_horiz_inner->Add( m_prov_remove, 0, wxALL, FromDIP(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, FromDIP(5) ); - - + + sb_bottom_horiz->Add( sb_bottom_horiz_inner, 1, wxEXPAND, FromDIP(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, FromDIP(5) ); - - + + sb_content->Add( sb_bottom_horiz, 0, wxEXPAND, FromDIP(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 ) ); @@ -85,39 +85,39 @@ wxEAPConfigDialogBase::~wxEAPConfigDialogBase() 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, FromDIP(5) ); - + m_panels = new wxBoxSizer( wxVERTICAL ); - - + + sb_content->Add( m_panels, 1, wxEXPAND|wxALL, FromDIP(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, FromDIP(5) ); - - + + this->SetSizer( sb_content ); this->Layout(); sb_content->Fit( this ); - + // Connect Events this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxEAPGeneralDialogBase::OnInitDialog ) ); } @@ -126,40 +126,40 @@ 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, FromDIP(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, FromDIP(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, FromDIP(5) ); - - + + this->SetSizer( sb_content ); this->Layout(); sb_content->Fit( this ); - + // Connect Events this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxEAPCredentialsConnectionDialogBase::OnInitDialog ) ); } @@ -168,25 +168,25 @@ 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( FromDIP(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, FromDIP(5) ); - - + + this->SetSizer( sb_content ); this->Layout(); sb_content->Fit( this ); @@ -199,23 +199,23 @@ wxEAPBannerPanelBase::~wxEAPBannerPanelBase() wxEAPNotePanelBase::wxEAPNotePanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, long style, const wxString& name ) : wxPanel( parent, id, pos, parent->FromDIP(wxSize( 500,-1 )), 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, FromDIP(5) ); - + m_note_vert = new wxBoxSizer( wxVERTICAL ); - + m_note_label = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_note_label->Wrap( FromDIP(449) ); m_note_vert->Add( m_note_label, 0, wxALL|wxEXPAND, FromDIP(5) ); - - + + sb_note_horiz->Add( m_note_vert, 1, wxEXPAND, FromDIP(5) ); - - + + this->SetSizer( sb_note_horiz ); this->Layout(); } @@ -227,114 +227,114 @@ wxEAPNotePanelBase::~wxEAPNotePanelBase() wxEAPCredentialsConfigPanelBase::wxEAPCredentialsConfigPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, long style, const wxString& name ) : wxPanel( parent, id, pos, parent->FromDIP(wxSize( 500,-1 )), 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, FromDIP(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( FromDIP(440) ); sb_credentials_vert->Add( m_credentials_label, 0, wxALL|wxEXPAND, FromDIP(5) ); - + m_storage = new wxRadioButton( m_sb_credentials->GetStaticBox(), wxID_ANY, _("Use 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, FromDIP(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, FromDIP(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, FromDIP(5) ); - - + + sb_storage->Add( sb_storage_identity, 1, wxEXPAND, FromDIP(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, FromDIP(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, FromDIP(5) ); - - + + sb_storage->Add( sb_buttons_storage, 0, wxALIGN_RIGHT|wxTOP, FromDIP(5) ); - - + + sb_credentials_vert->Add( sb_storage, 0, wxEXPAND|wxALL, FromDIP(5) ); - + m_config = new wxRadioButton( m_sb_credentials->GetStaticBox(), wxID_ANY, _("Use 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, FromDIP(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, FromDIP(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, FromDIP(5) ); - - + + sb_config->Add( sb_config_identity, 1, wxEXPAND, FromDIP(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, FromDIP(5) ); - - + + sb_config->Add( sb_buttons_config, 0, wxALIGN_RIGHT|wxTOP, FromDIP(5) ); - - + + sb_credentials_vert->Add( sb_config, 0, wxEXPAND|wxALL, FromDIP(5) ); - - + + sb_credentials_horiz->Add( sb_credentials_vert, 1, wxEXPAND, FromDIP(5) ); - - + + m_sb_credentials->Add( sb_credentials_horiz, 1, wxEXPAND, FromDIP(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 ); @@ -351,62 +351,62 @@ wxEAPCredentialsConfigPanelBase::~wxEAPCredentialsConfigPanelBase() 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, long style, const wxString& name ) : wxEAPCredentialsPanelBase( parent, id, pos, parent->FromDIP(wxSize( 500,-1 )), 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, FromDIP(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( FromDIP(440) ); m_sb_credentials_vert->Add( m_credentials_label, 0, wxALL|wxEXPAND, FromDIP(5) ); - + wxFlexGridSizer* sb_credentials_tbl; sb_credentials_tbl = new wxFlexGridSizer( 0, 2, FromDIP(5), FromDIP(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, FromDIP(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, FromDIP(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, FromDIP(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, FromDIP(5) ); - - + + m_sb_credentials_vert->Add( sb_credentials_tbl, 0, wxEXPAND|wxALL, FromDIP(5) ); - - + + sb_credentials_horiz->Add( m_sb_credentials_vert, 1, wxEXPAND, FromDIP(5) ); - - + + m_sb_credentials->Add( sb_credentials_horiz, 0, wxEXPAND, FromDIP(5) ); - - + + this->SetSizer( m_sb_credentials ); this->Layout(); - + // Connect Events m_password->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( wxPasswordCredentialsPanelBase::OnPasswordText ), NULL, this ); } @@ -415,50 +415,50 @@ wxPasswordCredentialsPanelBase::~wxPasswordCredentialsPanelBase() { // Disconnect Events m_password->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( wxPasswordCredentialsPanelBase::OnPasswordText ), NULL, this ); - + } wxIdentityCredentialsPanelBase::wxIdentityCredentialsPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, long style, const wxString& name ) : wxEAPCredentialsPanelBase( parent, id, pos, parent->FromDIP(wxSize( 500,-1 )), style, name ) { m_sb_credentials = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("User ID") ), 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, FromDIP(5) ); - + m_sb_credentials_vert = new wxBoxSizer( wxVERTICAL ); - + m_credentials_label = new wxStaticText( m_sb_credentials->GetStaticBox(), wxID_ANY, _("Please provide your user ID."), wxDefaultPosition, wxDefaultSize, 0 ); m_credentials_label->Wrap( FromDIP(440) ); m_sb_credentials_vert->Add( m_credentials_label, 0, wxALL|wxEXPAND, FromDIP(5) ); - + wxFlexGridSizer* sb_credentials_tbl; sb_credentials_tbl = new wxFlexGridSizer( 0, 2, FromDIP(5), FromDIP(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, FromDIP(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, FromDIP(5) ); - - + + m_sb_credentials_vert->Add( sb_credentials_tbl, 0, wxEXPAND|wxALL, FromDIP(5) ); - - + + sb_credentials_horiz->Add( m_sb_credentials_vert, 1, wxEXPAND, FromDIP(5) ); - - + + m_sb_credentials->Add( sb_credentials_horiz, 0, wxEXPAND, FromDIP(5) ); - - + + this->SetSizer( m_sb_credentials ); this->Layout(); } @@ -471,98 +471,98 @@ wxEAPProviderContactInfoPanelBase::wxEAPProviderContactInfoPanelBase( wxWindow* { 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, FromDIP(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( FromDIP(440) ); sb_provider_contact_vert->Add( m_provider_contact_label, 0, wxALL|wxEXPAND, FromDIP(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, FromDIP(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, FromDIP(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, FromDIP(5) ); - - + + sb_provider_contact_vert->Add( sb_provider_name, 0, wxEXPAND|wxALL, FromDIP(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, FromDIP(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, FromDIP(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, FromDIP(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, FromDIP(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, FromDIP(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, FromDIP(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, FromDIP(5) ); - - + + sb_provider_helpdesk->Add( sb_provider_helpdesk_inner, 0, wxEXPAND, FromDIP(5) ); - - + + sb_provider_contact_vert->Add( sb_provider_helpdesk, 0, wxEXPAND|wxALL, FromDIP(5) ); - - + + sb_provider_contact_horiz->Add( sb_provider_contact_vert, 1, wxEXPAND, FromDIP(5) ); - - + + sb_provider_contact->Add( sb_provider_contact_horiz, 1, wxEXPAND, FromDIP(5) ); - - + + this->SetSizer( sb_provider_contact ); this->Layout(); } @@ -575,58 +575,58 @@ wxEAPProviderIDPanelBase::wxEAPProviderIDPanelBase( wxWindow* parent, wxWindowID { 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, FromDIP(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( FromDIP(440) ); sb_provider_id_vert->Add( m_provider_id_label_outer, 0, wxALL|wxEXPAND, FromDIP(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, FromDIP(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, FromDIP(5) ); - - + + sb_provider_id_vert->Add( sb_provider_namespace, 0, wxEXPAND|wxALL, FromDIP(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, FromDIP(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, FromDIP(5) ); - - + + sb_provider_id_vert->Add( sb_provider_id_inner, 0, wxEXPAND|wxALL, FromDIP(5) ); - - + + sb_provider_id_horiz->Add( sb_provider_id_vert, 1, wxEXPAND, FromDIP(5) ); - - + + sb_provider_id->Add( sb_provider_id_horiz, 1, wxEXPAND, FromDIP(5) ); - - + + this->SetSizer( sb_provider_id ); this->Layout(); } @@ -639,40 +639,40 @@ wxEAPProviderLockPanelBase::wxEAPProviderLockPanelBase( wxWindow* parent, wxWind { 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, FromDIP(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( FromDIP(440) ); sb_provider_lock_vert->Add( m_provider_lock_label, 0, wxALL|wxEXPAND, FromDIP(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, FromDIP(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, FromDIP(5) ); - - + + sb_provider_lock_vert->Add( sb_provider_lock_inner, 0, wxEXPAND|wxALL, FromDIP(5) ); - - + + sb_provider_lock_horiz->Add( sb_provider_lock_vert, 1, wxEXPAND, FromDIP(5) ); - - + + sb_provider_lock->Add( sb_provider_lock_horiz, 1, wxEXPAND, FromDIP(5) ); - - + + this->SetSizer( sb_provider_lock ); this->Layout(); } @@ -684,32 +684,32 @@ 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, FromDIP(5) ); - + m_providers = new wxBoxSizer( wxVERTICAL ); - + m_providers->SetMinSize( FromDIP(wxSize( 350,-1 )) ); - + sb_content->Add( m_providers, 1, wxEXPAND|wxALL, FromDIP(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, FromDIP(5) ); - - + + this->SetSizer( sb_content ); this->Layout(); sb_content->Fit( this ); - + // Connect Events this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxEAPProviderSelectDialogBase::OnInitDialog ) ); } @@ -718,69 +718,69 @@ wxEAPProviderSelectDialogBase::~wxEAPProviderSelectDialogBase() { // Disconnect Events this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxEAPProviderSelectDialogBase::OnInitDialog ) ); - + } wxEAPIdentityConfigPanelBase::wxEAPIdentityConfigPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, long style ) : wxPanel( parent, id, pos, parent->FromDIP(wxSize( 500,-1 )), style ) { wxStaticBoxSizer* sb_identity; sb_identity = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Identity") ), wxVERTICAL ); - + wxBoxSizer* sb_identity_horiz; sb_identity_horiz = new wxBoxSizer( wxHORIZONTAL ); - + m_identity_icon = new wxStaticBitmap( sb_identity->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); sb_identity_horiz->Add( m_identity_icon, 0, wxALL, FromDIP(5) ); - + wxBoxSizer* sb_identity_vert; sb_identity_vert = new wxBoxSizer( wxVERTICAL ); - + m_identity_label = new wxStaticText( sb_identity->GetStaticBox(), wxID_ANY, _("Select the user ID supplicant introduces itself as to authenticator:"), wxDefaultPosition, wxDefaultSize, 0 ); m_identity_label->Wrap( FromDIP(440) ); sb_identity_vert->Add( m_identity_label, 0, wxALL|wxEXPAND, FromDIP(5) ); - + wxBoxSizer* sb_identity_radio; sb_identity_radio = new wxBoxSizer( wxVERTICAL ); - + m_identity_same = new wxRadioButton( sb_identity->GetStaticBox(), wxID_ANY, _("&True identity"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); m_identity_same->SetToolTip( _("Use my true user name") ); - + sb_identity_radio->Add( m_identity_same, 1, wxEXPAND, FromDIP(5) ); - + m_identity_empty = new wxRadioButton( sb_identity->GetStaticBox(), wxID_ANY, _("Use &empty identity"), wxDefaultPosition, wxDefaultSize, 0 ); m_identity_empty->SetToolTip( _("Omit my user name and use @mydomain.org only") ); - + sb_identity_radio->Add( m_identity_empty, 1, wxEXPAND, FromDIP(5) ); - + wxBoxSizer* sb_identity_custom; sb_identity_custom = new wxBoxSizer( wxHORIZONTAL ); - + m_identity_custom = new wxRadioButton( sb_identity->GetStaticBox(), wxID_ANY, _("&Custom identity:"), wxDefaultPosition, wxDefaultSize, 0 ); m_identity_custom->SetToolTip( _("Specify custom identity") ); - + sb_identity_custom->Add( m_identity_custom, 0, wxEXPAND, FromDIP(5) ); - + m_identity_custom_val = new wxTextCtrl( sb_identity->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_identity_custom_val->SetToolTip( _("Custom identity to use") ); - + sb_identity_custom->Add( m_identity_custom_val, 1, wxEXPAND, FromDIP(5) ); - - + + sb_identity_radio->Add( sb_identity_custom, 1, wxEXPAND, FromDIP(5) ); - - + + sb_identity_vert->Add( sb_identity_radio, 0, wxEXPAND|wxALL, FromDIP(5) ); - - + + sb_identity_horiz->Add( sb_identity_vert, 1, wxEXPAND, FromDIP(5) ); - - + + sb_identity->Add( sb_identity_horiz, 0, wxEXPAND, FromDIP(5) ); - - + + this->SetSizer( sb_identity ); this->Layout(); - + // Connect Events this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxEAPIdentityConfigPanelBase::OnUpdateUI ) ); } @@ -789,5 +789,5 @@ wxEAPIdentityConfigPanelBase::~wxEAPIdentityConfigPanelBase() { // Disconnect Events this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxEAPIdentityConfigPanelBase::OnUpdateUI ) ); - + } diff --git a/lib/EAPBase_UI/res/wxEAP_UI.fbp b/lib/EAPBase_UI/res/wxEAP_UI.fbp index 9d5c772..611433c 100644 --- a/lib/EAPBase_UI/res/wxEAP_UI.fbp +++ b/lib/EAPBase_UI/res/wxEAP_UI.fbp @@ -1,6 +1,6 @@ - + ; C++ @@ -53,54 +53,7 @@ - - - - - - - - - - - - - - - - - - - - - - OnInitDialog - - - - - - - - - - - - - - - - - - - - - - - - - OnUpdateUI @@ -167,36 +120,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -256,38 +179,6 @@ wxWS_EX_VALIDATE_RECURSIVELY - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -378,37 +269,7 @@ - - - - - - OnProvAdd - - - - - - - - - - - - - - - - - - - - - - - - @@ -481,37 +342,7 @@ - - - - - - OnProvRemove - - - - - - - - - - - - - - - - - - - - - - - - @@ -584,37 +415,7 @@ - - - - - - OnProvAdvanced - - - - - - - - - - - - - - - - - - - - - - - - @@ -635,14 +436,6 @@ m_buttons protected - - - - - - - - @@ -675,55 +468,7 @@ - - - - - - - - - - - - - - - - - - - - - - OnInitDialog - - - - - - - - - - - - - - - - - - - - - - - - - - sb_content @@ -789,36 +534,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -848,14 +563,6 @@ m_buttons protected - - - - - - - - @@ -886,55 +593,7 @@ - - - - - - - - - - - - - - - - - - - - - - OnInitDialog - - - - - - - - - - - - - - - - - - - - - - - - - - sb_content @@ -1000,36 +659,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1089,38 +718,6 @@ wxWS_EX_VALIDATE_RECURSIVELY - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1139,14 +736,6 @@ m_buttons protected - - - - - - - - @@ -1173,43 +762,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - sb_content @@ -1274,36 +826,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1330,43 +852,6 @@ wxTAB_TRAVERSAL|wxBORDER_SIMPLE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - sb_note_horiz @@ -1428,36 +913,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1528,36 +983,6 @@ 449 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1586,42 +1011,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnUpdateUI wxID_ANY @@ -1631,7 +1020,6 @@ wxVERTICAL 1 protected - 5 wxEXPAND @@ -1697,36 +1085,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1797,36 +1155,6 @@ 440 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1891,37 +1219,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2001,36 +1298,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2092,36 +1359,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2205,37 +1442,7 @@ - - - - - - OnClearStorage - - - - - - - - - - - - - - - - - - - - - - - - @@ -2308,37 +1515,7 @@ - - - - - - OnSetStorage - - - - - - - - - - - - - - - - - - - - - - - - @@ -2407,37 +1584,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2517,36 +1663,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2608,36 +1724,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2721,37 +1807,7 @@ - - - - - - OnSetConfig - - - - - - - - - - - - - - - - - - - - - - - - @@ -2795,43 +1851,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - wxID_ANY User ID and Password @@ -2840,7 +1859,6 @@ wxVERTICAL 1 protected - 5 wxEXPAND @@ -2906,36 +1924,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3006,36 +1994,6 @@ 440 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3113,36 +2071,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3207,40 +2135,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3302,36 +2196,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3396,40 +2260,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnPasswordText - - - - @@ -3462,43 +2293,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - wxID_ANY User ID @@ -3507,7 +2301,6 @@ wxVERTICAL 1 protected - 5 wxEXPAND @@ -3573,36 +2366,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3673,36 +2436,6 @@ 440 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3780,36 +2513,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3874,40 +2577,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3940,43 +2609,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - wxID_ANY Your Organization @@ -3985,7 +2617,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -4051,36 +2682,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4151,36 +2752,6 @@ 440 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4251,36 +2822,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4345,40 +2886,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4440,36 +2947,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4542,36 +3019,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4649,36 +3096,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4743,40 +3160,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4838,36 +3221,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4932,40 +3285,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5027,36 +3346,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5121,40 +3410,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5189,43 +3444,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - wxID_ANY Provider Unique Identifier @@ -5234,7 +3452,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -5300,36 +3517,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5400,36 +3587,6 @@ 440 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5500,36 +3657,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5594,37 +3721,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5697,36 +3793,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5791,40 +3857,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5857,43 +3889,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - wxID_ANY Configuration Lock @@ -5902,7 +3897,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -5968,36 +3962,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6068,36 +4032,6 @@ 440 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6171,37 +4105,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6263,36 +4166,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6329,55 +4202,7 @@ - - - - - - - - - - - - - - - - - - - - - - OnInitDialog - - - - - - - - - - - - - - - - - - - - - - - - - - sb_content @@ -6443,36 +4268,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6502,14 +4297,6 @@ m_buttons protected - - - - - - - - @@ -6536,42 +4323,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnUpdateUI wxID_ANY @@ -6581,7 +4332,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -6647,36 +4397,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6747,36 +4467,6 @@ 440 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6850,37 +4540,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6945,37 +4604,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7049,37 +4677,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7144,40 +4741,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lib/EAPBase_UI/res/wxEAP_UI.h b/lib/EAPBase_UI/res/wxEAP_UI.h index a2a7826..7aa9ef1 100644 --- a/lib/EAPBase_UI/res/wxEAP_UI.h +++ b/lib/EAPBase_UI/res/wxEAP_UI.h @@ -1,12 +1,11 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Aug 8 2018) +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __WXEAP_UI_H__ -#define __WXEAP_UI_H__ +#pragma once #include #include @@ -40,10 +39,10 @@ class wxEAPBannerPanel; /////////////////////////////////////////////////////////////////////////////// /// Class wxEAPConfigDialogBase /////////////////////////////////////////////////////////////////////////////// -class wxEAPConfigDialogBase : public wxDialog +class wxEAPConfigDialogBase : public wxDialog { private: - + protected: wxEAPBannerPanel *m_banner; wxNotebook* m_providers; @@ -53,115 +52,115 @@ class wxEAPConfigDialogBase : public wxDialog 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( 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 +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( 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 +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( 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 +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( 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 +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, long style = wxTAB_TRAVERSAL|wxBORDER_SIMPLE, const wxString& name = wxEmptyString ); ~wxEAPNotePanelBase(); - + }; /////////////////////////////////////////////////////////////////////////////// /// Class wxEAPCredentialsConfigPanelBase /////////////////////////////////////////////////////////////////////////////// -class wxEAPCredentialsConfigPanelBase : public wxPanel +class wxEAPCredentialsConfigPanelBase : public wxPanel { private: - + protected: wxStaticBoxSizer* m_sb_credentials; wxStaticBitmap* m_credentials_icon; @@ -176,20 +175,20 @@ class wxEAPCredentialsConfigPanelBase : public wxPanel 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, long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); ~wxEAPCredentialsConfigPanelBase(); - + }; /////////////////////////////////////////////////////////////////////////////// @@ -198,7 +197,7 @@ class wxEAPCredentialsConfigPanelBase : public wxPanel class wxPasswordCredentialsPanelBase : public wxEAPCredentialsPanelBase { private: - + protected: wxStaticBoxSizer* m_sb_credentials; wxStaticBitmap* m_credentials_icon; @@ -208,16 +207,16 @@ class wxPasswordCredentialsPanelBase : public wxEAPCredentialsPanelBase 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, long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); ~wxPasswordCredentialsPanelBase(); - + }; /////////////////////////////////////////////////////////////////////////////// @@ -226,7 +225,7 @@ class wxPasswordCredentialsPanelBase : public wxEAPCredentialsPanelBase class wxIdentityCredentialsPanelBase : public wxEAPCredentialsPanelBase { private: - + protected: wxStaticBoxSizer* m_sb_credentials; wxStaticBitmap* m_credentials_icon; @@ -234,21 +233,21 @@ class wxIdentityCredentialsPanelBase : public wxEAPCredentialsPanelBase wxStaticText* m_credentials_label; wxStaticText* m_identity_label; wxTextCtrl* m_identity; - + public: - + wxIdentityCredentialsPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); ~wxIdentityCredentialsPanelBase(); - + }; /////////////////////////////////////////////////////////////////////////////// /// Class wxEAPProviderContactInfoPanelBase /////////////////////////////////////////////////////////////////////////////// -class wxEAPProviderContactInfoPanelBase : public wxPanel +class wxEAPProviderContactInfoPanelBase : public wxPanel { private: - + protected: wxStaticBitmap* m_provider_contact_icon; wxStaticText* m_provider_contact_label; @@ -262,21 +261,21 @@ class wxEAPProviderContactInfoPanelBase : public wxPanel 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, long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); ~wxEAPProviderContactInfoPanelBase(); - + }; /////////////////////////////////////////////////////////////////////////////// /// Class wxEAPProviderIDPanelBase /////////////////////////////////////////////////////////////////////////////// -class wxEAPProviderIDPanelBase : public wxPanel +class wxEAPProviderIDPanelBase : public wxPanel { private: - + protected: wxStaticBitmap* m_provider_id_icon; wxStaticText* m_provider_id_label_outer; @@ -284,65 +283,65 @@ class wxEAPProviderIDPanelBase : public wxPanel 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, long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); ~wxEAPProviderIDPanelBase(); - + }; /////////////////////////////////////////////////////////////////////////////// /// Class wxEAPProviderLockPanelBase /////////////////////////////////////////////////////////////////////////////// -class wxEAPProviderLockPanelBase : public wxPanel +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, long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); ~wxEAPProviderLockPanelBase(); - + }; /////////////////////////////////////////////////////////////////////////////// /// Class wxEAPProviderSelectDialogBase /////////////////////////////////////////////////////////////////////////////// -class wxEAPProviderSelectDialogBase : public wxDialog +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( 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(); - + }; /////////////////////////////////////////////////////////////////////////////// /// Class wxEAPIdentityConfigPanelBase /////////////////////////////////////////////////////////////////////////////// -class wxEAPIdentityConfigPanelBase : public wxPanel +class wxEAPIdentityConfigPanelBase : public wxPanel { private: - + protected: wxStaticBitmap* m_identity_icon; wxStaticText* m_identity_label; @@ -350,16 +349,15 @@ class wxEAPIdentityConfigPanelBase : public wxPanel wxRadioButton* m_identity_empty; wxRadioButton* m_identity_custom; wxTextCtrl* m_identity_custom_val; - + // Virtual event handlers, overide them in your derived class virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); } - - + + public: - + wxEAPIdentityConfigPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, long style = wxTAB_TRAVERSAL ); ~wxEAPIdentityConfigPanelBase(); - + }; -#endif //__WXEAP_UI_H__ diff --git a/lib/EapHost_UI/res/wxEapHost_UI.cpp b/lib/EapHost_UI/res/wxEapHost_UI.cpp index 2fb0bc1..027fe9c 100644 --- a/lib/EapHost_UI/res/wxEapHost_UI.cpp +++ b/lib/EapHost_UI/res/wxEapHost_UI.cpp @@ -1,67 +1,67 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 17 2015) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#include - -#include "wxEapHost_UI.h" - -/////////////////////////////////////////////////////////////////////////// - -wxEapHostMethodConfigPanelBase::wxEapHostMethodConfigPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, long style ) : wxPanel( parent, id, pos, parent->FromDIP(wxSize( 500,-1 )), style ) -{ - wxStaticBoxSizer* sb_method; - sb_method = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Inner EAP Method") ), wxVERTICAL ); - - wxBoxSizer* sb_method_horiz; - sb_method_horiz = new wxBoxSizer( wxHORIZONTAL ); - - m_method_icon = new wxStaticBitmap( sb_method->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - sb_method_horiz->Add( m_method_icon, 0, wxALL, FromDIP(5) ); - - wxBoxSizer* sb_method_vert; - sb_method_vert = new wxBoxSizer( wxVERTICAL ); - - m_method_label = new wxStaticText( sb_method->GetStaticBox(), wxID_ANY, _("Select and configure inner EAP method"), wxDefaultPosition, wxDefaultSize, 0 ); - m_method_label->Wrap( FromDIP(440) ); - sb_method_vert->Add( m_method_label, 0, wxALL|wxEXPAND, FromDIP(5) ); - - wxBoxSizer* sb_method_inner; - sb_method_inner = new wxBoxSizer( wxHORIZONTAL ); - - wxArrayString m_methodChoices; - m_method = new wxChoice( sb_method->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_methodChoices, 0 ); - m_method->SetSelection( 0 ); - sb_method_inner->Add( m_method, 1, wxRIGHT|wxEXPAND, FromDIP(5) ); - - m_settings = new wxButton( sb_method->GetStaticBox(), wxID_ANY, _("&Settings"), wxDefaultPosition, wxDefaultSize, 0 ); - sb_method_inner->Add( m_settings, 0, 0, FromDIP(5) ); - - - sb_method_vert->Add( sb_method_inner, 0, wxEXPAND|wxALL, FromDIP(5) ); - - - sb_method_horiz->Add( sb_method_vert, 1, wxEXPAND, FromDIP(5) ); - - - sb_method->Add( sb_method_horiz, 1, wxEXPAND, FromDIP(5) ); - - - this->SetSizer( sb_method ); - this->Layout(); - - // Connect Events - this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxEapHostMethodConfigPanelBase::OnUpdateUI ) ); - m_settings->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEapHostMethodConfigPanelBase::OnSettings ), NULL, this ); -} - -wxEapHostMethodConfigPanelBase::~wxEapHostMethodConfigPanelBase() -{ - // Disconnect Events - this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxEapHostMethodConfigPanelBase::OnUpdateUI ) ); - m_settings->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEapHostMethodConfigPanelBase::OnSettings ), NULL, this ); - -} +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Oct 26 2018) +// http://www.wxformbuilder.org/ +// +// PLEASE DO *NOT* EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#include + +#include "wxEapHost_UI.h" + +/////////////////////////////////////////////////////////////////////////// + +wxEapHostMethodConfigPanelBase::wxEapHostMethodConfigPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, long style ) : wxPanel( parent, id, pos, parent->FromDIP(wxSize( 500,-1 )), style ) +{ + wxStaticBoxSizer* sb_method; + sb_method = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Inner EAP Method") ), wxVERTICAL ); + + wxBoxSizer* sb_method_horiz; + sb_method_horiz = new wxBoxSizer( wxHORIZONTAL ); + + m_method_icon = new wxStaticBitmap( sb_method->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + sb_method_horiz->Add( m_method_icon, 0, wxALL, FromDIP(5) ); + + wxBoxSizer* sb_method_vert; + sb_method_vert = new wxBoxSizer( wxVERTICAL ); + + m_method_label = new wxStaticText( sb_method->GetStaticBox(), wxID_ANY, _("Select and configure inner EAP method"), wxDefaultPosition, wxDefaultSize, 0 ); + m_method_label->Wrap( FromDIP(440) ); + sb_method_vert->Add( m_method_label, 0, wxALL|wxEXPAND, FromDIP(5) ); + + wxBoxSizer* sb_method_inner; + sb_method_inner = new wxBoxSizer( wxHORIZONTAL ); + + wxArrayString m_methodChoices; + m_method = new wxChoice( sb_method->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_methodChoices, 0 ); + m_method->SetSelection( 0 ); + sb_method_inner->Add( m_method, 1, wxRIGHT|wxEXPAND, FromDIP(5) ); + + m_settings = new wxButton( sb_method->GetStaticBox(), wxID_ANY, _("&Settings"), wxDefaultPosition, wxDefaultSize, 0 ); + sb_method_inner->Add( m_settings, 0, 0, FromDIP(5) ); + + + sb_method_vert->Add( sb_method_inner, 0, wxEXPAND|wxALL, FromDIP(5) ); + + + sb_method_horiz->Add( sb_method_vert, 1, wxEXPAND, FromDIP(5) ); + + + sb_method->Add( sb_method_horiz, 1, wxEXPAND, FromDIP(5) ); + + + this->SetSizer( sb_method ); + this->Layout(); + + // Connect Events + this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxEapHostMethodConfigPanelBase::OnUpdateUI ) ); + m_settings->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEapHostMethodConfigPanelBase::OnSettings ), NULL, this ); +} + +wxEapHostMethodConfigPanelBase::~wxEapHostMethodConfigPanelBase() +{ + // Disconnect Events + this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxEapHostMethodConfigPanelBase::OnUpdateUI ) ); + m_settings->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEapHostMethodConfigPanelBase::OnSettings ), NULL, this ); + +} diff --git a/lib/EapHost_UI/res/wxEapHost_UI.fbp b/lib/EapHost_UI/res/wxEapHost_UI.fbp index c1ede9c..e25cd12 100644 --- a/lib/EapHost_UI/res/wxEapHost_UI.fbp +++ b/lib/EapHost_UI/res/wxEapHost_UI.fbp @@ -1,6 +1,6 @@ - + ; C++ @@ -49,42 +49,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnUpdateUI wxID_ANY @@ -94,7 +58,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -160,36 +123,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -260,36 +193,6 @@ 440 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -363,37 +266,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -466,37 +338,7 @@ - - - - - - OnSettings - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lib/EapHost_UI/res/wxEapHost_UI.h b/lib/EapHost_UI/res/wxEapHost_UI.h index 330e2a7..10b9b1a 100644 --- a/lib/EapHost_UI/res/wxEapHost_UI.h +++ b/lib/EapHost_UI/res/wxEapHost_UI.h @@ -1,57 +1,55 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 17 2015) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#ifndef __WXEAPHOST_UI_H__ -#define __WXEAPHOST_UI_H__ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/////////////////////////////////////////////////////////////////////////// - -/////////////////////////////////////////////////////////////////////////////// -/// Class wxEapHostMethodConfigPanelBase -/////////////////////////////////////////////////////////////////////////////// -class wxEapHostMethodConfigPanelBase : public wxPanel -{ - private: - - protected: - wxStaticBitmap* m_method_icon; - wxStaticText* m_method_label; - wxChoice* m_method; - wxButton* m_settings; - - // Virtual event handlers, overide them in your derived class - virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); } - virtual void OnSettings( wxCommandEvent& event ) { event.Skip(); } - - - public: - - wxEapHostMethodConfigPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, long style = wxTAB_TRAVERSAL ); - ~wxEapHostMethodConfigPanelBase(); - -}; - -#endif //__WXEAPHOST_UI_H__ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Oct 26 2018) +// http://www.wxformbuilder.org/ +// +// PLEASE DO *NOT* EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#pragma once + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +/// Class wxEapHostMethodConfigPanelBase +/////////////////////////////////////////////////////////////////////////////// +class wxEapHostMethodConfigPanelBase : public wxPanel +{ + private: + + protected: + wxStaticBitmap* m_method_icon; + wxStaticText* m_method_label; + wxChoice* m_method; + wxButton* m_settings; + + // Virtual event handlers, overide them in your derived class + virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); } + virtual void OnSettings( wxCommandEvent& event ) { event.Skip(); } + + + public: + + wxEapHostMethodConfigPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, long style = wxTAB_TRAVERSAL ); + ~wxEapHostMethodConfigPanelBase(); + +}; + diff --git a/lib/GTC_UI/res/wxGTC_UI.cpp b/lib/GTC_UI/res/wxGTC_UI.cpp index e196578..b7d8bc7 100644 --- a/lib/GTC_UI/res/wxGTC_UI.cpp +++ b/lib/GTC_UI/res/wxGTC_UI.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Aug 8 2018) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -14,46 +14,46 @@ wxGTCResponsePanelBase::wxGTCResponsePanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, long style ) : wxPanel( parent, id, pos, parent->FromDIP(wxSize( 500,-1 )), style ) { m_sb_response = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("GTC Challenge") ), wxVERTICAL ); - + wxBoxSizer* sb_response_horiz; sb_response_horiz = new wxBoxSizer( wxHORIZONTAL ); - + m_response_icon = new wxStaticBitmap( m_sb_response->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); sb_response_horiz->Add( m_response_icon, 0, wxALL, FromDIP(5) ); - + m_sb_response_vert = new wxBoxSizer( wxVERTICAL ); - + m_response_label = new wxStaticText( m_sb_response->GetStaticBox(), wxID_ANY, _("Please provide your response."), wxDefaultPosition, wxDefaultSize, 0 ); m_response_label->Wrap( FromDIP(440) ); m_sb_response_vert->Add( m_response_label, 0, wxALL|wxEXPAND, FromDIP(5) ); - + wxFlexGridSizer* sb_response_tbl; sb_response_tbl = new wxFlexGridSizer( 0, 2, FromDIP(5), FromDIP(5) ); sb_response_tbl->AddGrowableCol( 1 ); sb_response_tbl->SetFlexibleDirection( wxBOTH ); sb_response_tbl->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - + m_challenge = new wxStaticText( m_sb_response->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, FromDIP(0) ); m_challenge->Wrap( -1 ); m_challenge->SetToolTip( _("Server challenge") ); - + sb_response_tbl->Add( m_challenge, 0, wxALIGN_CENTER_VERTICAL, FromDIP(5) ); - + m_response = new wxTextCtrl( m_sb_response->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_response->SetToolTip( _("Enter your response here") ); - + sb_response_tbl->Add( m_response, 2, wxEXPAND|wxALIGN_CENTER_VERTICAL, FromDIP(5) ); - - + + m_sb_response_vert->Add( sb_response_tbl, 0, wxEXPAND|wxALL, FromDIP(5) ); - - + + sb_response_horiz->Add( m_sb_response_vert, 1, wxEXPAND, FromDIP(5) ); - - + + m_sb_response->Add( sb_response_horiz, 0, wxEXPAND, FromDIP(5) ); - - + + this->SetSizer( m_sb_response ); this->Layout(); } @@ -66,20 +66,20 @@ wxGTCConfigPanelBase::wxGTCConfigPanelBase( wxWindow* parent, wxWindowID id, con { wxBoxSizer* sb_vertical; sb_vertical = new wxBoxSizer( wxVERTICAL ); - + m_auth_mode_label = new wxStaticText( this, wxID_ANY, _("EAP-GTC authentication &mode:"), wxDefaultPosition, wxDefaultSize, 0 ); m_auth_mode_label->Wrap( -1 ); sb_vertical->Add( m_auth_mode_label, 0, wxBOTTOM, FromDIP(5) ); - + m_auth_mode = new wxChoicebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxCHB_DEFAULT ); m_auth_mode->SetToolTip( _("Select EAP-GTC authentication mode from the list") ); - + sb_vertical->Add( m_auth_mode, 0, wxEXPAND, FromDIP(5) ); - - + + this->SetSizer( sb_vertical ); this->Layout(); - + // Connect Events this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxGTCConfigPanelBase::OnUpdateUI ) ); } @@ -88,5 +88,5 @@ wxGTCConfigPanelBase::~wxGTCConfigPanelBase() { // Disconnect Events this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxGTCConfigPanelBase::OnUpdateUI ) ); - + } diff --git a/lib/GTC_UI/res/wxGTC_UI.fbp b/lib/GTC_UI/res/wxGTC_UI.fbp index ef75c60..a9e41d4 100644 --- a/lib/GTC_UI/res/wxGTC_UI.fbp +++ b/lib/GTC_UI/res/wxGTC_UI.fbp @@ -1,6 +1,6 @@ - + ; C++ @@ -49,43 +49,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - wxID_ANY GTC Challenge @@ -94,7 +57,6 @@ wxVERTICAL 1 protected - 5 wxEXPAND @@ -160,36 +122,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -260,36 +192,6 @@ 440 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -367,36 +269,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -461,40 +333,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -527,42 +365,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnUpdateUI @@ -628,36 +430,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -716,38 +488,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lib/GTC_UI/res/wxGTC_UI.h b/lib/GTC_UI/res/wxGTC_UI.h index 5f8f614..1001028 100644 --- a/lib/GTC_UI/res/wxGTC_UI.h +++ b/lib/GTC_UI/res/wxGTC_UI.h @@ -1,12 +1,11 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Aug 8 2018) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __WXGTC_UI_H__ -#define __WXGTC_UI_H__ +#pragma once #include #include @@ -32,10 +31,10 @@ /////////////////////////////////////////////////////////////////////////////// /// Class wxGTCResponsePanelBase /////////////////////////////////////////////////////////////////////////////// -class wxGTCResponsePanelBase : public wxPanel +class wxGTCResponsePanelBase : public wxPanel { private: - + protected: wxStaticBoxSizer* m_sb_response; wxStaticBitmap* m_response_icon; @@ -43,34 +42,33 @@ class wxGTCResponsePanelBase : public wxPanel wxStaticText* m_response_label; wxStaticText* m_challenge; wxTextCtrl* m_response; - + public: - + wxGTCResponsePanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, long style = wxTAB_TRAVERSAL ); ~wxGTCResponsePanelBase(); - + }; /////////////////////////////////////////////////////////////////////////////// /// Class wxGTCConfigPanelBase /////////////////////////////////////////////////////////////////////////////// -class wxGTCConfigPanelBase : public wxPanel +class wxGTCConfigPanelBase : public wxPanel { private: - + protected: wxStaticText* m_auth_mode_label; wxChoicebook* m_auth_mode; - + // Virtual event handlers, overide them in your derived class virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); } - - + + public: - + wxGTCConfigPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, long style = wxTAB_TRAVERSAL ); ~wxGTCConfigPanelBase(); - + }; -#endif //__WXGTC_UI_H__ diff --git a/lib/TLS_UI/res/wxTLS_UI.cpp b/lib/TLS_UI/res/wxTLS_UI.cpp index 91cb605..075892f 100644 --- a/lib/TLS_UI/res/wxTLS_UI.cpp +++ b/lib/TLS_UI/res/wxTLS_UI.cpp @@ -1,173 +1,173 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 17 2015) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#include - -#include "wxTLS_UI.h" - -/////////////////////////////////////////////////////////////////////////// - -wxTLSServerTrustPanelBase::wxTLSServerTrustPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, long style ) : wxPanel( parent, id, pos, parent->FromDIP(wxSize( 500,-1 )), style ) -{ - wxStaticBoxSizer* sb_server_trust; - sb_server_trust = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Server Trust") ), wxVERTICAL ); - - wxBoxSizer* sb_server_trust_horiz; - sb_server_trust_horiz = new wxBoxSizer( wxHORIZONTAL ); - - m_server_trust_icon = new wxStaticBitmap( sb_server_trust->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - sb_server_trust_horiz->Add( m_server_trust_icon, 0, wxALL, FromDIP(5) ); - - wxBoxSizer* sb_server_trust_vert; - sb_server_trust_vert = new wxBoxSizer( wxVERTICAL ); - - m_server_trust_label = new wxStaticText( sb_server_trust->GetStaticBox(), wxID_ANY, _("Describe the servers you trust to prevent man-in-the-middle attacks."), wxDefaultPosition, wxDefaultSize, 0 ); - m_server_trust_label->Wrap( FromDIP(440) ); - sb_server_trust_vert->Add( m_server_trust_label, 0, wxALL|wxEXPAND, FromDIP(5) ); - - wxBoxSizer* sb_root_ca; - sb_root_ca = new wxBoxSizer( wxVERTICAL ); - - m_root_ca_lbl = new wxStaticText( sb_server_trust->GetStaticBox(), wxID_ANY, _("Acceptable Certificate Authorities:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_root_ca_lbl->Wrap( -1 ); - sb_root_ca->Add( m_root_ca_lbl, 0, wxEXPAND|wxBOTTOM, FromDIP(5) ); - - m_root_ca = new wxListBox( sb_server_trust->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SORT ); - m_root_ca->SetToolTip( _("Server's certificate must be issued by one of certificate authorities listed here") ); - - sb_root_ca->Add( m_root_ca, 1, wxEXPAND|wxBOTTOM, FromDIP(5) ); - - wxBoxSizer* sb_root_ca_btn; - sb_root_ca_btn = new wxBoxSizer( wxHORIZONTAL ); - - 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_store, 0, wxRIGHT, FromDIP(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, FromDIP(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") ); - - sb_root_ca_btn->Add( m_root_ca_remove, 0, wxLEFT, FromDIP(5) ); - - - sb_root_ca->Add( sb_root_ca_btn, 0, wxALIGN_RIGHT, FromDIP(5) ); - - - sb_server_trust_vert->Add( sb_root_ca, 1, wxEXPAND|wxALL, FromDIP(5) ); - - wxBoxSizer* sb_server_names; - sb_server_names = new wxBoxSizer( wxVERTICAL ); - - m_server_names_label = new wxStaticText( sb_server_trust->GetStaticBox(), wxID_ANY, _("Acceptable server &names:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_server_names_label->Wrap( -1 ); - sb_server_names->Add( m_server_names_label, 0, wxBOTTOM, FromDIP(5) ); - - m_server_names = new wxTextCtrl( sb_server_trust->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_server_names->SetToolTip( _("A semicolon delimited list of acceptable server FQDN names; blank to skip name check; Unicode characters allowed") ); - - sb_server_names->Add( m_server_names, 0, wxEXPAND|wxBOTTOM, FromDIP(5) ); - - m_server_names_note = new wxStaticText( sb_server_trust->GetStaticBox(), wxID_ANY, _("(Example: foo.bar.com;server2.bar.com)"), wxDefaultPosition, wxDefaultSize, 0 ); - m_server_names_note->Wrap( -1 ); - sb_server_names->Add( m_server_names_note, 0, wxALIGN_RIGHT, FromDIP(5) ); - - - sb_server_trust_vert->Add( sb_server_names, 0, wxEXPAND|wxALL, FromDIP(5) ); - - - sb_server_trust_horiz->Add( sb_server_trust_vert, 1, wxEXPAND, FromDIP(5) ); - - - sb_server_trust->Add( sb_server_trust_horiz, 1, wxEXPAND, FromDIP(5) ); - - - this->SetSizer( sb_server_trust ); - this->Layout(); - - // Connect Events - this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxTLSServerTrustPanelBase::OnUpdateUI ) ); - m_root_ca->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( wxTLSServerTrustPanelBase::OnRootCADClick ), NULL, this ); - m_root_ca_add_store->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxTLSServerTrustPanelBase::OnRootCAAddStore ), NULL, this ); - m_root_ca_add_file->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxTLSServerTrustPanelBase::OnRootCAAddFile ), NULL, this ); - m_root_ca_remove->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxTLSServerTrustPanelBase::OnRootCARemove ), NULL, this ); -} - -wxTLSServerTrustPanelBase::~wxTLSServerTrustPanelBase() -{ - // Disconnect Events - this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxTLSServerTrustPanelBase::OnUpdateUI ) ); - m_root_ca->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( wxTLSServerTrustPanelBase::OnRootCADClick ), NULL, this ); - m_root_ca_add_store->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxTLSServerTrustPanelBase::OnRootCAAddStore ), NULL, this ); - m_root_ca_add_file->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxTLSServerTrustPanelBase::OnRootCAAddFile ), NULL, this ); - m_root_ca_remove->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxTLSServerTrustPanelBase::OnRootCARemove ), NULL, this ); - -} - -wxTLSCredentialsPanelBase::wxTLSCredentialsPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, long style ) : wxEAPCredentialsPanelBase( parent, id, pos, parent->FromDIP(wxSize( 500,-1 )), style ) -{ - m_sb_credentials = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("User Certificate") ), 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, FromDIP(5) ); - - m_sb_credentials_vert = new wxBoxSizer( wxVERTICAL ); - - m_certificate_label = new wxStaticText( m_sb_credentials->GetStaticBox(), wxID_ANY, _("Please select your &certificate to use for authentication."), wxDefaultPosition, wxDefaultSize, 0 ); - m_certificate_label->Wrap( FromDIP(440) ); - m_sb_credentials_vert->Add( m_certificate_label, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, FromDIP(5) ); - - wxArrayString m_certificateChoices; - m_certificate = new wxChoice( m_sb_credentials->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_certificateChoices, wxCB_SORT ); - m_certificate->SetSelection( 0 ); - m_certificate->SetToolTip( _("Client certificate to use for authentication") ); - - m_sb_credentials_vert->Add( m_certificate, 0, wxEXPAND|wxALL, FromDIP(5) ); - - wxBoxSizer* sb_identity; - sb_identity = new wxBoxSizer( wxVERTICAL ); - - m_identity_label = new wxStaticText( m_sb_credentials->GetStaticBox(), wxID_ANY, _("Custom &identity:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_identity_label->Wrap( -1 ); - sb_identity->Add( m_identity_label, 0, wxBOTTOM, FromDIP(5) ); - - m_identity = new wxTextCtrl( m_sb_credentials->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_identity->SetToolTip( _("Your identity (username@domain) to override one from certificate; or blank to use one provided in certificate") ); - - sb_identity->Add( m_identity, 0, wxEXPAND, FromDIP(5) ); - - - m_sb_credentials_vert->Add( sb_identity, 0, wxEXPAND|wxALL, FromDIP(5) ); - - - sb_credentials_horiz->Add( m_sb_credentials_vert, 1, wxEXPAND, FromDIP(5) ); - - - m_sb_credentials->Add( sb_credentials_horiz, 0, wxEXPAND, FromDIP(5) ); - - - this->SetSizer( m_sb_credentials ); - this->Layout(); - - // Connect Events - this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxTLSCredentialsPanelBase::OnUpdateUI ) ); -} - -wxTLSCredentialsPanelBase::~wxTLSCredentialsPanelBase() -{ - // Disconnect Events - this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxTLSCredentialsPanelBase::OnUpdateUI ) ); - -} +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Oct 26 2018) +// http://www.wxformbuilder.org/ +// +// PLEASE DO *NOT* EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#include + +#include "wxTLS_UI.h" + +/////////////////////////////////////////////////////////////////////////// + +wxTLSServerTrustPanelBase::wxTLSServerTrustPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, long style ) : wxPanel( parent, id, pos, parent->FromDIP(wxSize( 500,-1 )), style ) +{ + wxStaticBoxSizer* sb_server_trust; + sb_server_trust = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Server Trust") ), wxVERTICAL ); + + wxBoxSizer* sb_server_trust_horiz; + sb_server_trust_horiz = new wxBoxSizer( wxHORIZONTAL ); + + m_server_trust_icon = new wxStaticBitmap( sb_server_trust->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + sb_server_trust_horiz->Add( m_server_trust_icon, 0, wxALL, FromDIP(5) ); + + wxBoxSizer* sb_server_trust_vert; + sb_server_trust_vert = new wxBoxSizer( wxVERTICAL ); + + m_server_trust_label = new wxStaticText( sb_server_trust->GetStaticBox(), wxID_ANY, _("Describe the servers you trust to prevent man-in-the-middle attacks."), wxDefaultPosition, wxDefaultSize, 0 ); + m_server_trust_label->Wrap( FromDIP(440) ); + sb_server_trust_vert->Add( m_server_trust_label, 0, wxALL|wxEXPAND, FromDIP(5) ); + + wxBoxSizer* sb_root_ca; + sb_root_ca = new wxBoxSizer( wxVERTICAL ); + + m_root_ca_lbl = new wxStaticText( sb_server_trust->GetStaticBox(), wxID_ANY, _("Acceptable Certificate Authorities:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_root_ca_lbl->Wrap( -1 ); + sb_root_ca->Add( m_root_ca_lbl, 0, wxEXPAND|wxBOTTOM, FromDIP(5) ); + + m_root_ca = new wxListBox( sb_server_trust->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SORT ); + m_root_ca->SetToolTip( _("Server's certificate must be issued by one of certificate authorities listed here") ); + + sb_root_ca->Add( m_root_ca, 1, wxEXPAND|wxBOTTOM, FromDIP(5) ); + + wxBoxSizer* sb_root_ca_btn; + sb_root_ca_btn = new wxBoxSizer( wxHORIZONTAL ); + + 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_store, 0, wxRIGHT, FromDIP(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, FromDIP(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") ); + + sb_root_ca_btn->Add( m_root_ca_remove, 0, wxLEFT, FromDIP(5) ); + + + sb_root_ca->Add( sb_root_ca_btn, 0, wxALIGN_RIGHT, FromDIP(5) ); + + + sb_server_trust_vert->Add( sb_root_ca, 1, wxEXPAND|wxALL, FromDIP(5) ); + + wxBoxSizer* sb_server_names; + sb_server_names = new wxBoxSizer( wxVERTICAL ); + + m_server_names_label = new wxStaticText( sb_server_trust->GetStaticBox(), wxID_ANY, _("Acceptable server &names:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_server_names_label->Wrap( -1 ); + sb_server_names->Add( m_server_names_label, 0, wxBOTTOM, FromDIP(5) ); + + m_server_names = new wxTextCtrl( sb_server_trust->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_server_names->SetToolTip( _("A semicolon delimited list of acceptable server FQDN names; blank to skip name check; Unicode characters allowed") ); + + sb_server_names->Add( m_server_names, 0, wxEXPAND|wxBOTTOM, FromDIP(5) ); + + m_server_names_note = new wxStaticText( sb_server_trust->GetStaticBox(), wxID_ANY, _("(Example: foo.bar.com;server2.bar.com)"), wxDefaultPosition, wxDefaultSize, 0 ); + m_server_names_note->Wrap( -1 ); + sb_server_names->Add( m_server_names_note, 0, wxALIGN_RIGHT, FromDIP(5) ); + + + sb_server_trust_vert->Add( sb_server_names, 0, wxEXPAND|wxALL, FromDIP(5) ); + + + sb_server_trust_horiz->Add( sb_server_trust_vert, 1, wxEXPAND, FromDIP(5) ); + + + sb_server_trust->Add( sb_server_trust_horiz, 1, wxEXPAND, FromDIP(5) ); + + + this->SetSizer( sb_server_trust ); + this->Layout(); + + // Connect Events + this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxTLSServerTrustPanelBase::OnUpdateUI ) ); + m_root_ca->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( wxTLSServerTrustPanelBase::OnRootCADClick ), NULL, this ); + m_root_ca_add_store->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxTLSServerTrustPanelBase::OnRootCAAddStore ), NULL, this ); + m_root_ca_add_file->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxTLSServerTrustPanelBase::OnRootCAAddFile ), NULL, this ); + m_root_ca_remove->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxTLSServerTrustPanelBase::OnRootCARemove ), NULL, this ); +} + +wxTLSServerTrustPanelBase::~wxTLSServerTrustPanelBase() +{ + // Disconnect Events + this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxTLSServerTrustPanelBase::OnUpdateUI ) ); + m_root_ca->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( wxTLSServerTrustPanelBase::OnRootCADClick ), NULL, this ); + m_root_ca_add_store->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxTLSServerTrustPanelBase::OnRootCAAddStore ), NULL, this ); + m_root_ca_add_file->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxTLSServerTrustPanelBase::OnRootCAAddFile ), NULL, this ); + m_root_ca_remove->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxTLSServerTrustPanelBase::OnRootCARemove ), NULL, this ); + +} + +wxTLSCredentialsPanelBase::wxTLSCredentialsPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, long style ) : wxEAPCredentialsPanelBase( parent, id, pos, parent->FromDIP(wxSize( 500,-1 )), style ) +{ + m_sb_credentials = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("User Certificate") ), 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, FromDIP(5) ); + + m_sb_credentials_vert = new wxBoxSizer( wxVERTICAL ); + + m_certificate_label = new wxStaticText( m_sb_credentials->GetStaticBox(), wxID_ANY, _("Please select your &certificate to use for authentication."), wxDefaultPosition, wxDefaultSize, 0 ); + m_certificate_label->Wrap( FromDIP(440) ); + m_sb_credentials_vert->Add( m_certificate_label, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, FromDIP(5) ); + + wxArrayString m_certificateChoices; + m_certificate = new wxChoice( m_sb_credentials->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_certificateChoices, wxCB_SORT ); + m_certificate->SetSelection( 0 ); + m_certificate->SetToolTip( _("Client certificate to use for authentication") ); + + m_sb_credentials_vert->Add( m_certificate, 0, wxEXPAND|wxALL, FromDIP(5) ); + + wxBoxSizer* sb_identity; + sb_identity = new wxBoxSizer( wxVERTICAL ); + + m_identity_label = new wxStaticText( m_sb_credentials->GetStaticBox(), wxID_ANY, _("Custom &identity:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_identity_label->Wrap( -1 ); + sb_identity->Add( m_identity_label, 0, wxBOTTOM, FromDIP(5) ); + + m_identity = new wxTextCtrl( m_sb_credentials->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_identity->SetToolTip( _("Your identity (username@domain) to override one from certificate; or blank to use one provided in certificate") ); + + sb_identity->Add( m_identity, 0, wxEXPAND, FromDIP(5) ); + + + m_sb_credentials_vert->Add( sb_identity, 0, wxEXPAND|wxALL, FromDIP(5) ); + + + sb_credentials_horiz->Add( m_sb_credentials_vert, 1, wxEXPAND, FromDIP(5) ); + + + m_sb_credentials->Add( sb_credentials_horiz, 0, wxEXPAND, FromDIP(5) ); + + + this->SetSizer( m_sb_credentials ); + this->Layout(); + + // Connect Events + this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxTLSCredentialsPanelBase::OnUpdateUI ) ); +} + +wxTLSCredentialsPanelBase::~wxTLSCredentialsPanelBase() +{ + // Disconnect Events + this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxTLSCredentialsPanelBase::OnUpdateUI ) ); + +} diff --git a/lib/TLS_UI/res/wxTLS_UI.fbp b/lib/TLS_UI/res/wxTLS_UI.fbp index 2741c65..6081ca6 100644 --- a/lib/TLS_UI/res/wxTLS_UI.fbp +++ b/lib/TLS_UI/res/wxTLS_UI.fbp @@ -1,6 +1,6 @@ - + ; C++ @@ -49,42 +49,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnUpdateUI wxID_ANY @@ -94,7 +58,6 @@ wxVERTICAL 1 none - 5 wxEXPAND @@ -160,36 +123,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -260,36 +193,6 @@ 440 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -360,36 +263,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -453,38 +326,7 @@ - - - - - - - - - - - - - - - - - - OnRootCADClick - - - - - - - - - - - - - @@ -566,37 +408,7 @@ - - - - - - OnRootCAAddStore - - - - - - - - - - - - - - - - - - - - - - - - @@ -669,37 +481,7 @@ - - - - - - OnRootCAAddFile - - - - - - - - - - - - - - - - - - - - - - - - @@ -772,37 +554,7 @@ - - - - - - OnRootCARemove - - - - - - - - - - - - - - - - - - - - - - - - @@ -877,36 +629,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -971,40 +693,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1066,36 +754,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1128,42 +786,6 @@ wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnUpdateUI wxID_ANY @@ -1173,7 +795,6 @@ wxVERTICAL 1 protected - 5 wxEXPAND @@ -1239,36 +860,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1339,36 +930,6 @@ 440 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1433,37 +994,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1534,36 +1064,6 @@ -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1628,40 +1128,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lib/TLS_UI/res/wxTLS_UI.h b/lib/TLS_UI/res/wxTLS_UI.h index 89aac92..2d8f28e 100644 --- a/lib/TLS_UI/res/wxTLS_UI.h +++ b/lib/TLS_UI/res/wxTLS_UI.h @@ -1,98 +1,94 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 17 2015) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#ifndef __WXTLS_UI_H__ -#define __WXTLS_UI_H__ - -#include -#include -#include -class wxEAPCredentialsPanelBase; - -#include "../../EAPBase_UI/include/wxEAP_UIBase.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/////////////////////////////////////////////////////////////////////////// - -/////////////////////////////////////////////////////////////////////////////// -/// Class wxTLSServerTrustPanelBase -/////////////////////////////////////////////////////////////////////////////// -class wxTLSServerTrustPanelBase : public wxPanel -{ - private: - - 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_store; - wxButton* m_root_ca_add_file; - wxButton* m_root_ca_remove; - wxStaticText* m_server_names_label; - wxTextCtrl* m_server_names; - wxStaticText* m_server_names_note; - - // Virtual event handlers, overide them in your derived class - virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); } - virtual void OnRootCADClick( wxCommandEvent& event ) { event.Skip(); } - virtual void OnRootCAAddStore( wxCommandEvent& event ) { event.Skip(); } - virtual void OnRootCAAddFile( wxCommandEvent& event ) { event.Skip(); } - virtual void OnRootCARemove( wxCommandEvent& event ) { event.Skip(); } - - - public: - - wxTLSServerTrustPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, long style = wxTAB_TRAVERSAL ); - ~wxTLSServerTrustPanelBase(); - -}; - -/////////////////////////////////////////////////////////////////////////////// -/// Class wxTLSCredentialsPanelBase -/////////////////////////////////////////////////////////////////////////////// -class wxTLSCredentialsPanelBase : public wxEAPCredentialsPanelBase -{ - private: - - protected: - wxStaticBoxSizer* m_sb_credentials; - wxStaticBitmap* m_credentials_icon; - wxBoxSizer* m_sb_credentials_vert; - wxStaticText* m_certificate_label; - wxChoice* m_certificate; - wxStaticText* m_identity_label; - wxTextCtrl* m_identity; - - // Virtual event handlers, overide them in your derived class - virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); } - - - public: - - wxTLSCredentialsPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, long style = wxTAB_TRAVERSAL ); - ~wxTLSCredentialsPanelBase(); - -}; - -#endif //__WXTLS_UI_H__ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Oct 26 2018) +// http://www.wxformbuilder.org/ +// +// PLEASE DO *NOT* EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#pragma once + +#include +#include +#include +#include "../../EAPBase_UI/include/wxEAP_UIBase.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +/// Class wxTLSServerTrustPanelBase +/////////////////////////////////////////////////////////////////////////////// +class wxTLSServerTrustPanelBase : public wxPanel +{ + private: + + 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_store; + wxButton* m_root_ca_add_file; + wxButton* m_root_ca_remove; + wxStaticText* m_server_names_label; + wxTextCtrl* m_server_names; + wxStaticText* m_server_names_note; + + // Virtual event handlers, overide them in your derived class + virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); } + virtual void OnRootCADClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnRootCAAddStore( wxCommandEvent& event ) { event.Skip(); } + virtual void OnRootCAAddFile( wxCommandEvent& event ) { event.Skip(); } + virtual void OnRootCARemove( wxCommandEvent& event ) { event.Skip(); } + + + public: + + wxTLSServerTrustPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, long style = wxTAB_TRAVERSAL ); + ~wxTLSServerTrustPanelBase(); + +}; + +/////////////////////////////////////////////////////////////////////////////// +/// Class wxTLSCredentialsPanelBase +/////////////////////////////////////////////////////////////////////////////// +class wxTLSCredentialsPanelBase : public wxEAPCredentialsPanelBase +{ + private: + + protected: + wxStaticBoxSizer* m_sb_credentials; + wxStaticBitmap* m_credentials_icon; + wxBoxSizer* m_sb_credentials_vert; + wxStaticText* m_certificate_label; + wxChoice* m_certificate; + wxStaticText* m_identity_label; + wxTextCtrl* m_identity; + + // Virtual event handlers, overide them in your derived class + virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); } + + + public: + + wxTLSCredentialsPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, long style = wxTAB_TRAVERSAL ); + ~wxTLSCredentialsPanelBase(); + +}; +