diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-07-29 16:21:40 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-07-29 16:21:40 +0100 |
| commit | fbe2784c136fa1550815babfce89589f66b35a29 (patch) | |
| tree | 2099493253d82c71e7a1f2036bcbcbf980ab9f95 /src/wx/name_format_editor.h | |
| parent | fe9d2a290682021cd12a00bf21fa4db3012e2049 (diff) | |
Simplification of name format stuff.
Diffstat (limited to 'src/wx/name_format_editor.h')
| -rw-r--r-- | src/wx/name_format_editor.h | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/wx/name_format_editor.h b/src/wx/name_format_editor.h index 1ca4c0b71..0f4682127 100644 --- a/src/wx/name_format_editor.h +++ b/src/wx/name_format_editor.h @@ -30,19 +30,20 @@ template <class T> class NameFormatEditor { public: - NameFormatEditor (wxWindow* parent, T name) + NameFormatEditor (wxWindow* parent, T name, dcp::NameFormat::Map titles, dcp::NameFormat::Map examples) : _panel (new wxPanel (parent)) , _example (new wxStaticText (_panel, wxID_ANY, "")) , _sizer (new wxBoxSizer (wxVERTICAL)) , _specification (new wxTextCtrl (_panel, wxID_ANY, "")) , _name (name) + , _examples (examples) { _sizer->Add (_specification, 0, wxEXPAND, DCPOMATIC_SIZER_Y_GAP); _sizer->Add (_example, 0, wxBOTTOM, DCPOMATIC_SIZER_Y_GAP); _panel->SetSizer (_sizer); - BOOST_FOREACH (dcp::NameFormat::Component c, name.components ()) { - wxStaticText* t = new wxStaticText (_panel, wxID_ANY, std_to_wx (String::compose ("%%%1 %2", c.placeholder, c.title))); + BOOST_FOREACH (char c, name.components ()) { + wxStaticText* t = new wxStaticText (_panel, wxID_ANY, std_to_wx (String::compose ("%%%1 %2", c, titles[c]))); _sizer->Add (t); wxFont font = t->GetFont(); font.SetStyle (wxFONTSTYLE_ITALIC); @@ -57,16 +58,10 @@ public: update_example (); } - wxPanel* panel () const - { + wxPanel* panel () const { return _panel; } - void set_example (dcp::NameFormat::Map v) { - _example_values = v; - update_example (); - } - T get () const { return _name; } @@ -85,7 +80,7 @@ private: { _name.set_specification (wx_to_std (_specification->GetValue ())); - wxString example = wxString::Format (_("e.g. %s"), _name.get (_example_values)); + wxString example = wxString::Format (_("e.g. %s"), _name.get (_examples)); wxString wrapped; for (size_t i = 0; i < example.Length(); ++i) { if (i > 0 && (i % 30) == 0) { @@ -103,7 +98,7 @@ private: wxTextCtrl* _specification; T _name; - dcp::NameFormat::Map _example_values; + dcp::NameFormat::Map _examples; }; #endif |