X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ftext_subtitle_appearance_dialog.cc;h=6f47d66ebf4d4e6fe37ad984b34e1c49f06aa3cb;hp=63df4fc2066f67d5cca263842dd001c8bdb7058d;hb=ad5c8849fc3ef5aad88201f28db5474a60db4436;hpb=775ae0e37bbec115d742feade0adc614a9a2301c diff --git a/src/wx/text_subtitle_appearance_dialog.cc b/src/wx/text_subtitle_appearance_dialog.cc index 63df4fc20..6f47d66eb 100644 --- a/src/wx/text_subtitle_appearance_dialog.cc +++ b/src/wx/text_subtitle_appearance_dialog.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2015-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -22,32 +23,91 @@ #include "lib/subtitle_content.h" #include #include +#include +#include using boost::shared_ptr; +using boost::bind; + +int const TextSubtitleAppearanceDialog::NONE = 0; +int const TextSubtitleAppearanceDialog::OUTLINE = 1; +int const TextSubtitleAppearanceDialog::SHADOW = 2; -TextSubtitleAppearanceDialog::TextSubtitleAppearanceDialog (wxWindow* parent, shared_ptr content) - : TableDialog (parent, _("Subtitle appearance"), 2, 1, true) +TextSubtitleAppearanceDialog::TextSubtitleAppearanceDialog (wxWindow* parent, shared_ptr content) + : wxDialog (parent, wxID_ANY, _("Subtitle appearance")) , _content (content) { - add (_("Colour"), true); + wxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL); + SetSizer (overall_sizer); + + _table = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + + overall_sizer->Add (_table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER); + + int r = 0; + + add_label_to_sizer (_table, this, _("Colour"), true, wxGBPosition (r, 0)); _colour = new wxColourPickerCtrl (this, wxID_ANY); - add (_colour); + _table->Add (_colour, wxGBPosition (r, 1)); + ++r; + + add_label_to_sizer (_table, this, _("Effect"), true, wxGBPosition (r, 0)); + _effect = new wxChoice (this, wxID_ANY); + _table->Add (_effect, wxGBPosition (r, 1)); + ++r; + + add_label_to_sizer (_table, this, _("Effect colour"), true, wxGBPosition (r, 0)); + _effect_colour = new wxColourPickerCtrl (this, wxID_ANY); + _table->Add (_effect_colour, wxGBPosition (r, 1)); + ++r; + + add_label_to_sizer (_table, this, _("Outline width"), true, wxGBPosition (r, 0)); + _outline_width = new wxSpinCtrl (this, wxID_ANY); + _table->Add (_outline_width, wxGBPosition (r, 1)); + ++r; - _outline = new wxCheckBox (this, wxID_ANY, _("Outline")); - add (_outline); - add_spacer (); + add_label_to_sizer (_table, this, _("Fade in time"), true, wxGBPosition (r, 0)); + _fade_in = new Timecode (this); + _table->Add (_fade_in, wxGBPosition (r, 1)); + ++r; - add (_("Outline colour"), true); - _outline_colour = new wxColourPickerCtrl (this, wxID_ANY); - add (_outline_colour); + add_label_to_sizer (_table, this, _("Fade out time"), true, wxGBPosition (r, 0)); + _fade_out = new Timecode (this); + _table->Add (_fade_out, wxGBPosition (r, 1)); + ++r; - layout (); + wxSizer* buttons = CreateSeparatedButtonSizer (wxOK); + if (buttons) { + overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder()); + } + + overall_sizer->Layout (); + overall_sizer->SetSizeHints (this); + + /* Keep these Appends() up to date with NONE/OUTLINE/SHADOW variables */ + _effect->Append (_("None")); + _effect->Append (_("Outline")); + _effect->Append (_("Shadow"));; _colour->SetColour (wxColour (_content->subtitle->colour().r, _content->subtitle->colour().g, _content->subtitle->colour().b)); - _outline->SetValue (_content->subtitle->outline ()); - _outline_colour->SetColour ( - wxColour (_content->subtitle->outline_colour().r, _content->subtitle->outline_colour().g, _content->subtitle->outline_colour().b) + if (_content->subtitle->outline()) { + _effect->SetSelection (OUTLINE); + } else if (_content->subtitle->shadow()) { + _effect->SetSelection (SHADOW); + } else { + _effect->SetSelection (NONE); + } + _effect_colour->SetColour ( + wxColour (_content->subtitle->effect_colour().r, _content->subtitle->effect_colour().g, _content->subtitle->effect_colour().b) ); + _fade_in->set (_content->subtitle->fade_in(), _content->active_video_frame_rate ()); + _fade_out->set (_content->subtitle->fade_out(), _content->active_video_frame_rate ()); + _outline_width->SetValue (_content->subtitle->outline_width ()); + + _effect->Bind (wxEVT_CHOICE, bind (&TextSubtitleAppearanceDialog::setup_sensitivity, this)); + _content_connection = _content->Changed.connect (bind (&TextSubtitleAppearanceDialog::setup_sensitivity, this)); + + setup_sensitivity (); } void @@ -55,7 +115,25 @@ TextSubtitleAppearanceDialog::apply () { wxColour const c = _colour->GetColour (); _content->subtitle->set_colour (dcp::Colour (c.Red(), c.Green(), c.Blue())); - _content->subtitle->set_outline (_outline->GetValue ()); - wxColour const oc = _outline_colour->GetColour (); - _content->subtitle->set_outline_colour (dcp::Colour (oc.Red(), oc.Green(), oc.Blue())); + _content->subtitle->set_outline (_effect->GetSelection() == OUTLINE); + _content->subtitle->set_shadow (_effect->GetSelection() == SHADOW); + wxColour const ec = _effect_colour->GetColour (); + _content->subtitle->set_effect_colour (dcp::Colour (ec.Red(), ec.Green(), ec.Blue())); + _content->subtitle->set_fade_in (_fade_in->get (_content->active_video_frame_rate ())); + _content->subtitle->set_fade_out (_fade_out->get (_content->active_video_frame_rate ())); + _content->subtitle->set_outline_width (_outline_width->GetValue ()); +} + +void +TextSubtitleAppearanceDialog::setup_sensitivity () +{ + _effect_colour->Enable (_effect->GetSelection() != NONE); + + bool const can_outline_width = _effect->GetSelection() == OUTLINE && _content->subtitle->burn (); + _outline_width->Enable (can_outline_width); + if (can_outline_width) { + _outline_width->UnsetToolTip (); + } else { + _outline_width->SetToolTip (_("Outline width cannot be set unless you are burning in subtitles")); + } }