X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsubtitle_panel.h;h=bcff995a0029a5ef223d5381113648aaef893fc0;hb=3e12c68dc0451e73b5bc1a84d1d70f4999f7b4b5;hp=20d7c40c2eb1d3eb1add4350a1b1482b3cbfc2a1;hpb=4ba8772aef261da209bbb882325fd61a8b479fd7;p=dcpomatic.git

diff --git a/src/wx/subtitle_panel.h b/src/wx/subtitle_panel.h
index 20d7c40c2..bcff995a0 100644
--- a/src/wx/subtitle_panel.h
+++ b/src/wx/subtitle_panel.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 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
@@ -17,32 +17,38 @@
 
 */
 
-#include "film_editor_panel.h"
+#include "content_sub_panel.h"
 
 class wxCheckBox;
 class wxSpinCtrl;
+class SubtitleView;
 
-class SubtitlePanel : public FilmEditorPanel
+class SubtitlePanel : public ContentSubPanel
 {
 public:
-	SubtitlePanel (FilmEditor *);
+	SubtitlePanel (ContentPanel *);
 
 	void film_changed (Film::Property);
 	void film_content_changed (int);
 	void content_selection_changed ();
 	
 private:
-	void with_subtitles_toggled ();
+	void use_toggled ();
 	void x_offset_changed ();
 	void y_offset_changed ();
-	void scale_changed ();
+	void x_scale_changed ();
+	void y_scale_changed ();
 	void stream_changed ();
+	void view_clicked ();
 
 	void setup_sensitivity ();
 	
-	wxCheckBox* _with_subtitles;
+	wxCheckBox* _use;
 	wxSpinCtrl* _x_offset;
 	wxSpinCtrl* _y_offset;
-	wxSpinCtrl* _scale;
+	wxSpinCtrl* _x_scale;
+	wxSpinCtrl* _y_scale;
 	wxChoice* _stream;
+	wxButton* _view_button;
+	SubtitleView* _view;
 };