#include "key_dialog.h"
#include "isdcf_metadata_dialog.h"
#include "audio_dialog.h"
+#include "focus_manager.h"
#include "lib/ratio.h"
#include "lib/config.h"
#include "lib/dcp_content_type.h"
#include "lib/ffmpeg_content.h"
#include "lib/audio_processor.h"
#include "lib/video_content.h"
-#include "lib/subtitle_content.h"
+#include "lib/caption_content.h"
#include "lib/dcp_content.h"
#include "lib/audio_content.h"
#include <dcp/locale_convert.h>
grid->Add (_name, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND | wxLEFT | wxRIGHT);
++r;
+ FocusManager::instance()->add(_name);
+
int flags = wxALIGN_CENTER_VERTICAL;
#ifdef __WXOSX__
flags |= wxALIGN_RIGHT;
grid->Add (_upload_after_make_dcp, wxGBPosition (r, 0), wxGBSpan (1, 2));
++r;
- _name->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&DCPPanel::name_changed, this));
- _use_isdcf_name->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&DCPPanel::use_isdcf_name_toggled, this));
- _edit_isdcf_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DCPPanel::edit_isdcf_button_clicked, this));
- _copy_isdcf_name_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DCPPanel::copy_isdcf_name_button_clicked, this));
- _dcp_content_type->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::dcp_content_type_changed, this));
- _signed->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&DCPPanel::signed_toggled, this));
- _encrypted->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&DCPPanel::encrypted_toggled, this));
- _edit_key->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DCPPanel::edit_key_clicked, this));
- _reel_type->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::reel_type_changed, this));
- _reel_length->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&DCPPanel::reel_length_changed, this));
- _standard->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::standard_changed, this));
- _upload_after_make_dcp->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&DCPPanel::upload_after_make_dcp_changed, this));
+ _name->Bind (wxEVT_TEXT, boost::bind (&DCPPanel::name_changed, this));
+ _use_isdcf_name->Bind (wxEVT_CHECKBOX, boost::bind (&DCPPanel::use_isdcf_name_toggled, this));
+ _edit_isdcf_button->Bind (wxEVT_BUTTON, boost::bind (&DCPPanel::edit_isdcf_button_clicked, this));
+ _copy_isdcf_name_button->Bind(wxEVT_BUTTON, boost::bind (&DCPPanel::copy_isdcf_name_button_clicked, this));
+ _dcp_content_type->Bind (wxEVT_CHOICE, boost::bind (&DCPPanel::dcp_content_type_changed, this));
+ _signed->Bind (wxEVT_CHECKBOX, boost::bind (&DCPPanel::signed_toggled, this));
+ _encrypted->Bind (wxEVT_CHECKBOX, boost::bind (&DCPPanel::encrypted_toggled, this));
+ _edit_key->Bind (wxEVT_BUTTON, boost::bind (&DCPPanel::edit_key_clicked, this));
+ _reel_type->Bind (wxEVT_CHOICE, boost::bind (&DCPPanel::reel_type_changed, this));
+ _reel_length->Bind (wxEVT_SPINCTRL, boost::bind (&DCPPanel::reel_length_changed, this));
+ _standard->Bind (wxEVT_CHOICE, boost::bind (&DCPPanel::standard_changed, this));
+ _upload_after_make_dcp->Bind (wxEVT_CHECKBOX, boost::bind (&DCPPanel::upload_after_make_dcp_changed, this));
- vector<DCPContentType const *> const ct = DCPContentType::all ();
- for (vector<DCPContentType const *>::const_iterator i = ct.begin(); i != ct.end(); ++i) {
- _dcp_content_type->Append (std_to_wx ((*i)->pretty_name ()));
+ BOOST_FOREACH (DCPContentType const * i, DCPContentType::all()) {
+ _dcp_content_type->Append (std_to_wx (i->pretty_name ()));
}
_reel_type->Append (_("Single reel"));
checked_set (_frame_rate_spin, _film->video_frame_rate ());
_best_frame_rate->Enable (_film->best_video_frame_rate () != _film->video_frame_rate ());
+ setup_dcp_name ();
break;
}
case Film::AUDIO_CHANNELS:
DCPPanel::film_content_changed (int property)
{
if (property == AudioContentProperty::STREAMS ||
- property == SubtitleContentProperty::USE ||
- property == SubtitleContentProperty::BURN ||
+ property == CaptionContentProperty::USE ||
+ property == CaptionContentProperty::BURN ||
property == VideoContentProperty::SCALE ||
property == DCPContentProperty::REFERENCE_VIDEO ||
property == DCPContentProperty::REFERENCE_AUDIO ||
- property == DCPContentProperty::REFERENCE_SUBTITLE) {
+ property == DCPContentProperty::REFERENCE_CAPTION) {
setup_dcp_name ();
+ setup_sensitivity ();
}
}
DCPPanel::setup_container ()
{
int n = 0;
- vector<Ratio const *> ratios = Ratio::all ();
+ vector<Ratio const *> ratios = Ratio::containers ();
vector<Ratio const *>::iterator i = ratios.begin ();
while (i != ratios.end() && *i != _film->container ()) {
++i;
int const n = _container->GetSelection ();
if (n >= 0) {
- vector<Ratio const *> ratios = Ratio::all ();
+ vector<Ratio const *> ratios = Ratio::containers ();
DCPOMATIC_ASSERT (n < int (ratios.size()));
_film->set_container (ratios[n]);
}
film_changed (Film::REEL_TYPE);
film_changed (Film::REEL_LENGTH);
film_changed (Film::UPLOAD_AFTER_MAKE_DCP);
+
+ set_general_sensitivity(static_cast<bool>(_film));
}
void
DCPPanel::set_general_sensitivity (bool s)
{
- _name->Enable (s);
- _use_isdcf_name->Enable (s);
- _edit_isdcf_button->Enable (s);
- _dcp_content_type->Enable (s);
- _copy_isdcf_name_button->Enable (s);
+ _generally_sensitive = s;
+ setup_sensitivity ();
+}
- bool si = s;
+void
+DCPPanel::setup_sensitivity ()
+{
+ _name->Enable (_generally_sensitive);
+ _use_isdcf_name->Enable (_generally_sensitive);
+ _edit_isdcf_button->Enable (_generally_sensitive);
+ _dcp_content_type->Enable (_generally_sensitive);
+ _copy_isdcf_name_button->Enable (_generally_sensitive);
+
+ bool si = _generally_sensitive;
if (_film && _film->encrypted ()) {
si = false;
}
_signed->Enable (si);
- _encrypted->Enable (s);
- _key->Enable (s && _film && _film->encrypted ());
- _edit_key->Enable (s && _film && _film->encrypted ());
- _reel_type->Enable (s);
- _reel_length->Enable (s && _film && _film->reel_type() == REELTYPE_BY_LENGTH);
- _upload_after_make_dcp->Enable (s);
- _frame_rate_choice->Enable (s);
- _frame_rate_spin->Enable (s);
- _audio_channels->Enable (s);
- _audio_processor->Enable (s);
- _j2k_bandwidth->Enable (s);
- _container->Enable (s);
- _best_frame_rate->Enable (s && _film && _film->best_video_frame_rate () != _film->video_frame_rate ());
- _resolution->Enable (s);
- _three_d->Enable (s);
- _standard->Enable (s);
+ _encrypted->Enable (_generally_sensitive);
+ _key->Enable (_generally_sensitive && _film && _film->encrypted ());
+ _edit_key->Enable (_generally_sensitive && _film && _film->encrypted ());
+ _reel_type->Enable (_generally_sensitive && _film && !_film->references_dcp_video() && !_film->references_dcp_audio());
+ _reel_length->Enable (_generally_sensitive && _film && _film->reel_type() == REELTYPE_BY_LENGTH);
+ _upload_after_make_dcp->Enable (_generally_sensitive);
+ _frame_rate_choice->Enable (_generally_sensitive && _film && !_film->references_dcp_video());
+ _frame_rate_spin->Enable (_generally_sensitive && _film && !_film->references_dcp_video());
+ _audio_channels->Enable (_generally_sensitive && _film && !_film->references_dcp_audio());
+ _audio_processor->Enable (_generally_sensitive && _film && !_film->references_dcp_audio());
+ _j2k_bandwidth->Enable (_generally_sensitive && _film && !_film->references_dcp_video());
+ _container->Enable (_generally_sensitive && _film && !_film->references_dcp_video());
+ _best_frame_rate->Enable (_generally_sensitive && _film && _film->best_video_frame_rate () != _film->video_frame_rate ());
+ _resolution->Enable (_generally_sensitive && _film && !_film->references_dcp_video());
+ _three_d->Enable (_generally_sensitive && _film && !_film->references_dcp_video());
+ _standard->Enable (_generally_sensitive && _film && !_film->references_dcp_video() && !_film->references_dcp_audio());
}
void
++r;
}
+ add_label_to_sizer (grid, panel, _("Resolution"), true, wxGBPosition (r, 0));
+ _resolution = new wxChoice (panel, wxID_ANY);
+ grid->Add (_resolution, wxGBPosition (r, 1));
+ ++r;
+
add_label_to_sizer (grid, panel, _("Frame Rate"), true, wxGBPosition (r, 0));
{
_frame_rate_sizer = new wxBoxSizer (wxHORIZONTAL);
grid->Add (_three_d, wxGBPosition (r, 0), wxGBSpan (1, 2));
++r;
- add_label_to_sizer (grid, panel, _("Resolution"), true, wxGBPosition (r, 0));
- _resolution = new wxChoice (panel, wxID_ANY);
- grid->Add (_resolution, wxGBPosition (r, 1));
- ++r;
-
{
add_label_to_sizer (grid, panel, _("JPEG2000 bandwidth\nfor newly-encoded data"), true, wxGBPosition (r, 0));
wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
}
++r;
- _container->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::container_changed, this));
- _frame_rate_choice->Bind(wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::frame_rate_choice_changed, this));
- _frame_rate_spin->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&DCPPanel::frame_rate_spin_changed, this));
- _best_frame_rate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DCPPanel::best_frame_rate_clicked, this));
- _j2k_bandwidth->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&DCPPanel::j2k_bandwidth_changed, this));
- /* Also listen to wxEVT_COMMAND_TEXT_UPDATED so that typing numbers directly in is always noticed */
- _j2k_bandwidth->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&DCPPanel::j2k_bandwidth_changed, this));
- _resolution->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::resolution_changed, this));
- _three_d->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&DCPPanel::three_d_changed, this));
+ _container->Bind (wxEVT_CHOICE, boost::bind (&DCPPanel::container_changed, this));
+ _frame_rate_choice->Bind(wxEVT_CHOICE, boost::bind (&DCPPanel::frame_rate_choice_changed, this));
+ _frame_rate_spin->Bind (wxEVT_SPINCTRL, boost::bind (&DCPPanel::frame_rate_spin_changed, this));
+ _best_frame_rate->Bind (wxEVT_BUTTON, boost::bind (&DCPPanel::best_frame_rate_clicked, this));
+ _j2k_bandwidth->Bind (wxEVT_SPINCTRL, boost::bind (&DCPPanel::j2k_bandwidth_changed, this));
+ /* Also listen to wxEVT_TEXT so that typing numbers directly in is always noticed */
+ _j2k_bandwidth->Bind (wxEVT_TEXT, boost::bind (&DCPPanel::j2k_bandwidth_changed, this));
+ _resolution->Bind (wxEVT_CHOICE, boost::bind (&DCPPanel::resolution_changed, this));
+ _three_d->Bind (wxEVT_CHECKBOX, boost::bind (&DCPPanel::three_d_changed, this));
- vector<Ratio const *> const ratio = Ratio::all ();
- for (vector<Ratio const *>::const_iterator i = ratio.begin(); i != ratio.end(); ++i) {
- _container->Append (std_to_wx ((*i)->nickname ()));
+ BOOST_FOREACH (Ratio const * i, Ratio::containers()) {
+ _container->Append (std_to_wx(i->container_nickname()));
}
- list<int> const dfr = Config::instance()->allowed_dcp_frame_rates ();
- for (list<int>::const_iterator i = dfr.begin(); i != dfr.end(); ++i) {
- _frame_rate_choice->Append (std_to_wx (boost::lexical_cast<string> (*i)));
+ BOOST_FOREACH (int i, Config::instance()->allowed_dcp_frame_rates()) {
+ _frame_rate_choice->Append (std_to_wx (boost::lexical_cast<string> (i)));
}
_j2k_bandwidth->SetRange (1, Config::instance()->maximum_j2k_bandwidth() / 1000000);
grid->Add (_show_audio, wxGBPosition (r, 0), wxGBSpan (1, 2));
++r;
- _audio_channels->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::audio_channels_changed, this));
- _audio_processor->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::audio_processor_changed, this));
- _show_audio->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DCPPanel::show_audio_clicked, this));
+ _audio_channels->Bind (wxEVT_CHOICE, boost::bind (&DCPPanel::audio_channels_changed, this));
+ _audio_processor->Bind (wxEVT_CHOICE, boost::bind (&DCPPanel::audio_processor_changed, this));
+ _show_audio->Bind (wxEVT_BUTTON, boost::bind (&DCPPanel::show_audio_clicked, this));
return panel;
}
projects / dcpomatic.git / blobdiff