swaroop: fix up restart-after-crash.

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

diff --git a/src/wx/text_panel.cc b/src/wx/text_panel.cc
index 350dddc0dffe9d5b2d6952673c76735b4a6f7994..ed49d8484d4575cfb534201f82701ed7472948b6 100644 (file)
--- a/src/wx/text_panel.cc
+++ b/src/wx/text_panel.cc
@@ -26,6 +26,9 @@
 #include "fonts_dialog.h"
 #include "dcp_text_track_dialog.h"
 #include "subtitle_appearance_dialog.h"
+#include "static_text.h"
+#include "check_box.h"
+#include "dcpomatic_button.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/string_text_file_content.h"
 #include "lib/ffmpeg_subtitle_stream.h"
@@ -58,40 +61,40 @@ TextPanel::TextPanel (ContentPanel* p, TextType t)
                refer = _("Use this DCP's closed caption as OV and make VF");
        }
 
-       _reference = new wxCheckBox (this, wxID_ANY, refer);
-       _reference_note = new wxStaticText (this, wxID_ANY, wxT(""));
+       _reference = new CheckBox (this, refer);
+       _reference_note = new StaticText (this, wxT(""));
        _reference_note->Wrap (200);
        wxFont font = _reference_note->GetFont();
        font.SetStyle(wxFONTSTYLE_ITALIC);
        font.SetPointSize(font.GetPointSize() - 1);
        _reference_note->SetFont(font);
 
-       _use = new wxCheckBox (this, wxID_ANY, _("Use as"));
+       _use = new CheckBox (this, _("Use as"));
        _type = new wxChoice (this, wxID_ANY);
        _type->Append (_("open subtitles"));
        _type->Append (_("closed captions"));
 
-       _burn = new wxCheckBox (this, wxID_ANY, _("Burn subtitles into image"));
+       _burn = new CheckBox (this, _("Burn subtitles into image"));
 
        _offset_label = create_label (this, _("Offset"), true);
        _x_offset_label = create_label (this, _("X"), true);
        _x_offset = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(64, -1));
-       _x_offset_pc_label = new wxStaticText (this, wxID_ANY, _("%"));
+       _x_offset_pc_label = new StaticText (this, _("%"));
        _y_offset_label = create_label (this, _("Y"), true);
        _y_offset = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(64, -1));
-       _y_offset_pc_label = new wxStaticText (this, wxID_ANY, _("%"));
+       _y_offset_pc_label = new StaticText (this, _("%"));
 
        _scale_label = create_label (this, _("Scale"), true);
        _x_scale_label = create_label (this, _("X"), true);
        _x_scale = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(64, -1));
-       _x_scale_pc_label = new wxStaticText (this, wxID_ANY, _("%"));
+       _x_scale_pc_label = new StaticText (this, _("%"));
        _y_scale_label = create_label (this, _("Y"), true);
        _y_scale = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(64, -1));
-       _y_scale_pc_label = new wxStaticText (this, wxID_ANY, _("%"));
+       _y_scale_pc_label = new StaticText (this, _("%"));
 
        _line_spacing_label = create_label (this, _("Line spacing"), true);
        _line_spacing = new wxSpinCtrl (this);
-       _line_spacing_pc_label = new wxStaticText (this, wxID_ANY, _("%"));
+       _line_spacing_pc_label = new StaticText (this, _("%"));
 
        _dcp_track_label = create_label (this, _("DCP track"), true);
        _dcp_track = new wxChoice (this, wxID_ANY);
@@ -102,9 +105,9 @@ TextPanel::TextPanel (ContentPanel* p, TextType t)
        _stream_label = create_label (this, _("Stream"), true);
        _stream = new wxChoice (this, wxID_ANY);
 
-       _text_view_button = new wxButton (this, wxID_ANY, _("View..."));
-       _fonts_dialog_button = new wxButton (this, wxID_ANY, _("Fonts..."));
-       _appearance_dialog_button = new wxButton (this, wxID_ANY, _("Appearance..."));
+       _text_view_button = new Button (this, _("View..."));
+       _fonts_dialog_button = new Button (this, _("Fonts..."));
+       _appearance_dialog_button = new Button (this, _("Appearance..."));
 
        _x_offset->SetRange (-100, 100);
        _y_offset->SetRange (-100, 100);
@@ -457,7 +460,7 @@ TextPanel::setup_sensitivity ()
        }
 
        string why_not;
-       bool const can_reference = dcp && dcp->can_reference_text (_original_type, why_not);
+       bool const can_reference = dcp && dcp->can_reference_text (_parent->film(), _original_type, why_not);
        setup_refer_button (_reference, _reference_note, dcp, can_reference, why_not);
 
        bool const reference = _reference->GetValue ();
@@ -582,7 +585,7 @@ TextPanel::text_view_clicked ()
        ContentList c = _parent->selected_text ();
        DCPOMATIC_ASSERT (c.size() == 1);
 
-       shared_ptr<Decoder> decoder = decoder_factory (c.front(), _parent->film()->log(), false);
+       shared_ptr<Decoder> decoder = decoder_factory (_parent->film(), c.front(), false);
 
        if (decoder) {
                _text_view = new TextView (this, _parent->film(), c.front(), c.front()->text_of_original_type(_original_type), decoder, _parent->film_viewer());
@@ -627,7 +630,7 @@ TextPanel::appearance_dialog_clicked ()
        ContentList c = _parent->selected_text ();
        DCPOMATIC_ASSERT (c.size() == 1);
 
-       SubtitleAppearanceDialog* d = new SubtitleAppearanceDialog (this, c.front(), c.front()->text_of_original_type(_original_type));
+       SubtitleAppearanceDialog* d = new SubtitleAppearanceDialog (this, _parent->film(), c.front(), c.front()->text_of_original_type(_original_type));
        if (d->ShowModal () == wxID_OK) {
                d->apply ();
        }