projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
wx
/
subtitle_panel.h
diff --git
a/src/wx/subtitle_panel.h
b/src/wx/subtitle_panel.h
index c5665098bb2cc839f4c51bb0e6789455ea56ec81..bcff995a0029a5ef223d5381113648aaef893fc0 100644
(file)
--- a/
src/wx/subtitle_panel.h
+++ b/
src/wx/subtitle_panel.h
@@
-17,16
+17,16
@@
*/
*/
-#include "
film_editor
_panel.h"
+#include "
content_sub
_panel.h"
class wxCheckBox;
class wxSpinCtrl;
class SubtitleView;
class wxCheckBox;
class wxSpinCtrl;
class SubtitleView;
-class SubtitlePanel : public
FilmEditor
Panel
+class SubtitlePanel : public
ContentSub
Panel
{
public:
{
public:
- SubtitlePanel (
FilmEditor
*);
+ SubtitlePanel (
ContentPanel
*);
void film_changed (Film::Property);
void film_content_changed (int);
void film_changed (Film::Property);
void film_content_changed (int);
@@
-36,7
+36,8
@@
private:
void use_toggled ();
void x_offset_changed ();
void y_offset_changed ();
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 stream_changed ();
void view_clicked ();
@@
-45,7
+46,8
@@
private:
wxCheckBox* _use;
wxSpinCtrl* _x_offset;
wxSpinCtrl* _y_offset;
wxCheckBox* _use;
wxSpinCtrl* _x_offset;
wxSpinCtrl* _y_offset;
- wxSpinCtrl* _scale;
+ wxSpinCtrl* _x_scale;
+ wxSpinCtrl* _y_scale;
wxChoice* _stream;
wxButton* _view_button;
SubtitleView* _view;
wxChoice* _stream;
wxButton* _view_button;
SubtitleView* _view;