Merge master.

diff --git a/ChangeLog b/ChangeLog
index da343f6bea1f2efcd9c3dfdcd35b2aca4405c07f..b1fab23cfd6904a7bd0b15550febb0f998e7d666 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
 
 2014-09-10  Carl Hetherington  <cth@carlh.net>
 
+       * Allow DCP names to be created using the ISDCF template and then
+       edited afterwards (#401).
+
+       * Fix hidden advanced preferences button in some locales.
+
        * Version 2.0.8 released.
 
 2014-09-10  Carl Hetherington  <cth@carlh.net>

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index d68edefc897c0d6e9d3031a59dfe87b0d7e2d904..f042e5eb139a29f8930097c7f2e8fb440273c6ec 100644 (file)
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -58,11 +58,6 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr<Film> f)
        grid->Add (_name, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND | wxLEFT | wxRIGHT);
        ++r;
        
-       add_label_to_grid_bag_sizer (grid, _panel, _("DCP Name"), true, wxGBPosition (r, 0));
-       _dcp_name = new wxStaticText (_panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END);
-       grid->Add (_dcp_name, wxGBPosition(r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxEXPAND);
-       ++r;
-
        int flags = wxALIGN_CENTER_VERTICAL;
 #ifdef __WXOSX__
        flags |= wxALIGN_RIGHT;
@@ -74,6 +69,11 @@ DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr<Film> f)
        grid->Add (_edit_isdcf_button, wxGBPosition (r, 1));
        ++r;
 
+       add_label_to_grid_bag_sizer (grid, _panel, _("DCP Name"), true, wxGBPosition (r, 0));
+       _dcp_name = new wxStaticText (_panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END);
+       grid->Add (_dcp_name, wxGBPosition(r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxEXPAND);
+       ++r;
+
        add_label_to_grid_bag_sizer (grid, _panel, _("Content Type"), true, wxGBPosition (r, 0));
        _dcp_content_type = new wxChoice (_panel, wxID_ANY);
        grid->Add (_dcp_content_type, wxGBPosition (r, 1));
@@ -266,9 +266,16 @@ DCPPanel::film_changed (int p)
                checked_set (_j2k_bandwidth, _film->j2k_bandwidth() / 1000000);
                break;
        case Film::USE_ISDCF_NAME:
+       {
                checked_set (_use_isdcf_name, _film->use_isdcf_name ());
                setup_dcp_name ();
+               bool const i = _film->use_isdcf_name ();
+               if (!i) {
+                       _film->set_name (_film->isdcf_name (true));
+               }
+               _edit_isdcf_button->Enable (i);
                break;
+       }
        case Film::ISDCF_METADATA:
                setup_dcp_name ();
                break;

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index a198d7aa7d0ce221b0e246a13b3bd24bdd6667d6..b311184fae003a73bf5da5dd6e39c29abea89f07 100644 (file)
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -25,8 +25,8 @@
 #include <boost/signals2.hpp>
 #include "lib/film.h"
 
-class wxNotebook;
 class wxSpinCtrl;
+class wxNotebook;
 class Film;
 class Ratio;
 class ContentPanel;