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

Own credential update logic revised to work for newly added identity providers now, plus updates are every 5s and selective for visible controls only

Browse Source
This commit is contained in:
Simon Rozman 2016-09-05 11:34:54 +02:00
parent 643270752c
commit b2382a0bdb
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/EAPBase_UI/include/EAP_UI.h
View File

@ -268,16 +268,16 @@ protected:
m_cfg.m_providers.push_back(std::move(cfg_provider)); m_cfg.m_providers.push_back(std::move(cfg_provider));
eap::config_provider &cfg_provider2 = m_cfg.m_providers.back(); eap::config_provider &cfg_provider2 = m_cfg.m_providers.back();
eap::config_method *cfg_method2 = cfg_provider2.m_methods.front().get(); eap::config_method *cfg_method2 = cfg_provider2.m_methods.front().get();
m_providers->InsertPage( _wxT *page = new _wxT(cfg_provider2, *cfg_method2, m_providers);
m_providers->GetSelection() + 1, m_providers->InsertPage(m_providers->GetSelection() + 1, page, wxEAPGetProviderName(cfg_provider2.m_name), true);
new _wxT(
cfg_provider2,
*cfg_method2,
m_providers),
wxEAPGetProviderName(cfg_provider2.m_name), true);
this->Layout(); this->Layout();
this->Fit(); this->GetSizer()->Fit(this);
// We initialized other pages in OnInitDialog(). This one was added later so it needs to be initialized.
// (Timers in child panels didn't start otherwise.)
wxInitDialogEvent event_init;
page->GetEventHandler()->ProcessEvent(event_init);
} }
@ -720,7 +720,8 @@ protected:
virtual void OnTimerOwn(wxTimerEvent& /*event*/) virtual void OnTimerOwn(wxTimerEvent& /*event*/)
{ {
RetrieveOwnCredentials(); if (m_own_identity->IsShownOnScreen())
RetrieveOwnCredentials();
} }
@ -751,6 +752,7 @@ protected:
m_own_identity->SetValue( m_own_identity->SetValue(
!identity.empty() ? identity : !identity.empty() ? identity :
m_cred_own.empty() ? _("<empty>") : _("<blank ID>")); m_cred_own.empty() ? _("<empty>") : _("<blank ID>"));
m_own_identity->Refresh();
} }

2
lib/EAPBase_UI/res/wxEAP_UI.fbp
View File

@ -2358,7 +2358,7 @@
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="name">m_timer_own</property> <property name="name">m_timer_own</property>
<property name="oneshot">0</property> <property name="oneshot">0</property>
<property name="period">3000</property> <property name="period">5000</property>
<property name="permission">protected</property> <property name="permission">protected</property>
<event name="OnTimer">OnTimerOwn</event> <event name="OnTimer">OnTimerOwn</event>
</object> </object>