X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fsubtitle_panel.cc;h=b4c031ed00a43534bf8a2cdba3f23100bbfaf764;hp=4efc4eee426f6be0916751dac236ba95c724b5a6;hb=ad5c8849fc3ef5aad88201f28db5474a60db4436;hpb=13aae5d8ff27886656ab7ea3ef1194987954bb3f diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc index 4efc4eee4..b4c031ed0 100644 --- a/src/wx/subtitle_panel.cc +++ b/src/wx/subtitle_panel.cc @@ -105,6 +105,16 @@ SubtitlePanel::SubtitlePanel (ContentPanel* p) ++r; } + { + add_label_to_sizer (grid, this, _("Line spacing"), true, wxGBPosition (r, 0)); + wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + _line_spacing = new wxSpinCtrl (this); + s->Add (_line_spacing); + add_label_to_sizer (s, this, _("%"), false); + grid->Add (s, wxGBPosition (r, 1)); + ++r; + } + add_label_to_sizer (grid, this, _("Language"), true, wxGBPosition (r, 0)); _language = new wxTextCtrl (this, wxID_ANY); grid->Add (_language, wxGBPosition (r, 1)); @@ -133,19 +143,21 @@ SubtitlePanel::SubtitlePanel (ContentPanel* p) _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)); - _appearance_dialog_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&SubtitlePanel::appearance_dialog_clicked, this)); + _line_spacing->SetRange (10, 1000); + + _reference->Bind (wxEVT_CHECKBOX, boost::bind (&SubtitlePanel::reference_clicked, this)); + _use->Bind (wxEVT_CHECKBOX, boost::bind (&SubtitlePanel::use_toggled, this)); + _burn->Bind (wxEVT_CHECKBOX, boost::bind (&SubtitlePanel::burn_toggled, this)); + _x_offset->Bind (wxEVT_SPINCTRL, boost::bind (&SubtitlePanel::x_offset_changed, this)); + _y_offset->Bind (wxEVT_SPINCTRL, boost::bind (&SubtitlePanel::y_offset_changed, this)); + _x_scale->Bind (wxEVT_SPINCTRL, boost::bind (&SubtitlePanel::x_scale_changed, this)); + _y_scale->Bind (wxEVT_SPINCTRL, boost::bind (&SubtitlePanel::y_scale_changed, this)); + _line_spacing->Bind (wxEVT_SPINCTRL, boost::bind (&SubtitlePanel::line_spacing_changed, this)); + _language->Bind (wxEVT_TEXT, boost::bind (&SubtitlePanel::language_changed, this)); + _stream->Bind (wxEVT_CHOICE, boost::bind (&SubtitlePanel::stream_changed, this)); + _subtitle_view_button->Bind (wxEVT_BUTTON, boost::bind (&SubtitlePanel::subtitle_view_clicked, this)); + _fonts_dialog_button->Bind (wxEVT_BUTTON, boost::bind (&SubtitlePanel::fonts_dialog_clicked, this)); + _appearance_dialog_button->Bind (wxEVT_BUTTON, boost::bind (&SubtitlePanel::appearance_dialog_clicked, this)); } void @@ -200,6 +212,8 @@ SubtitlePanel::film_content_changed (int property) checked_set (_x_scale, scs ? lrint (scs->subtitle->x_scale() * 100) : 100); } else if (property == SubtitleContentProperty::Y_SCALE) { checked_set (_y_scale, scs ? lrint (scs->subtitle->y_scale() * 100) : 100); + } else if (property == SubtitleContentProperty::LINE_SPACING) { + checked_set (_line_spacing, scs ? lrint (scs->subtitle->line_spacing() * 100) : 100); } else if (property == SubtitleContentProperty::LANGUAGE) { checked_set (_language, scs ? scs->subtitle->language() : ""); } else if (property == DCPContentProperty::REFERENCE_SUBTITLE) { @@ -242,6 +256,7 @@ SubtitlePanel::setup_sensitivity () /* These are the content types that could include subtitles */ shared_ptr fc = boost::dynamic_pointer_cast (i); shared_ptr sc = boost::dynamic_pointer_cast (i); + shared_ptr dc = boost::dynamic_pointer_cast (i); shared_ptr dsc = boost::dynamic_pointer_cast (i); if (fc) { if (fc->subtitle) { @@ -255,7 +270,7 @@ SubtitlePanel::setup_sensitivity () ++ffmpeg_subs; ++any_subs; } - } else if (sc || dsc) { + } else if (sc || dc || dsc) { /* XXX: in the future there could be bitmap subs from DCPs */ ++text_subs; ++any_subs; @@ -290,11 +305,12 @@ SubtitlePanel::setup_sensitivity () _y_offset->Enable (!reference && any_subs > 0 && use); _x_scale->Enable (!reference && any_subs > 0 && use); _y_scale->Enable (!reference && any_subs > 0 && use); + _line_spacing->Enable (!reference && text_subs > 0 && use); _language->Enable (!reference && any_subs > 0 && use); _stream->Enable (!reference && ffmpeg_subs == 1); _subtitle_view_button->Enable (!reference && text_subs == 1); _fonts_dialog_button->Enable (!reference && text_subs == 1); - _appearance_dialog_button->Enable (!reference); + _appearance_dialog_button->Enable (!reference && any_subs > 0 && use); } void @@ -352,6 +368,14 @@ SubtitlePanel::y_scale_changed () } } +void +SubtitlePanel::line_spacing_changed () +{ + BOOST_FOREACH (shared_ptr i, _parent->selected_subtitle ()) { + i->subtitle->set_line_spacing (_line_spacing->GetValue() / 100.0); + } +} + void SubtitlePanel::language_changed () { @@ -370,6 +394,7 @@ SubtitlePanel::content_selection_changed () film_content_changed (SubtitleContentProperty::Y_OFFSET); film_content_changed (SubtitleContentProperty::X_SCALE); film_content_changed (SubtitleContentProperty::Y_SCALE); + film_content_changed (SubtitleContentProperty::LINE_SPACING); film_content_changed (SubtitleContentProperty::LANGUAGE); film_content_changed (SubtitleContentProperty::FONTS); film_content_changed (DCPContentProperty::REFERENCE_SUBTITLE); @@ -386,7 +411,7 @@ SubtitlePanel::subtitle_view_clicked () ContentList c = _parent->selected_subtitle (); DCPOMATIC_ASSERT (c.size() == 1); - shared_ptr decoder = decoder_factory (c.front(), _parent->film()->log(), false); + shared_ptr decoder = decoder_factory (c.front(), _parent->film()->log()); if (decoder) { _subtitle_view = new SubtitleView (this, _parent->film(), decoder, c.front()->position ()); @@ -452,7 +477,7 @@ SubtitlePanel::appearance_dialog_clicked () } if (text) { - TextSubtitleAppearanceDialog* d = new TextSubtitleAppearanceDialog (this, c.front()->subtitle); + TextSubtitleAppearanceDialog* d = new TextSubtitleAppearanceDialog (this, c.front()); if (d->ShowModal () == wxID_OK) { d->apply (); }