X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_output_panel.cc;h=bc66e37b95e098467061aa48a6d551712f2965ce;hb=7bc591abc86ed4742f21f45ca1d6151cb14bc100;hp=db5bb1354f8a9ee3d79cd64825461c9e2c0ace80;hpb=eaedff2a7877fa4b560e0c65ac13ed3dad9437e5;p=dcpomatic.git diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc index db5bb1354..bc66e37b9 100644 --- a/src/wx/kdm_output_panel.cc +++ b/src/wx/kdm_output_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2018 Carl Hetherington + Copyright (C) 2015-2022 Carl Hetherington This file is part of DCP-o-matic. @@ -18,16 +18,18 @@ */ -#include "kdm_output_panel.h" -#include "kdm_timing_panel.h" + +#include "check_box.h" #include "confirm_kdm_email_dialog.h" -#include "wx_util.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 "name_format_editor.h" -#include "check_box.h" -#include "dcpomatic_button.h" -#include "lib/config.h" +#include "wx_util.h" #include "lib/cinema.h" +#include "lib/config.h" #include "lib/send_kdm_email_job.h" #include "lib/warnings.h" #include @@ -43,45 +45,51 @@ DCPOMATIC_DISABLE_WARNINGS #include DCPOMATIC_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); + auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, 0); table->AddGrowableCol (1); - add_label_to_sizer (table, this, _("KDM type"), true); + add_label_to_sizer (table, this, _("KDM type"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL); - wxBoxSizer* type = new wxBoxSizer (wxHORIZONTAL); - _type = new wxChoice (this, wxID_ANY); - _type->Append ("Modified Transitional 1", ((void *) dcp::MODIFIED_TRANSITIONAL_1)); - _type->Append ("Multiple Modified Transitional 1", ((void *) dcp::MULTIPLE_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)); - } - type->Add (_type, 1, wxEXPAND); - _type->SetSelection (0); - wxButton* advanced = new Button (this, _("Advanced...")); - type->Add (advanced, 0, wxALIGN_CENTER_VERTICAL); - table->Add (type, 1, wxEXPAND); + 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_TOP | wxTOP | wxLEFT | wxRIGHT); + 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); - add_label_to_sizer (table, this, _("Filename format"), true, 0, wxALIGN_TOP | wxTOP | wxLEFT | wxRIGHT); + 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 dcp::NameFormat::Map titles; titles['f'] = wx_to_std (_("film name")); titles['c'] = wx_to_std (_("cinema")); @@ -106,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 { @@ -115,13 +123,13 @@ 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, wxTOP | wxBOTTOM | DCPOMATIC_BUTTON_STACK_GAP); + 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, wxTOP | wxBOTTOM | DCPOMATIC_BUTTON_STACK_GAP); + 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, wxTOP | wxBOTTOM | DCPOMATIC_BUTTON_STACK_GAP); + write_options->Add (_write_zip, 1, wxTOP | wxBOTTOM, DCPOMATIC_BUTTON_STACK_GAP); table->AddSpacer (0); table->Add (write_options); @@ -141,10 +149,11 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop) break; } - _write_to->SetValue (true); + _write_to->SetValue (Config::instance()->write_kdms_to_disk()); + _email->SetValue (Config::instance()->email_kdms()); - _write_to->Bind (wxEVT_CHECKBOX, boost::bind (&KDMOutputPanel::setup_sensitivity, this)); - _email->Bind (wxEVT_CHECKBOX, 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)); @@ -153,6 +162,23 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop) 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 () { @@ -163,10 +189,11 @@ KDMOutputPanel::setup_sensitivity () _write_zip->Enable (write); } + void KDMOutputPanel::advanced_clicked () { - KDMAdvancedDialog* d = new KDMAdvancedDialog (this, _forensic_mark_video, _forensic_mark_audio, _forensic_mark_audio_up_to); + 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 (); @@ -174,6 +201,7 @@ KDMOutputPanel::advanced_clicked () d->Destroy (); } + void KDMOutputPanel::kdm_write_type_changed () { @@ -186,12 +214,13 @@ KDMOutputPanel::kdm_write_type_changed () } } + pair, int> KDMOutputPanel::make ( list kdms, string name, function confirm_overwrite ) { - list > const cinema_kdms = collect (kdms); + auto const cinema_kdms = collect (kdms); /* Decide whether to proceed */ @@ -204,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 (list i, cinema_kdms) { - if (i.front()->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, @@ -220,14 +247,14 @@ KDMOutputPanel::make ( if (proceed && Config::instance()->confirm_kdm_email ()) { list emails; - BOOST_FOREACH (list const& i, cinema_kdms) { - BOOST_FOREACH (string j, i.front()->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; } @@ -236,7 +263,7 @@ KDMOutputPanel::make ( } if (!proceed) { - return make_pair (shared_ptr(), 0); + return {}; } Config::instance()->set_kdm_filename_format (_filename_format->get ()); @@ -295,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 {