X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm.cc;h=362d8105f0c862d4d7ea824e52de7b773994a2df;hb=fbe2784c136fa1550815babfce89589f66b35a29;hp=b98ec84a9aa939cf165c84bd1283afc8aad10e56;hpb=0f3c2864599f9e5a5ec001266b4aefb0205d1e1f;p=dcpomatic.git diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index b98ec84a9..362d8105f 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2015 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -86,7 +87,7 @@ class DOMFrame : public wxFrame { public: DOMFrame (wxString const & title) - : wxFrame (NULL, -1, title) + : wxFrame (0, -1, title) , _config_dialog (0) , _job_view (0) { @@ -125,42 +126,51 @@ public: wxPanel* overall_panel = new wxPanel (this, wxID_ANY); wxBoxSizer* main_sizer = new wxBoxSizer (wxHORIZONTAL); - wxBoxSizer* vertical = new wxBoxSizer (wxVERTICAL); + wxBoxSizer* horizontal = new wxBoxSizer (wxHORIZONTAL); + wxBoxSizer* left = new wxBoxSizer (wxVERTICAL); + wxBoxSizer* right = new wxBoxSizer (wxVERTICAL); + + horizontal->Add (left, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_X_GAP * 2); + horizontal->Add (right, 1, wxEXPAND); wxFont subheading_font (*wxNORMAL_FONT); subheading_font.SetWeight (wxFONTWEIGHT_BOLD); wxStaticText* h = new wxStaticText (overall_panel, wxID_ANY, _("Screens")); h->SetFont (subheading_font); - vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL); + left->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP); _screens = new ScreensPanel (overall_panel); - vertical->Add (_screens, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP); + left->Add (_screens, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP); + /// TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix + h = new wxStaticText (overall_panel, wxID_ANY, S_("KDM|Timing")); + h->SetFont (subheading_font); + right->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP * 2); _timing = new KDMTimingPanel (overall_panel); - vertical->Add (_timing, 0, wxALL, DCPOMATIC_SIZER_Y_GAP); + right->Add (_timing, 0, wxALL, DCPOMATIC_SIZER_Y_GAP); h = new wxStaticText (overall_panel, wxID_ANY, _("DKDM")); h->SetFont (subheading_font); - vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); + right->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); vector columns; columns.push_back (wx_to_std (_("CPL"))); _dkdm = new EditableList ( - overall_panel, columns, bind (&DOMFrame::dkdms, this), bind (&DOMFrame::set_dkdms, this, _1), bind (&column, _1), false + overall_panel, columns, bind (&DOMFrame::dkdms, this), bind (&DOMFrame::set_dkdms, this, _1), bind (&always_valid), bind (&column, _1), false ); - vertical->Add (_dkdm, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP); + right->Add (_dkdm, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP); h = new wxStaticText (overall_panel, wxID_ANY, _("Output")); h->SetFont (subheading_font); - vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); + right->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); /* XXX: hard-coded non-interop here */ _output = new KDMOutputPanel (overall_panel, false); - vertical->Add (_output, 0, wxALL, DCPOMATIC_SIZER_Y_GAP); + right->Add (_output, 0, wxALL, DCPOMATIC_SIZER_Y_GAP); _create = new wxButton (overall_panel, wxID_ANY, _("Create KDMs")); - vertical->Add (_create, 0, wxALL, DCPOMATIC_SIZER_GAP); + right->Add (_create, 0, wxALL, DCPOMATIC_SIZER_GAP); - main_sizer->Add (vertical, 1, wxALL, DCPOMATIC_DIALOG_BORDER); + main_sizer->Add (horizontal, 1, wxALL | wxEXPAND, DCPOMATIC_DIALOG_BORDER); overall_panel->SetSizer (main_sizer); /* Instantly save any config changes when using a DCP-o-matic GUI */ @@ -271,9 +281,9 @@ private: /* Make an empty KDM */ dcp::DecryptedKDM kdm ( - dcp::LocalTime (_timing->from(), i->cinema->utc_offset(), 0), - dcp::LocalTime (_timing->until(), i->cinema->utc_offset(), 0), - decrypted.annotation_text(), + dcp::LocalTime (_timing->from(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()), + dcp::LocalTime (_timing->until(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()), + decrypted.annotation_text().get_value_or (""), decrypted.content_title_text(), dcp::LocalTime().as_string() ); @@ -287,8 +297,13 @@ private: screen_kdms.push_back (ScreenKDM (i, kdm.encrypt (signer, i->recipient.get(), i->trusted_devices, _output->formulation()))); } + dcp::NameFormat::Map name_values; + name_values['f'] = decrypted.content_title_text(); + 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 (_output->write_to()) { - ScreenKDM::write_files (decrypted.content_title_text(), screen_kdms, _output->directory()); + ScreenKDM::write_files (screen_kdms, _output->directory(), _output->name_format(), name_values); /* XXX: proper plural form support in wxWidgets? */ wxString s = screen_kdms.size() == 1 ? _("%d KDM written to %s") : _("%d KDMs written to %s"); message_dialog ( @@ -296,15 +311,15 @@ private: wxString::Format (s, int(screen_kdms.size()), std_to_wx(_output->directory().string()).data()) ); } else { - string film_name = decrypted.annotation_text (); + string film_name = decrypted.annotation_text().get_value_or (""); if (film_name.empty ()) { film_name = decrypted.content_title_text (); } shared_ptr job (new SendKDMEmailJob ( - film_name, - decrypted.content_title_text(), - _timing->from(), _timing->until(), CinemaKDMs::collect (screen_kdms), + _output->name_format(), + name_values, + decrypted.content_title_text(), shared_ptr () )); @@ -359,7 +374,7 @@ private: { wxInitAllImageHandlers (); - SetAppName (_("DCP-o-matic KDM creator")); + SetAppName (_("DCP-o-matic KDM Creator")); if (!wxApp::OnInit()) { return false; @@ -395,7 +410,7 @@ private: */ Config::drop (); - _frame = new DOMFrame (_("DCP-o-matic KDM creator")); + _frame = new DOMFrame (_("DCP-o-matic KDM Creator")); SetTopWindow (_frame); _frame->Maximize (); _frame->Show ();