X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_output_panel.cc;h=98f40813514a7a38e4061fad8188bf040046b6b3;hb=3c29aa6531a4046a8db72dcac81189eb8893233c;hp=bbfc1a01d4bf53ff6b7bca07742d9adda1d29661;hpb=7fe0f3035f13d306d38c63740674e4fc2f652052;p=dcpomatic.git diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc index bbfc1a01d..98f408135 100644 --- a/src/wx/kdm_output_panel.cc +++ b/src/wx/kdm_output_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Carl Hetherington + Copyright (C) 2015-2022 Carl Hetherington This file is part of DCP-o-matic. @@ -18,79 +18,84 @@ */ -#include "lib/config.h" -#include "lib/cinema.h" -#include "lib/cinema_kdms.h" -#include "lib/send_kdm_email_job.h" + +#include "check_box.h" +#include "confirm_kdm_email_dialog.h" +#include "dcpomatic_button.h" +#include "kdm_advanced_dialog.h" +#include "kdm_choice.h" #include "kdm_output_panel.h" #include "kdm_timing_panel.h" -#include "confirm_kdm_email_dialog.h" -#include "wx_util.h" #include "name_format_editor.h" +#include "wx_util.h" +#include "lib/cinema.h" +#include "lib/config.h" +#include "lib/send_kdm_email_job.h" #include #include +#include #ifdef DCPOMATIC_USE_OWN_PICKER #include "dir_picker_ctrl.h" #else +LIBDCP_DISABLE_WARNINGS #include +LIBDCP_ENABLE_WARNINGS #endif +LIBDCP_DISABLE_WARNINGS #include +LIBDCP_ENABLE_WARNINGS + -using std::pair; -using std::string; -using std::list; using std::exception; +using std::function; +using std::list; using std::make_pair; -using boost::shared_ptr; -using boost::function; +using std::pair; +using std::shared_ptr; +using std::string; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif -KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop) + +KDMOutputPanel::KDMOutputPanel (wxWindow* parent) : wxPanel (parent, wxID_ANY) + , _forensic_mark_video (true) + , _forensic_mark_audio (true) + , _forensic_mark_audio_up_to (12) { - wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, 0); - - add_label_to_sizer (table, this, _("KDM type"), true); - _type = new wxChoice (this, wxID_ANY); - _type->Append ("Modified Transitional 1", ((void *) dcp::MODIFIED_TRANSITIONAL_1)); - _type->Append ("Modified Transitional 1 (without AuthorizedDeviceInfo)", ((void *) dcp::MODIFIED_TRANSITIONAL_TEST)); - if (!interop) { - _type->Append ("DCI Any", ((void *) dcp::DCI_ANY)); - _type->Append ("DCI Specific", ((void *) dcp::DCI_SPECIFIC)); - } - table->Add (_type, 1, wxEXPAND); - _type->SetSelection (0); - - { - int flags = wxALIGN_TOP | wxTOP | wxLEFT | wxRIGHT; - wxString t = _("Folder / ZIP name format"); -#ifdef __WXOSX__ - flags |= wxALIGN_RIGHT; - t += wxT (":"); -#endif - wxStaticText* m = new wxStaticText (this, wxID_ANY, t); - table->Add (m, 0, flags, DCPOMATIC_SIZER_Y_GAP); - } + auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, 0); + table->AddGrowableCol (1); + + add_label_to_sizer (table, this, _("KDM type"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); + auto type = new wxBoxSizer (wxHORIZONTAL); + _type = new KDMChoice (this); + type->Add (_type, 1, wxTOP, DCPOMATIC_CHOICE_TOP_PAD); + _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, _("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); - { - int flags = wxALIGN_TOP | wxTOP | wxLEFT | wxRIGHT; - wxString t = _("Filename format"); -#ifdef __WXOSX__ - flags |= wxALIGN_RIGHT; - t += wxT (":"); + auto format = create_label (this, _("Filename format"), true); + auto align = new wxBoxSizer (wxHORIZONTAL); +#ifdef DCPOMATIC_OSX + 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); + table->Add (align, 0, wxTOP | wxRIGHT | wxALIGN_TOP, DCPOMATIC_SIZER_GAP); #endif - wxStaticText* m = new wxStaticText (this, wxID_ANY, t); - table->Add (m, 0, flags, DCPOMATIC_SIZER_Y_GAP); - } - dcp::NameFormat::Map titles; - titles['f'] = "film name"; - titles['c'] = "cinema"; - titles['s'] = "screen"; - titles['b'] = "from date/time"; - titles['e'] = "to date/time"; + titles['f'] = wx_to_std (_("film name")); + titles['c'] = wx_to_std (_("cinema")); + titles['s'] = wx_to_std (_("screen")); + titles['b'] = wx_to_std (_("from date/time")); + titles['e'] = wx_to_std (_("to date/time")); dcp::NameFormat::Map ex; ex['f'] = "Bambi"; ex['c'] = "Lumière"; @@ -100,7 +105,7 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop) _filename_format = new NameFormatEditor (this, Config::instance()->kdm_filename_format(), titles, ex, ".xml"); table->Add (_filename_format->panel(), 1, wxEXPAND); - _write_to = new wxCheckBox (this, wxID_ANY, _("Write to")); + _write_to = new CheckBox (this, _("Write to")); table->Add (_write_to, 1, wxEXPAND); #ifdef DCPOMATIC_USE_OWN_PICKER @@ -109,7 +114,7 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop) _folder = new wxDirPickerCtrl (this, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1)); #endif - boost::optional path = Config::instance()->default_kdm_directory (); + auto path = Config::instance()->default_kdm_directory(); if (path) { _folder->SetPath (std_to_wx (path->string ())); } else { @@ -118,28 +123,62 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop) table->Add (_folder, 1, wxEXPAND); - wxSizer* write_options = new wxBoxSizer(wxVERTICAL); + auto write_options = new wxBoxSizer(wxVERTICAL); _write_flat = new wxRadioButton (this, wxID_ANY, _("Write all KDMs to the same folder"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP); - write_options->Add (_write_flat); + write_options->Add (_write_flat, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); _write_folder = new wxRadioButton (this, wxID_ANY, _("Write a folder for each cinema's KDMs")); - write_options->Add (_write_folder); + write_options->Add (_write_folder, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); _write_zip = new wxRadioButton (this, wxID_ANY, _("Write a ZIP file for each cinema's KDMs")); - write_options->Add (_write_zip); + write_options->Add (_write_zip, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); table->AddSpacer (0); table->Add (write_options); - _email = new wxCheckBox (this, wxID_ANY, _("Send by email")); + _email = new CheckBox (this, _("Send by email")); table->Add (_email, 1, wxEXPAND); table->AddSpacer (0); - _write_to->SetValue (true); + switch (Config::instance()->last_kdm_write_type().get_value_or(Config::KDM_WRITE_FLAT)) { + case Config::KDM_WRITE_FLAT: + _write_flat->SetValue (true); + break; + case Config::KDM_WRITE_FOLDER: + _write_folder->SetValue (true); + break; + case Config::KDM_WRITE_ZIP: + _write_zip->SetValue (true); + break; + } + + _write_to->SetValue (Config::instance()->write_kdms_to_disk()); + _email->SetValue (Config::instance()->email_kdms()); - _write_to->Bind (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::setup_sensitivity, this)); - _email->Bind (wxEVT_RADIOBUTTON, boost::bind (&KDMOutputPanel::setup_sensitivity, this)); + _write_to->Bind (wxEVT_CHECKBOX, boost::bind (&KDMOutputPanel::write_to_changed, this)); + _email->Bind (wxEVT_CHECKBOX, boost::bind (&KDMOutputPanel::email_changed, 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)); + advanced->Bind (wxEVT_BUTTON, boost::bind (&KDMOutputPanel::advanced_clicked, this)); SetSizer (table); } + +void +KDMOutputPanel::write_to_changed () +{ + Config::instance()->set_write_kdms_to_disk(_write_to->GetValue()); + setup_sensitivity (); +} + + +void +KDMOutputPanel::email_changed () +{ + Config::instance()->set_email_kdms(_email->GetValue()); + setup_sensitivity (); +} + + void KDMOutputPanel::setup_sensitivity () { @@ -150,12 +189,38 @@ KDMOutputPanel::setup_sensitivity () _write_zip->Enable (write); } + +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 (); +} + + +void +KDMOutputPanel::kdm_write_type_changed () +{ + if (_write_flat->GetValue()) { + Config::instance()->set_last_kdm_write_type (Config::KDM_WRITE_FLAT); + } else if (_write_folder->GetValue()) { + Config::instance()->set_last_kdm_write_type (Config::KDM_WRITE_FOLDER); + } else if (_write_zip->GetValue()) { + Config::instance()->set_last_kdm_write_type (Config::KDM_WRITE_ZIP); + } +} + + pair, int> KDMOutputPanel::make ( - list screen_kdms, string name, KDMTimingPanel* timing, function confirm_overwrite, shared_ptr log + list kdms, string name, function confirm_overwrite ) { - list const cinema_kdms = CinemaKDMs::collect (screen_kdms); + auto const cinema_kdms = collect (kdms); /* Decide whether to proceed */ @@ -168,12 +233,10 @@ KDMOutputPanel::make ( error_dialog (this, _("You must set up a mail server in Preferences before you can send emails.")); } - bool cinemas_with_no_email = false; - BOOST_FOREACH (CinemaKDMs i, cinema_kdms) { - if (i.cinema->emails.empty ()) { - cinemas_with_no_email = true; - } - } + bool const cinemas_with_no_email = std::any_of( + cinema_kdms.begin(), cinema_kdms.end(), + [](list const& list) { return list.front()->emails().empty(); } + ); if (proceed && cinemas_with_no_email && !confirm_dialog ( this, @@ -184,14 +247,14 @@ KDMOutputPanel::make ( if (proceed && Config::instance()->confirm_kdm_email ()) { list emails; - BOOST_FOREACH (CinemaKDMs i, cinema_kdms) { - BOOST_FOREACH (string j, i.cinema->emails) { + for (auto const& i: cinema_kdms) { + for (auto j: i.front()->emails()) { emails.push_back (j); } } if (!emails.empty ()) { - ConfirmKDMEmailDialog* d = new ConfirmKDMEmailDialog (this, emails); + auto d = new ConfirmKDMEmailDialog (this, emails); if (d->ShowModal() == wxID_CANCEL) { proceed = false; } @@ -200,7 +263,7 @@ KDMOutputPanel::make ( } if (!proceed) { - return make_pair (shared_ptr(), 0); + return {}; } Config::instance()->set_kdm_filename_format (_filename_format->get ()); @@ -209,36 +272,29 @@ KDMOutputPanel::make ( shared_ptr job; try { - dcp::NameFormat::Map name_values; - name_values['f'] = name; - name_values['b'] = dcp::LocalTime(timing->from()).date() + " " + dcp::LocalTime(timing->from()).time_of_day(); - name_values['e'] = dcp::LocalTime(timing->until()).date() + " " + dcp::LocalTime(timing->until()).time_of_day(); if (_write_to->GetValue()) { if (_write_flat->GetValue()) { - written = ScreenKDM::write_files ( - screen_kdms, + written = write_files ( + kdms, directory(), _filename_format->get(), - name_values, confirm_overwrite ); } else if (_write_folder->GetValue()) { - written = CinemaKDMs::write_directories ( - CinemaKDMs::collect (screen_kdms), + written = write_directories ( + collect (kdms), directory(), _container_name_format->get(), _filename_format->get(), - name_values, confirm_overwrite ); } else if (_write_zip->GetValue()) { - written = CinemaKDMs::write_zip_files ( - CinemaKDMs::collect (screen_kdms), + written = write_zip_files ( + collect (kdms), directory(), _container_name_format->get(), _filename_format->get(), - name_values, confirm_overwrite ); } @@ -248,10 +304,9 @@ KDMOutputPanel::make ( job.reset ( new SendKDMEmailJob ( cinema_kdms, + _container_name_format->get(), _filename_format->get(), - name_values, - name, - log + name ) ); } @@ -259,7 +314,7 @@ KDMOutputPanel::make ( } catch (dcp::NotEncryptedError& e) { error_dialog (this, _("CPL's content is not encrypted.")); } catch (exception& e) { - error_dialog (this, e.what ()); + error_dialog (this, std_to_wx(e.what())); } catch (...) { error_dialog (this, _("An unknown exception occurred.")); } @@ -267,12 +322,14 @@ KDMOutputPanel::make ( return make_pair (job, written); } + dcp::Formulation KDMOutputPanel::formulation () const { - return (dcp::Formulation) reinterpret_cast (_type->GetClientData (_type->GetSelection())); + return _type->get(); } + boost::filesystem::path KDMOutputPanel::directory () const {