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

wxEAPProviderLockedPanelBase renamed to wxEAPGeneralNotePanel to accommodate general use later

Browse Source
This commit is contained in:
Simon Rozman 2016-08-15 16:53:42 +02:00
parent e34d2ba275
commit 4dc7083028
5 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,7 +176,7 @@ protected:
}; };
class wxEAPProviderLockedPanel : public wxEAPProviderLockedPanelBase class wxEAPProviderLockedPanel : public wxEAPGeneralNotePanel
{ {
public: public:
/// ///

24
lib/EAPBase_UI/res/wxEAP_UI.cpp
View File

@ -119,31 +119,31 @@ wxEAPBannerPanelBase::~wxEAPBannerPanelBase()
{ {
} }
wxEAPProviderLockedPanelBase::wxEAPProviderLockedPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) wxEAPGeneralNotePanel::wxEAPGeneralNotePanel( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
{ {
this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_INFOBK ) ); this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_INFOBK ) );
wxBoxSizer* sb_provider_locked_horiz; wxBoxSizer* sb_note_horiz;
sb_provider_locked_horiz = new wxBoxSizer( wxHORIZONTAL ); sb_note_horiz = new wxBoxSizer( wxHORIZONTAL );
m_provider_locked_icon = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); m_note_icon = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
sb_provider_locked_horiz->Add( m_provider_locked_icon, 0, wxALL, 5 ); sb_note_horiz->Add( m_note_icon, 0, wxALL, 5 );
m_provider_locked_vert = new wxBoxSizer( wxVERTICAL ); m_note_vert = new wxBoxSizer( wxVERTICAL );
m_provider_locked_label = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_note_label = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_provider_locked_label->Wrap( 452 ); m_note_label->Wrap( 452 );
m_provider_locked_vert->Add( m_provider_locked_label, 0, wxALL|wxEXPAND, 5 ); m_note_vert->Add( m_note_label, 0, wxALL|wxEXPAND, 5 );
sb_provider_locked_horiz->Add( m_provider_locked_vert, 1, wxEXPAND, 5 ); sb_note_horiz->Add( m_note_vert, 1, wxEXPAND, 5 );
this->SetSizer( sb_provider_locked_horiz ); this->SetSizer( sb_note_horiz );
this->Layout(); this->Layout();
} }
wxEAPProviderLockedPanelBase::~wxEAPProviderLockedPanelBase() wxEAPGeneralNotePanel::~wxEAPGeneralNotePanel()
{ {
} }

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

@ -637,7 +637,7 @@
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">wxEAPProviderLockedPanelBase</property> <property name="name">wxEAPGeneralNotePanel</property>
<property name="pos"></property> <property name="pos"></property>
<property name="size">500,-1</property> <property name="size">500,-1</property>
<property name="subclass"></property> <property name="subclass"></property>
@ -677,7 +677,7 @@
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
<object class="wxBoxSizer" expanded="1"> <object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">sb_provider_locked_horiz</property> <property name="name">sb_note_horiz</property>
<property name="orient">wxHORIZONTAL</property> <property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property> <property name="permission">none</property>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
@ -720,7 +720,7 @@
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
<property name="name">m_provider_locked_icon</property> <property name="name">m_note_icon</property>
<property name="pane_border">1</property> <property name="pane_border">1</property>
<property name="pane_position"></property> <property name="pane_position"></property>
<property name="pane_size"></property> <property name="pane_size"></property>
@ -767,7 +767,7 @@
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxBoxSizer" expanded="1"> <object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">m_provider_locked_vert</property> <property name="name">m_note_vert</property>
<property name="orient">wxVERTICAL</property> <property name="orient">wxVERTICAL</property>
<property name="permission">protected</property> <property name="permission">protected</property>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
@ -810,7 +810,7 @@
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
<property name="name">m_provider_locked_label</property> <property name="name">m_note_label</property>
<property name="pane_border">1</property> <property name="pane_border">1</property>
<property name="pane_position"></property> <property name="pane_position"></property>
<property name="pane_size"></property> <property name="pane_size"></property>

14
lib/EAPBase_UI/res/wxEAP_UI.h
View File

@ -102,21 +102,21 @@ class wxEAPBannerPanelBase : public wxPanel
}; };
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
/// Class wxEAPProviderLockedPanelBase /// Class wxEAPGeneralNotePanel
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
class wxEAPProviderLockedPanelBase : public wxPanel class wxEAPGeneralNotePanel : public wxPanel
{ {
private: private:
protected: protected:
wxStaticBitmap* m_provider_locked_icon; wxStaticBitmap* m_note_icon;
wxBoxSizer* m_provider_locked_vert; wxBoxSizer* m_note_vert;
wxStaticText* m_provider_locked_label; wxStaticText* m_note_label;
public: public:
wxEAPProviderLockedPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxSIMPLE_BORDER|wxTAB_TRAVERSAL ); wxEAPGeneralNotePanel( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxSIMPLE_BORDER|wxTAB_TRAVERSAL );
~wxEAPProviderLockedPanelBase(); ~wxEAPGeneralNotePanel();
}; };

