Rename SubtitleApperanceDialog -> TextSubtitleAppearanceDialog.

diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc
index 3024617e56de9ddff76006632a2bf7eb158d25ee..f02ad9bb70031a2c83ae3deefd7cddfcd73fcaad 100644 (file)
--- a/src/wx/subtitle_panel.cc
+++ b/src/wx/subtitle_panel.cc
@@ -23,7 +23,7 @@
 #include "subtitle_view.h"
 #include "content_panel.h"
 #include "fonts_dialog.h"
-#include "subtitle_appearance_dialog.h"
+#include "text_subtitle_appearance_dialog.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/text_subtitle_content.h"
 #include "lib/ffmpeg_subtitle_stream.h"
@@ -435,7 +435,7 @@ SubtitlePanel::appearance_dialog_clicked ()
        shared_ptr<TextSubtitleContent> sr = dynamic_pointer_cast<TextSubtitleContent> (c.front ());
        DCPOMATIC_ASSERT (sr);
 
-       SubtitleAppearanceDialog* d = new SubtitleAppearanceDialog (this, sr);
+       TextSubtitleAppearanceDialog* d = new TextSubtitleAppearanceDialog (this, sr);
        if (d->ShowModal () == wxID_OK) {
                d->apply ();
        }

diff --git a/src/wx/text_subtitle_appearance_dialog.cc b/src/wx/text_subtitle_appearance_dialog.cc
new file mode 100644 (file)
index 0000000..bdab2c6
--- /dev/null
+++ b/src/wx/text_subtitle_appearance_dialog.cc
@@ -0,0 +1,58 @@
+/*
+    Copyright (C) 2015-2016 Carl Hetherington <cth@carlh.net>
+
+    This program 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,
+    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.
+
+*/
+
+#include "text_subtitle_appearance_dialog.h"
+#include "lib/text_subtitle_content.h"
+#include <wx/wx.h>
+#include <wx/clrpicker.h>
+
+using boost::shared_ptr;
+
+TextSubtitleAppearanceDialog::TextSubtitleAppearanceDialog (wxWindow* parent, shared_ptr<TextSubtitleContent> content)
+       : TableDialog (parent, _("Subtitle appearance"), 2, 1, true)
+       , _content (content)
+{
+       add (_("Colour"), true);
+       _colour = new wxColourPickerCtrl (this, wxID_ANY);
+       add (_colour);
+
+       _outline = new wxCheckBox (this, wxID_ANY, _("Outline"));
+       add (_outline);
+       add_spacer ();
+
+       add (_("Outline colour"), true);
+       _outline_colour = new wxColourPickerCtrl (this, wxID_ANY);
+       add (_outline_colour);
+
+       layout ();
+
+       _colour->SetColour (wxColour (_content->colour().r, _content->colour().g, _content->colour().b));
+       _outline->SetValue (_content->outline ());
+       _outline_colour->SetColour (wxColour (_content->outline_colour().r, _content->outline_colour().g, _content->outline_colour().b));
+}
+
+void
+TextSubtitleAppearanceDialog::apply ()
+{
+       wxColour const c = _colour->GetColour ();
+       _content->set_colour (dcp::Colour (c.Red(), c.Green(), c.Blue()));
+       _content->set_outline (_outline->GetValue ());
+       wxColour const oc = _outline_colour->GetColour ();
+       _content->set_outline_colour (dcp::Colour (oc.Red(), oc.Green(), oc.Blue()));
+}

diff --git a/src/wx/text_subtitle_appearance_dialog.h b/src/wx/text_subtitle_appearance_dialog.h
new file mode 100644 (file)
index 0000000..3b74239
--- /dev/null
+++ b/src/wx/text_subtitle_appearance_dialog.h
@@ -0,0 +1,40 @@
+/*
+    Copyright (C) 2015-2016 Carl Hetherington <cth@carlh.net>
+
+    This program 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,
+    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.
+
+*/
+
+#include "table_dialog.h"
+#include <boost/shared_ptr.hpp>
+
+class wxCheckBox;
+class wxColourPickerCtrl;
+class TextSubtitleContent;
+
+class TextSubtitleAppearanceDialog : public TableDialog
+{
+public:
+       TextSubtitleAppearanceDialog (wxWindow* parent, boost::shared_ptr<TextSubtitleContent> content);
+
+       void apply ();
+
+private:
+       wxColourPickerCtrl* _colour;
+       wxCheckBox* _outline;
+       wxColourPickerCtrl* _outline_colour;
+
+       boost::shared_ptr<TextSubtitleContent> _content;
+};

diff --git a/src/wx/wscript b/src/wx/wscript
index 2198a401aaed6ea9937c998b1b1d4e12170f148b..c5c4d39ce0c1741587b078ef151ddc2cefc3b5b8 100644 (file)
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -73,11 +73,11 @@ sources = """
           self_dkdm_dialog.cc
           server_dialog.cc
           servers_list_dialog.cc
-          subtitle_appearance_dialog.cc
           subtitle_panel.cc
           subtitle_view.cc
           system_font_dialog.cc
           table_dialog.cc
+          text_subtitle_appearance_dialog.cc
           timecode.cc
           timeline.cc
           timeline_content_view.cc