X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm.cc;h=2af57e3690dbc6fc5ea8e92ff06b76f6ec04a943;hb=1f251f64efee1984e8ff662e44568a7619df7b2f;hp=95ed07769e94b07d90d0340df3587ab4c19fe40b;hpb=ba049fdab4a47023d6d5ee8b5ff9bbb710afbabb;p=dcpomatic.git diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index 95ed07769..2af57e369 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -18,7 +18,7 @@ */ -#include "wx/config_dialog.h" +#include "wx/full_config_dialog.h" #include "wx/about_dialog.h" #include "wx/report_problem_dialog.h" #include "wx/file_picker_ctrl.h" @@ -42,11 +42,13 @@ #include "lib/compose.hpp" #include "lib/cinema.h" #include "lib/dkdm_wrapper.h" +#include "lib/cross.h" #include #include #include #include #include +#include #include #ifdef __WXOSX__ #include @@ -77,7 +79,7 @@ enum { class DOMFrame : public wxFrame { public: - DOMFrame (wxString const & title) + explicit DOMFrame (wxString const & title) : wxFrame (0, -1, title) , _config_dialog (0) , _job_view (0) @@ -198,7 +200,7 @@ private: void edit_preferences () { if (!_config_dialog) { - _config_dialog = create_config_dialog (); + _config_dialog = create_full_config_dialog (); } _config_dialog->Show (this); } @@ -326,11 +328,19 @@ private: } /* Encrypt */ - screen_kdms.push_back (ScreenKDM (i, kdm.encrypt (signer, i->recipient.get(), i->trusted_devices, _output->formulation()))); + screen_kdms.push_back ( + ScreenKDM ( + i, + kdm.encrypt ( + signer, i->recipient.get(), i->trusted_device_thumbprints(), _output->formulation(), + !_output->forensic_mark_video(), _output->forensic_mark_audio() ? boost::optional() : 0 + ) + ) + ); } pair, int> result = _output->make ( - screen_kdms, decrypted.content_title_text(), _timing, bind (&DOMFrame::confirm_overwrite, this, _1), shared_ptr () + screen_kdms, decrypted.content_title_text(), _timing, bind (&DOMFrame::confirm_overwrite, this, _1) ); if (result.first) { @@ -354,7 +364,7 @@ private: } catch (dcp::NotEncryptedError& e) { error_dialog (this, _("CPL's content is not encrypted.")); } catch (exception& e) { - error_dialog (this, e.what ()); + error_dialog (this, std_to_wx(e.what())); } catch (...) { error_dialog (this, _("An unknown exception occurred.")); } @@ -378,7 +388,7 @@ private: { DKDMMap::iterator from = _dkdm_id.find (_dkdm->GetSelection ()); DKDMMap::iterator to = _dkdm_id.find (ev.GetItem ()); - if (from == _dkdm_id.end() || to == _dkdm_id.end()) { + if (from == _dkdm_id.end() || to == _dkdm_id.end() || from->first == to->first) { return; } @@ -391,11 +401,11 @@ private: DCPOMATIC_ASSERT (from->second->parent ()); from->second->parent()->remove (from->second); - add_dkdm_model (from->second, group); + add_dkdm_model (from->second, group, dynamic_pointer_cast(to->second)); _dkdm->Delete (from->first); _dkdm_id.erase (from->first); - add_dkdm_view (from->second); + add_dkdm_view (from->second, dynamic_pointer_cast(to->second) ? to->first : optional()); } void add_dkdm_clicked () @@ -404,26 +414,33 @@ private: if (d->ShowModal() == wxID_OK) { shared_ptr new_dkdm; try { - new_dkdm.reset ( - new DKDM (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ()), MAX_KDM_SIZE))) - ); + dcp::EncryptedKDM ekdm(dcp::file_to_string (wx_to_std (d->GetPath ()), MAX_KDM_SIZE)); + + /* Decrypt the DKDM to make sure that we can */ + shared_ptr chain = Config::instance()->decryption_chain(); + DCPOMATIC_ASSERT (chain->key()); + dcp::DecryptedKDM dkdm(ekdm, chain->key().get()); + + new_dkdm.reset(new DKDM(ekdm)); + shared_ptr group = dynamic_pointer_cast (selected_dkdm ()); + if (!group) { + group = Config::instance()->dkdms (); + } + add_dkdm_model (new_dkdm, group); + add_dkdm_view (new_dkdm); } catch (dcp::KDMFormatError& e) { error_dialog ( this, - wxString::Format ( - _("Could not read file as a KDM. Perhaps it is badly formatted, or not a KDM at all.\n\n%s"), - std_to_wx(e.what()).data() - ) + _("Could not read file as a KDM. Perhaps it is badly formatted, or not a KDM at all."), + std_to_wx(e.what()) ); return; + } catch (dcp::KDMDecryptionError) { + error_dialog ( + this, + _("Could not decrypt the DKDM. Perhaps it was not created with the correct certificate.") + ); } - - shared_ptr group = dynamic_pointer_cast (selected_dkdm ()); - if (!group) { - group = Config::instance()->dkdms (); - } - add_dkdm_model (new_dkdm, group); - add_dkdm_view (new_dkdm); } d->Destroy (); } @@ -446,14 +463,20 @@ private: /** @param dkdm Thing to add. * @param parent Parent group, or 0. */ - void add_dkdm_view (shared_ptr base) + void add_dkdm_view (shared_ptr base, optional previous = optional()) { if (!base->parent()) { /* This is the root group */ _dkdm_id[_dkdm->AddRoot("root")] = base; } else { /* Add base to the view */ - _dkdm_id[_dkdm->AppendItem(dkdm_to_id(base->parent()), std_to_wx(base->name()))] = base; + wxTreeItemId added; + if (previous) { + added = _dkdm->InsertItem(dkdm_to_id(base->parent()), *previous, std_to_wx(base->name())); + } else { + added = _dkdm->AppendItem(dkdm_to_id(base->parent()), std_to_wx(base->name())); + } + _dkdm_id[added] = base; } /* Add children */ @@ -466,9 +489,9 @@ private: } /** @param group Group to add dkdm to */ - void add_dkdm_model (shared_ptr dkdm, shared_ptr group) + void add_dkdm_model (shared_ptr dkdm, shared_ptr group, shared_ptr previous = shared_ptr ()) { - group->add (dkdm); + group->add (dkdm, previous); /* We're messing with a Config-owned object here, so tell it that something has changed. This isn't nice. */ @@ -530,6 +553,11 @@ private: { wxInitAllImageHandlers (); + Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this)); + Config::Warning.connect (boost::bind (&App::config_warning, this, _1)); + + wxSplashScreen* splash = maybe_show_splash (); + SetAppName (_("DCP-o-matic KDM Creator")); if (!wxApp::OnInit()) { @@ -569,6 +597,9 @@ private: _frame = new DOMFrame (_("DCP-o-matic KDM Creator")); SetTopWindow (_frame); _frame->Maximize (); + if (splash) { + splash->Destroy (); + } _frame->Show (); signal_manager = new wxSignalManager (this); @@ -578,7 +609,7 @@ private: } catch (exception& e) { - error_dialog (0, wxString::Format ("DCP-o-matic could not start: %s", e.what ())); + error_dialog (0, _("DCP-o-matic could not start"), std_to_wx(e.what())); return true; } @@ -622,6 +653,16 @@ private: signal_manager->ui_idle (); } + void config_failed_to_load () + { + message_dialog (_frame, _("The existing configuration failed to load. Default values will be used instead. These may take a short time to create.")); + } + + void config_warning (string m) + { + message_dialog (_frame, std_to_wx (m)); + } + DOMFrame* _frame; };