X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fname_format_editor.cc;h=5755d75f4b0ed6253befb575429feb92e9a699ab;hb=9c1bb2e5ca7c80c4e26b1b2e41159aa171360a94;hp=4a93edb1841c3b690653efc21940b6ec41d82757;hpb=ad5c8849fc3ef5aad88201f28db5474a60db4436;p=dcpomatic.git

diff --git a/src/wx/name_format_editor.cc b/src/wx/name_format_editor.cc
index 4a93edb18..5755d75f4 100644
--- a/src/wx/name_format_editor.cc
+++ b/src/wx/name_format_editor.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -20,12 +20,14 @@
 
 #include "name_format_editor.h"
 #include "wx_util.h"
+#include "static_text.h"
+#include "lib/util.h"
 
 using std::string;
 
 NameFormatEditor::NameFormatEditor (wxWindow* parent, dcp::NameFormat name, dcp::NameFormat::Map titles, dcp::NameFormat::Map examples, string suffix)
 	: _panel (new wxPanel (parent))
-	, _example (new wxStaticText (_panel, wxID_ANY, ""))
+	, _example (new StaticText (_panel, ""))
 	, _sizer (new wxBoxSizer (wxVERTICAL))
 	, _specification (new wxTextCtrl (_panel, wxID_ANY, ""))
 	, _name (name)
@@ -33,11 +35,13 @@ NameFormatEditor::NameFormatEditor (wxWindow* parent, dcp::NameFormat name, dcp:
 	, _suffix (suffix)
 {
 	_sizer->Add (_specification, 0, wxEXPAND, DCPOMATIC_SIZER_Y_GAP);
-	_sizer->Add (_example, 0, wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
+	if (!_examples.empty ()) {
+		_sizer->Add (_example, 0, wxBOTTOM, DCPOMATIC_SIZER_Y_GAP);
+	}
 	_panel->SetSizer (_sizer);
 
 	for (dcp::NameFormat::Map::const_iterator i = titles.begin(); i != titles.end(); ++i) {
-		wxStaticText* t = new wxStaticText (_panel, wxID_ANY, std_to_wx (String::compose ("%%%1 %2", i->first, i->second)));
+		wxStaticText* t = new StaticText (_panel, std_to_wx (String::compose ("%%%1 %2", i->first, i->second)));
 		_sizer->Add (t);
 		wxFont font = t->GetFont();
 		font.SetStyle (wxFONTSTYLE_ITALIC);
@@ -62,7 +66,11 @@ NameFormatEditor::changed ()
 void
 NameFormatEditor::update_example ()
 {
-	_name.set_specification (wx_to_std (_specification->GetValue ()));
+	if (_examples.empty ()) {
+		return;
+	}
+
+	_name.set_specification (careful_string_filter (wx_to_std (_specification->GetValue ())));
 
 	wxString example = wxString::Format (_("e.g. %s"), std_to_wx (_name.get (_examples, _suffix)));
 	wxString wrapped;