X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ftext_panel.cc;h=27465ad6879ee6336db60bd5064e60842216f143;hp=3c5abcefc2453d723c6cb4baf4f92a30eea2881f;hb=1f88a38a2a607c21988a403e76f315444c4be36b;hpb=5cc679b5c96e4a2916159f956e63d0d1a8724f86 diff --git a/src/wx/text_panel.cc b/src/wx/text_panel.cc index 3c5abcefc..27465ad68 100644 --- a/src/wx/text_panel.cc +++ b/src/wx/text_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2018 Carl Hetherington + Copyright (C) 2012-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -52,6 +52,10 @@ using boost::dynamic_pointer_cast; /** @param t Original text type of the content, if known */ TextPanel::TextPanel (ContentPanel* p, TextType t) : ContentSubPanel (p, std_to_wx(text_type_to_name(t))) + , _dcp_track_label (0) + , _dcp_track (0) + , _language_label (0) + , _language (0) , _text_view (0) , _fonts_dialog (0) , _original_type (t) @@ -88,7 +92,7 @@ TextPanel::TextPanel (ContentPanel* p, TextType t) _x_scale_label = create_label (this, _("X"), true); _x_scale = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(64, -1)); _x_scale_pc_label = new StaticText (this, _("%")); - _y_scale_label = create_label (this, _("Y"), true); + _y_scale_label = create_label (this, S_("Coord|Y"), true); _y_scale = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(64, -1)); _y_scale_pc_label = new StaticText (this, _("%")); @@ -96,12 +100,6 @@ TextPanel::TextPanel (ContentPanel* p, TextType t) _line_spacing = new wxSpinCtrl (this); _line_spacing_pc_label = new StaticText (this, _("%")); - _dcp_track_label = create_label (this, _("DCP track"), true); - _dcp_track = new wxChoice (this, wxID_ANY); - - _language_label = create_label (this, _("Language"), true); - _language = new wxTextCtrl (this, wxID_ANY); - _stream_label = create_label (this, _("Stream"), true); _stream = new wxChoice (this, wxID_ANY); @@ -115,10 +113,6 @@ 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)); _use->Bind (wxEVT_CHECKBOX, boost::bind (&TextPanel::use_toggled, this)); _type->Bind (wxEVT_CHOICE, boost::bind (&TextPanel::type_changed, this)); @@ -128,14 +122,65 @@ 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)); _fonts_dialog_button->Bind (wxEVT_BUTTON, boost::bind (&TextPanel::fonts_dialog_clicked, this)); _appearance_dialog_button->Bind (wxEVT_BUTTON, boost::bind (&TextPanel::appearance_dialog_clicked, this)); add_to_grid(); + content_selection_changed (); +} + +void +TextPanel::setup_visibility () +{ + switch (current_type()) { + case TEXT_OPEN_SUBTITLE: + if (_dcp_track_label) { + _dcp_track_label->Destroy (); + _dcp_track_label = 0; + } + if (_dcp_track) { + _dcp_track->Destroy (); + _dcp_track = 0; + } + if (!_language_label) { + _language_label = create_label (this, _("Language"), true); + add_label_to_sizer (_grid, _language_label, true, wxGBPosition(_language_row, 0)); + } + if (!_language) { + _language = new wxTextCtrl (this, wxID_ANY); + _language->Bind (wxEVT_TEXT, boost::bind(&TextPanel::language_changed, this)); + _grid->Add (_language, wxGBPosition(_language_row, 1), wxDefaultSpan, wxEXPAND); + film_content_changed (TextContentProperty::LANGUAGE); + } + break; + case TEXT_CLOSED_CAPTION: + if (_language_label) { + _language_label->Destroy (); + _language_label = 0; + } + if (_language) { + _language->Destroy (); + _language = 0; + } + if (!_dcp_track_label) { + _dcp_track_label = create_label (this, _("CCAP track"), true); + add_label_to_sizer (_grid, _dcp_track_label, true, wxGBPosition(_language_row, 0)); + } + if (!_dcp_track) { + _dcp_track = new wxChoice (this, wxID_ANY); + _dcp_track->Bind (wxEVT_CHOICE, boost::bind(&TextPanel::dcp_track_changed, this)); + _grid->Add (_dcp_track, wxGBPosition(_language_row, 1), wxDefaultSpan, wxEXPAND); + update_dcp_tracks (); + film_content_changed (TextContentProperty::DCP_TRACK); + } + break; + default: + break; + } + + _grid->Layout (); } void @@ -196,12 +241,8 @@ TextPanel::add_to_grid () ++r; } - add_label_to_sizer (_grid, _dcp_track_label, true, wxGBPosition(r, 0)); - _grid->Add (_dcp_track, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND); - ++r; - - add_label_to_sizer (_grid, _language_label, true, wxGBPosition (r, 0)); - _grid->Add (_language, wxGBPosition (r, 1)); + _language_row = r; + setup_visibility (); ++r; add_label_to_sizer (_grid, _stream_label, true, wxGBPosition (r, 0)); @@ -223,6 +264,8 @@ TextPanel::add_to_grid () void TextPanel::update_dcp_track_selection () { + DCPOMATIC_ASSERT (_dcp_track); + optional selected; bool many = false; BOOST_FOREACH (shared_ptr i, _parent->selected_text()) { @@ -253,9 +296,16 @@ TextPanel::update_dcp_track_selection () void TextPanel::update_dcp_tracks () { + DCPOMATIC_ASSERT (_dcp_track); + _dcp_track->Clear (); BOOST_FOREACH (DCPTextTrack i, _parent->film()->closed_caption_tracks()) { - _dcp_track->Append (std_to_wx(i.summary())); + /* XXX: don't display the "magic" track which has empty name and language; + this is a nasty hack (see also Film::closed_caption_tracks) + */ + if (!i.name.empty() || !i.language.empty()) { + _dcp_track->Append (std_to_wx(i.summary())); + } } if (_parent->film()->closed_caption_tracks().size() < 6) { @@ -360,7 +410,7 @@ TextPanel::film_content_changed (int property) _type->SetSelection (0); } setup_sensitivity (); - update_dcp_track_selection (); + setup_visibility (); } else if (property == TextContentProperty::BURN) { checked_set (_burn, text ? text->burn() : false); } else if (property == TextContentProperty::X_OFFSET) { @@ -374,9 +424,13 @@ TextPanel::film_content_changed (int property) } else if (property == TextContentProperty::LINE_SPACING) { checked_set (_line_spacing, text ? lrint (text->line_spacing() * 100) : 100); } else if (property == TextContentProperty::LANGUAGE) { - checked_set (_language, text ? text->language() : ""); + if (_language) { + checked_set (_language, text ? text->language() : ""); + } } else if (property == TextContentProperty::DCP_TRACK) { - update_dcp_track_selection (); + if (_dcp_track) { + update_dcp_track_selection (); + } } else if (property == DCPContentProperty::REFERENCE_TEXT) { if (scs) { shared_ptr dcp = dynamic_pointer_cast (scs); @@ -419,6 +473,8 @@ TextPanel::type_changed () BOOST_FOREACH (shared_ptr i, _parent->selected_text()) { i->text_of_original_type(_original_type)->set_type (current_type ()); } + + setup_visibility (); } void @@ -433,7 +489,10 @@ void TextPanel::setup_sensitivity () { int any_subs = 0; + /* We currently assume that FFmpeg subtitles are bitmapped */ int ffmpeg_subs = 0; + /* DCP subs can't have their line spacing changed */ + int dcp_subs = 0; ContentList sel = _parent->selected_text (); BOOST_FOREACH (shared_ptr i, sel) { /* These are the content types that could include subtitles */ @@ -446,7 +505,10 @@ TextPanel::setup_sensitivity () ++ffmpeg_subs; ++any_subs; } - } else if (sc || dc || dsc) { + } else if (dc || dsc) { + ++dcp_subs; + ++any_subs; + } else if (sc) { /* XXX: in the future there could be bitmap subs from DCPs */ ++any_subs; } @@ -467,6 +529,26 @@ TextPanel::setup_sensitivity () TextType const type = current_type (); + /* Set up _type */ + _type->Clear (); + _type->Append (_("open subtitles")); + if (ffmpeg_subs == 0) { + _type->Append (_("closed captions")); + } + + switch (type) { + case TEXT_OPEN_SUBTITLE: + _type->SetSelection (0); + break; + case TEXT_CLOSED_CAPTION: + if (_type->GetCount() > 1) { + _type->SetSelection (1); + } + break; + default: + break; + } + /* Set up sensitivity */ _use->Enable (!reference && any_subs > 0); bool const use = _use->GetValue (); @@ -476,9 +558,7 @@ TextPanel::setup_sensitivity () _y_offset->Enable (!reference && any_subs > 0 && use && type == TEXT_OPEN_SUBTITLE); _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 && type == TEXT_OPEN_SUBTITLE); + _line_spacing->Enable (!reference && use && type == TEXT_OPEN_SUBTITLE && dcp_subs < any_subs); _stream->Enable (!reference && ffmpeg_subs == 1); /* Ideally we would check here to see if the FFmpeg content has "string" subs (i.e. not bitmaps) */ _text_view_button->Enable (!reference && any_subs > 0 && ffmpeg_subs == 0); @@ -552,6 +632,7 @@ TextPanel::line_spacing_changed () void TextPanel::language_changed () { + DCPOMATIC_ASSERT (_language); BOOST_FOREACH (shared_ptr i, _parent->selected_text ()) { i->text_of_original_type(_original_type)->set_language (wx_to_std (_language->GetValue())); } @@ -586,7 +667,7 @@ TextPanel::text_view_clicked () ContentList c = _parent->selected_text (); DCPOMATIC_ASSERT (c.size() == 1); - shared_ptr decoder = decoder_factory (_parent->film(), c.front(), false); + shared_ptr decoder = decoder_factory (_parent->film(), c.front(), false, false, shared_ptr()); if (decoder) { _text_view = new TextView (this, _parent->film(), c.front(), c.front()->text_of_original_type(_original_type), decoder, _parent->film_viewer());