12
lib/EAPBase_UI/src/EAP_UI.cpp
View File

@ -79,23 +79,23 @@ void wxEAPCredentialsDialog::OnInitDialog(wxInitDialogEvent& event)
wxEAPProviderLockedPanel::wxEAPProviderLockedPanel(const eap::config_provider &prov, wxWindow* parent) : wxEAPProviderLockedPanel::wxEAPProviderLockedPanel(const eap::config_provider &prov, wxWindow* parent) :
m_prov(prov), m_prov(prov),
wxEAPProviderLockedPanelBase(parent) wxEAPGeneralNotePanel(parent)
{ {
// Load and set icon. // Load and set icon.
if (m_shell32.load(_T("shell32.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE)) if (m_shell32.load(_T("shell32.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE))
wxSetIconFromResource(m_provider_locked_icon, m_icon, m_shell32, MAKEINTRESOURCE(48)); wxSetIconFromResource(m_note_icon, m_icon, m_shell32, MAKEINTRESOURCE(48));
m_provider_locked_label->SetLabel(wxString::Format(_("%s has pre-set parts of this configuration. Those parts are locked to prevent accidental modification."), m_note_label->SetLabel(wxString::Format(_("%s has pre-set parts of this configuration. Those parts are locked to prevent accidental modification."),
!m_prov.m_name.empty() ? m_prov.m_name.c_str() : !m_prov.m_name.empty() ? m_prov.m_name.c_str() :
!m_prov.m_id .empty() ? winstd::tstring_printf(_("Your %ls provider"), m_prov.m_id.c_str()).c_str() : _("Your provider"))); !m_prov.m_id .empty() ? winstd::tstring_printf(_("Your %ls provider"), m_prov.m_id.c_str()).c_str() : _("Your provider")));
m_provider_locked_label->Wrap(452); m_note_label->Wrap(452);
if (!m_prov.m_help_email.empty() || !m_prov.m_help_web.empty() || !m_prov.m_help_phone.empty()) { if (!m_prov.m_help_email.empty() || !m_prov.m_help_web.empty() || !m_prov.m_help_phone.empty()) {
wxStaticText *provider_notice = new wxStaticText(this, wxID_ANY, wxString::Format(_("For additional help and instructions, please contact %s at:"), wxStaticText *provider_notice = new wxStaticText(this, wxID_ANY, wxString::Format(_("For additional help and instructions, please contact %s at:"),
!m_prov.m_name.empty() ? m_prov.m_name.c_str() : !m_prov.m_name.empty() ? m_prov.m_name.c_str() :
!m_prov.m_id .empty() ? winstd::tstring_printf(_("your %ls provider"), m_prov.m_id.c_str()).c_str() : _("your provider")), wxDefaultPosition, wxDefaultSize, 0); !m_prov.m_id .empty() ? winstd::tstring_printf(_("your %ls provider"), m_prov.m_id.c_str()).c_str() : _("your provider")), wxDefaultPosition, wxDefaultSize, 0);
provider_notice->Wrap(452); provider_notice->Wrap(452);
m_provider_locked_vert->Add(provider_notice, 0, wxUP|wxLEFT|wxRIGHT|wxEXPAND, 5); m_note_vert->Add(provider_notice, 0, wxUP|wxLEFT|wxRIGHT|wxEXPAND, 5);
wxFlexGridSizer* sb_contact_tbl; wxFlexGridSizer* sb_contact_tbl;
sb_contact_tbl = new wxFlexGridSizer(0, 2, 5, 5); sb_contact_tbl = new wxFlexGridSizer(0, 2, 5, 5);
@ -138,7 +138,7 @@ wxEAPProviderLockedPanel::wxEAPProviderLockedPanel(const eap::config_provider &p
sb_contact_tbl->Add(value, 0, wxEXPAND|wxALIGN_TOP, 5); sb_contact_tbl->Add(value, 0, wxEXPAND|wxALIGN_TOP, 5);
} }
m_provider_locked_vert->Add(sb_contact_tbl, 0, wxLEFT|wxRIGHT|wxDOWN|wxEXPAND, 5); m_note_vert->Add(sb_contact_tbl, 0, wxLEFT|wxRIGHT|wxDOWN|wxEXPAND, 5);
} }
this->Layout(); this->Layout();