X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm.cc;h=ae5802e74506a4f4f9e558dc338ad4b2f1886279;hb=69f25e496ba409c02aa27b1e07dfcde34c86a32b;hp=b0821361276b242ce3d0717cf83f07c7d09ba1cf;hpb=5cd49a43b0c453f714bb654d0f23b726b39dadec;p=dcpomatic.git diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index b08213612..ae5802e74 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -20,11 +20,13 @@ #include "wx/config_dialog.h" #include "wx/about_dialog.h" #include "wx/report_problem_dialog.h" +#include "wx/file_picker_ctrl.h" #include "wx/wx_util.h" #include "wx/wx_signal_manager.h" #include "wx/screens_panel.h" #include "wx/kdm_timing_panel.h" #include "wx/kdm_output_panel.h" +#include "wx/job_view_dialog.h" #include "lib/config.h" #include "lib/util.h" #include "lib/screen.h" @@ -39,6 +41,9 @@ #include #include #include +#ifdef __WXOSX__ +#include +#endif #include #include @@ -48,11 +53,12 @@ using std::exception; using std::list; +using std::string; using boost::shared_ptr; using boost::bind; enum { - ID_help_report_a_problem, + ID_help_report_a_problem = 1, }; class DOMFrame : public wxFrame @@ -61,7 +67,28 @@ public: DOMFrame (wxString const & title) : wxFrame (NULL, -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); @@ -88,29 +115,19 @@ public: _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); -#ifdef DCPOMATIC_USE_OWN_PICKER - _dkdm = new FilePicker (overall_panel, _("Select a DKDM XML file..."), "*.xml"); -#else - _dkdm = new wxFilePickerCtrl (overall_panel, wxID_ANY, wxEmptyString, _("Select a DKDM XML file..."), "*.xml", wxDefaultPosition, wxSize (300, -1)); -#endif + _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, _("Annotation"), true); + _annotation_text = new wxStaticText (overall_panel, wxID_ANY, wxT("")); + dkdm->Add (_annotation_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); @@ -204,6 +221,10 @@ private: 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()); @@ -243,7 +264,7 @@ private: list screen_kdms; BOOST_FOREACH (shared_ptr i, _screens->screens()) { - if (!i->certificate) { + if (!i->recipient) { continue; } @@ -258,7 +279,7 @@ private: } /* 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()) { @@ -270,14 +291,25 @@ private: wxString::Format (s, int(screen_kdms.size()), std_to_wx(_output->directory().string()).data()) ); } else { - JobManager::instance()->add ( - shared_ptr (new SendKDMEmailJob ( - decrypted.annotation_text(), - decrypted.content_title_text(), - _timing->from(), _timing->until(), - CinemaKDMs::collect (screen_kdms) - )) - ); + string film_name = decrypted.annotation_text (); + 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), + shared_ptr () + )); + + JobManager::instance()->add (job); + if (_job_view) { + _job_view->Destroy (); + _job_view = 0; + } + _job_view = new JobViewDialog (this, _("Send KDM emails"), job); + _job_view->ShowModal (); } } catch (dcp::NotEncryptedError& e) { error_dialog (this, _("CPL's content is not encrypted.")); @@ -298,17 +330,14 @@ private: wxPreferencesEditor* _config_dialog; ScreensPanel* _screens; KDMTimingPanel* _timing; -#ifdef DCPOMATIC_USE_OWN_PICKER - FilePicker* _dkdm; -#else - wxFilePickerCtrl* _dkdm; -#endif + /* 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; wxButton* _create; KDMOutputPanel* _output; - JobManagerView* _jobs; + JobViewDialog* _job_view; }; /** @class App