From ef9fa750a0f42722725d1b31d9b6797bb78d4e21 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Wed, 15 Jun 2016 15:44:10 +0200 Subject: [PATCH] UI tune-up --- lib/EAPBase_UI/res/wxEAP_UI.cpp | 2 +- lib/EAPBase_UI/res/wxEAP_UI.fbp | 2 +- lib/PAP_UI/src/PAP_UI.cpp | 6 ++---- lib/TLS_UI/src/TLS_UI.cpp | 11 +++++------ lib/TTLS_UI/src/TTLS_UI.cpp | 24 ++++++++++++------------ 5 files changed, 21 insertions(+), 24 deletions(-) diff --git a/lib/EAPBase_UI/res/wxEAP_UI.cpp b/lib/EAPBase_UI/res/wxEAP_UI.cpp index f84504e..3bebb07 100644 --- a/lib/EAPBase_UI/res/wxEAP_UI.cpp +++ b/lib/EAPBase_UI/res/wxEAP_UI.cpp @@ -24,7 +24,7 @@ wxEAPConfigDialogBase::wxEAPConfigDialogBase( wxWindow* parent, wxWindowID id, c m_providers = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - sb_content->Add( m_providers, 1, wxEXPAND|wxALL, 5 ); + sb_content->Add( m_providers, 1, wxEXPAND|wxALL, 10 ); m_buttons = new wxStdDialogButtonSizer(); m_buttonsOK = new wxButton( this, wxID_OK ); diff --git a/lib/EAPBase_UI/res/wxEAP_UI.fbp b/lib/EAPBase_UI/res/wxEAP_UI.fbp index 9a233b0..700dc65 100644 --- a/lib/EAPBase_UI/res/wxEAP_UI.fbp +++ b/lib/EAPBase_UI/res/wxEAP_UI.fbp @@ -179,7 +179,7 @@ - 5 + 10 wxEXPAND|wxALL 1 diff --git a/lib/PAP_UI/src/PAP_UI.cpp b/lib/PAP_UI/src/PAP_UI.cpp index 2f315fa..1f617a0 100644 --- a/lib/PAP_UI/src/PAP_UI.cpp +++ b/lib/PAP_UI/src/PAP_UI.cpp @@ -32,7 +32,7 @@ wxPAPConfigPanel::wxPAPConfigPanel(eap::config_pap &cfg, LPCTSTR pszCredTarget, if (cfg.m_allow_save) { m_credentials = new wxPAPCredentialsConfigPanel(cfg, pszCredTarget, this); - sb_content->Add(m_credentials, 0, wxALL|wxEXPAND, 5); + sb_content->Add(m_credentials, 0, wxEXPAND, 5); m_label = NULL; } else { @@ -40,11 +40,9 @@ wxPAPConfigPanel::wxPAPConfigPanel(eap::config_pap &cfg, LPCTSTR pszCredTarget, m_label = new wxStaticText(this, wxID_ANY, _("This method requires no additional settings."), wxDefaultPosition, wxDefaultSize, 0); m_label->Wrap(-1); - sb_content->Add(m_label, 0, wxALL|wxEXPAND, 5); + sb_content->Add(m_label, 0, wxEXPAND, 5); } - sb_content->Add(10, 10, 1, wxEXPAND, 5); - this->SetSizer(sb_content); this->Layout(); diff --git a/lib/TLS_UI/src/TLS_UI.cpp b/lib/TLS_UI/src/TLS_UI.cpp index 05061e7..6711b43 100644 --- a/lib/TLS_UI/src/TLS_UI.cpp +++ b/lib/TLS_UI/src/TLS_UI.cpp @@ -625,15 +625,14 @@ wxEAPTLSConfigPanel::wxEAPTLSConfigPanel(eap::config_tls &cfg, LPCTSTR pszCredTa sb_content = new wxBoxSizer( wxVERTICAL ); m_server_trust = new wxEAPTLSServerTrustPanel(cfg, this); - sb_content->Add(m_server_trust, 0, wxALL|wxEXPAND, 5); - if (cfg.m_allow_save) { + sb_content->Add(m_server_trust, 0, wxDOWN|wxEXPAND, 5); m_credentials = new wxEAPTLSCredentialsConfigPanel(cfg, pszCredTarget, this); - sb_content->Add(m_credentials, 0, wxALL|wxEXPAND, 5); - } else + sb_content->Add(m_credentials, 0, wxUP|wxEXPAND, 5); + } else { + sb_content->Add(m_server_trust, 0, wxEXPAND, 5); m_credentials = NULL; - - sb_content->Add(10, 10, 1, wxEXPAND, 5); + } this->SetSizer(sb_content); this->Layout(); diff --git a/lib/TTLS_UI/src/TTLS_UI.cpp b/lib/TTLS_UI/src/TTLS_UI.cpp index 0241ba3..30a4344 100644 --- a/lib/TTLS_UI/src/TTLS_UI.cpp +++ b/lib/TTLS_UI/src/TTLS_UI.cpp @@ -89,6 +89,18 @@ wxEAPTTLSConfig::wxEAPTTLSConfig(eap::config_ttls &cfg, LPCTSTR pszCredTarget, w wxBoxSizer* sb_content; sb_content = new wxBoxSizer( wxVERTICAL ); + m_inner_title = new wxStaticText(this, wxID_ANY, _("Inner Authentication"), wxDefaultPosition, wxDefaultSize, 0); + m_inner_title->SetFont(wxFont(18, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString)); + m_inner_title->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_INACTIVECAPTION ) ); + sb_content->Add(m_inner_title, 0, wxALL|wxALIGN_RIGHT, 5); + + m_inner_type = new wxChoicebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxCHB_DEFAULT); + m_inner_type->SetToolTip( _("Select inner authentication method from the list") ); + m_inner_type->AddPage(new wxPAPConfigPanel(m_cfg_pap, pszCredTarget, m_inner_type), _("PAP")); + sb_content->Add(m_inner_type, 0, wxALL|wxEXPAND, 5); + + sb_content->Add(20, 20, 1, wxALL|wxEXPAND, 5); + m_outer_title = new wxStaticText(this, wxID_ANY, _("Outer Authentication"), wxDefaultPosition, wxDefaultSize, 0); m_outer_title->SetFont(wxFont(18, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString)); m_outer_title->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_INACTIVECAPTION ) ); @@ -100,18 +112,6 @@ wxEAPTTLSConfig::wxEAPTTLSConfig(eap::config_ttls &cfg, LPCTSTR pszCredTarget, w m_tls = new wxEAPTLSConfigPanel(m_cfg, pszCredTarget, this); sb_content->Add(m_tls, 0, wxALL|wxEXPAND, 5); - sb_content->Add(20, 20, 1, wxEXPAND, 5); - - m_inner_title = new wxStaticText(this, wxID_ANY, _("Inner Authentication"), wxDefaultPosition, wxDefaultSize, 0); - m_inner_title->SetFont(wxFont(18, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString)); - m_inner_title->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_INACTIVECAPTION ) ); - sb_content->Add(m_inner_title, 0, wxALL|wxALIGN_RIGHT, 5); - - m_inner_type = new wxChoicebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxCHB_DEFAULT); - m_inner_type->SetToolTip( _("Select inner authentication method from the list") ); - m_inner_type->AddPage(new wxPAPConfigPanel(m_cfg_pap, pszCredTarget, m_inner_type), _("PAP")); - sb_content->Add(m_inner_type, 0, wxALL|wxEXPAND, 5); - wxSize size = sb_content->CalcMin(); if (size.y > 500) { // Increase the width to allow space for vertical scroll bar (to prevent horizontal one) and truncate the height.