From 5008f986d2d9d5891919d2db4de6268470a0ff7a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 20 Jul 2018 00:16:15 +0100 Subject: [PATCH] caption -> subtitle. --- src/wx/caption_panel.cc | 24 ++++++++++---------- src/wx/caption_panel.h | 8 +++---- src/wx/{subtitle_view.cc => caption_view.cc} | 20 ++++++++-------- src/wx/{subtitle_view.h => caption_view.h} | 4 ++-- src/wx/wscript | 4 ++-- 5 files changed, 30 insertions(+), 30 deletions(-) rename src/wx/{subtitle_view.cc => caption_view.cc} (80%) rename src/wx/{subtitle_view.h => caption_view.h} (87%) diff --git a/src/wx/caption_panel.cc b/src/wx/caption_panel.cc index c9ae97767..ca341167d 100644 --- a/src/wx/caption_panel.cc +++ b/src/wx/caption_panel.cc @@ -21,7 +21,7 @@ #include "caption_panel.h" #include "film_editor.h" #include "wx_util.h" -#include "subtitle_view.h" +#include "caption_view.h" #include "content_panel.h" #include "fonts_dialog.h" #include "caption_appearance_dialog.h" @@ -45,7 +45,7 @@ using boost::dynamic_pointer_cast; CaptionPanel::CaptionPanel (ContentPanel* p) : ContentSubPanel (p, _("Captions")) - , _subtitle_view (0) + , _caption_view (0) , _fonts_dialog (0) { wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL); @@ -144,8 +144,8 @@ CaptionPanel::CaptionPanel (ContentPanel* p) { wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - _subtitle_view_button = new wxButton (this, wxID_ANY, _("View...")); - s->Add (_subtitle_view_button, 1, wxALL, DCPOMATIC_SIZER_GAP); + _caption_view_button = new wxButton (this, wxID_ANY, _("View...")); + s->Add (_caption_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...")); @@ -172,7 +172,7 @@ CaptionPanel::CaptionPanel (ContentPanel* p) _line_spacing->Bind (wxEVT_SPINCTRL, boost::bind (&CaptionPanel::line_spacing_changed, this)); _language->Bind (wxEVT_TEXT, boost::bind (&CaptionPanel::language_changed, this)); _stream->Bind (wxEVT_CHOICE, boost::bind (&CaptionPanel::stream_changed, this)); - _subtitle_view_button->Bind (wxEVT_BUTTON, boost::bind (&CaptionPanel::subtitle_view_clicked, this)); + _caption_view_button->Bind (wxEVT_BUTTON, boost::bind (&CaptionPanel::caption_view_clicked, this)); _fonts_dialog_button->Bind (wxEVT_BUTTON, boost::bind (&CaptionPanel::fonts_dialog_clicked, this)); _appearance_dialog_button->Bind (wxEVT_BUTTON, boost::bind (&CaptionPanel::appearance_dialog_clicked, this)); } @@ -342,7 +342,7 @@ CaptionPanel::setup_sensitivity () _line_spacing->Enable (!reference && use); _language->Enable (!reference && any_subs > 0 && use); _stream->Enable (!reference && ffmpeg_subs == 1); - _subtitle_view_button->Enable (!reference); + _caption_view_button->Enable (!reference); _fonts_dialog_button->Enable (!reference); _appearance_dialog_button->Enable (!reference && any_subs > 0 && use); } @@ -436,11 +436,11 @@ CaptionPanel::content_selection_changed () } void -CaptionPanel::subtitle_view_clicked () +CaptionPanel::caption_view_clicked () { - if (_subtitle_view) { - _subtitle_view->Destroy (); - _subtitle_view = 0; + if (_caption_view) { + _caption_view->Destroy (); + _caption_view = 0; } ContentList c = _parent->selected_caption (); @@ -449,8 +449,8 @@ CaptionPanel::subtitle_view_clicked () shared_ptr decoder = decoder_factory (c.front(), _parent->film()->log(), false); if (decoder) { - _subtitle_view = new SubtitleView (this, _parent->film(), c.front(), decoder, _parent->film_viewer()); - _subtitle_view->Show (); + _caption_view = new CaptionView (this, _parent->film(), c.front(), decoder, _parent->film_viewer()); + _caption_view->Show (); } } diff --git a/src/wx/caption_panel.h b/src/wx/caption_panel.h index 1e7242fcb..38501e4d4 100644 --- a/src/wx/caption_panel.h +++ b/src/wx/caption_panel.h @@ -22,7 +22,7 @@ class wxCheckBox; class wxSpinCtrl; -class SubtitleView; +class CaptionView; class FontsDialog; class CaptionPanel : public ContentSubPanel @@ -45,7 +45,7 @@ private: void line_spacing_changed (); void language_changed (); void stream_changed (); - void subtitle_view_clicked (); + void caption_view_clicked (); void fonts_dialog_clicked (); void reference_clicked (); void appearance_dialog_clicked (); @@ -64,8 +64,8 @@ private: wxSpinCtrl* _line_spacing; wxTextCtrl* _language; wxChoice* _stream; - wxButton* _subtitle_view_button; - SubtitleView* _subtitle_view; + wxButton* _caption_view_button; + CaptionView* _caption_view; wxButton* _fonts_dialog_button; FontsDialog* _fonts_dialog; wxButton* _appearance_dialog_button; diff --git a/src/wx/subtitle_view.cc b/src/wx/caption_view.cc similarity index 80% rename from src/wx/subtitle_view.cc rename to src/wx/caption_view.cc index 6d34a93db..c57f9161e 100644 --- a/src/wx/subtitle_view.cc +++ b/src/wx/caption_view.cc @@ -26,7 +26,7 @@ #include "lib/config.h" #include "lib/text_caption_file_content.h" #include "lib/caption_decoder.h" -#include "subtitle_view.h" +#include "caption_view.h" #include "film_viewer.h" #include "wx_util.h" @@ -35,8 +35,8 @@ using boost::shared_ptr; using boost::bind; using boost::dynamic_pointer_cast; -SubtitleView::SubtitleView (wxWindow* parent, shared_ptr film, shared_ptr content, shared_ptr decoder, FilmViewer* viewer) - : wxDialog (parent, wxID_ANY, _("Subtitles"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) +CaptionView::CaptionView (wxWindow* parent, shared_ptr film, shared_ptr content, shared_ptr decoder, FilmViewer* viewer) + : wxDialog (parent, wxID_ANY, _("Captions"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) , _content (content) , _film_viewer (viewer) { @@ -61,7 +61,7 @@ SubtitleView::SubtitleView (wxWindow* parent, shared_ptr film, shared_ptr< { wxListItem ip; ip.SetId (2); - ip.SetText (_("Subtitle")); + ip.SetText (_("Caption")); ip.SetWidth (640); _list->InsertColumn (2, ip); } @@ -69,7 +69,7 @@ SubtitleView::SubtitleView (wxWindow* parent, shared_ptr film, shared_ptr< wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL); sizer->Add (_list, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_X_GAP); - _list->Bind (wxEVT_LIST_ITEM_SELECTED, boost::bind (&SubtitleView::subtitle_selected, this, _1)); + _list->Bind (wxEVT_LIST_ITEM_SELECTED, boost::bind (&CaptionView::subtitle_selected, this, _1)); wxSizer* buttons = CreateSeparatedButtonSizer (wxOK); if (buttons) { @@ -85,14 +85,14 @@ SubtitleView::SubtitleView (wxWindow* parent, shared_ptr film, shared_ptr< _subs = 0; _frc = film->active_frame_rate_change (content->position()); - decoder->caption->PlainStart.connect (bind (&SubtitleView::data_start, this, _1)); - decoder->caption->Stop.connect (bind (&SubtitleView::data_stop, this, _1)); + decoder->caption->PlainStart.connect (bind (&CaptionView::data_start, this, _1)); + decoder->caption->Stop.connect (bind (&CaptionView::data_stop, this, _1)); while (!decoder->pass ()) {} SetSizerAndFit (sizer); } void -SubtitleView::data_start (ContentTextCaption cts) +CaptionView::data_start (ContentTextCaption cts) { BOOST_FOREACH (dcp::SubtitleString const & i, cts.subs) { wxListItem list_item; @@ -108,7 +108,7 @@ SubtitleView::data_start (ContentTextCaption cts) } void -SubtitleView::data_stop (ContentTime time) +CaptionView::data_stop (ContentTime time) { if (!_last_count) { return; @@ -120,7 +120,7 @@ SubtitleView::data_stop (ContentTime time) } void -SubtitleView::subtitle_selected (wxListEvent& ev) +CaptionView::subtitle_selected (wxListEvent& ev) { if (!Config::instance()->jump_to_selected ()) { return; diff --git a/src/wx/subtitle_view.h b/src/wx/caption_view.h similarity index 87% rename from src/wx/subtitle_view.h rename to src/wx/caption_view.h index 445f646aa..34fec1905 100644 --- a/src/wx/subtitle_view.h +++ b/src/wx/caption_view.h @@ -26,10 +26,10 @@ class Decoder; class FilmViewer; -class SubtitleView : public wxDialog +class CaptionView : public wxDialog { public: - SubtitleView (wxWindow *, boost::shared_ptr, boost::shared_ptr content, boost::shared_ptr, FilmViewer* viewer); + CaptionView (wxWindow *, boost::shared_ptr, boost::shared_ptr content, boost::shared_ptr, FilmViewer* viewer); private: void data_start (ContentTextCaption cts); diff --git a/src/wx/wscript b/src/wx/wscript index b89ad5c49..ec75bd99c 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -1,5 +1,5 @@ # -# Copyright (C) 2012-2015 Carl Hetherington +# Copyright (C) 2012-2018 Carl Hetherington # # This file is part of DCP-o-matic. # @@ -34,6 +34,7 @@ sources = """ batch_job_view.cc caption_appearance_dialog.cc caption_panel.cc + caption_view.cc cinema_dialog.cc colour_conversion_editor.cc config_dialog.cc @@ -97,7 +98,6 @@ sources = """ self_dkdm_dialog.cc server_dialog.cc servers_list_dialog.cc - subtitle_view.cc system_font_dialog.cc table_dialog.cc templates_dialog.cc -- 2.30.2