projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix font ID allocation from DCP when there are subs and ccaps using the same IDs...
[dcpomatic.git]
/
src
/
wx
/
kdm_output_panel.h
diff --git
a/src/wx/kdm_output_panel.h
b/src/wx/kdm_output_panel.h
index fbfc1205ebcea73c90d1a3a15e9eb2619aa5245c..3b82321c6c2aa58c8d2b64bc8753653868358bdd 100644
(file)
--- a/
src/wx/kdm_output_panel.h
+++ b/
src/wx/kdm_output_panel.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2015-20
17
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2015-20
22
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,24
+18,30
@@
*/
*/
-#include "lib/kdm_with_metadata.h"
+
#include "wx_util.h"
#include "wx_util.h"
-#include "
name_format_editor
.h"
+#include "
lib/kdm_with_metadata
.h"
#include <dcp/types.h>
#include <dcp/types.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
#include <boost/filesystem.hpp>
#include <boost/filesystem.hpp>
-class wxRadioButton;
-class
wxDirPickerCtrl
;
+
+class
CheckBox
;
class DirPickerCtrl;
class DirPickerCtrl;
-class KDMTimingPanel;
class Job;
class Job;
-class Log;
+class KDMChoice;
+class NameFormatEditor;
+class wxDirPickerCtrl;
+class wxRadioButton;
+
class KDMOutputPanel : public wxPanel
{
public:
class KDMOutputPanel : public wxPanel
{
public:
- KDMOutputPanel (wxWindow* parent
, bool interop
);
+ KDMOutputPanel (wxWindow* parent);
void setup_sensitivity ();
void setup_sensitivity ();
@@
-51,21
+57,31
@@
public:
return _forensic_mark_audio_up_to;
}
return _forensic_mark_audio_up_to;
}
- std::pair<
boost
::shared_ptr<Job>, int> make (
- std::list<KDMWithMetadataPtr
> screen_kdms,
+ std::pair<
std
::shared_ptr<Job>, int> make (
+ std::list<KDMWithMetadataPtr> screen_kdms,
std::string name,
std::string name,
- KDMTimingPanel* timing,
- boost::function<bool (boost::filesystem::path)> confirm_overwrite
+ std::function<bool (boost::filesystem::path)> confirm_overwrite
);
);
+ bool method_selected() const;
+
+ void set_annotation_text(std::string text);
+ std::string annotation_text() const;
+
+ boost::signals2::signal<void ()> MethodChanged;
+
private:
void kdm_write_type_changed ();
void advanced_clicked ();
private:
void kdm_write_type_changed ();
void advanced_clicked ();
+ void write_to_changed ();
+ void email_changed ();
+ void add_email_addresses_clicked ();
- wxChoice* _type;
+ KDMChoice* _type;
+ wxTextCtrl* _annotation_text;
NameFormatEditor* _container_name_format;
NameFormatEditor* _filename_format;
NameFormatEditor* _container_name_format;
NameFormatEditor* _filename_format;
-
wx
CheckBox* _write_to;
+ CheckBox* _write_to;
#ifdef DCPOMATIC_USE_OWN_PICKER
DirPickerCtrl* _folder;
#else
#ifdef DCPOMATIC_USE_OWN_PICKER
DirPickerCtrl* _folder;
#else
@@
-74,8
+90,9
@@
private:
wxRadioButton* _write_flat;
wxRadioButton* _write_folder;
wxRadioButton* _write_zip;
wxRadioButton* _write_flat;
wxRadioButton* _write_folder;
wxRadioButton* _write_zip;
-
wx
CheckBox* _email;
+ CheckBox* _email;
bool _forensic_mark_video;
bool _forensic_mark_audio;
boost::optional<int> _forensic_mark_audio_up_to;
bool _forensic_mark_video;
bool _forensic_mark_audio;
boost::optional<int> _forensic_mark_audio_up_to;
+ std::vector<std::string> _extra_addresses;
};
};