Use an enum for the effect in SubtitleContent.

[dcpomatic.git] / src / wx / subtitle_appearance_dialog.cc

diff --git a/src/wx/subtitle_appearance_dialog.cc b/src/wx/subtitle_appearance_dialog.cc
index 80b347587b16eb73f6d50620ca06352a0e01aa18..929bc6006b6c7e8dc2bec3d4ee3ece33f508d38b 100644 (file)
--- a/src/wx/subtitle_appearance_dialog.cc
+++ b/src/wx/subtitle_appearance_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -33,6 +33,7 @@ using std::map;
 using boost::shared_ptr;
 using boost::bind;
 using boost::dynamic_pointer_cast;
+using boost::optional;
 
 int const SubtitleAppearanceDialog::NONE = 0;
 int const SubtitleAppearanceDialog::OUTLINE = 1;
@@ -57,8 +58,14 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr
        int r = 0;
 
        add_label_to_sizer (_table, this, _("Colour"), true, wxGBPosition (r, 0));
-       _colour = new wxColourPickerCtrl (this, wxID_ANY);
-       _table->Add (_colour, wxGBPosition (r, 1));
+       {
+               wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+               _force_colour = new wxCheckBox (this, wxID_ANY, _("Set to"));
+               s->Add (_force_colour, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 8);
+               _colour = new wxColourPickerCtrl (this, wxID_ANY);
+               s->Add (_colour, 0, wxALIGN_CENTER_VERTICAL);
+               _table->Add (s, wxGBPosition (r, 1));
+       }
        ++r;
 
        add_label_to_sizer (_table, this, _("Effect"), true, wxGBPosition (r, 0));
@@ -67,8 +74,14 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr
        ++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));
+       {
+               wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+               _force_effect_colour = new wxCheckBox (this, wxID_ANY, _("Set to"));
+               s->Add (_force_effect_colour, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 8);
+               _effect_colour = new wxColourPickerCtrl (this, wxID_ANY);
+               s->Add (_effect_colour, 0, wxALIGN_CENTER_VERTICAL);
+               _table->Add (s, wxGBPosition (r, 1));
+       }
        ++r;
 
        add_label_to_sizer (_table, this, _("Outline width"), true, wxGBPosition (r, 0));
@@ -86,15 +99,15 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr
        _table->Add (_fade_out, wxGBPosition (r, 1));
        ++r;
 
-       wxScrolled<wxPanel>* colours_panel = new wxScrolled<wxPanel> (this);
-       colours_panel->EnableScrolling (false, true);
-       colours_panel->ShowScrollbars (wxSHOW_SB_NEVER, wxSHOW_SB_ALWAYS);
-       colours_panel->SetScrollRate (0, 16);
+       if (_stream) {
+               wxScrolled<wxPanel>* colours_panel = new wxScrolled<wxPanel> (this);
+               colours_panel->EnableScrolling (false, true);
+               colours_panel->ShowScrollbars (wxSHOW_SB_NEVER, wxSHOW_SB_ALWAYS);
+               colours_panel->SetScrollRate (0, 16);
 
-       wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-       table->AddGrowableCol (1, 1);
+               wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+               table->AddGrowableCol (1, 1);
 
-       if (_stream) {
                map<RGBA, RGBA> colours = _stream->colours ();
 
                wxStaticText* t = new wxStaticText (colours_panel, wxID_ANY, "");
@@ -135,21 +148,42 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr
        _effect->Append (_("Outline"));
        _effect->Append (_("Shadow"));;
 
-       _colour->SetColour (wxColour (_content->subtitle->colour().r, _content->subtitle->colour().g, _content->subtitle->colour().b));
-       if (_content->subtitle->outline()) {
+       optional<dcp::Colour> colour = _content->subtitle->colour();
+       if (colour) {
+               _force_colour->SetValue (true);
+               _colour->SetColour (wxColour (colour->r, colour->g, colour->b));
+       } else {
+               _force_colour->SetValue (false);
+               _colour->SetColour (wxColour (255, 255, 255));
+       }
+
+       switch (_content->subtitle->effect()) {
+       case dcp::NONE:
+               _effect->SetSelection (NONE);
+               break;
+       case dcp::BORDER:
                _effect->SetSelection (OUTLINE);
-       } else if (_content->subtitle->shadow()) {
+               break;
+       case dcp::SHADOW:
                _effect->SetSelection (SHADOW);
+               break;
+       }
+
+       optional<dcp::Colour> effect_colour = _content->subtitle->effect_colour();
+       if (effect_colour) {
+               _force_effect_colour->SetValue (true);
+               _effect_colour->SetColour (wxColour (effect_colour->r, effect_colour->g, effect_colour->b));
        } else {
-               _effect->SetSelection (NONE);
+               _force_effect_colour->SetValue (false);
+               _effect_colour->SetColour (wxColour (0, 0, 0));
        }
-       _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 ());
 
+       _force_colour->Bind (wxEVT_CHECKBOX, bind (&SubtitleAppearanceDialog::setup_sensitivity, this));
+       _force_effect_colour->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));
 
@@ -159,12 +193,29 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr
 void
 SubtitleAppearanceDialog::apply ()
 {
-       wxColour const c = _colour->GetColour ();
-       _content->subtitle->set_colour (dcp::Colour (c.Red(), c.Green(), c.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()));
+       if (_force_colour->GetValue ()) {
+               wxColour const c = _colour->GetColour ();
+               _content->subtitle->set_colour (dcp::Colour (c.Red(), c.Green(), c.Blue()));
+       } else {
+               _content->subtitle->unset_colour ();
+       }
+       switch (_effect->GetSelection()) {
+       case NONE:
+               _content->subtitle->set_effect (dcp::NONE);
+               break;
+       case OUTLINE:
+               _content->subtitle->set_effect (dcp::BORDER);
+               break;
+       case SHADOW:
+               _content->subtitle->set_effect (dcp::SHADOW);
+               break;
+       }
+       if (_force_effect_colour->GetValue ()) {
+               wxColour const ec = _effect_colour->GetColour ();
+               _content->subtitle->set_effect_colour (dcp::Colour (ec.Red(), ec.Green(), ec.Blue()));
+       } else {
+               _content->subtitle->unset_effect_colour ();
+       }
        _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 ());
@@ -192,7 +243,8 @@ SubtitleAppearanceDialog::restore ()
 void
 SubtitleAppearanceDialog::setup_sensitivity ()
 {
-       _effect_colour->Enable (_effect->GetSelection() != NONE);
+       _colour->Enable (_force_colour->GetValue ());
+       _effect_colour->Enable (_force_effect_colour->GetValue ());
 
        bool const can_outline_width = _effect->GetSelection() == OUTLINE && _content->subtitle->burn ();
        _outline_width->Enable (can_outline_width);