X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ftext_panel.cc;h=2fdcbb51f5d03733abdbce3d9950d5c1ad089acd;hp=5e00d4f41b820cd1a6aee5c514ca92a99101de1b;hb=c7044a1b444c2e5e7659bf5d34ed5ac73f5a6271;hpb=e0a70cd5cfb11fc2de167f3146acdd437a6faa82 diff --git a/src/wx/text_panel.cc b/src/wx/text_panel.cc index 5e00d4f41..2fdcbb51f 100644 --- a/src/wx/text_panel.cc +++ b/src/wx/text_panel.cc @@ -18,6 +18,7 @@ */ + #include "check_box.h" #include "content_panel.h" #include "dcp_text_track_dialog.h" @@ -31,6 +32,7 @@ #include "subtitle_appearance_dialog.h" #include "text_panel.h" #include "text_view.h" +#include "wx_ptr.h" #include "wx_util.h" #include "lib/analyse_subtitles_job.h" #include "lib/dcp_content.h" @@ -40,36 +42,41 @@ #include "lib/ffmpeg_content.h" #include "lib/ffmpeg_subtitle_stream.h" #include "lib/job_manager.h" +#include "lib/scope_guard.h" #include "lib/string_text_file_content.h" #include "lib/string_text_file_decoder.h" #include "lib/subtitle_analysis.h" #include "lib/text_content.h" +#include +LIBDCP_DISABLE_WARNINGS #include +LIBDCP_ENABLE_WARNINGS -using std::vector; -using std::string; -using std::list; using std::cout; -using std::shared_ptr; -using boost::optional; using std::dynamic_pointer_cast; +using std::list; +using std::shared_ptr; +using std::string; +using std::vector; using boost::bind; +using boost::optional; /** @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))) - , _outline_subtitles (0) - , _dcp_track_label (0) - , _dcp_track (0) - , _text_view (0) - , _fonts_dialog (0) , _original_type (t) - , _loading_analysis (false) +{ + +} + + +void +TextPanel::create () { wxString refer = _("Use this DCP's subtitle as OV and make VF"); - if (t == TextType::CLOSED_CAPTION) { + if (_original_type == TextType::CLOSED_CAPTION) { refer = _("Use this DCP's closed caption as OV and make VF"); } @@ -88,30 +95,24 @@ TextPanel::TextPanel (ContentPanel* p, TextType t) _burn = new CheckBox (this, _("Burn subtitles into image")); -#ifdef __WXGTK3__ - int const spin_width = 118; -#else - int const spin_width = 56; -#endif - _offset_label = create_label (this, _("Offset"), true); _x_offset_label = create_label (this, _("X"), true); - _x_offset = new SpinCtrl (this, spin_width); + _x_offset = new SpinCtrl (this, DCPOMATIC_SPIN_CTRL_WIDTH); _x_offset_pc_label = new StaticText (this, _("%")); _y_offset_label = create_label (this, _("Y"), true); - _y_offset = new SpinCtrl (this, spin_width); + _y_offset = new SpinCtrl (this, DCPOMATIC_SPIN_CTRL_WIDTH); _y_offset_pc_label = new StaticText (this, _("%")); _scale_label = create_label (this, _("Scale"), true); _x_scale_label = create_label (this, _("X"), true); - _x_scale = new SpinCtrl (this, spin_width); + _x_scale = new SpinCtrl (this, DCPOMATIC_SPIN_CTRL_WIDTH); _x_scale_pc_label = new StaticText (this, _("%")); _y_scale_label = create_label (this, S_("Coord|Y"), true); - _y_scale = new SpinCtrl (this, spin_width); + _y_scale = new SpinCtrl (this, DCPOMATIC_SPIN_CTRL_WIDTH); _y_scale_pc_label = new StaticText (this, _("%")); _line_spacing_label = create_label (this, _("Line spacing"), true); - _line_spacing = new SpinCtrl (this, spin_width); + _line_spacing = new SpinCtrl (this, DCPOMATIC_SPIN_CTRL_WIDTH); _line_spacing_pc_label = new StaticText (this, _("%")); _stream_label = create_label (this, _("Stream"), true); @@ -127,10 +128,10 @@ TextPanel::TextPanel (ContentPanel* p, TextType t) _y_scale->SetRange (0, 1000); _line_spacing->SetRange (0, 1000); - _reference->Bind (wxEVT_CHECKBOX, boost::bind (&TextPanel::reference_clicked, this)); - _use->Bind (wxEVT_CHECKBOX, boost::bind (&TextPanel::use_toggled, this)); + _reference->bind(&TextPanel::reference_clicked, this); + _use->bind(&TextPanel::use_toggled, this); _type->Bind (wxEVT_CHOICE, boost::bind (&TextPanel::type_changed, this)); - _burn->Bind (wxEVT_CHECKBOX, boost::bind (&TextPanel::burn_toggled, this)); + _burn->bind(&TextPanel::burn_toggled, this); _x_offset->Bind (wxEVT_SPINCTRL, boost::bind (&TextPanel::x_offset_changed, this)); _y_offset->Bind (wxEVT_SPINCTRL, boost::bind (&TextPanel::y_offset_changed, this)); _x_scale->Bind (wxEVT_SPINCTRL, boost::bind (&TextPanel::x_scale_changed, this)); @@ -143,6 +144,8 @@ TextPanel::TextPanel (ContentPanel* p, TextType t) add_to_grid(); content_selection_changed (); + + _sizer->Layout (); } @@ -161,7 +164,7 @@ TextPanel::setup_visibility () } if (!_outline_subtitles) { _outline_subtitles = new CheckBox (this, _("Show subtitle area")); - _outline_subtitles->Bind (wxEVT_CHECKBOX, boost::bind (&TextPanel::outline_subtitles_changed, this)); + _outline_subtitles->bind(&TextPanel::outline_subtitles_changed, this); _grid->Add (_outline_subtitles, wxGBPosition(_outline_subtitles_row, 0), wxGBSpan(1, 2)); } if (!_language) { @@ -177,7 +180,7 @@ TextPanel::setup_visibility () _language_type->Append (_("Main")); _language_type->Append (_("Additional")); _language_type->Bind (wxEVT_CHOICE, boost::bind(&TextPanel::language_is_additional_changed, this)); - _language_sizer->Add (_language_type, 0); + _language_sizer->Add (_language_type, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_CHOICE_TOP_PAD); _grid->Add (_language_sizer, wxGBPosition(_ccap_track_or_language_row, 1), wxGBSpan(1, 2)); film_content_changed (TextContentProperty::LANGUAGE); film_content_changed (TextContentProperty::LANGUAGE_IS_ADDITIONAL); @@ -294,11 +297,11 @@ TextPanel::add_to_grid () { auto s = new wxBoxSizer (wxHORIZONTAL); - s->Add (_text_view_button, 1, wxALL, DCPOMATIC_SIZER_GAP); - s->Add (_fonts_dialog_button, 1, wxALL, DCPOMATIC_SIZER_GAP); - s->Add (_appearance_dialog_button, 1, wxALL, DCPOMATIC_SIZER_GAP); + s->Add (_text_view_button, 0, wxALL, DCPOMATIC_SIZER_GAP); + s->Add (_fonts_dialog_button, 0, wxALL, DCPOMATIC_SIZER_GAP); + s->Add (_appearance_dialog_button, 0, wxALL, DCPOMATIC_SIZER_GAP); - _grid->Add (s, wxGBPosition (r, 0), wxGBSpan (1, 2)); + _grid->Add (s, wxGBPosition(r, 0), wxGBSpan(1, 2)); ++r; } @@ -349,7 +352,7 @@ TextPanel::update_dcp_tracks () /* 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()) { + if (!i.name.empty() || i.language) { _dcp_track->Append (std_to_wx(i.summary())); } } @@ -368,11 +371,10 @@ TextPanel::dcp_track_changed () optional track; if (_dcp_track->GetSelection() == int(_dcp_track->GetCount()) - 1) { - auto d = new DCPTextTrackDialog (this); + auto d = make_wx(this); if (d->ShowModal() == wxID_OK) { track = d->get(); } - d->Destroy (); } else { /* Find the DCPTextTrack that was selected */ for (auto i: _parent->film()->closed_caption_tracks()) { @@ -733,18 +735,13 @@ TextPanel::content_selection_changed () void TextPanel::text_view_clicked () { - if (_text_view) { - _text_view->Destroy (); - _text_view = nullptr; - } - auto c = _parent->selected_text (); DCPOMATIC_ASSERT (c.size() == 1); auto 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()); + _text_view.reset(this, _parent->film(), c.front(), c.front()->text_of_original_type(_original_type), decoder, _parent->film_viewer()); _text_view->Show (); } } @@ -753,15 +750,10 @@ TextPanel::text_view_clicked () void TextPanel::fonts_dialog_clicked () { - if (_fonts_dialog) { - _fonts_dialog->Destroy (); - _fonts_dialog = nullptr; - } - auto c = _parent->selected_text (); DCPOMATIC_ASSERT (c.size() == 1); - _fonts_dialog = new FontsDialog (this, c.front(), c.front()->text_of_original_type(_original_type)); + _fonts_dialog.reset(this, c.front(), c.front()->text_of_original_type(_original_type)); _fonts_dialog->Show (); } @@ -789,11 +781,10 @@ TextPanel::appearance_dialog_clicked () auto c = _parent->selected_text (); DCPOMATIC_ASSERT (c.size() == 1); - auto d = new SubtitleAppearanceDialog (this, _parent->film(), c.front(), c.front()->text_of_original_type(_original_type)); - if (d->ShowModal () == wxID_OK) { - d->apply (); + SubtitleAppearanceDialog dialog(this, _parent->film(), c.front(), c.front()->text_of_original_type(_original_type)); + if (dialog.ShowModal() == wxID_OK) { + dialog.apply(); } - d->Destroy (); } @@ -818,13 +809,16 @@ TextPanel::try_to_load_analysis () } _loading_analysis = true; + ScopeGuard sg = [this]() { + _loading_analysis = false; + setup_sensitivity(); + }; + setup_sensitivity (); _analysis.reset (); auto content = _analysis_content.lock (); if (!content) { - _loading_analysis = false; - setup_sensitivity (); return; } @@ -832,7 +826,7 @@ TextPanel::try_to_load_analysis () if (!boost::filesystem::exists(path)) { for (auto i: JobManager::instance()->get()) { - if (dynamic_pointer_cast(i)) { + if (dynamic_pointer_cast(i) && !i->finished()) { i->cancel (); } } @@ -851,33 +845,28 @@ TextPanel::try_to_load_analysis () _parent->film(), content, _analysis_finished_connection, bind(&TextPanel::analysis_finished, this) ); return; - } + } update_outline_subtitles_in_viewer (); - _loading_analysis = false; - setup_sensitivity (); } void TextPanel::update_outline_subtitles_in_viewer () { - auto fv = _parent->film_viewer().lock(); - if (!fv) { - return; - } + auto& fv = _parent->film_viewer(); if (_analysis) { auto rect = _analysis->bounding_box (); if (rect) { auto content = _analysis_content.lock (); DCPOMATIC_ASSERT (content); - rect->x += content->text.front()->x_offset(); - rect->y += content->text.front()->y_offset(); + rect->x += content->text.front()->x_offset() - _analysis->analysis_x_offset(); + rect->y += content->text.front()->y_offset() - _analysis->analysis_y_offset(); } - fv->set_outline_subtitles (rect); + fv.set_outline_subtitles(rect); } else { - fv->set_outline_subtitles (optional >()); + fv.set_outline_subtitles({}); } } @@ -897,9 +886,10 @@ TextPanel::clear_outline_subtitles () void TextPanel::analysis_finished () { + _loading_analysis = false; + auto content = _analysis_content.lock (); if (!content) { - _loading_analysis = false; setup_sensitivity (); return; } @@ -910,12 +900,10 @@ TextPanel::analysis_finished () */ error_dialog (_parent->window(), _("Could not analyse subtitles.")); clear_outline_subtitles (); - _loading_analysis = false; setup_sensitivity (); return; } - _loading_analysis = false; try_to_load_analysis (); }