projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use a label rather than a tooltip to tell users why they can't refer to DCPs.
[dcpomatic.git]
/
src
/
wx
/
video_panel.h
diff --git
a/src/wx/video_panel.h
b/src/wx/video_panel.h
index aa0c6ed531af796a4fdc54df2c4f83e8b3957262..a1579bf62ef8e82c974779513ce91ff1750e9162 100644
(file)
--- a/
src/wx/video_panel.h
+++ b/
src/wx/video_panel.h
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2012-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
5
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/>.
*/
*/
@@
-24,6
+25,7
@@
#include "content_sub_panel.h"
#include "content_widget.h"
#include "timecode.h"
#include "content_sub_panel.h"
#include "content_widget.h"
#include "timecode.h"
+#include "lib/video_content_scale.h"
#include "lib/film.h"
class wxChoice;
#include "lib/film.h"
class wxChoice;
@@
-37,20
+39,25
@@
class wxButton;
class VideoPanel : public ContentSubPanel
{
public:
class VideoPanel : public ContentSubPanel
{
public:
- VideoPanel (ContentPanel *);
+
explicit
VideoPanel (ContentPanel *);
void film_changed (Film::Property);
void film_content_changed (int);
void content_selection_changed ();
private:
void film_changed (Film::Property);
void film_content_changed (int);
void content_selection_changed ();
private:
+ void reference_clicked ();
void edit_filters_clicked ();
void edit_filters_clicked ();
+ void colour_conversion_changed ();
void edit_colour_conversion_clicked ();
void fade_in_changed ();
void fade_out_changed ();
void setup_description ();
void edit_colour_conversion_clicked ();
void fade_in_changed ();
void fade_out_changed ();
void setup_description ();
+ void setup_sensitivity ();
+ wxCheckBox* _reference;
+ wxStaticText* _reference_note;
ContentChoice<VideoContent, VideoFrameType>* _frame_type;
ContentSpinCtrl<VideoContent>* _left_crop;
ContentSpinCtrl<VideoContent>* _right_crop;
ContentChoice<VideoContent, VideoFrameType>* _frame_type;
ContentSpinCtrl<VideoContent>* _left_crop;
ContentSpinCtrl<VideoContent>* _right_crop;
@@
-62,6
+69,6
@@
private:
wxStaticText* _description;
wxStaticText* _filters;
wxButton* _filters_button;
wxStaticText* _description;
wxStaticText* _filters;
wxButton* _filters_button;
- wx
StaticText
* _colour_conversion;
- wxButton* _colour_conversion_button;
+ wx
Choice
* _colour_conversion;
+ wxButton* _
edit_
colour_conversion_button;
};
};