X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdkdm_dialog.cc;h=c7503048cea80331645afb15808949ca1a1316a0;hb=HEAD;hp=71feeed10f2744c2917521dc2ce4e031f9f7e091;hpb=3e96f929fdf740f414b114c5d9765e22fcc46de6;p=dcpomatic.git diff --git a/src/wx/dkdm_dialog.cc b/src/wx/dkdm_dialog.cc index 71feeed10..34a8d6284 100644 --- a/src/wx/dkdm_dialog.cc +++ b/src/wx/dkdm_dialog.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2020 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,46 +18,53 @@ */ + +#include "confirm_kdm_email_dialog.h" +#include "dcpomatic_button.h" #include "dkdm_dialog.h" -#include "wx_util.h" -#include "recipients_panel.h" -#include "kdm_timing_panel.h" #include "dkdm_output_panel.h" #include "kdm_cpl_panel.h" -#include "confirm_kdm_email_dialog.h" +#include "kdm_timing_panel.h" +#include "recipients_panel.h" #include "static_text.h" -#include "dcpomatic_button.h" +#include "wx_util.h" +#include "lib/config.h" #include "lib/film.h" -#include "lib/kdm_with_metadata.h" #include "lib/job_manager.h" -#include "lib/config.h" +#include "lib/kdm_with_metadata.h" #include #include -#include +#include +LIBDCP_DISABLE_WARNINGS #include -#include +#include +LIBDCP_ENABLE_WARNINGS + -using std::string; using std::exception; -using std::map; using std::list; -using std::pair; -using std::cout; -using std::vector; using std::make_pair; +using std::map; +using std::pair; using std::runtime_error; -using boost::shared_ptr; +using std::shared_ptr; +using std::string; +using std::vector; using boost::bind; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif + DKDMDialog::DKDMDialog (wxWindow* parent, shared_ptr film) : wxDialog (parent, wxID_ANY, _("Make DKDMs")) , _film (film) { /* Main sizers */ - wxBoxSizer* horizontal = new wxBoxSizer (wxHORIZONTAL); - wxBoxSizer* left = new wxBoxSizer (wxVERTICAL); - wxBoxSizer* right = new wxBoxSizer (wxVERTICAL); + auto horizontal = new wxBoxSizer (wxHORIZONTAL); + auto left = new wxBoxSizer (wxVERTICAL); + auto right = new wxBoxSizer (wxVERTICAL); horizontal->Add (left, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_X_GAP * 4); horizontal->Add (right, 1, wxEXPAND); @@ -67,9 +74,9 @@ DKDMDialog::DKDMDialog (wxWindow* parent, shared_ptr film) subheading_font.SetWeight (wxFONTWEIGHT_BOLD); /* Sub-heading: Screens */ - wxStaticText* h = new StaticText (this, _("Recipients")); + auto h = new StaticText (this, _("Recipients")); h->SetFont (subheading_font); - left->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP); + left->Add (h, 0, wxBOTTOM, DCPOMATIC_SIZER_Y_GAP); _recipients = new RecipientsPanel (this); left->Add (_recipients, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP); @@ -77,17 +84,17 @@ DKDMDialog::DKDMDialog (wxWindow* parent, shared_ptr film) /// TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix h = new StaticText (this, S_("KDM|Timing")); h->SetFont (subheading_font); - right->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP * 2); + right->Add (h); _timing = new KDMTimingPanel (this); right->Add (_timing); /* Sub-heading: CPL */ h = new StaticText (this, _("CPL")); h->SetFont (subheading_font); - right->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP * 2); + right->Add (h); vector cpls; - BOOST_FOREACH (CPLSummary const & i, film->cpls()) { + for (auto const& i: film->cpls()) { if (i.encrypted) { cpls.push_back (i); } @@ -99,7 +106,7 @@ DKDMDialog::DKDMDialog (wxWindow* parent, shared_ptr film) /* Sub-heading: Output */ h = new StaticText (this, _("Output")); h->SetFont (subheading_font); - right->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); + right->Add(h, 0, wxTOP, DCPOMATIC_SUBHEADING_TOP_PAD); _output = new DKDMOutputPanel (this); right->Add (_output, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP); @@ -108,7 +115,7 @@ DKDMDialog::DKDMDialog (wxWindow* parent, shared_ptr film) /* Make an overall sizer to get a nice border */ - wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL); + auto overall_sizer = new wxBoxSizer (wxVERTICAL); overall_sizer->Add (horizontal, 0, wxEXPAND | wxTOP | wxLEFT | wxRIGHT, DCPOMATIC_DIALOG_BORDER); /* Bind */ @@ -116,6 +123,7 @@ DKDMDialog::DKDMDialog (wxWindow* parent, shared_ptr film) _recipients->RecipientsChanged.connect (boost::bind(&DKDMDialog::setup_sensitivity, this)); _timing->TimingChanged.connect (boost::bind(&DKDMDialog::setup_sensitivity, this)); _make->Bind (wxEVT_BUTTON, boost::bind(&DKDMDialog::make_clicked, this)); + _cpl->Changed.connect(boost::bind(&DKDMDialog::setup_sensitivity, this)); setup_sensitivity (); @@ -124,6 +132,7 @@ DKDMDialog::DKDMDialog (wxWindow* parent, shared_ptr film) overall_sizer->SetSizeHints (this); } + void DKDMDialog::setup_sensitivity () { @@ -132,25 +141,27 @@ DKDMDialog::setup_sensitivity () _make->Enable (!_recipients->recipients().empty() && _timing->valid() && _cpl->has_selected()); } + bool DKDMDialog::confirm_overwrite (boost::filesystem::path path) { return confirm_dialog ( this, - wxString::Format (_("File %s already exists. Do you want to overwrite it?"), std_to_wx(path.string()).data()) + wxString::Format(_("File %s already exists. Do you want to overwrite it?"), std_to_wx(path.string()).data()) ); } + void DKDMDialog::make_clicked () { - shared_ptr film = _film.lock (); + auto film = _film.lock (); DCPOMATIC_ASSERT (film); list kdms; try { - BOOST_FOREACH (shared_ptr i, _recipients->recipients()) { - KDMWithMetadataPtr p = kdm_for_dkdm_recipient (film, _cpl->cpl(), i, _timing->from(), _timing->until()); + for (auto i: _recipients->recipients()) { + auto p = kdm_for_dkdm_recipient (film, _cpl->cpl(), i, _timing->from(), _timing->until()); if (p) { kdms.push_back (p); } @@ -159,7 +170,7 @@ DKDMDialog::make_clicked () if (e.starts_too_early()) { error_dialog (this, _("The KDM start period is before (or close to) the start of the signing certificate's validity period. Use a later start time for this KDM.")); } else { - error_dialog (this, _("The KDM end period is after (or close to) the end of the signing certficates' validity period. Either use an earlier end time for this KDM or re-create your signing certificates in the DCP-o-matic preferences window.")); + error_dialog (this, _("The KDM end period is after (or close to) the end of the signing certificates' validity period. Either use an earlier end time for this KDM or re-create your signing certificates in the DCP-o-matic preferences window.")); } return; } catch (runtime_error& e) { @@ -167,17 +178,17 @@ DKDMDialog::make_clicked () return; } - pair, int> result = _output->make (kdms, film->name(), bind(&DKDMDialog::confirm_overwrite, this, _1)); + auto result = _output->make(kdms, film->dcp_name(), bind(&DKDMDialog::confirm_overwrite, this, _1)); if (result.first) { JobManager::instance()->add (result.first); } if (result.second > 0) { /* XXX: proper plural form support in wxWidgets? */ - wxString s = result.second == 1 ? _("%d DKDM written to %s") : _("%d DKDMs written to %s"); + auto s = result.second == 1 ? _("%d DKDM written to %s") : _("%d DKDMs written to %s"); message_dialog ( this, - wxString::Format (s, result.second, std_to_wx(_output->directory().string()).data()) + wxString::Format(s, result.second, std_to_wx(_output->directory().string()).data()) ); } }