#include "text_view.h"
#include "content_panel.h"
#include "fonts_dialog.h"
+#include "dcp_text_track_dialog.h"
#include "subtitle_appearance_dialog.h"
#include "lib/ffmpeg_content.h"
#include "lib/string_text_file_content.h"
grid->Add (_burn, wxGBPosition (r, 0), wxGBSpan (1, 2));
++r;
- {
- add_label_to_sizer (grid, this, _("X Offset"), true, wxGBPosition (r, 0));
- wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- _x_offset = new wxSpinCtrl (this);
- s->Add (_x_offset);
- add_label_to_sizer (s, this, _("%"), false);
- grid->Add (s, wxGBPosition (r, 1));
- ++r;
- }
-
- {
- add_label_to_sizer (grid, this, _("Y Offset"), true, wxGBPosition (r, 0));
- wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- _y_offset = new wxSpinCtrl (this);
- s->Add (_y_offset);
- add_label_to_sizer (s, this, _("%"), false);
- grid->Add (s, wxGBPosition (r, 1));
- ++r;
- }
-
- {
- add_label_to_sizer (grid, this, _("X Scale"), true, wxGBPosition (r, 0));
- wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- _x_scale = new wxSpinCtrl (this);
- s->Add (_x_scale);
- add_label_to_sizer (s, this, _("%"), false);
- grid->Add (s, wxGBPosition (r, 1));
- ++r;
- }
+ add_label_to_sizer (grid, this, _("Offset"), true, wxGBPosition (r, 0));
+ wxBoxSizer* offset = new wxBoxSizer (wxHORIZONTAL);
+ add_label_to_sizer (offset, this, _("X"), true);
+ _x_offset = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(64, -1));
+ offset->Add (_x_offset, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
+ wxStaticText* pc = new wxStaticText (this, wxID_ANY, _("%"));
+ offset->Add (pc, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP * 2);
+ add_label_to_sizer (offset, this, _("Y"), true);
+ _y_offset = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(64, -1));
+ offset->Add (_y_offset, 0);
+ add_label_to_sizer (offset, this, _("%"), false);
+ grid->Add (offset, wxGBPosition (r, 1));
+ ++r;
- {
- add_label_to_sizer (grid, this, _("Y Scale"), true, wxGBPosition (r, 0));
- wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
- _y_scale = new wxSpinCtrl (this);
- s->Add (_y_scale);
- add_label_to_sizer (s, this, _("%"), false);
- grid->Add (s, wxGBPosition (r, 1));
- ++r;
- }
+ add_label_to_sizer (grid, this, _("Scale"), true, wxGBPosition (r, 0));
+ wxBoxSizer* scale = new wxBoxSizer (wxHORIZONTAL);
+ add_label_to_sizer (scale, this, _("X"), true);
+ _x_scale = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(64, -1));
+ scale->Add (_x_scale, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
+ pc = new wxStaticText (this, wxID_ANY, _("%"));
+ scale->Add (pc, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP * 2);
+ add_label_to_sizer (scale, this, _("Y"), true);
+ _y_scale = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(64, -1));
+ scale->Add (_y_scale, 0);
+ add_label_to_sizer (scale, this, _("%"), false);
+ grid->Add (scale, wxGBPosition (r, 1));
+ ++r;
{
add_label_to_sizer (grid, this, _("Line spacing"), true, wxGBPosition (r, 0));
++r;
}
+ add_label_to_sizer (grid, this, _("DCP track"), true, wxGBPosition(r, 0));
+ _dcp_track = new wxChoice (this, wxID_ANY);
+ grid->Add (_dcp_track, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND);
+ ++r;
+
add_label_to_sizer (grid, this, _("Language"), true, wxGBPosition (r, 0));
_language = new wxTextCtrl (this, wxID_ANY);
grid->Add (_language, wxGBPosition (r, 1));
_y_scale->SetRange (10, 1000);
_line_spacing->SetRange (10, 1000);
+ update_dcp_tracks ();
+
content_selection_changed ();
_reference->Bind (wxEVT_CHECKBOX, boost::bind (&TextPanel::reference_clicked, this));
_x_scale->Bind (wxEVT_SPINCTRL, boost::bind (&TextPanel::x_scale_changed, this));
_y_scale->Bind (wxEVT_SPINCTRL, boost::bind (&TextPanel::y_scale_changed, this));
_line_spacing->Bind (wxEVT_SPINCTRL, boost::bind (&TextPanel::line_spacing_changed, this));
+ _dcp_track->Bind (wxEVT_CHOICE, boost::bind (&TextPanel::dcp_track_changed, this));
_language->Bind (wxEVT_TEXT, boost::bind (&TextPanel::language_changed, this));
_stream->Bind (wxEVT_CHOICE, boost::bind (&TextPanel::stream_changed, this));
_text_view_button->Bind (wxEVT_BUTTON, boost::bind (&TextPanel::text_view_clicked, this));
_appearance_dialog_button->Bind (wxEVT_BUTTON, boost::bind (&TextPanel::appearance_dialog_clicked, this));
}
+void
+TextPanel::update_dcp_track_selection ()
+{
+ optional<DCPTextTrack> selected;
+ bool many = false;
+ BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_text()) {
+ shared_ptr<TextContent> t = i->text_of_original_type(_original_type);
+ if (t) {
+ optional<DCPTextTrack> dt = t->dcp_track();
+ if (dt && selected && *dt != *selected) {
+ many = true;
+ } else if (!selected) {
+ selected = dt;
+ }
+ }
+ }
+
+ int n = 0;
+ BOOST_FOREACH (DCPTextTrack i, _parent->film()->closed_caption_tracks()) {
+ if (!many && selected && *selected == i) {
+ _dcp_track->SetSelection (n);
+ }
+ ++n;
+ }
+
+ if (!selected || many) {
+ _dcp_track->SetSelection (wxNOT_FOUND);
+ }
+}
+
+void
+TextPanel::update_dcp_tracks ()
+{
+ _dcp_track->Clear ();
+ BOOST_FOREACH (DCPTextTrack i, _parent->film()->closed_caption_tracks()) {
+ _dcp_track->Append (std_to_wx(i.summary()));
+ }
+
+ if (_parent->film()->closed_caption_tracks().size() < 6) {
+ _dcp_track->Append (_("Add new..."));
+ }
+
+ update_dcp_track_selection ();
+}
+
+void
+TextPanel::dcp_track_changed ()
+{
+ optional<DCPTextTrack> track;
+
+ if (_dcp_track->GetSelection() == int(_dcp_track->GetCount()) - 1) {
+ DCPTextTrackDialog* d = new DCPTextTrackDialog (this);
+ if (d->ShowModal() == wxID_OK) {
+ track = d->get();
+ }
+ d->Destroy ();
+ } else {
+ /* Find the DCPTextTrack that was selected */
+ BOOST_FOREACH (DCPTextTrack i, _parent->film()->closed_caption_tracks()) {
+ if (i.summary() == wx_to_std(_dcp_track->GetStringSelection())) {
+ track = i;
+ }
+ }
+ }
+
+ if (track) {
+ BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_text()) {
+ shared_ptr<TextContent> t = i->text_of_original_type(_original_type);
+ if (t && t->type() == TEXT_CLOSED_CAPTION) {
+ t->set_dcp_track(*track);
+ }
+ }
+ }
+
+ update_dcp_tracks ();
+}
+
void
TextPanel::film_changed (Film::Property property)
{
_type->SetSelection (0);
}
setup_sensitivity ();
+ update_dcp_track_selection ();
} else if (property == TextContentProperty::BURN) {
checked_set (_burn, text ? text->burn() : false);
} else if (property == TextContentProperty::X_OFFSET) {
checked_set (_line_spacing, text ? lrint (text->line_spacing() * 100) : 100);
} else if (property == TextContentProperty::LANGUAGE) {
checked_set (_language, text ? text->language() : "");
+ } else if (property == TextContentProperty::DCP_TRACK) {
+ update_dcp_track_selection ();
} else if (property == DCPContentProperty::REFERENCE_TEXT) {
if (scs) {
shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (scs);
_x_scale->Enable (!reference && any_subs > 0 && use && type == TEXT_OPEN_SUBTITLE);
_y_scale->Enable (!reference && any_subs > 0 && use && type == TEXT_OPEN_SUBTITLE);
_line_spacing->Enable (!reference && use && type == TEXT_OPEN_SUBTITLE);
+ _dcp_track->Enable (!reference && any_subs > 0 && use && type == TEXT_CLOSED_CAPTION);
_language->Enable (!reference && any_subs > 0 && use);
_stream->Enable (!reference && ffmpeg_subs == 1);
_text_view_button->Enable (!reference);
film_content_changed (TextContentProperty::LANGUAGE);
film_content_changed (TextContentProperty::FONTS);
film_content_changed (TextContentProperty::TYPE);
+ film_content_changed (TextContentProperty::DCP_TRACK);
film_content_changed (DCPContentProperty::REFERENCE_TEXT);
}