Amebis/GEANTLink
Amebis/GEANTLink
1
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 50 Wiki Activity

UI work continues...

Browse Source
This commit is contained in:
Simon Rozman 2016-06-04 07:03:58 +02:00
parent 6c935d53c3
commit ec6291f6ac
20 changed files with 226 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
EAPMethods/EAPTTLSUI/EAPTTLSUI.rc
View File

Binary file not shown.

1
EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj
View File

@ -125,7 +125,6 @@
</ItemGroup>
<ItemGroup>
<None Include="..\build\EAPMethodUI.def" />
<None Include="..\res\banner.bmp" />
<None Include="..\res\wxEAPMethods.fbp" />
<None Include="..\res\wxEAPTLS.fbp" />
<None Include="..\res\wxEAPTTLS.fbp" />

3
EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters
View File

@ -120,9 +120,6 @@
<None Include="..\res\wxEAPMethods.fbp">
<Filter>Resource Files\wx</Filter>
</None>
<None Include="..\res\banner.bmp">
<Filter>Resource Files</Filter>
</None>
<None Include="..\res\wxpass.fbp">
<Filter>Resource Files\wx</Filter>
</None>

BIN
EAPMethods/include/EAPMethodsUI.h
View File

Binary file not shown.

BIN
EAPMethods/include/EAPTLSUI.h
View File

Binary file not shown.

BIN
EAPMethods/include/EAPTTLSUI.h
View File

Binary file not shown.

BIN
EAPMethods/res/banner.bmp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 20 KiB

31
EAPMethods/res/wxEAPMethods.cpp
View File

@ -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()
{
}

160
EAPMethods/res/wxEAPMethods.fbp
View File

@ -46,7 +46,7 @@
<property name="pos"></property>
<property name="size"></property>
<property name="style">wxDEFAULT_DIALOG_STYLE</property>
<property name="subclass"></property>
<property name="subclass">; </property>
<property name="title">EAP Method Configuration</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
@ -97,7 +97,7 @@
<property name="border">5</property>
<property name="flag">wxEXPAND|wxBOTTOM</property>
<property name="proportion">0</property>
<object class="wxStaticBitmap" expanded="1">
<object class="CustomControl" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
@ -108,13 +108,15 @@
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="bitmap"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="class">wxEAPBannerPanel</property>
<property name="close_button">1</property>
<property name="construction">m_banner = new wxEAPBannerPanel( this );&#x0A;</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="declaration">wxEAPBannerPanel *m_banner;</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
@ -126,6 +128,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="include">class wxEAPBannerPanel;</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
@ -141,9 +144,10 @@
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="settings"></property>
<property name="show">1</property>
<property name="size"></property>
<property name="subclass"></property>
<property name="size">-1,-1</property>
<property name="subclass">; ../include/EAPMethodsUI.h</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
@ -177,7 +181,7 @@
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxALL</property>
<property name="proportion">0</property>
<property name="proportion">1</property>
<object class="wxNotebook" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
@ -260,7 +264,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="flag">wxEXPAND|wxALL</property>
<property name="proportion">0</property>
<object class="wxStdDialogButtonSizer" expanded="1">
<property name="Apply">0</property>
@ -286,5 +290,147 @@
</object>
</object>
</object>
<object class="Panel" expanded="1">
<property name="aui_managed">0</property>
<property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
<property name="bg">wxSYS_COLOUR_WINDOW</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="enabled">1</property>
<property name="event_handler">impl_virtual</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="maximum_size"></property>
<property name="minimum_size">-1,48</property>
<property name="name">wxEAPBannerPanelBase</property>
<property name="pos"></property>
<property name="size">-1,-1</property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnAuiFindManager"></event>
<event name="OnAuiPaneButton"></event>
<event name="OnAuiPaneClose"></event>
<event name="OnAuiPaneMaximize"></event>
<event name="OnAuiPaneRestore"></event>
<event name="OnAuiRender"></event>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnInitDialog"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">sc_content</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font">,90,90,14,70,0</property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label"></property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_product_name</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxALIGN_RIGHT</property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
</object>
</object>
</object>
</wxFormBuilder_Project>

26
EAPMethods/res/wxEAPMethods.h
View File

@ -11,10 +11,7 @@
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <wx/intl.h>
#include <wx/bitmap.h>
#include <wx/image.h>
#include <wx/icon.h>
#include <wx/statbmp.h>
class wxEAPBannerPanel;
#include <wx/gdicmn.h>
#include <wx/font.h>
#include <wx/colour.h>
@ -24,6 +21,8 @@
#include <wx/sizer.h>
#include <wx/button.h>
#include <wx/dialog.h>
#include <wx/stattext.h>
#include <wx/panel.h>
///////////////////////////////////////////////////////////////////////////
@ -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__

12
EAPMethods/res/wxEAPTLS.cpp
View File

@ -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()
{
}

4
EAPMethods/res/wxEAPTLS.fbp
View File

@ -40,9 +40,9 @@
<property name="id">wxID_ANY</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">wxEAPTLSConfigBase</property>
<property name="name">wxEAPTLSConfigPanelBase</property>
<property name="pos"></property>
<property name="size">500,300</property>
<property name="size">500,-1</property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>

8
EAPMethods/res/wxEAPTLS.h
View File

@ -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();
};

12
EAPMethods/res/wxEAPTTLS.cpp
View File

@ -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()
{
}

2
EAPMethods/res/wxEAPTTLS.fbp
View File

@ -40,7 +40,7 @@
<property name="id">wxID_ANY</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">wxEAPTTLSConfigBase</property>
<property name="name">wxEAPTTLSConfigPanelBase</property>
<property name="pos"></property>
<property name="size">500,-1</property>
<property name="subclass"></property>

8
EAPMethods/res/wxEAPTTLS.h
View File

@ -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();
};

BIN
EAPMethods/src/EAPMethodsUI.cpp
View File

Binary file not shown.

BIN
EAPMethods/src/EAPTLSUI.cpp
View File

Binary file not shown.

BIN
EAPMethods/src/EAPTTLSUI.cpp
View File

Binary file not shown.

2
lib/WinStd

@ -1 +1 @@
Subproject commit d4fb7f292f255a0ba24955b2202dbb4005215476
Subproject commit 8aca7f8214179b98055123b5f2b46f207c8f7e7f