/*
Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
- 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 <http://www.gnu.org/licenses/>.
*/
#include "wx/kdm_timing_panel.h"
#include "wx/kdm_output_panel.h"
#include "wx/job_view_dialog.h"
+#include "wx/file_dialog_wrapper.h"
+#include "wx/editable_list.h"
#include "lib/config.h"
#include "lib/util.h"
#include "lib/screen.h"
#include "lib/exceptions.h"
#include "lib/cinema_kdms.h"
#include "lib/send_kdm_email_job.h"
+#include "lib/compose.hpp"
+#include "lib/cinema.h"
#include <dcp/encrypted_kdm.h>
#include <dcp/decrypted_kdm.h>
#include <dcp/exceptions.h>
#include <wx/wx.h>
#include <wx/preferences.h>
#include <wx/filepicker.h>
+#ifdef __WXOSX__
+#include <ApplicationServices/ApplicationServices.h>
+#endif
#include <boost/bind.hpp>
#include <boost/foreach.hpp>
using std::exception;
using std::list;
using std::string;
+using std::vector;
using boost::shared_ptr;
using boost::bind;
enum {
- ID_help_report_a_problem,
+ ID_help_report_a_problem = 1,
+};
+
+class KDMFileDialogWrapper : public FileDialogWrapper<dcp::EncryptedKDM>
+{
+public:
+ KDMFileDialogWrapper (wxWindow* parent)
+ : FileDialogWrapper<dcp::EncryptedKDM> (parent, _("Select DKDM file"))
+ {
+
+ }
};
+static string
+column (dcp::EncryptedKDM k)
+{
+ return String::compose ("%1 (%2)", k.content_title_text(), k.cpl_id());
+}
+
class DOMFrame : public wxFrame
{
public:
DOMFrame (wxString const & title)
- : wxFrame (NULL, -1, title)
+ : wxFrame (0, -1, title)
, _config_dialog (0)
, _job_view (0)
{
+#if defined(DCPOMATIC_WINDOWS)
+ if (Config::instance()->win32_console ()) {
+ AllocConsole();
+
+ HANDLE handle_out = GetStdHandle(STD_OUTPUT_HANDLE);
+ int hCrt = _open_osfhandle((intptr_t) handle_out, _O_TEXT);
+ FILE* hf_out = _fdopen(hCrt, "w");
+ setvbuf(hf_out, NULL, _IONBF, 1);
+ *stdout = *hf_out;
+
+ HANDLE handle_in = GetStdHandle(STD_INPUT_HANDLE);
+ hCrt = _open_osfhandle((intptr_t) handle_in, _O_TEXT);
+ FILE* hf_in = _fdopen(hCrt, "r");
+ setvbuf(hf_in, NULL, _IONBF, 128);
+ *stdin = *hf_in;
+
+ std::cout << "DCP-o-matic KDM creator is starting." << "\n";
+ }
+#endif
+
wxMenuBar* bar = new wxMenuBar;
setup_menu (bar);
SetMenuBar (bar);
_screens = new ScreensPanel (overall_panel);
vertical->Add (_screens, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP);
- h = new wxStaticText (overall_panel, wxID_ANY, S_("KDM|Timing"));
- h->SetFont (subheading_font);
- vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
_timing = new KDMTimingPanel (overall_panel);
vertical->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);
- wxSizer* dkdm = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
- add_label_to_sizer (dkdm, overall_panel, _("DKDM file"), true);
- _dkdm = new FilePickerCtrl (overall_panel, _("Select a DKDM XML file..."), "*.xml");
- dkdm->Add (_dkdm, 1, wxEXPAND);
- add_label_to_sizer (dkdm, overall_panel, _("Annotation"), true);
- _annotation_text = new wxStaticText (overall_panel, wxID_ANY, wxT(""));
- dkdm->Add (_annotation_text, 1, wxEXPAND);
- add_label_to_sizer (dkdm, overall_panel, _("Content title"), true);
- _content_title_text = new wxStaticText (overall_panel, wxID_ANY, wxT(""));
- dkdm->Add (_content_title_text, 1, wxEXPAND);
- add_label_to_sizer (dkdm, overall_panel, _("Issue date"), true);
- _issue_date = new wxStaticText (overall_panel, wxID_ANY, wxT(""));
- dkdm->Add (_issue_date, 1, wxEXPAND);
- vertical->Add (dkdm, 0, wxALL, DCPOMATIC_SIZER_X_GAP);
+
+ vector<string> columns;
+ columns.push_back (wx_to_std (_("CPL")));
+ _dkdm = new EditableList<dcp::EncryptedKDM, KDMFileDialogWrapper> (
+ 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);
h = new wxStaticText (overall_panel, wxID_ANY, _("Output"));
h->SetFont (subheading_font);
_create = new wxButton (overall_panel, wxID_ANY, _("Create KDMs"));
vertical->Add (_create, 0, wxALL, DCPOMATIC_SIZER_GAP);
- main_sizer->Add (vertical, 1, wxALL, DCPOMATIC_DIALOG_BORDER);
+ main_sizer->Add (vertical, 1, wxALL | wxEXPAND, DCPOMATIC_DIALOG_BORDER);
overall_panel->SetSizer (main_sizer);
/* Instantly save any config changes when using a DCP-o-matic GUI */
Config::instance()->Changed.connect (boost::bind (&Config::write, Config::instance ()));
_screens->ScreensChanged.connect (boost::bind (&DOMFrame::setup_sensitivity, this));
- _dkdm->Bind (wxEVT_COMMAND_FILEPICKER_CHANGED, bind (&DOMFrame::dkdm_changed, this));
_create->Bind (wxEVT_COMMAND_BUTTON_CLICKED, bind (&DOMFrame::create_kdms, this));
+ _dkdm->SelectionChanged.connect (boost::bind (&DOMFrame::setup_sensitivity, this));
setup_sensitivity ();
}
private:
+ vector<dcp::EncryptedKDM> dkdms () const
+ {
+ return Config::instance()->dkdms ();
+ }
+
+ void set_dkdms (vector<dcp::EncryptedKDM> dkdms)
+ {
+ Config::instance()->set_dkdms (dkdms);
+ }
+
void file_exit ()
{
/* false here allows the close handler to veto the close request */
m->Append (help, _("&Help"));
}
- void dkdm_changed ()
- {
- if (_dkdm->GetPath().IsEmpty()) {
- return;
- }
-
- try {
- dcp::EncryptedKDM encrypted (dcp::file_to_string (wx_to_std (_dkdm->GetPath())));
- dcp::DecryptedKDM decrypted (encrypted, Config::instance()->decryption_chain()->key().get());
- _annotation_text->Enable (true);
- _annotation_text->SetLabel (std_to_wx (decrypted.annotation_text ()));
- _content_title_text->Enable (true);
- _content_title_text->SetLabel (std_to_wx (decrypted.content_title_text ()));
- _issue_date->Enable (true);
- _issue_date->SetLabel (std_to_wx (decrypted.issue_date ()));
- } catch (exception& e) {
- error_dialog (this, wxString::Format (_("Could not load DKDM (%s)"), std_to_wx (e.what()).data()));
- _dkdm->SetPath (wxT(""));
- _annotation_text->SetLabel (wxT(""));
- _annotation_text->Enable (false);
- _content_title_text->SetLabel (wxT(""));
- _content_title_text->Enable (false);
- _issue_date->SetLabel (wxT(""));
- _issue_date->Enable (false);
- }
-
- setup_sensitivity ();
- }
-
void create_kdms ()
{
try {
+ if (!_dkdm->selection()) {
+ return;
+ }
+
/* Decrypt the DKDM */
- dcp::EncryptedKDM encrypted (dcp::file_to_string (wx_to_std (_dkdm->GetPath())));
- dcp::DecryptedKDM decrypted (encrypted, Config::instance()->decryption_chain()->key().get());
+ dcp::DecryptedKDM decrypted (_dkdm->selection().get(), Config::instance()->decryption_chain()->key().get());
/* This is the signer for our new KDMs */
shared_ptr<const dcp::CertificateChain> signer = Config::instance()->signer_chain ();
list<ScreenKDM> screen_kdms;
BOOST_FOREACH (shared_ptr<Screen> i, _screens->screens()) {
- if (!i->certificate) {
+ if (!i->recipient) {
continue;
}
/* Make an empty KDM */
dcp::DecryptedKDM kdm (
- _timing->from(), _timing->until(), decrypted.annotation_text(), decrypted.content_title_text(), dcp::LocalTime().as_string()
+ 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()
);
/* Add keys from the DKDM */
}
/* Encrypt */
- screen_kdms.push_back (ScreenKDM (i, kdm.encrypt (signer, i->certificate.get(), _output->formulation())));
+ screen_kdms.push_back (ScreenKDM (i, kdm.encrypt (signer, i->recipient.get(), i->trusted_devices, _output->formulation())));
}
if (_output->write_to()) {
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 ();
}
film_name,
decrypted.content_title_text(),
_timing->from(), _timing->until(),
- CinemaKDMs::collect (screen_kdms)
+ CinemaKDMs::collect (screen_kdms),
+ shared_ptr<Log> ()
));
JobManager::instance()->add (job);
{
_screens->setup_sensitivity ();
_output->setup_sensitivity ();
- _create->Enable (!_screens->screens().empty() && !_dkdm->GetPath().IsEmpty());
+ _create->Enable (!_screens->screens().empty() && _dkdm->selection());
}
wxPreferencesEditor* _config_dialog;
ScreensPanel* _screens;
KDMTimingPanel* _timing;
- /* I can't seem to clear the value in a wxFilePickerCtrl, so use our own */
- FilePickerCtrl* _dkdm;
- wxStaticText* _annotation_text;
- wxStaticText* _content_title_text;
- wxStaticText* _issue_date;
+ EditableList<dcp::EncryptedKDM, KDMFileDialogWrapper>* _dkdm;
wxButton* _create;
KDMOutputPanel* _output;
JobViewDialog* _job_view;
{
wxInitAllImageHandlers ();
- SetAppName (_("DCP-o-matic KDM creator"));
+ SetAppName (_("DCP-o-matic KDM Creator"));
if (!wxApp::OnInit()) {
return false;
*/
Config::drop ();
- _frame = new DOMFrame (_("DCP-o-matic KDM creator"));
+ _frame = new DOMFrame (_("DCP-o-matic KDM Creator"));
SetTopWindow (_frame);
_frame->Maximize ();
_frame->Show ();
projects / dcpomatic.git / blobdiff