diff --git a/EAPMethods/EAPTTLSUI/EAPTTLSUI.rc b/EAPMethods/EAPTTLSUI/EAPTTLSUI.rc index 816f68b..cabbcdb 100644 Binary files a/EAPMethods/EAPTTLSUI/EAPTTLSUI.rc and b/EAPMethods/EAPTTLSUI/EAPTTLSUI.rc differ diff --git a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj index fe79b43..a60e218 100644 --- a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj +++ b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj @@ -125,7 +125,6 @@ - diff --git a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters index bed6da2..fe235d7 100644 --- a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters +++ b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters @@ -120,9 +120,6 @@ Resource Files\wx - - Resource Files - Resource Files\wx diff --git a/EAPMethods/include/EAPMethodsUI.h b/EAPMethods/include/EAPMethodsUI.h index e0f1ed8..caa663d 100644 Binary files a/EAPMethods/include/EAPMethodsUI.h and b/EAPMethods/include/EAPMethodsUI.h differ diff --git a/EAPMethods/include/EAPTLSUI.h b/EAPMethods/include/EAPTLSUI.h index fd3724b..3a6b624 100644 Binary files a/EAPMethods/include/EAPTLSUI.h and b/EAPMethods/include/EAPTLSUI.h differ diff --git a/EAPMethods/include/EAPTTLSUI.h b/EAPMethods/include/EAPTTLSUI.h index 35a4363..5e23d1c 100644 Binary files a/EAPMethods/include/EAPTTLSUI.h and b/EAPMethods/include/EAPTTLSUI.h differ diff --git a/EAPMethods/res/banner.bmp b/EAPMethods/res/banner.bmp deleted file mode 100644 index e08fa2f..0000000 Binary files a/EAPMethods/res/banner.bmp and /dev/null differ diff --git a/EAPMethods/res/wxEAPMethods.cpp b/EAPMethods/res/wxEAPMethods.cpp index bf22d73..441bb73 100644 --- a/EAPMethods/res/wxEAPMethods.cpp +++ b/EAPMethods/res/wxEAPMethods.cpp @@ -18,12 +18,13 @@ wxEAPConfigBase::wxEAPConfigBase( wxWindow* parent, wxWindowID id, const wxStrin wxBoxSizer* sz_content; sz_content = new wxBoxSizer( wxVERTICAL ); - m_banner = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + m_banner = new wxEAPBannerPanel( this ); + sz_content->Add( m_banner, 0, wxEXPAND|wxBOTTOM, 5 ); m_providers = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - sz_content->Add( m_providers, 0, wxEXPAND|wxALL, 5 ); + sz_content->Add( m_providers, 1, wxEXPAND|wxALL, 5 ); m_buttons = new wxStdDialogButtonSizer(); m_buttonsOK = new wxButton( this, wxID_OK ); @@ -32,7 +33,7 @@ wxEAPConfigBase::wxEAPConfigBase( wxWindow* parent, wxWindowID id, const wxStrin m_buttons->AddButton( m_buttonsCancel ); m_buttons->Realize(); - sz_content->Add( m_buttons, 0, wxEXPAND, 5 ); + sz_content->Add( m_buttons, 0, wxEXPAND|wxALL, 5 ); this->SetSizer( sz_content ); @@ -45,3 +46,27 @@ wxEAPConfigBase::wxEAPConfigBase( wxWindow* parent, wxWindowID id, const wxStrin wxEAPConfigBase::~wxEAPConfigBase() { } + +wxEAPBannerPanelBase::wxEAPBannerPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) +{ + this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); + this->SetMinSize( wxSize( -1,48 ) ); + + wxBoxSizer* sc_content; + sc_content = new wxBoxSizer( wxVERTICAL ); + + m_product_name = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); + m_product_name->Wrap( -1 ); + m_product_name->SetFont( wxFont( 14, 70, 90, 90, false, wxEmptyString ) ); + + sc_content->Add( m_product_name, 0, wxALL|wxEXPAND, 5 ); + + + this->SetSizer( sc_content ); + this->Layout(); + sc_content->Fit( this ); +} + +wxEAPBannerPanelBase::~wxEAPBannerPanelBase() +{ +} diff --git a/EAPMethods/res/wxEAPMethods.fbp b/EAPMethods/res/wxEAPMethods.fbp index bffc8f0..6ee7834 100644 --- a/EAPMethods/res/wxEAPMethods.fbp +++ b/EAPMethods/res/wxEAPMethods.fbp @@ -46,7 +46,7 @@ wxDEFAULT_DIALOG_STYLE - + ; EAP Method Configuration @@ -97,7 +97,7 @@ 5 wxEXPAND|wxBOTTOM 0 - + 1 1 1 @@ -108,13 +108,15 @@ - 1 0 + wxEAPBannerPanel 1 + m_banner = new wxEAPBannerPanel( this ); 1 + wxEAPBannerPanel *m_banner; 0 Dock 0 @@ -126,6 +128,7 @@ 0 0 wxID_ANY + class wxEAPBannerPanel; 0 @@ -141,9 +144,10 @@ 1 Resizable + 1 - - + -1,-1 + ; ../include/EAPMethodsUI.h 0 @@ -177,7 +181,7 @@ 5 wxEXPAND|wxALL - 0 + 1 1 1 @@ -260,7 +264,7 @@ 5 - wxEXPAND + wxEXPAND|wxALL 0 0 @@ -286,5 +290,147 @@ + + 0 + wxAUI_MGR_DEFAULT + wxSYS_COLOUR_WINDOW + + 1 + 1 + impl_virtual + + + 0 + wxID_ANY + + -1,48 + wxEAPBannerPanelBase + + -1,-1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + sc_content + wxVERTICAL + none + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + ,90,90,14,70,0 + 0 + 0 + wxID_ANY + + + 0 + + + 0 + + 1 + m_product_name + 1 + + + protected + 1 + + Resizable + 1 + + wxALIGN_RIGHT + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/EAPMethods/res/wxEAPMethods.h b/EAPMethods/res/wxEAPMethods.h index 8971153..9e5a37f 100644 --- a/EAPMethods/res/wxEAPMethods.h +++ b/EAPMethods/res/wxEAPMethods.h @@ -11,10 +11,7 @@ #include #include #include -#include -#include -#include -#include +class wxEAPBannerPanel; #include #include #include @@ -24,6 +21,8 @@ #include #include #include +#include +#include /////////////////////////////////////////////////////////////////////////// @@ -35,7 +34,7 @@ class wxEAPConfigBase : public wxDialog private: protected: - wxStaticBitmap* m_banner; + wxEAPBannerPanel *m_banner; wxNotebook* m_providers; wxStdDialogButtonSizer* m_buttons; wxButton* m_buttonsOK; @@ -48,4 +47,21 @@ class wxEAPConfigBase : public wxDialog }; +/////////////////////////////////////////////////////////////////////////////// +/// Class wxEAPBannerPanelBase +/////////////////////////////////////////////////////////////////////////////// +class wxEAPBannerPanelBase : public wxPanel +{ + private: + + protected: + wxStaticText* m_product_name; + + public: + + wxEAPBannerPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = 0 ); + ~wxEAPBannerPanelBase(); + +}; + #endif //__WXEAPMETHODS_H__ diff --git a/EAPMethods/res/wxEAPTLS.cpp b/EAPMethods/res/wxEAPTLS.cpp index 53939b5..64927de 100644 --- a/EAPMethods/res/wxEAPTLS.cpp +++ b/EAPMethods/res/wxEAPTLS.cpp @@ -11,13 +11,13 @@ /////////////////////////////////////////////////////////////////////////// -BEGIN_EVENT_TABLE( wxEAPTLSConfigBase, wxPanel ) - EVT_LISTBOX_DCLICK( wxID_ANY, wxEAPTLSConfigBase::_wxFB_OnRootCADClick ) - EVT_BUTTON( wxID_ANY, wxEAPTLSConfigBase::_wxFB_OnRootCAAdd ) - EVT_BUTTON( wxID_ANY, wxEAPTLSConfigBase::_wxFB_OnRootCARemove ) +BEGIN_EVENT_TABLE( wxEAPTLSConfigPanelBase, wxPanel ) + EVT_LISTBOX_DCLICK( wxID_ANY, wxEAPTLSConfigPanelBase::_wxFB_OnRootCADClick ) + EVT_BUTTON( wxID_ANY, wxEAPTLSConfigPanelBase::_wxFB_OnRootCAAdd ) + EVT_BUTTON( wxID_ANY, wxEAPTLSConfigPanelBase::_wxFB_OnRootCARemove ) END_EVENT_TABLE() -wxEAPTLSConfigBase::wxEAPTLSConfigBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) +wxEAPTLSConfigPanelBase::wxEAPTLSConfigPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) { wxStaticBoxSizer* sb_server_trust; sb_server_trust = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Server Trust") ), wxVERTICAL ); @@ -96,6 +96,6 @@ wxEAPTLSConfigBase::wxEAPTLSConfigBase( wxWindow* parent, wxWindowID id, const w this->Layout(); } -wxEAPTLSConfigBase::~wxEAPTLSConfigBase() +wxEAPTLSConfigPanelBase::~wxEAPTLSConfigPanelBase() { } diff --git a/EAPMethods/res/wxEAPTLS.fbp b/EAPMethods/res/wxEAPTLS.fbp index 676028b..eef3c2b 100644 --- a/EAPMethods/res/wxEAPTLS.fbp +++ b/EAPMethods/res/wxEAPTLS.fbp @@ -40,9 +40,9 @@ wxID_ANY - wxEAPTLSConfigBase + wxEAPTLSConfigPanelBase - 500,300 + 500,-1 diff --git a/EAPMethods/res/wxEAPTLS.h b/EAPMethods/res/wxEAPTLS.h index 67b365e..06537b2 100644 --- a/EAPMethods/res/wxEAPTLS.h +++ b/EAPMethods/res/wxEAPTLS.h @@ -31,9 +31,9 @@ /////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// -/// Class wxEAPTLSConfigBase +/// Class wxEAPTLSConfigPanelBase /////////////////////////////////////////////////////////////////////////////// -class wxEAPTLSConfigBase : public wxPanel +class wxEAPTLSConfigPanelBase : public wxPanel { DECLARE_EVENT_TABLE() private: @@ -63,8 +63,8 @@ class wxEAPTLSConfigBase : public wxPanel public: - wxEAPTLSConfigBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,300 ), long style = wxTAB_TRAVERSAL ); - ~wxEAPTLSConfigBase(); + wxEAPTLSConfigPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); + ~wxEAPTLSConfigPanelBase(); }; diff --git a/EAPMethods/res/wxEAPTTLS.cpp b/EAPMethods/res/wxEAPTTLS.cpp index c0624f4..33627fa 100644 --- a/EAPMethods/res/wxEAPTTLS.cpp +++ b/EAPMethods/res/wxEAPTTLS.cpp @@ -11,13 +11,13 @@ /////////////////////////////////////////////////////////////////////////// -BEGIN_EVENT_TABLE( wxEAPTTLSConfigBase, wxPanel ) - EVT_RADIOBUTTON( wxID_ANY, wxEAPTTLSConfigBase::_wxFB_OnOuterIdentitySame ) - EVT_RADIOBUTTON( wxID_ANY, wxEAPTTLSConfigBase::_wxFB_OnOuterIdentityEmpty ) - EVT_RADIOBUTTON( wxID_ANY, wxEAPTTLSConfigBase::_wxFB_OnOuterIdentityCustom ) +BEGIN_EVENT_TABLE( wxEAPTTLSConfigPanelBase, wxPanel ) + EVT_RADIOBUTTON( wxID_ANY, wxEAPTTLSConfigPanelBase::_wxFB_OnOuterIdentitySame ) + EVT_RADIOBUTTON( wxID_ANY, wxEAPTTLSConfigPanelBase::_wxFB_OnOuterIdentityEmpty ) + EVT_RADIOBUTTON( wxID_ANY, wxEAPTTLSConfigPanelBase::_wxFB_OnOuterIdentityCustom ) END_EVENT_TABLE() -wxEAPTTLSConfigBase::wxEAPTTLSConfigBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) +wxEAPTTLSConfigPanelBase::wxEAPTTLSConfigPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) { wxStaticBoxSizer* sb_outer_identity; sb_outer_identity = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Outer Identity") ), wxVERTICAL ); @@ -78,6 +78,6 @@ wxEAPTTLSConfigBase::wxEAPTTLSConfigBase( wxWindow* parent, wxWindowID id, const this->Layout(); } -wxEAPTTLSConfigBase::~wxEAPTTLSConfigBase() +wxEAPTTLSConfigPanelBase::~wxEAPTTLSConfigPanelBase() { } diff --git a/EAPMethods/res/wxEAPTTLS.fbp b/EAPMethods/res/wxEAPTTLS.fbp index 38e97a8..29114fd 100644 --- a/EAPMethods/res/wxEAPTTLS.fbp +++ b/EAPMethods/res/wxEAPTTLS.fbp @@ -40,7 +40,7 @@ wxID_ANY - wxEAPTTLSConfigBase + wxEAPTTLSConfigPanelBase 500,-1 diff --git a/EAPMethods/res/wxEAPTTLS.h b/EAPMethods/res/wxEAPTTLS.h index 57ed0a5..bb19d33 100644 --- a/EAPMethods/res/wxEAPTTLS.h +++ b/EAPMethods/res/wxEAPTTLS.h @@ -30,9 +30,9 @@ /////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// -/// Class wxEAPTTLSConfigBase +/// Class wxEAPTTLSConfigPanelBase /////////////////////////////////////////////////////////////////////////////// -class wxEAPTTLSConfigBase : public wxPanel +class wxEAPTTLSConfigPanelBase : public wxPanel { DECLARE_EVENT_TABLE() private: @@ -59,8 +59,8 @@ class wxEAPTTLSConfigBase : public wxPanel public: - wxEAPTTLSConfigBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); - ~wxEAPTTLSConfigBase(); + wxEAPTTLSConfigPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); + ~wxEAPTTLSConfigPanelBase(); }; diff --git a/EAPMethods/src/EAPMethodsUI.cpp b/EAPMethods/src/EAPMethodsUI.cpp index 482a6a4..19b4450 100644 Binary files a/EAPMethods/src/EAPMethodsUI.cpp and b/EAPMethods/src/EAPMethodsUI.cpp differ diff --git a/EAPMethods/src/EAPTLSUI.cpp b/EAPMethods/src/EAPTLSUI.cpp index 0e8f179..12a5245 100644 Binary files a/EAPMethods/src/EAPTLSUI.cpp and b/EAPMethods/src/EAPTLSUI.cpp differ diff --git a/EAPMethods/src/EAPTTLSUI.cpp b/EAPMethods/src/EAPTTLSUI.cpp index e3b80f9..4477fa5 100644 Binary files a/EAPMethods/src/EAPTTLSUI.cpp and b/EAPMethods/src/EAPTTLSUI.cpp differ diff --git a/lib/WinStd b/lib/WinStd index d4fb7f2..8aca7f8 160000 --- a/lib/WinStd +++ b/lib/WinStd @@ -1 +1 @@ -Subproject commit d4fb7f292f255a0ba24955b2202dbb4005215476 +Subproject commit 8aca7f8214179b98055123b5f2b46f207c8f7e7f