X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fname_format_editor.cc;h=67e2517bed7758f818d9f554b7714065e7c99cca;hb=HEAD;hp=5460b2f22625872472c6f6340fbee9fd8a370bc9;hpb=a4e27b8ddbd4dfa99f40df205b51bfe393ca3ced;p=dcpomatic.git diff --git a/src/wx/name_format_editor.cc b/src/wx/name_format_editor.cc index 5460b2f22..67e2517be 100644 --- a/src/wx/name_format_editor.cc +++ b/src/wx/name_format_editor.cc @@ -20,8 +20,8 @@ #include "name_format_editor.h" -#include "wx_util.h" #include "static_text.h" +#include "wx_util.h" #include "lib/util.h" @@ -46,7 +46,7 @@ NameFormatEditor::NameFormatEditor (wxWindow* parent, dcp::NameFormat name, dcp: auto titles_sizer = new wxFlexGridSizer (2); for (auto const& i: titles) { auto t = new StaticText (_panel, std_to_wx (String::compose ("%%%1 %2", i.first, i.second))); - titles_sizer->Add (t); + titles_sizer->Add(t, 1, wxRIGHT, DCPOMATIC_SIZER_X_GAP); auto font = t->GetFont(); font.SetStyle (wxFONTSTYLE_ITALIC); font.SetPointSize (font.GetPointSize() - 1); @@ -77,9 +77,9 @@ NameFormatEditor::update_example () return; } - _name.set_specification (careful_string_filter(wx_to_std(_specification->GetValue()))); + _name.set_specification(wx_to_std(_specification->GetValue())); - auto example = wxString::Format (_("e.g. %s"), std_to_wx (_name.get (_examples, _suffix))); + auto example = wxString::Format(_("e.g. %s"), std_to_wx(careful_string_filter(_name.get(_examples, _suffix)))); wxString wrapped; for (size_t i = 0; i < example.Length(); ++i) { if (i > 0 && (i % 40) == 0) {