diff --git a/lib/EAPBase_UI/res/wxEAP_UI.cpp b/lib/EAPBase_UI/res/wxEAP_UI.cpp index f486085..fd05c35 100644 --- a/lib/EAPBase_UI/res/wxEAP_UI.cpp +++ b/lib/EAPBase_UI/res/wxEAP_UI.cpp @@ -238,31 +238,22 @@ wxEAPCredentialsConfigPanelBase::wxEAPCredentialsConfigPanelBase( wxWindow* pare wxBoxSizer* sb_credentials_vert; sb_credentials_vert = new wxBoxSizer( wxVERTICAL ); - m_credentials_label = new wxStaticText( sb_credentials->GetStaticBox(), wxID_ANY, _("Manage credentials used to connect."), wxDefaultPosition, wxDefaultSize, 0 ); + m_credentials_label = new wxStaticText( sb_credentials->GetStaticBox(), wxID_ANY, _("Select the source where your username, password, or certificate used to connect are stored."), wxDefaultPosition, wxDefaultSize, 0 ); m_credentials_label->Wrap( 440 ); sb_credentials_vert->Add( m_credentials_label, 0, wxALL|wxEXPAND, 5 ); - wxBoxSizer* sb_cred_radio; - sb_cred_radio = new wxBoxSizer( wxVERTICAL ); + m_storage = new wxRadioButton( sb_credentials->GetStaticBox(), wxID_ANY, _("Use credentials 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, 5 ); wxBoxSizer* sz_storage; sz_storage = new wxBoxSizer( wxVERTICAL ); - wxBoxSizer* sz_storage_inner; - sz_storage_inner = new wxBoxSizer( wxHORIZONTAL ); - - m_storage = new wxRadioButton( sb_credentials->GetStaticBox(), wxID_ANY, _("Use &own credentials:"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); - m_storage->SetToolTip( _("Select this option if you have your unique credentials to connect") ); - - sz_storage_inner->Add( m_storage, 2, wxEXPAND, 5 ); - m_storage_identity = new wxTextCtrl( sb_credentials->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); - m_storage_identity->SetToolTip( _("Your credentials loaded from Windows Credential Manager") ); + m_storage_identity->SetToolTip( _("Your present credentials stored in Windows Credential Manager") ); - sz_storage_inner->Add( m_storage_identity, 3, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); - - - sz_storage->Add( sz_storage_inner, 1, wxEXPAND|wxBOTTOM, 5 ); + sz_storage->Add( m_storage_identity, 3, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); wxBoxSizer* sb_buttons_storage; sb_buttons_storage = new wxBoxSizer( wxHORIZONTAL ); @@ -278,29 +269,23 @@ wxEAPCredentialsConfigPanelBase::wxEAPCredentialsConfigPanelBase( wxWindow* pare sb_buttons_storage->Add( m_storage_set, 0, wxLEFT, 5 ); - sz_storage->Add( sb_buttons_storage, 0, wxALIGN_RIGHT, 5 ); + sz_storage->Add( sb_buttons_storage, 0, wxALIGN_RIGHT|wxTOP, 5 ); - sb_cred_radio->Add( sz_storage, 0, wxEXPAND|wxBOTTOM, 5 ); + sb_credentials_vert->Add( sz_storage, 0, wxEXPAND|wxALL, 5 ); + + m_config = new wxRadioButton( sb_credentials->GetStaticBox(), wxID_ANY, _("Use credentials 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, 5 ); wxBoxSizer* sz_config; sz_config = new wxBoxSizer( wxVERTICAL ); - wxBoxSizer* sz_config_inner; - sz_config_inner = new wxBoxSizer( wxHORIZONTAL ); - - m_config = new wxRadioButton( sb_credentials->GetStaticBox(), wxID_ANY, _("Use &pre-shared credentials:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_config->SetToolTip( _("Select this options if all clients connect using the same credentials") ); - - sz_config_inner->Add( m_config, 2, wxEXPAND, 5 ); - m_config_identity = new wxTextCtrl( sb_credentials->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); - m_config_identity->SetToolTip( _("Common (pre-shared) credentials") ); + m_config_identity->SetToolTip( _("Profile configuration credentials") ); - sz_config_inner->Add( m_config_identity, 3, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); - - - sz_config->Add( sz_config_inner, 1, wxEXPAND|wxBOTTOM, 5 ); + sz_config->Add( m_config_identity, 3, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); wxBoxSizer* sb_buttons_config; sb_buttons_config = new wxBoxSizer( wxHORIZONTAL ); @@ -311,13 +296,10 @@ wxEAPCredentialsConfigPanelBase::wxEAPCredentialsConfigPanelBase( wxWindow* pare sb_buttons_config->Add( m_config_set, 0, 0, 5 ); - sz_config->Add( sb_buttons_config, 0, wxALIGN_RIGHT, 5 ); + sz_config->Add( sb_buttons_config, 0, wxALIGN_RIGHT|wxTOP, 5 ); - sb_cred_radio->Add( sz_config, 0, wxEXPAND|wxTOP, 5 ); - - - sb_credentials_vert->Add( sb_cred_radio, 0, wxEXPAND|wxALL, 5 ); + sb_credentials_vert->Add( sz_config, 0, wxEXPAND|wxALL, 5 ); sb_credentials_horiz->Add( sb_credentials_vert, 1, wxEXPAND, 5 ); diff --git a/lib/EAPBase_UI/res/wxEAP_UI.fbp b/lib/EAPBase_UI/res/wxEAP_UI.fbp index dfcee37..8d4aa4b 100644 --- a/lib/EAPBase_UI/res/wxEAP_UI.fbp +++ b/lib/EAPBase_UI/res/wxEAP_UI.fbp @@ -1598,7 +1598,7 @@ 0 0 wxID_ANY - Manage credentials used to connect. + Select the source where your username, password, or certificate used to connect are stored. 0 @@ -1649,699 +1649,666 @@ + + 5 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Use credentials from Credential &Manager: + + 0 + + + 0 + + 1 + m_storage + 1 + + + protected + 1 + + Resizable + 1 + + wxRB_GROUP + + 0 + Select this option if you would like to use credentials stored in Windows Credential Manager + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 wxEXPAND|wxALL 0 - sb_cred_radio + sz_storage wxVERTICAL none 5 - wxEXPAND|wxBOTTOM - 0 - + wxEXPAND|wxALIGN_CENTER_VERTICAL + 3 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + + 0 - sz_storage - wxVERTICAL - none - - 5 - wxEXPAND|wxBOTTOM - 1 - - - sz_storage_inner - wxHORIZONTAL - none - - 5 - wxEXPAND - 2 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Use &own credentials: - - 0 - - - 0 - - 1 - m_storage - 1 - - - protected - 1 - - Resizable - 1 - - wxRB_GROUP - - 0 - Select this option if you have your unique credentials to connect - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL - 3 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - - 1 - m_storage_identity - 1 - - - protected - 1 - - Resizable - 1 - - wxTE_READONLY - - 0 - Your credentials loaded from Windows Credential Manager - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_RIGHT - 0 - - - sb_buttons_storage - wxHORIZONTAL - none - - 5 - wxRIGHT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - &Clear Credentials - - 0 - - - 0 - - 1 - m_storage_clear - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Click to clear your credentials from Credential Manager. Note: You will be prompted to enter credentials when connecting. - - wxFILTER_NONE - wxDefaultValidator - - - - - OnClearStorage - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - &Set Credentials... - - 0 - - - 0 - - 1 - m_storage_set - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Click here to set or modify your credentials - - wxFILTER_NONE - wxDefaultValidator - - - - - OnSetStorage - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + m_storage_identity + 1 + + + protected + 1 + + Resizable + 1 + + wxTE_READONLY + + 0 + Your present credentials stored in Windows Credential Manager + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 - wxEXPAND|wxTOP + wxALIGN_RIGHT|wxTOP 0 - sz_config - wxVERTICAL + sb_buttons_storage + wxHORIZONTAL none 5 - wxEXPAND|wxBOTTOM - 1 - + wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + &Clear Credentials + + 0 + + + 0 - sz_config_inner - wxHORIZONTAL - none - - 5 - wxEXPAND - 2 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Use &pre-shared credentials: - - 0 - - - 0 - - 1 - m_config - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Select this options if all clients connect using the same credentials - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL - 3 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - - 1 - m_config_identity - 1 - - - protected - 1 - - Resizable - 1 - - wxTE_READONLY - - 0 - Common (pre-shared) credentials - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + m_storage_clear + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Click to clear your credentials from Credential Manager. Note: You will be prompted to enter credentials when connecting. + + wxFILTER_NONE + wxDefaultValidator + + + + + OnClearStorage + + + + + + + + + + + + + + + + + + + + + + + 5 - wxALIGN_RIGHT + wxLEFT 0 - + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + &Set Credentials... + + 0 + + + 0 - sb_buttons_config - wxHORIZONTAL - none - - 5 - - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - &Set Credentials... - - 0 - - - 0 - - 1 - m_config_set - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Click here to set or modify your credentials - - wxFILTER_NONE - wxDefaultValidator - - - - - OnSetConfig - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + m_storage_set + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Click here to set or modify your credentials + + wxFILTER_NONE + wxDefaultValidator + + + + + OnSetStorage + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Use credentials from &profile configuration: + + 0 + + + 0 + + 1 + m_config + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Select this option if you would like to store credentials as a part of profile configuration + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxALL + 0 + + + sz_config + wxVERTICAL + none + + 5 + wxEXPAND|wxALIGN_CENTER_VERTICAL + 3 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + + 0 + + 1 + m_config_identity + 1 + + + protected + 1 + + Resizable + 1 + + wxTE_READONLY + + 0 + Profile configuration credentials + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_RIGHT|wxTOP + 0 + + + sb_buttons_config + wxHORIZONTAL + none + + 5 + + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + &Set Credentials... + + 0 + + + 0 + + 1 + m_config_set + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Click here to set or modify your credentials + + wxFILTER_NONE + wxDefaultValidator + + + + + OnSetConfig + + + + + + + + + + + + + + + + + + + + + + + @@ -3595,11 +3562,11 @@ none 0 0 - + 5 wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT 0 - + 1 1 1 @@ -3678,11 +3645,11 @@ - + 5 wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM 1 - + 1 1 1 @@ -3769,11 +3736,11 @@ - + 5 wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT 0 - + 1 1 1 @@ -3852,11 +3819,11 @@ - + 5 wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM 1 - + 1 1 1 @@ -3943,11 +3910,11 @@ - + 5 wxALIGN_CENTER_VERTICAL|wxRIGHT 0 - + 1 1 1 @@ -4026,11 +3993,11 @@ - + 5 wxEXPAND|wxALIGN_CENTER_VERTICAL 1 - + 1 1 1