#include "check_box.h"
#include "confirm_kdm_email_dialog.h"
#include "dcpomatic_button.h"
+#include "extra_kdm_email_dialog.h"
#include "kdm_advanced_dialog.h"
+#include "kdm_choice.h"
#include "kdm_output_panel.h"
#include "kdm_timing_panel.h"
#include "name_format_editor.h"
#include "lib/cinema.h"
#include "lib/config.h"
#include "lib/send_kdm_email_job.h"
-#include "lib/warnings.h"
#include <dcp/exceptions.h>
#include <dcp/types.h>
+#include <dcp/warnings.h>
#ifdef DCPOMATIC_USE_OWN_PICKER
#include "dir_picker_ctrl.h"
#else
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
#include <wx/filepicker.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
#endif
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
#include <wx/stdpaths.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
using std::exception;
using std::function;
using std::list;
using std::make_pair;
+using std::make_shared;
using std::pair;
using std::shared_ptr;
using std::string;
add_label_to_sizer (table, this, _("KDM type"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
auto type = new wxBoxSizer (wxHORIZONTAL);
- _type = new wxChoice (this, wxID_ANY);
- _type->Append ("Modified Transitional 1", ((void *) dcp::Formulation::MODIFIED_TRANSITIONAL_1));
- _type->Append ("DCI Any", ((void *) dcp::Formulation::DCI_ANY));
- _type->Append ("DCI Specific", ((void *) dcp::Formulation::DCI_SPECIFIC));
- _type->Append ("Multiple Modified Transitional 1", ((void *) dcp::Formulation::MULTIPLE_MODIFIED_TRANSITIONAL_1));
- _type->Append ("Modified Transitional 1 (without AuthorizedDeviceInfo)", ((void *) dcp::Formulation::MODIFIED_TRANSITIONAL_TEST));
+ _type = new KDMChoice (this);
type->Add (_type, 1, wxTOP, DCPOMATIC_CHOICE_TOP_PAD);
- _type->SetSelection (0);
+ _type->set(Config::instance()->default_kdm_type());
auto advanced = new Button (this, _("Advanced..."));
type->Add (advanced, 0, wxLEFT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP);
table->Add (type, 1, wxTOP, DCPOMATIC_CHOICE_TOP_PAD);
+ add_label_to_sizer(table, this, _("Annotation text"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL);
+ _annotation_text = new wxTextCtrl(this, wxID_ANY);
+ table->Add(_annotation_text, 1, wxEXPAND);
+
add_label_to_sizer (table, this, _("Folder / ZIP name format"), true, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT);
_container_name_format = new NameFormatEditor (this, Config::instance()->kdm_container_name_format(), dcp::NameFormat::Map(), dcp::NameFormat::Map(), "");
table->Add (_container_name_format->panel(), 1, wxEXPAND);
align->Add (format, 0, wxTOP, 2);
table->Add (align, 0, wxALIGN_RIGHT | wxRIGHT, DCPOMATIC_SIZER_GAP - 2);
#else
- align->Add (format, 0, wxLEFT, DCPOMATIC_SIZER_GAP - 2);
+ align->Add (format, 0, wxLEFT, DCPOMATIC_SIZER_GAP);
table->Add (align, 0, wxTOP | wxRIGHT | wxALIGN_TOP, DCPOMATIC_SIZER_GAP);
#endif
dcp::NameFormat::Map titles;
_email = new CheckBox (this, _("Send by email"));
table->Add (_email, 1, wxEXPAND);
- table->AddSpacer (0);
+ auto add_email_addresses = new wxButton(this, wxID_ANY, _("Set additional email addresses..."));
+ table->Add (add_email_addresses);
switch (Config::instance()->last_kdm_write_type().get_value_or(Config::KDM_WRITE_FLAT)) {
case Config::KDM_WRITE_FLAT:
_write_to->SetValue (Config::instance()->write_kdms_to_disk());
_email->SetValue (Config::instance()->email_kdms());
- _write_to->Bind (wxEVT_CHECKBOX, boost::bind (&KDMOutputPanel::write_to_changed, this));
- _email->Bind (wxEVT_CHECKBOX, boost::bind (&KDMOutputPanel::email_changed, this));
+ _write_to->bind(&KDMOutputPanel::write_to_changed, this);
+ _email->bind(&KDMOutputPanel::email_changed, this);
+ add_email_addresses->Bind (wxEVT_BUTTON, boost::bind(&KDMOutputPanel::add_email_addresses_clicked, this));
_write_flat->Bind (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::kdm_write_type_changed, this));
_write_folder->Bind (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::kdm_write_type_changed, this));
_write_zip->Bind (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::kdm_write_type_changed, this));
{
Config::instance()->set_write_kdms_to_disk(_write_to->GetValue());
setup_sensitivity ();
+ MethodChanged();
}
{
Config::instance()->set_email_kdms(_email->GetValue());
setup_sensitivity ();
+ MethodChanged();
}
void
KDMOutputPanel::advanced_clicked ()
{
- auto d = new KDMAdvancedDialog (this, _forensic_mark_video, _forensic_mark_audio, _forensic_mark_audio_up_to);
- d->ShowModal ();
- _forensic_mark_video = d->forensic_mark_video ();
- _forensic_mark_audio = d->forensic_mark_audio ();
- _forensic_mark_audio_up_to = d->forensic_mark_audio_up_to ();
- d->Destroy ();
+ KDMAdvancedDialog dialog(this, _forensic_mark_video, _forensic_mark_audio, _forensic_mark_audio_up_to);
+ dialog.ShowModal();
+ _forensic_mark_video = dialog.forensic_mark_video();
+ _forensic_mark_audio = dialog.forensic_mark_audio();
+ _forensic_mark_audio_up_to = dialog.forensic_mark_audio_up_to();
}
}
if (_email->GetValue ()) {
- job.reset (
- new SendKDMEmailJob (
- cinema_kdms,
- _container_name_format->get(),
- _filename_format->get(),
- name
- )
+ job = make_shared<SendKDMEmailJob>(
+ cinema_kdms,
+ _container_name_format->get(),
+ _filename_format->get(),
+ name,
+ _extra_addresses
);
}
dcp::Formulation
KDMOutputPanel::formulation () const
{
- return (dcp::Formulation) reinterpret_cast<intptr_t> (_type->GetClientData (_type->GetSelection()));
+ return _type->get();
}
{
return wx_to_std (_folder->GetPath ());
}
+
+
+void
+KDMOutputPanel::add_email_addresses_clicked ()
+{
+ ExtraKDMEmailDialog dialog(this, _extra_addresses);
+ if (dialog.ShowModal() == wxID_OK) {
+ _extra_addresses = dialog.get();
+ }
+}
+
+
+bool
+KDMOutputPanel::method_selected() const
+{
+ return _write_to->GetValue() || _email->GetValue();
+}
+
+
+void
+KDMOutputPanel::set_annotation_text(string text)
+{
+ checked_set(_annotation_text, std::move(text));
+}
+
+
+string
+KDMOutputPanel::annotation_text() const
+{
+ return wx_to_std(_annotation_text->GetValue());
+}
+