projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a load of explicit keywords.
[dcpomatic.git]
/
src
/
wx
/
subtitle_panel.h
diff --git
a/src/wx/subtitle_panel.h
b/src/wx/subtitle_panel.h
index e3fd7cd75617e91c29a767cbfab3fd20a7b0a7d9..5e619a995b9d5cbeaed16e15cba3dc62926ef34f 100644
(file)
--- a/
src/wx/subtitle_panel.h
+++ b/
src/wx/subtitle_panel.h
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2012-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
6
Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-23,12
+24,11
@@
class wxCheckBox;
class wxSpinCtrl;
class SubtitleView;
class FontsDialog;
class wxSpinCtrl;
class SubtitleView;
class FontsDialog;
-class SubtitleAppearanceDialog;
class SubtitlePanel : public ContentSubPanel
{
public:
class SubtitlePanel : public ContentSubPanel
{
public:
- SubtitlePanel (ContentPanel *);
+
explicit
SubtitlePanel (ContentPanel *);
void film_changed (Film::Property);
void film_content_changed (int);
void film_changed (Film::Property);
void film_content_changed (int);
@@
-41,6
+41,7
@@
private:
void y_offset_changed ();
void x_scale_changed ();
void y_scale_changed ();
void y_offset_changed ();
void x_scale_changed ();
void y_scale_changed ();
+ void line_spacing_changed ();
void language_changed ();
void stream_changed ();
void subtitle_view_clicked ();
void language_changed ();
void stream_changed ();
void subtitle_view_clicked ();
@@
-57,6
+58,7
@@
private:
wxSpinCtrl* _y_offset;
wxSpinCtrl* _x_scale;
wxSpinCtrl* _y_scale;
wxSpinCtrl* _y_offset;
wxSpinCtrl* _x_scale;
wxSpinCtrl* _y_scale;
+ wxSpinCtrl* _line_spacing;
wxTextCtrl* _language;
wxChoice* _stream;
wxButton* _subtitle_view_button;
wxTextCtrl* _language;
wxChoice* _stream;
wxButton* _subtitle_view_button;