projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put Time types in dcpomatic namespace.
[dcpomatic.git]
/
src
/
wx
/
subtitle_appearance_dialog.h
diff --git
a/src/wx/subtitle_appearance_dialog.h
b/src/wx/subtitle_appearance_dialog.h
index 8d36d4da83e27bb99f266959bacc0d7fa2b97e85..6c7e468178dc638c2fd0e742e4a4fedef5530dbf 100644
(file)
--- a/
src/wx/subtitle_appearance_dialog.h
+++ b/
src/wx/subtitle_appearance_dialog.h
@@
-30,32
+30,54
@@
class wxGridBagSizer;
class Content;
class RGBAColourPicker;
class FFmpegSubtitleStream;
class Content;
class RGBAColourPicker;
class FFmpegSubtitleStream;
+class wxCheckBox;
+class wxWidget;
+class Film;
+class Job;
class SubtitleAppearanceDialog : public wxDialog
{
public:
class SubtitleAppearanceDialog : public wxDialog
{
public:
- SubtitleAppearanceDialog (wxWindow* parent, boost::shared_ptr<
Content> content
);
+ SubtitleAppearanceDialog (wxWindow* parent, boost::shared_ptr<
const Film> film, boost::shared_ptr<Content> content, boost::shared_ptr<TextContent> caption
);
void apply ();
private:
void setup_sensitivity ();
void restore ();
void apply ();
private:
void setup_sensitivity ();
void restore ();
+ wxCheckBox* set_to (wxWindow* w, int& r);
+ void content_change (ChangeType type);
+ void active_jobs_changed (boost::optional<std::string> last);
+ void add_colours ();
+ boost::weak_ptr<const Film> _film;
wxCheckBox* _force_colour;
wxColourPickerCtrl* _colour;
wxCheckBox* _force_colour;
wxColourPickerCtrl* _colour;
+ wxCheckBox* _force_effect;
wxChoice* _effect;
wxChoice* _effect;
+ wxCheckBox* _force_effect_colour;
wxColourPickerCtrl* _effect_colour;
wxColourPickerCtrl* _effect_colour;
- Timecode<ContentTime>* _fade_in;
- Timecode<ContentTime>* _fade_out;
+ wxCheckBox* _force_fade_in;
+ Timecode<dcpomatic::ContentTime>* _fade_in;
+ wxCheckBox* _force_fade_out;
+ Timecode<dcpomatic::ContentTime>* _fade_out;
wxSpinCtrl* _outline_width;
wxGridBagSizer* _table;
std::map<RGBA, RGBAColourPicker*> _pickers;
wxSpinCtrl* _outline_width;
wxGridBagSizer* _table;
std::map<RGBA, RGBAColourPicker*> _pickers;
+ wxBoxSizer* _overall_sizer;
+ wxScrolled<wxPanel>* _colours_panel;
+ wxStaticText* _finding;
+ wxFlexGridSizer* _colour_table;
+
boost::shared_ptr<Content> _content;
boost::shared_ptr<Content> _content;
+ boost::shared_ptr<TextContent> _caption;
boost::shared_ptr<FFmpegSubtitleStream> _stream;
boost::signals2::scoped_connection _content_connection;
boost::shared_ptr<FFmpegSubtitleStream> _stream;
boost::signals2::scoped_connection _content_connection;
+ boost::signals2::scoped_connection _job_manager_connection;
+
+ boost::weak_ptr<Job> _job;
static int const NONE;
static int const OUTLINE;
static int const NONE;
static int const OUTLINE;