X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftext_panel.h;h=f35f39cbe340774aebe7aa0dd83439059ab74467;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=3d3483a465d36dfbc4fddc55058ea802f7fb6273;hpb=8484d278ec6905502bd1178cc58d8cb7b3c12df0;p=dcpomatic.git

diff --git a/src/wx/text_panel.h b/src/wx/text_panel.h
index 3d3483a46..f35f39cbe 100644
--- a/src/wx/text_panel.h
+++ b/src/wx/text_panel.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -24,6 +24,7 @@ class wxCheckBox;
 class wxSpinCtrl;
 class TextView;
 class FontsDialog;
+class SubtitleAnalysis;
 
 class TextPanel : public ContentSubPanel
 {
@@ -43,27 +44,52 @@ private:
 	void x_scale_changed ();
 	void y_scale_changed ();
 	void line_spacing_changed ();
-	void language_changed ();
+	void dcp_track_changed ();
 	void stream_changed ();
 	void text_view_clicked ();
 	void fonts_dialog_clicked ();
 	void reference_clicked ();
 	void appearance_dialog_clicked ();
+	void outline_subtitles_changed ();
 	TextType current_type () const;
+	void update_dcp_tracks ();
+	void update_dcp_track_selection ();
+	void add_to_grid ();
+	void try_to_load_analysis ();
+	void analysis_finished ();
 
 	void setup_sensitivity ();
+	void setup_visibility ();
+
+	void update_outline_subtitles_in_viewer ();
+	void clear_outline_subtitles ();
 
 	wxCheckBox* _reference;
 	wxStaticText* _reference_note;
+	wxCheckBox* _outline_subtitles;
 	wxCheckBox* _use;
 	wxChoice* _type;
 	wxCheckBox* _burn;
+	wxStaticText* _offset_label;
+	wxStaticText* _x_offset_label;
+	wxStaticText* _x_offset_pc_label;
+	wxStaticText* _y_offset_label;
+	wxStaticText* _y_offset_pc_label;
 	wxSpinCtrl* _x_offset;
 	wxSpinCtrl* _y_offset;
+	wxStaticText* _scale_label;
+	wxStaticText* _x_scale_label;
+	wxStaticText* _x_scale_pc_label;
+	wxStaticText* _y_scale_label;
+	wxStaticText* _y_scale_pc_label;
 	wxSpinCtrl* _x_scale;
 	wxSpinCtrl* _y_scale;
+	wxStaticText* _line_spacing_label;
+	wxStaticText* _line_spacing_pc_label;
 	wxSpinCtrl* _line_spacing;
-	wxTextCtrl* _language;
+	wxStaticText* _dcp_track_label;
+	wxChoice* _dcp_track;
+	wxStaticText* _stream_label;
 	wxChoice* _stream;
 	wxButton* _text_view_button;
 	TextView* _text_view;
@@ -71,4 +97,12 @@ private:
 	FontsDialog* _fonts_dialog;
 	wxButton* _appearance_dialog_button;
 	TextType _original_type;
+
+	int _outline_subtitles_row;
+	int _ccap_track_row;
+
+	std::weak_ptr<Content> _analysis_content;
+	boost::signals2::scoped_connection _analysis_finished_connection;
+	std::shared_ptr<SubtitleAnalysis> _analysis;
+	bool _loading_analysis;
 };