From 30689b10d2f83fad01718ce93b121009a2a153a7 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Tue, 7 Jun 2016 06:07:53 +0200 Subject: [PATCH] TLS configuration panel finished --- EAPMethods/EAPTTLSUI/StdAfx.h | Bin 3100 -> 3200 bytes EAPMethods/include/TLS_UI.h | Bin 10596 -> 11004 bytes EAPMethods/res/wxTLS_UI.cpp | 5 +++++ EAPMethods/res/wxTLS_UI.fbp | 6 +++--- EAPMethods/res/wxTLS_UI.h | 2 ++ EAPMethods/src/TLS_UI.cpp | Bin 18972 -> 28894 bytes lib/WinStd | 2 +- 7 files changed, 11 insertions(+), 4 deletions(-) diff --git a/EAPMethods/EAPTTLSUI/StdAfx.h b/EAPMethods/EAPTTLSUI/StdAfx.h index fae4a7699cfec04b3c73cbbdc9e3c9f300718462..6c1e78df6bf3ea45129ecda81fcd20caa7017e5b 100644 GIT binary patch delta 58 zcmbOu(IB~ji;FjnA(J78A(bHoNTyE~4E_vx3_(C%K0^tEGlL_8217YR1(21`kPC!~ zK-m-qSB5f%R3NK_K@F%Q70%OSu%65>DjSO1G#8*rIY66|8M4VSITE+YjzD*%Fa!hL zl+REEbQ2lw4ku)~8_?xBmgTj<3S5MxkDlMA?)R7N#jRG)^Kt4x_ zv&nz?1A&DED{_ delta 230 zcmewp`Xp!r2iN3hk}8{b@R)EiD==tHelIF5slZUppukYXkjhZPPzt2;fV?~)uY9t+ zsHU(6gBDOcgCUclm_d`l8YovgxlllR^8vLYrp+rP5?F~aXQGrMA#*MAdd( m_root_ca_add_file, 0, wxRIGHT|wxLEFT, 5 ); m_root_ca_remove = new wxButton( sb_server_trust->GetStaticBox(), wxID_ANY, _("&Remove CA"), wxDefaultPosition, wxDefaultSize, 0 ); + m_root_ca_remove->Enable( false ); m_root_ca_remove->SetToolTip( _("Removes selected certificate authorities from the list") ); sb_root_ca_btn->Add( m_root_ca_remove, 0, wxLEFT, 5 ); @@ -95,7 +96,9 @@ wxEAPTLSConfigPanelBase::wxEAPTLSConfigPanelBase( wxWindow* parent, wxWindowID i this->Layout(); // Connect Events + m_root_ca->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCA ), NULL, this ); m_root_ca->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCADClick ), NULL, this ); + m_root_ca_add_store->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCAAddStore ), NULL, this ); m_root_ca_add_file->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCAAddFile ), NULL, this ); m_root_ca_remove->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCARemove ), NULL, this ); } @@ -103,7 +106,9 @@ wxEAPTLSConfigPanelBase::wxEAPTLSConfigPanelBase( wxWindow* parent, wxWindowID i wxEAPTLSConfigPanelBase::~wxEAPTLSConfigPanelBase() { // Disconnect Events + m_root_ca->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCA ), NULL, this ); m_root_ca->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCADClick ), NULL, this ); + m_root_ca_add_store->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCAAddStore ), NULL, this ); m_root_ca_add_file->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCAAddFile ), NULL, this ); m_root_ca_remove->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCARemove ), NULL, this ); diff --git a/EAPMethods/res/wxTLS_UI.fbp b/EAPMethods/res/wxTLS_UI.fbp index ad75595..62c1635 100644 --- a/EAPMethods/res/wxTLS_UI.fbp +++ b/EAPMethods/res/wxTLS_UI.fbp @@ -431,7 +431,7 @@ - + OnRootCA OnRootCADClick @@ -519,7 +519,7 @@ - + OnRootCAAddStore @@ -659,7 +659,7 @@ Dock 0 Left - 1 + 0 1 diff --git a/EAPMethods/res/wxTLS_UI.h b/EAPMethods/res/wxTLS_UI.h index 2e57cc2..da2ed89 100644 --- a/EAPMethods/res/wxTLS_UI.h +++ b/EAPMethods/res/wxTLS_UI.h @@ -50,7 +50,9 @@ class wxEAPTLSConfigPanelBase : public wxPanel wxStaticText* m_server_names_note; // Virtual event handlers, overide them in your derived class + virtual void OnRootCA( wxCommandEvent& 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(); } diff --git a/EAPMethods/src/TLS_UI.cpp b/EAPMethods/src/TLS_UI.cpp index e5908fbf62a72c4b73c37c8a896e50fab2d7a5ff..6f12599122e98520d63a6d104c4f94b84f6e1fe7 100644 GIT binary patch literal 28894 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 NVR0^BiKcr5{|D1}s_Xy& delta 202 zcmccjka5lw#tmw0lO@dNP0kQk+HAr;k8AR#B)Q3IqGgk1%w}y~U~I=W`GSMV=37=R z0zd}evO|H~