Remove name documentation with short screens.

4 files changed, 20 insertions, 14 deletions

diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc
index f86808a70..ecce47da2 100644
--- a/src/wx/kdm_output_panel.cc
+++ b/src/wx/kdm_output_panel.cc
@@ -133,22 +133,28 @@ KDMOutputPanel::create_details_widgets(wxWindow* parent)
 
 
 void
-KDMOutputPanel::create_name_format_widgets(wxWindow* parent)
+KDMOutputPanel::create_name_format_widgets(wxWindow* parent, bool detailed)
 {
 	_container_name_format = new NameFormatEditor(parent, Config::instance()->kdm_container_name_format(), dcp::NameFormat::Map(), dcp::NameFormat::Map(), "");
 
 	dcp::NameFormat::Map titles;
-	titles['f'] = wx_to_std (_("film name"));
-	titles['c'] = wx_to_std (_("cinema"));
-	titles['s'] = wx_to_std (_("screen"));
-	titles['b'] = wx_to_std (_("from date/time"));
-	titles['e'] = wx_to_std (_("to date/time"));
+	if (detailed) {
+		titles['f'] = wx_to_std (_("film name"));
+		titles['c'] = wx_to_std (_("cinema"));
+		titles['s'] = wx_to_std (_("screen"));
+		titles['b'] = wx_to_std (_("from date/time"));
+		titles['e'] = wx_to_std (_("to date/time"));
+	}
+
 	dcp::NameFormat::Map ex;
-	ex['f'] = "Bambi";
-	ex['c'] = "Lumière";
-	ex['s'] = "Screen 1";
-	ex['b'] = "2012/03/15 12:30";
-	ex['e'] = "2012/03/22 02:30";
+	if (detailed) {
+		ex['f'] = "Bambi";
+		ex['c'] = "Lumière";
+		ex['s'] = "Screen 1";
+		ex['b'] = "2012/03/15 12:30";
+		ex['e'] = "2012/03/22 02:30";
+	}
+
 	_filename_format = new NameFormatEditor(parent, Config::instance()->kdm_filename_format(), titles, ex, ".xml");
 }
 
diff --git a/src/wx/kdm_output_panel.h b/src/wx/kdm_output_panel.h
index 848b15722..b555162dd 100644
--- a/src/wx/kdm_output_panel.h
+++ b/src/wx/kdm_output_panel.h
@@ -78,7 +78,7 @@ public:
 protected:
 	void create_destination_widgets(wxWindow* parent);
 	void create_details_widgets(wxWindow* parent);
-	void create_name_format_widgets(wxWindow* parent);
+	void create_name_format_widgets(wxWindow* parent, bool detailed);
 
 	KDMChoice* _type;
 	wxTextCtrl* _annotation_text;
diff --git a/src/wx/short_kdm_output_panel.cc b/src/wx/short_kdm_output_panel.cc
index 7e0692319..a7b8f5eb5 100644
--- a/src/wx/short_kdm_output_panel.cc
+++ b/src/wx/short_kdm_output_panel.cc
@@ -53,7 +53,7 @@ ShortKDMOutputPanel::ShortKDMOutputPanel(wxWindow* parent)
 	notebook->AddPage(details, _("Details"));
 
 	auto name_formats = new wxPanel(notebook, wxID_ANY);
-	create_name_format_widgets(name_formats);
+	create_name_format_widgets(name_formats, false);
 	fill_name_formats_panel(name_formats);
 	notebook->AddPage(name_formats, _("Name formats"));
 
diff --git a/src/wx/tall_kdm_output_panel.cc b/src/wx/tall_kdm_output_panel.cc
index 5d4c5c661..b8b01f61b 100644
--- a/src/wx/tall_kdm_output_panel.cc
+++ b/src/wx/tall_kdm_output_panel.cc
@@ -66,7 +66,7 @@ TallKDMOutputPanel::TallKDMOutputPanel(wxWindow* parent)
 {
 	create_destination_widgets(this);
 	create_details_widgets(this);
-	create_name_format_widgets(this);
+	create_name_format_widgets(this, true);
 
 	auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, 0);
 	table->AddGrowableCol (1);