Remove all use of stringstream in an attempt to fix

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

diff --git a/src/wx/text_subtitle_appearance_dialog.cc b/src/wx/text_subtitle_appearance_dialog.cc
index 63df4fc2066f67d5cca263842dd001c8bdb7058d..a826cbc6689f0705ab2d932595726bfa5811444e 100644 (file)
--- 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 <cth@carlh.net>
 
-    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 <http://www.gnu.org/licenses/>.
 
 */
 
@@ -25,7 +26,7 @@
 
 using boost::shared_ptr;
 
-TextSubtitleAppearanceDialog::TextSubtitleAppearanceDialog (wxWindow* parent, shared_ptr<TextSubtitleContent> content)
+TextSubtitleAppearanceDialog::TextSubtitleAppearanceDialog (wxWindow* parent, shared_ptr<SubtitleContent> content)
        : TableDialog (parent, _("Subtitle appearance"), 2, 1, true)
        , _content (content)
 {
@@ -33,20 +34,29 @@ TextSubtitleAppearanceDialog::TextSubtitleAppearanceDialog (wxWindow* parent, sh
        _colour = new wxColourPickerCtrl (this, wxID_ANY);
        add (_colour);
 
-       _outline = new wxCheckBox (this, wxID_ANY, _("Outline"));
+       wxRadioButton* no_effect = new wxRadioButton (this, wxID_ANY, _("No effect"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
+       add (no_effect);
+       add_spacer ();
+
+       _outline = new wxRadioButton (this, wxID_ANY, _("Outline"));
        add (_outline);
        add_spacer ();
 
-       add (_("Outline colour"), true);
-       _outline_colour = new wxColourPickerCtrl (this, wxID_ANY);
-       add (_outline_colour);
+       _shadow = new wxRadioButton (this, wxID_ANY, _("Shadow"));
+       add (_shadow);
+       add_spacer ();
+
+       add (_("Outline / shadow colour"), true);
+       _effect_colour = new wxColourPickerCtrl (this, wxID_ANY);
+       add (_effect_colour);
 
        layout ();
 
-       _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)
+       _colour->SetColour (wxColour (_content->colour().r, _content->colour().g, _content->colour().b));
+       _outline->SetValue (_content->outline ());
+       _shadow->SetValue (_content->shadow ());
+       _effect_colour->SetColour (
+               wxColour (_content->effect_colour().r, _content->effect_colour().g, _content->effect_colour().b)
                );
 }
 
@@ -54,8 +64,9 @@ void
 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->set_colour (dcp::Colour (c.Red(), c.Green(), c.Blue()));
+       _content->set_outline (_outline->GetValue ());
+       _content->set_shadow (_shadow->GetValue ());
+       wxColour const ec = _effect_colour->GetColour ();
+       _content->set_effect_colour (dcp::Colour (ec.Red(), ec.Green(), ec.Blue()));
 }