Remove name documentation with short screens.

diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc
index f86808a701d850b5db2435af74a0b27359c0e6de..ecce47da29943db4ae5bb833c23c5e2c0fd7dd1e 100644 (file)
--- 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 848b15722abed423ca48dc03804595edd5af778d..b555162ddc8a5d85c38ac88012cc6dcff28b4470 100644 (file)
--- 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 7e06923197077605e6b1a92047c07fb6dc8a6deb..a7b8f5eb535da3c5bbf8874c11b6a861d33a143d 100644 (file)
--- 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 5d4c5c661f76c30fbed01bcac77aa1d789ccd578..b8b01f61b69d923dfd829edfcaa9b902d260a0d8 100644 (file)
--- 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);