Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

2 files changed, 86 insertions, 19 deletions

diff --git a/src/wx/text_subtitle_appearance_dialog.cc b/src/wx/text_subtitle_appearance_dialog.cc
index d00dd2cf1..6fc21bd6b 100644
--- a/src/wx/text_subtitle_appearance_dialog.cc
+++ b/src/wx/text_subtitle_appearance_dialog.cc
@@ -23,51 +23,91 @@
 #include "lib/subtitle_content.h"
 #include <wx/wx.h>
 #include <wx/clrpicker.h>
+#include <wx/spinctrl.h>
+#include <wx/gbsizer.h>
 
 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> content)
-	: TableDialog (parent, _("Subtitle appearance"), 2, 1, true)
+	: 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 (_("Effect"), true);
-	add (_effect = new wxChoice (this, wxID_ANY));
+	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 (_("Outline / shadow colour"), true);
+	add_label_to_sizer (_table, this, _("Effect colour"), true, wxGBPosition (r, 0));
 	_effect_colour = new wxColourPickerCtrl (this, wxID_ANY);
-	add (_effect_colour);
+	_table->Add (_effect_colour, wxGBPosition (r, 1));
+	++r;
 
-	add (_("Fade in time"), true);
+	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;
+
+	add_label_to_sizer (_table, this, _("Fade in time"), true, wxGBPosition (r, 0));
 	_fade_in = new Timecode<ContentTime> (this);
-	add (_fade_in);
+	_table->Add (_fade_in, wxGBPosition (r, 1));
+	++r;
 
-	add (_("Fade out time"), true);
+	add_label_to_sizer (_table, this, _("Fade out time"), true, wxGBPosition (r, 0));
 	_fade_out = new Timecode<ContentTime> (this);
-	add (_fade_out);
+	_table->Add (_fade_out, wxGBPosition (r, 1));
+	++r;
+
+	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
+	if (buttons) {
+		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
+	}
 
-	layout ();
+	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));
 	if (_content->subtitle->outline()) {
-		_effect->SetSelection (1);
+		_effect->SetSelection (OUTLINE);
 	} else if (_content->subtitle->shadow()) {
-		_effect->SetSelection (2);
+		_effect->SetSelection (SHADOW);
 	} else {
-		_effect->SetSelection (0);
+		_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_COMMAND_CHOICE_SELECTED, bind (&TextSubtitleAppearanceDialog::setup_sensitivity, this));
+	_content_connection = _content->Changed.connect (bind (&TextSubtitleAppearanceDialog::setup_sensitivity, this));
+
+	setup_sensitivity ();
 }
 
 void
@@ -75,10 +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 (_effect->GetSelection() == 1);
-	_content->subtitle->set_shadow (_effect->GetSelection() == 2);
+	_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"));
+	}
 }
diff --git a/src/wx/text_subtitle_appearance_dialog.h b/src/wx/text_subtitle_appearance_dialog.h
index 381b36ec7..10169fb50 100644
--- a/src/wx/text_subtitle_appearance_dialog.h
+++ b/src/wx/text_subtitle_appearance_dialog.h
@@ -18,15 +18,17 @@
 
 */
 
-#include "table_dialog.h"
 #include "timecode.h"
+#include <wx/wx.h>
 #include <boost/shared_ptr.hpp>
+#include <boost/signals2.hpp>
 
 class wxRadioButton;
 class wxColourPickerCtrl;
+class wxGridBagSizer;
 class Content;
 
-class TextSubtitleAppearanceDialog : public TableDialog
+class TextSubtitleAppearanceDialog : public wxDialog
 {
 public:
 	TextSubtitleAppearanceDialog (wxWindow* parent, boost::shared_ptr<Content> content);
@@ -34,11 +36,21 @@ public:
 	void apply ();
 
 private:
+	void setup_sensitivity ();
+
 	wxColourPickerCtrl* _colour;
 	wxChoice* _effect;
 	wxColourPickerCtrl* _effect_colour;
 	Timecode<ContentTime>* _fade_in;
 	Timecode<ContentTime>* _fade_out;
+	wxSpinCtrl* _outline_width;
+	wxGridBagSizer* _table;
 
 	boost::shared_ptr<Content> _content;
+
+	boost::signals2::scoped_connection _content_connection;
+
+	static int const NONE;
+	static int const OUTLINE;
+	static int const SHADOW;
 };