X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsubtitle_appearance_dialog.h;h=6c7e468178dc638c2fd0e742e4a4fedef5530dbf;hb=c0d9ec5d4c7a75448ec36501c2764073b1f12116;hp=80ef584704a17e2f3453aedc3ccca6ec90e55a25;hpb=6c7489e5d778d3e71065d88a094a7383ba2c117d;p=dcpomatic.git

diff --git a/src/wx/subtitle_appearance_dialog.h b/src/wx/subtitle_appearance_dialog.h
index 80ef58470..6c7e46817 100644
--- a/src/wx/subtitle_appearance_dialog.h
+++ b/src/wx/subtitle_appearance_dialog.h
@@ -32,11 +32,13 @@ class RGBAColourPicker;
 class FFmpegSubtitleStream;
 class wxCheckBox;
 class wxWidget;
+class Film;
+class Job;
 
 class SubtitleAppearanceDialog : public wxDialog
 {
 public:
-	SubtitleAppearanceDialog (wxWindow* parent, boost::shared_ptr<Content> content, boost::shared_ptr<TextContent> caption);
+	SubtitleAppearanceDialog (wxWindow* parent, boost::shared_ptr<const Film> film, boost::shared_ptr<Content> content, boost::shared_ptr<TextContent> caption);
 
 	void apply ();
 
@@ -45,7 +47,10 @@ private:
 	void restore ();
 	wxCheckBox* set_to (wxWindow* w, int& r);
 	void content_change (ChangeType type);
+	void active_jobs_changed (boost::optional<std::string> last);
+	void add_colours ();
 
+	boost::weak_ptr<const Film> _film;
 	wxCheckBox* _force_colour;
 	wxColourPickerCtrl* _colour;
 	wxCheckBox* _force_effect;
@@ -53,18 +58,26 @@ private:
 	wxCheckBox* _force_effect_colour;
 	wxColourPickerCtrl* _effect_colour;
 	wxCheckBox* _force_fade_in;
-	Timecode<ContentTime>* _fade_in;
+	Timecode<dcpomatic::ContentTime>* _fade_in;
 	wxCheckBox* _force_fade_out;
-	Timecode<ContentTime>* _fade_out;
+	Timecode<dcpomatic::ContentTime>* _fade_out;
 	wxSpinCtrl* _outline_width;
 	wxGridBagSizer* _table;
 	std::map<RGBA, RGBAColourPicker*> _pickers;
 
+	wxBoxSizer* _overall_sizer;
+	wxScrolled<wxPanel>* _colours_panel;
+	wxStaticText* _finding;
+	wxFlexGridSizer* _colour_table;
+
 	boost::shared_ptr<Content> _content;
 	boost::shared_ptr<TextContent> _caption;
 	boost::shared_ptr<FFmpegSubtitleStream> _stream;
 
 	boost::signals2::scoped_connection _content_connection;
+	boost::signals2::scoped_connection _job_manager_connection;
+
+	boost::weak_ptr<Job> _job;
 
 	static int const NONE;
 	static int const OUTLINE;