From a5f4cafc55601a8338a62ce85f02cd6bf540a3ad Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 26 Sep 2016 12:01:46 +0200 Subject: [PATCH] Configuration dialog banner title updated to include method name --- lib/EAPBase_UI/include/EAP_UI.h | 4 ++++ lib/EAPBase_UI/src/EAP_UI.cpp | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/EAPBase_UI/include/EAP_UI.h b/lib/EAPBase_UI/include/EAP_UI.h index e943b44..667942b 100644 --- a/lib/EAPBase_UI/include/EAP_UI.h +++ b/lib/EAPBase_UI/include/EAP_UI.h @@ -199,6 +199,10 @@ public: this->SetIcon(wxIcon(wxICON(product.ico))); #endif + // Set banner title. + std::unique_ptr cfg_dummy(cfg.m_module.make_config_method()); + m_banner->m_title->SetLabel(wxString::Format("%s %s", wxT(PRODUCT_NAME_STR), cfg_dummy->get_method_str())); + for (eap::config_connection::provider_list::iterator provider = m_cfg.m_providers.begin(), provider_end = m_cfg.m_providers.end(); provider != provider_end; ++provider) { bool is_single = provider->m_methods.size() == 1; std::vector >::size_type count = 0; diff --git a/lib/EAPBase_UI/src/EAP_UI.cpp b/lib/EAPBase_UI/src/EAP_UI.cpp index 385ea68..03da128 100644 --- a/lib/EAPBase_UI/src/EAP_UI.cpp +++ b/lib/EAPBase_UI/src/EAP_UI.cpp @@ -27,7 +27,6 @@ wxEAPBannerPanel::wxEAPBannerPanel(wxWindow* parent) : wxEAPBannerPanelBase(parent) { - m_title->SetLabelText(wxT(PRODUCT_NAME_STR)); }