X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsubtitle_panel.cc;h=3024617e56de9ddff76006632a2bf7eb158d25ee;hb=80400212e939dc2f3b987cb6df57709929aa5178;hp=d2f0e4c111e3b1f7e013c7654fd12140e7ad271d;hpb=4e6f15f602c605804f95c6b06af9bf79eaf2dde1;p=dcpomatic.git diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc index d2f0e4c11..3024617e5 100644 --- a/src/wx/subtitle_panel.cc +++ b/src/wx/subtitle_panel.cc @@ -23,11 +23,12 @@ #include "subtitle_view.h" #include "content_panel.h" #include "fonts_dialog.h" +#include "subtitle_appearance_dialog.h" #include "lib/ffmpeg_content.h" -#include "lib/subrip_content.h" +#include "lib/text_subtitle_content.h" #include "lib/ffmpeg_subtitle_stream.h" #include "lib/dcp_subtitle_content.h" -#include "lib/subrip_decoder.h" +#include "lib/text_subtitle_decoder.h" #include "lib/dcp_subtitle_decoder.h" #include "lib/dcp_content.h" #include @@ -36,6 +37,7 @@ using std::vector; using std::string; +using std::list; using boost::shared_ptr; using boost::lexical_cast; using boost::dynamic_pointer_cast; @@ -45,95 +47,109 @@ SubtitlePanel::SubtitlePanel (ContentPanel* p) , _subtitle_view (0) , _fonts_dialog (0) { - wxFlexGridSizer* grid = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + wxGridBagSizer* grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); _sizer->Add (grid, 0, wxALL, 8); + int r = 0; _reference = new wxCheckBox (this, wxID_ANY, _("Refer to existing DCP")); - grid->Add (_reference); - grid->AddSpacer (0); + grid->Add (_reference, wxGBPosition (r, 0), wxGBSpan (1, 2)); + ++r; _use = new wxCheckBox (this, wxID_ANY, _("Use subtitles")); - grid->Add (_use); - grid->AddSpacer (0); + grid->Add (_use, wxGBPosition (r, 0), wxGBSpan (1, 2)); + ++r; _burn = new wxCheckBox (this, wxID_ANY, _("Burn subtitles into image")); - grid->Add (_burn); - grid->AddSpacer (0); + grid->Add (_burn, wxGBPosition (r, 0), wxGBSpan (1, 2)); + ++r; { - add_label_to_sizer (grid, this, _("X Offset"), true); + 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); + grid->Add (s, wxGBPosition (r, 1)); + ++r; } { - add_label_to_sizer (grid, this, _("Y Offset"), true); + 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); + grid->Add (s, wxGBPosition (r, 1)); + ++r; } { - add_label_to_sizer (grid, this, _("X Scale"), true); + 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); + grid->Add (s, wxGBPosition (r, 1)); + ++r; } { - add_label_to_sizer (grid, this, _("Y Scale"), true); + 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); + grid->Add (s, wxGBPosition (r, 1)); + ++r; } - add_label_to_sizer (grid, this, _("Language"), true); + add_label_to_sizer (grid, this, _("Language"), true, wxGBPosition (r, 0)); _language = new wxTextCtrl (this, wxID_ANY); - grid->Add (_language, 1, wxEXPAND); + grid->Add (_language, wxGBPosition (r, 1)); + ++r; - add_label_to_sizer (grid, this, _("Stream"), true); + add_label_to_sizer (grid, this, _("Stream"), true, wxGBPosition (r, 0)); _stream = new wxChoice (this, wxID_ANY); - grid->Add (_stream, 1, wxEXPAND); + grid->Add (_stream, wxGBPosition (r, 1)); + ++r; - _subtitle_view_button = new wxButton (this, wxID_ANY, _("View...")); - grid->Add (_subtitle_view_button); - grid->AddSpacer (0); + { + wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - _fonts_dialog_button = new wxButton (this, wxID_ANY, _("Fonts...")); - grid->Add (_fonts_dialog_button); - grid->AddSpacer (0); + _subtitle_view_button = new wxButton (this, wxID_ANY, _("View...")); + s->Add (_subtitle_view_button, 1, wxALL, DCPOMATIC_SIZER_GAP); + _fonts_dialog_button = new wxButton (this, wxID_ANY, _("Fonts...")); + s->Add (_fonts_dialog_button, 1, wxALL, DCPOMATIC_SIZER_GAP); + _appearance_dialog_button = new wxButton (this, wxID_ANY, _("Appearance...")); + s->Add (_appearance_dialog_button, 1, wxALL, DCPOMATIC_SIZER_GAP); + + grid->Add (s, wxGBPosition (r, 0), wxGBSpan (1, 2)); + ++r; + } _x_offset->SetRange (-100, 100); _y_offset->SetRange (-100, 100); _x_scale->SetRange (10, 1000); _y_scale->SetRange (10, 1000); - _reference->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&SubtitlePanel::reference_clicked, this)); - _use->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&SubtitlePanel::use_toggled, this)); - _burn->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&SubtitlePanel::burn_toggled, this)); - _x_offset->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::x_offset_changed, this)); - _y_offset->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::y_offset_changed, this)); - _x_scale->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::x_scale_changed, this)); - _y_scale->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::y_scale_changed, this)); - _language->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&SubtitlePanel::language_changed, this)); - _stream->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&SubtitlePanel::stream_changed, this)); - _subtitle_view_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&SubtitlePanel::subtitle_view_clicked, this)); - _fonts_dialog_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&SubtitlePanel::fonts_dialog_clicked, this)); + _reference->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&SubtitlePanel::reference_clicked, this)); + _use->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&SubtitlePanel::use_toggled, this)); + _burn->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&SubtitlePanel::burn_toggled, this)); + _x_offset->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::x_offset_changed, this)); + _y_offset->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::y_offset_changed, this)); + _x_scale->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::x_scale_changed, this)); + _y_scale->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::y_scale_changed, this)); + _language->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&SubtitlePanel::language_changed, this)); + _stream->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&SubtitlePanel::stream_changed, this)); + _subtitle_view_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&SubtitlePanel::subtitle_view_clicked, this)); + _fonts_dialog_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&SubtitlePanel::fonts_dialog_clicked, this)); + _appearance_dialog_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&SubtitlePanel::appearance_dialog_clicked, this)); } void SubtitlePanel::film_changed (Film::Property property) { - if (property == Film::CONTENT) { + if (property == Film::CONTENT || property == Film::REEL_TYPE) { setup_sensitivity (); } } @@ -217,19 +233,24 @@ SubtitlePanel::setup_sensitivity () { int any_subs = 0; int ffmpeg_subs = 0; - int subrip_or_dcp_subs = 0; + int text_subs = 0; + int dcp_subs = 0; int image_subs = 0; - BOOST_FOREACH (shared_ptr i, _parent->selected_subtitle ()) { + SubtitleContentList sel = _parent->selected_subtitle (); + BOOST_FOREACH (shared_ptr i, sel) { shared_ptr fc = boost::dynamic_pointer_cast (i); - shared_ptr sc = boost::dynamic_pointer_cast (i); + shared_ptr sc = boost::dynamic_pointer_cast (i); shared_ptr dsc = boost::dynamic_pointer_cast (i); if (fc) { if (fc->has_subtitles ()) { ++ffmpeg_subs; ++any_subs; } - } else if (sc || dsc) { - ++subrip_or_dcp_subs; + } else if (sc) { + ++text_subs; + ++any_subs; + } else if (dsc) { + ++dcp_subs; ++any_subs; } else { ++any_subs; @@ -242,6 +263,15 @@ SubtitlePanel::setup_sensitivity () } } + shared_ptr dcp; + if (sel.size() == 1) { + dcp = dynamic_pointer_cast (sel.front ()); + } + + list why_not; + bool const can_reference = dcp && dcp->can_reference_subtitle (why_not); + setup_refer_button (_reference, dcp, can_reference, why_not); + bool const reference = _reference->GetValue (); _use->Enable (!reference && any_subs > 0); @@ -253,8 +283,9 @@ SubtitlePanel::setup_sensitivity () _y_scale->Enable (!reference && any_subs > 0 && use); _language->Enable (!reference && any_subs > 0 && use); _stream->Enable (!reference && ffmpeg_subs == 1); - _subtitle_view_button->Enable (!reference && subrip_or_dcp_subs == 1); - _fonts_dialog_button->Enable (!reference && subrip_or_dcp_subs == 1); + _subtitle_view_button->Enable (!reference && (text_subs == 1 || dcp_subs == 1)); + _fonts_dialog_button->Enable (!reference && (text_subs == 1 || dcp_subs == 1)); + _appearance_dialog_button->Enable (!reference && text_subs == 1); } void @@ -332,6 +363,7 @@ SubtitlePanel::content_selection_changed () film_content_changed (SubtitleContentProperty::SUBTITLE_Y_SCALE); film_content_changed (SubtitleContentProperty::SUBTITLE_LANGUAGE); film_content_changed (SubtitleContentProperty::FONTS); + film_content_changed (DCPContentProperty::REFERENCE_SUBTITLE); } void @@ -347,9 +379,9 @@ SubtitlePanel::subtitle_view_clicked () shared_ptr decoder; - shared_ptr sr = dynamic_pointer_cast (c.front ()); + shared_ptr sr = dynamic_pointer_cast (c.front ()); if (sr) { - decoder.reset (new SubRipDecoder (sr)); + decoder.reset (new TextSubtitleDecoder (sr)); } shared_ptr dc = dynamic_pointer_cast (c.front ()); @@ -393,3 +425,19 @@ SubtitlePanel::reference_clicked () d->set_reference_subtitle (_reference->GetValue ()); } + +void +SubtitlePanel::appearance_dialog_clicked () +{ + SubtitleContentList c = _parent->selected_subtitle (); + DCPOMATIC_ASSERT (c.size() == 1); + + shared_ptr sr = dynamic_pointer_cast (c.front ()); + DCPOMATIC_ASSERT (sr); + + SubtitleAppearanceDialog* d = new SubtitleAppearanceDialog (this, sr); + if (d->ShowModal () == wxID_OK) { + d->apply (); + } + d->Destroy (); +}