X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsubtitle_appearance_dialog.cc;h=8ae99bc73afa4092063780ea10384144ead40eb5;hb=66ce3b83877b3d7b95f6cd424fc9516e0bf79aa9;hp=80b347587b16eb73f6d50620ca06352a0e01aa18;hpb=f9495d05657dc1a163cf195bd839e3497fb30b33;p=dcpomatic.git

diff --git a/src/wx/subtitle_appearance_dialog.cc b/src/wx/subtitle_appearance_dialog.cc
index 80b347587..8ae99bc73 100644
--- 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,19 +58,13 @@ 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));
-	++r;
+	_force_colour = set_to (_colour = new wxColourPickerCtrl (this, wxID_ANY), 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;
+	_force_effect = set_to (_effect = new wxChoice (this, wxID_ANY), 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;
+	_force_effect_colour = set_to (_effect_colour = new wxColourPickerCtrl (this, wxID_ANY), r);
 
 	add_label_to_sizer (_table, this, _("Outline width"), true, wxGBPosition (r, 0));
 	_outline_width = new wxSpinCtrl (this, wxID_ANY);
@@ -77,24 +72,20 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr
 	++r;
 
 	add_label_to_sizer (_table, this, _("Fade in time"), true, wxGBPosition (r, 0));
-	_fade_in = new Timecode<ContentTime> (this);
-	_table->Add (_fade_in, wxGBPosition (r, 1));
-	++r;
+	_force_fade_in = set_to (_fade_in = new Timecode<ContentTime> (this), r);
 
 	add_label_to_sizer (_table, this, _("Fade out time"), true, wxGBPosition (r, 0));
-	_fade_out = new Timecode<ContentTime> (this);
-	_table->Add (_fade_out, wxGBPosition (r, 1));
-	++r;
+	_force_fade_out = set_to (_fade_out = new Timecode<ContentTime> (this), 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,38 +126,117 @@ 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()) {
-		_effect->SetSelection (OUTLINE);
-	} else if (_content->subtitle->shadow()) {
-		_effect->SetSelection (SHADOW);
+	optional<dcp::Colour> colour = _content->subtitle->colour();
+	_force_colour->SetValue (static_cast<bool>(colour));
+	if (colour) {
+		_colour->SetColour (wxColour (colour->r, colour->g, colour->b));
+	} else {
+		_colour->SetColour (wxColour (255, 255, 255));
+	}
+
+	optional<dcp::Effect> effect = _content->subtitle->effect();
+	_force_effect->SetValue (static_cast<bool>(effect));
+	if (effect) {
+		switch (*effect) {
+		case dcp::NONE:
+			_effect->SetSelection (NONE);
+			break;
+		case dcp::BORDER:
+			_effect->SetSelection (OUTLINE);
+			break;
+		case dcp::SHADOW:
+			_effect->SetSelection (SHADOW);
+			break;
+		}
 	} 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 ());
+
+	optional<dcp::Colour> effect_colour = _content->subtitle->effect_colour();
+	_force_effect_colour->SetValue (static_cast<bool>(effect_colour));
+	if (effect_colour) {
+		_effect_colour->SetColour (wxColour (effect_colour->r, effect_colour->g, effect_colour->b));
+	} else {
+		_effect_colour->SetColour (wxColour (0, 0, 0));
+	}
+
+	optional<ContentTime> fade_in = _content->subtitle->fade_in();
+	_force_fade_in->SetValue (static_cast<bool>(fade_in));
+	if (fade_in) {
+		_fade_in->set (*fade_in, _content->active_video_frame_rate());
+	} else {
+		_fade_in->set (ContentTime(), _content->active_video_frame_rate());
+	}
+
+	optional<ContentTime> fade_out = _content->subtitle->fade_out();
+	_force_fade_out->SetValue (static_cast<bool>(fade_out));
+	if (fade_out) {
+		_fade_out->set (*fade_out, _content->active_video_frame_rate ());
+	} else {
+		_fade_out->set (ContentTime(), _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));
+	_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));
 
 	setup_sensitivity ();
 }
 
+wxCheckBox*
+SubtitleAppearanceDialog::set_to (wxWindow* w, int& r)
+{
+	wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+	wxCheckBox* set_to = new wxCheckBox (this, wxID_ANY, _("Set to"));
+	s->Add (set_to, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 8);
+	s->Add (w, 0, wxALIGN_CENTER_VERTICAL);
+	_table->Add (s, wxGBPosition (r, 1));
+	++r;
+	return set_to;
+}
+
 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()));
-	_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 ()));
+	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 ();
+	}
+	if (_force_fade_in->GetValue ()) {
+		_content->subtitle->set_fade_in (_fade_in->get (_content->active_video_frame_rate ()));
+	} else {
+		_content->subtitle->unset_fade_in ();
+	}
+	if (_force_fade_out->GetValue ()) {
+		_content->subtitle->set_fade_out (_fade_out->get (_content->active_video_frame_rate ()));
+	} else {
+		_content->subtitle->unset_fade_out ();
+	}
 	_content->subtitle->set_outline_width (_outline_width->GetValue ());
 
 	if (_stream) {
@@ -192,7 +262,11 @@ SubtitleAppearanceDialog::restore ()
 void
 SubtitleAppearanceDialog::setup_sensitivity ()
 {
-	_effect_colour->Enable (_effect->GetSelection() != NONE);
+	_colour->Enable (_force_colour->GetValue ());
+	_effect_colour->Enable (_force_effect_colour->GetValue ());
+	_effect->Enable (_force_effect->GetValue ());
+	_fade_in->Enable (_force_fade_in->GetValue ());
+	_fade_out->Enable (_force_fade_out->GetValue ());
 
 	bool const can_outline_width = _effect->GetSelection() == OUTLINE && _content->subtitle->burn ();
 	_outline_width->Enable (can_outline_width);