diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-09-11 20:48:04 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-09-11 20:48:04 +0100 |
| commit | 7979aeb87a83de31c4cf25f88eef4fbca4b56553 (patch) | |
| tree | 08ad0d379ab925795403902b79c1b6a6bebb165f /src | |
| parent | 02cdeb8663b9819373680efd0d867373258d51f7 (diff) | |
| parent | a8f51733f93bcf88d867d5a4b359e6e14ddad91a (diff) | |
Merge master.
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/dcp_panel.cc | 17 | ||||
| -rw-r--r-- | src/wx/film_editor.h | 2 |
2 files changed, 13 insertions, 6 deletions
diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc index d68edefc8..f042e5eb1 100644 --- 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 a198d7aa7..b311184fa 100644 --- 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; |