From 7c930c4d6668bc8d9d5c5ae20208de8dee50f389 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 19 Jul 2018 22:47:38 +0100 Subject: [PATCH] Rename subtitle appearance dialogue. --- ...dialog.cc => caption_appearance_dialog.cc} | 36 +++++++++---------- ...e_dialog.h => caption_appearance_dialog.h} | 4 +-- src/wx/caption_panel.cc | 4 +-- src/wx/wscript | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) rename src/wx/{subtitle_appearance_dialog.cc => caption_appearance_dialog.cc} (87%) rename src/wx/{subtitle_appearance_dialog.h => caption_appearance_dialog.h} (93%) diff --git a/src/wx/subtitle_appearance_dialog.cc b/src/wx/caption_appearance_dialog.cc similarity index 87% rename from src/wx/subtitle_appearance_dialog.cc rename to src/wx/caption_appearance_dialog.cc index c0a6a0df6..9377fa6ef 100644 --- a/src/wx/subtitle_appearance_dialog.cc +++ b/src/wx/caption_appearance_dialog.cc @@ -18,7 +18,7 @@ */ -#include "subtitle_appearance_dialog.h" +#include "caption_appearance_dialog.h" #include "rgba_colour_picker.h" #include "lib/text_caption_file_content.h" #include "lib/caption_content.h" @@ -35,12 +35,12 @@ using boost::bind; using boost::dynamic_pointer_cast; using boost::optional; -int const SubtitleAppearanceDialog::NONE = 0; -int const SubtitleAppearanceDialog::OUTLINE = 1; -int const SubtitleAppearanceDialog::SHADOW = 2; +int const CaptionAppearanceDialog::NONE = 0; +int const CaptionAppearanceDialog::OUTLINE = 1; +int const CaptionAppearanceDialog::SHADOW = 2; -SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr content) - : wxDialog (parent, wxID_ANY, _("Subtitle appearance")) +CaptionAppearanceDialog::CaptionAppearanceDialog (wxWindow* parent, shared_ptr content) + : wxDialog (parent, wxID_ANY, _("Caption appearance")) , _content (content) { shared_ptr ff = dynamic_pointer_cast (content); @@ -109,7 +109,7 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr overall_sizer->Add (colours_panel, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER); wxButton* restore = new wxButton (this, wxID_ANY, _("Restore to original colours")); - restore->Bind (wxEVT_BUTTON, bind (&SubtitleAppearanceDialog::restore, this)); + restore->Bind (wxEVT_BUTTON, bind (&CaptionAppearanceDialog::restore, this)); overall_sizer->Add (restore, 0, wxALL, DCPOMATIC_SIZER_X_GAP); } @@ -178,19 +178,19 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr _outline_width->SetValue (_content->caption->outline_width ()); - _force_colour->Bind (wxEVT_CHECKBOX, bind (&SubtitleAppearanceDialog::setup_sensitivity, this)); - _force_effect_colour->Bind (wxEVT_CHECKBOX, bind (&SubtitleAppearanceDialog::setup_sensitivity, this)); - _force_effect->Bind (wxEVT_CHECKBOX, bind (&SubtitleAppearanceDialog::setup_sensitivity, this)); - _force_fade_in->Bind (wxEVT_CHECKBOX, bind (&SubtitleAppearanceDialog::setup_sensitivity, this)); - _force_fade_out->Bind (wxEVT_CHECKBOX, bind (&SubtitleAppearanceDialog::setup_sensitivity, this)); - _effect->Bind (wxEVT_CHOICE, bind (&SubtitleAppearanceDialog::setup_sensitivity, this)); - _content_connection = _content->Changed.connect (bind (&SubtitleAppearanceDialog::setup_sensitivity, this)); + _force_colour->Bind (wxEVT_CHECKBOX, bind (&CaptionAppearanceDialog::setup_sensitivity, this)); + _force_effect_colour->Bind (wxEVT_CHECKBOX, bind (&CaptionAppearanceDialog::setup_sensitivity, this)); + _force_effect->Bind (wxEVT_CHECKBOX, bind (&CaptionAppearanceDialog::setup_sensitivity, this)); + _force_fade_in->Bind (wxEVT_CHECKBOX, bind (&CaptionAppearanceDialog::setup_sensitivity, this)); + _force_fade_out->Bind (wxEVT_CHECKBOX, bind (&CaptionAppearanceDialog::setup_sensitivity, this)); + _effect->Bind (wxEVT_CHOICE, bind (&CaptionAppearanceDialog::setup_sensitivity, this)); + _content_connection = _content->Changed.connect (bind (&CaptionAppearanceDialog::setup_sensitivity, this)); setup_sensitivity (); } wxCheckBox* -SubtitleAppearanceDialog::set_to (wxWindow* w, int& r) +CaptionAppearanceDialog::set_to (wxWindow* w, int& r) { wxSizer* s = new wxBoxSizer (wxHORIZONTAL); wxCheckBox* set_to = new wxCheckBox (this, wxID_ANY, _("Set to")); @@ -202,7 +202,7 @@ SubtitleAppearanceDialog::set_to (wxWindow* w, int& r) } void -SubtitleAppearanceDialog::apply () +CaptionAppearanceDialog::apply () { if (_force_colour->GetValue ()) { wxColour const c = _colour->GetColour (); @@ -256,7 +256,7 @@ SubtitleAppearanceDialog::apply () } void -SubtitleAppearanceDialog::restore () +CaptionAppearanceDialog::restore () { for (map::const_iterator i = _pickers.begin(); i != _pickers.end(); ++i) { i->second->set (i->first); @@ -264,7 +264,7 @@ SubtitleAppearanceDialog::restore () } void -SubtitleAppearanceDialog::setup_sensitivity () +CaptionAppearanceDialog::setup_sensitivity () { _colour->Enable (_force_colour->GetValue ()); _effect_colour->Enable (_force_effect_colour->GetValue ()); diff --git a/src/wx/subtitle_appearance_dialog.h b/src/wx/caption_appearance_dialog.h similarity index 93% rename from src/wx/subtitle_appearance_dialog.h rename to src/wx/caption_appearance_dialog.h index a1a3128fe..ebb70047e 100644 --- a/src/wx/subtitle_appearance_dialog.h +++ b/src/wx/caption_appearance_dialog.h @@ -33,10 +33,10 @@ class FFmpegSubtitleStream; class wxCheckBox; class wxWidget; -class SubtitleAppearanceDialog : public wxDialog +class CaptionAppearanceDialog : public wxDialog { public: - SubtitleAppearanceDialog (wxWindow* parent, boost::shared_ptr content); + CaptionAppearanceDialog (wxWindow* parent, boost::shared_ptr content); void apply (); diff --git a/src/wx/caption_panel.cc b/src/wx/caption_panel.cc index c70a9ad8c..64d9bee4a 100644 --- a/src/wx/caption_panel.cc +++ b/src/wx/caption_panel.cc @@ -24,7 +24,7 @@ #include "subtitle_view.h" #include "content_panel.h" #include "fonts_dialog.h" -#include "subtitle_appearance_dialog.h" +#include "caption_appearance_dialog.h" #include "lib/ffmpeg_content.h" #include "lib/text_caption_file_content.h" #include "lib/ffmpeg_subtitle_stream.h" @@ -491,7 +491,7 @@ CaptionPanel::appearance_dialog_clicked () ContentList c = _parent->selected_subtitle (); DCPOMATIC_ASSERT (c.size() == 1); - SubtitleAppearanceDialog* d = new SubtitleAppearanceDialog (this, c.front()); + CaptionAppearanceDialog* d = new CaptionAppearanceDialog (this, c.front()); if (d->ShowModal () == wxID_OK) { d->apply (); } diff --git a/src/wx/wscript b/src/wx/wscript index 4eded300d..b89ad5c49 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -32,6 +32,7 @@ sources = """ audio_panel.cc audio_plot.cc batch_job_view.cc + caption_appearance_dialog.cc caption_panel.cc cinema_dialog.cc colour_conversion_editor.cc @@ -96,7 +97,6 @@ sources = """ self_dkdm_dialog.cc server_dialog.cc servers_list_dialog.cc - subtitle_appearance_dialog.cc subtitle_view.cc system_font_dialog.cc table_dialog.cc -- 2.30.2