projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hand-apply a2f776bd239ef1a744c1a9fea841ac0a51c4f33b from master; more deflickering.
[dcpomatic.git]
/
src
/
wx
/
subtitle_panel.h
diff --git
a/src/wx/subtitle_panel.h
b/src/wx/subtitle_panel.h
index 3f795189593dba1972715760686d4149c7b7db48..ef94adb5468ca959457aa5722e97e6c10ee43f09 100644
(file)
--- a/
src/wx/subtitle_panel.h
+++ b/
src/wx/subtitle_panel.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-201
3
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
4
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
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,30
+17,44
@@
*/
*/
-#include "
film_editor
_panel.h"
+#include "
content_sub
_panel.h"
class wxCheckBox;
class wxSpinCtrl;
class wxCheckBox;
class wxSpinCtrl;
+class SubtitleView;
+class FontsDialog;
-class SubtitlePanel : public
FilmEditor
Panel
+class SubtitlePanel : public
ContentSub
Panel
{
public:
{
public:
- SubtitlePanel (
FilmEditor
*);
+ SubtitlePanel (
ContentPanel
*);
void film_changed (Film::Property);
void film_changed (Film::Property);
- void film_content_changed (
boost::shared_ptr<Content>,
int);
-
+ void film_content_changed (int);
+ void content_selection_changed ();
private:
private:
- void with_subtitles_toggled ();
- void offset_changed ();
- void scale_changed ();
+ void use_toggled ();
+ void x_offset_changed ();
+ void y_offset_changed ();
+ void x_scale_changed ();
+ void y_scale_changed ();
+ void language_changed ();
void stream_changed ();
void stream_changed ();
+ void subtitle_view_clicked ();
+ void fonts_dialog_clicked ();
void setup_sensitivity ();
void setup_sensitivity ();
- wxCheckBox* _with_subtitles;
- wxSpinCtrl* _offset;
- wxSpinCtrl* _scale;
+ wxCheckBox* _use;
+ wxSpinCtrl* _x_offset;
+ wxSpinCtrl* _y_offset;
+ wxSpinCtrl* _x_scale;
+ wxSpinCtrl* _y_scale;
+ wxTextCtrl* _language;
wxChoice* _stream;
wxChoice* _stream;
+ wxButton* _subtitle_view_button;
+ SubtitleView* _subtitle_view;
+ wxButton* _fonts_dialog_button;
+ FontsDialog* _fonts_dialog;
};
};