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 98c82b7c5463c7e4ff50225995bbdd45ef4e97cd..1ee775025ae80710638f869c2488fb9366a1b182 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
@@
-21,6
+21,7
@@
class wxCheckBox;
class wxSpinCtrl;
class wxCheckBox;
class wxSpinCtrl;
+class SubtitleView;
class SubtitlePanel : public FilmEditorPanel
{
class SubtitlePanel : public FilmEditorPanel
{
@@
-28,23
+29,24
@@
public:
SubtitlePanel (FilmEditor *);
void film_changed (Film::Property);
SubtitlePanel (FilmEditor *);
void film_changed (Film::Property);
- void film_content_changed (
- boost::shared_ptr<Content>,
- boost::shared_ptr<AudioContent>,
- boost::shared_ptr<SubtitleContent>,
- boost::shared_ptr<FFmpegContent>,
- int);
-
- void setup_control_sensitivity ();
+ void film_content_changed (int);
+ void content_selection_changed ();
private:
private:
- void with_subtitles_toggled (wxCommandEvent &);
- void offset_changed (wxCommandEvent &);
- void scale_changed (wxCommandEvent &);
- void stream_changed (wxCommandEvent &);
+ void with_subtitles_toggled ();
+ void x_offset_changed ();
+ void y_offset_changed ();
+ void scale_changed ();
+ void stream_changed ();
+ void view_clicked ();
+
+ void setup_sensitivity ();
wxCheckBox* _with_subtitles;
wxCheckBox* _with_subtitles;
- wxSpinCtrl* _offset;
+ wxSpinCtrl* _x_offset;
+ wxSpinCtrl* _y_offset;
wxSpinCtrl* _scale;
wxChoice* _stream;
wxSpinCtrl* _scale;
wxChoice* _stream;
+ wxButton* _view_button;
+ SubtitleView* _view;
};
};