X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftext_panel.cc;h=169732b66b70a8ba9a72f39ce724a71202f0fec6;hb=401af8742fe5b2bb3ec117acdc4b0b36bc8f5047;hp=68f246913f543ba53730afb1b061e260995d625b;hpb=7d81ed516d246b5d1387f5bf1019237c5c7a8d2b;p=dcpomatic.git diff --git a/src/wx/text_panel.cc b/src/wx/text_panel.cc index 68f246913..169732b66 100644 --- a/src/wx/text_panel.cc +++ b/src/wx/text_panel.cc @@ -24,6 +24,7 @@ #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" @@ -90,45 +91,33 @@ TextPanel::TextPanel (ContentPanel* p, TextType t) 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)); @@ -140,6 +129,11 @@ TextPanel::TextPanel (ContentPanel* p, TextType t) ++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)); @@ -170,6 +164,8 @@ TextPanel::TextPanel (ContentPanel* p, TextType t) _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)); @@ -181,6 +177,7 @@ TextPanel::TextPanel (ContentPanel* p, TextType t) _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)); @@ -188,6 +185,89 @@ TextPanel::TextPanel (ContentPanel* p, TextType t) _appearance_dialog_button->Bind (wxEVT_BUTTON, boost::bind (&TextPanel::appearance_dialog_clicked, this)); } +void +TextPanel::add_to_grid () +{ + +} + +void +TextPanel::update_dcp_track_selection () +{ + optional selected; + bool many = false; + BOOST_FOREACH (shared_ptr i, _parent->selected_text()) { + shared_ptr t = i->text_of_original_type(_original_type); + if (t) { + optional 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 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 i, _parent->selected_text()) { + shared_ptr 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) { @@ -251,6 +331,7 @@ TextPanel::film_content_changed (int 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) { @@ -265,6 +346,8 @@ TextPanel::film_content_changed (int property) 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 dcp = dynamic_pointer_cast (scs); @@ -365,7 +448,8 @@ TextPanel::setup_sensitivity () _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); - _language->Enable (!reference && any_subs > 0 && use); + _dcp_track->Enable (!reference && any_subs > 0 && use && type == TEXT_CLOSED_CAPTION); + _language->Enable (!reference && any_subs > 0 && use && type == TEXT_OPEN_SUBTITLE); _stream->Enable (!reference && ffmpeg_subs == 1); _text_view_button->Enable (!reference); _fonts_dialog_button->Enable (!reference && type == TEXT_OPEN_SUBTITLE); @@ -457,6 +541,7 @@ TextPanel::content_selection_changed () 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); }