X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm.cc;h=6c1fbd8004c0fedbda1b482fd0480d068aa14b51;hb=01a0dcfde7cdfdd4ade603338fb9b2fc586a2f01;hp=072cc2b0ebc8afa70dacfe1cef2bf23143a45512;hpb=aaf1d809a0ebbc2eb7dcd9ea7146cfe7bb4702f1;p=dcpomatic.git diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index 072cc2b0e..6c1fbd800 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" @@ -31,6 +31,8 @@ #include "wx/file_dialog_wrapper.h" #include "wx/new_dkdm_folder_dialog.h" #include "wx/editable_list.h" +#include "wx/static_text.h" +#include "wx/dcpomatic_button.h" #include "lib/config.h" #include "lib/util.h" #include "lib/screen.h" @@ -42,11 +44,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 +81,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) @@ -127,20 +131,20 @@ public: wxFont subheading_font (*wxNORMAL_FONT); subheading_font.SetWeight (wxFONTWEIGHT_BOLD); - wxStaticText* h = new wxStaticText (overall_panel, wxID_ANY, _("Screens")); + wxStaticText* h = new StaticText (overall_panel, _("Screens")); h->SetFont (subheading_font); left->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP); _screens = new ScreensPanel (overall_panel); 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 = new StaticText (overall_panel, S_("KDM|Timing")); h->SetFont (subheading_font); right->Add (h, 0, wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_Y_GAP * 2); _timing = new KDMTimingPanel (overall_panel); right->Add (_timing, 0, wxALL, DCPOMATIC_SIZER_Y_GAP); - h = new wxStaticText (overall_panel, wxID_ANY, _("DKDM")); + h = new StaticText (overall_panel, _("DKDM")); h->SetFont (subheading_font); right->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); wxBoxSizer* dkdm_sizer = new wxBoxSizer (wxHORIZONTAL); @@ -149,25 +153,25 @@ public: ); dkdm_sizer->Add (_dkdm, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP); wxBoxSizer* dkdm_buttons = new wxBoxSizer(wxVERTICAL); - _add_dkdm = new wxButton (overall_panel, wxID_ANY, _("Add...")); + _add_dkdm = new Button (overall_panel, _("Add...")); dkdm_buttons->Add (_add_dkdm, 0, wxALL | wxEXPAND, DCPOMATIC_BUTTON_STACK_GAP); - _add_dkdm_folder = new wxButton (overall_panel, wxID_ANY, _("Add folder...")); + _add_dkdm_folder = new Button (overall_panel, _("Add folder...")); dkdm_buttons->Add (_add_dkdm_folder, 0, wxALL | wxEXPAND, DCPOMATIC_BUTTON_STACK_GAP); - _remove_dkdm = new wxButton (overall_panel, wxID_ANY, _("Remove")); + _remove_dkdm = new Button (overall_panel, _("Remove")); dkdm_buttons->Add (_remove_dkdm, 0, wxALL | wxEXPAND, DCPOMATIC_BUTTON_STACK_GAP); dkdm_sizer->Add (dkdm_buttons, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_GAP); right->Add (dkdm_sizer, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP); - add_dkdm_view (Config::instance()->dkdms(), shared_ptr ()); + add_dkdm_view (Config::instance()->dkdms()); - h = new wxStaticText (overall_panel, wxID_ANY, _("Output")); + h = new StaticText (overall_panel, _("Output")); h->SetFont (subheading_font); 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); right->Add (_output, 0, wxALL, DCPOMATIC_SIZER_Y_GAP); - _create = new wxButton (overall_panel, wxID_ANY, _("Create KDMs")); + _create = new Button (overall_panel, _("Create KDMs")); right->Add (_create, 0, wxALL, DCPOMATIC_SIZER_GAP); main_sizer->Add (horizontal, 1, wxALL | wxEXPAND, DCPOMATIC_DIALOG_BORDER); @@ -179,6 +183,8 @@ public: _screens->ScreensChanged.connect (boost::bind (&DOMFrame::setup_sensitivity, this)); _create->Bind (wxEVT_BUTTON, bind (&DOMFrame::create_kdms, this)); _dkdm->Bind (wxEVT_TREE_SEL_CHANGED, boost::bind (&DOMFrame::setup_sensitivity, this)); + _dkdm->Bind (wxEVT_TREE_BEGIN_DRAG, boost::bind (&DOMFrame::dkdm_begin_drag, this, _1)); + _dkdm->Bind (wxEVT_TREE_END_DRAG, boost::bind (&DOMFrame::dkdm_end_drag, this, _1)); _add_dkdm->Bind (wxEVT_BUTTON, bind (&DOMFrame::add_dkdm_clicked, this)); _add_dkdm_folder->Bind (wxEVT_BUTTON, bind (&DOMFrame::add_dkdm_folder_clicked, this)); _remove_dkdm->Bind (wxEVT_BUTTON, bind (&DOMFrame::remove_dkdm_clicked, this)); @@ -196,7 +202,7 @@ private: void edit_preferences () { if (!_config_dialog) { - _config_dialog = create_config_dialog (); + _config_dialog = create_full_config_dialog (); } _config_dialog->Show (this); } @@ -324,11 +330,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) { @@ -352,7 +366,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.")); } @@ -367,32 +381,74 @@ private: _create->Enable (!_screens->screens().empty() && sel.GetCount() > 0); } + void dkdm_begin_drag (wxTreeEvent& ev) + { + ev.Allow (); + } + + void dkdm_end_drag (wxTreeEvent& ev) + { + 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() || from->first == to->first) { + return; + } + + shared_ptr group = dynamic_pointer_cast (to->second); + if (!group) { + group = to->second->parent(); + } + + DCPOMATIC_ASSERT (group); + DCPOMATIC_ASSERT (from->second->parent ()); + + from->second->parent()->remove (from->second); + 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, dynamic_pointer_cast(to->second) ? to->first : optional()); + } + void add_dkdm_clicked () { wxFileDialog* d = new wxFileDialog (this, _("Select DKDM file")); 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.") + ); + } catch (dcp::MiscError& e) { + error_dialog ( + this, + _("Could not read file as a KDM. It is much too large. Make sure you are loading a DKDM (XML) file."), + std_to_wx(e.what()) + ); } - - 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, group); } d->Destroy (); } @@ -407,7 +463,7 @@ private: parent = Config::instance()->dkdms (); } add_dkdm_model (new_dkdm, parent); - add_dkdm_view (new_dkdm, parent); + add_dkdm_view (new_dkdm); } d->Destroy (); } @@ -415,29 +471,35 @@ private: /** @param dkdm Thing to add. * @param parent Parent group, or 0. */ - void add_dkdm_view (shared_ptr base, shared_ptr parent) + void add_dkdm_view (shared_ptr base, optional previous = optional()) { - if (!parent) { + 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(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 */ shared_ptr g = dynamic_pointer_cast (base); if (g) { BOOST_FOREACH (shared_ptr i, g->children()) { - add_dkdm_view (i, g); + add_dkdm_view (i); } } } /** @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. */ @@ -495,61 +557,75 @@ public: private: bool OnInit () - try { - wxInitAllImageHandlers (); + wxSplashScreen* splash = 0; + + try { + wxInitAllImageHandlers (); - SetAppName (_("DCP-o-matic KDM Creator")); + Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this)); + Config::Warning.connect (boost::bind (&App::config_warning, this, _1)); - if (!wxApp::OnInit()) { - return false; - } + splash = maybe_show_splash (); + + SetAppName (_("DCP-o-matic KDM Creator")); + + if (!wxApp::OnInit()) { + return false; + } #ifdef DCPOMATIC_LINUX - unsetenv ("UBUNTU_MENUPROXY"); + unsetenv ("UBUNTU_MENUPROXY"); #endif #ifdef __WXOSX__ - ProcessSerialNumber serial; - GetCurrentProcess (&serial); - TransformProcessType (&serial, kProcessTransformToForegroundApplication); + ProcessSerialNumber serial; + GetCurrentProcess (&serial); + TransformProcessType (&serial, kProcessTransformToForegroundApplication); #endif - dcpomatic_setup_path_encoding (); - - /* Enable i18n; this will create a Config object - to look for a force-configured language. This Config - object will be wrong, however, because dcpomatic_setup - hasn't yet been called and there aren't any filters etc. - set up yet. - */ - dcpomatic_setup_i18n (); - - /* Set things up, including filters etc. - which will now be internationalised correctly. - */ - dcpomatic_setup (); - - /* Force the configuration to be re-loaded correctly next - time it is needed. - */ - Config::drop (); - - _frame = new DOMFrame (_("DCP-o-matic KDM Creator")); - SetTopWindow (_frame); - _frame->Maximize (); - _frame->Show (); + dcpomatic_setup_path_encoding (); + + /* Enable i18n; this will create a Config object + to look for a force-configured language. This Config + object will be wrong, however, because dcpomatic_setup + hasn't yet been called and there aren't any filters etc. + set up yet. + */ + dcpomatic_setup_i18n (); + + /* Set things up, including filters etc. + which will now be internationalised correctly. + */ + dcpomatic_setup (); + + /* Force the configuration to be re-loaded correctly next + time it is needed. + */ + Config::drop (); + + _frame = new DOMFrame (_("DCP-o-matic KDM Creator")); + SetTopWindow (_frame); + _frame->Maximize (); + if (splash) { + splash->Destroy (); + splash = 0; + } + _frame->Show (); - signal_manager = new wxSignalManager (this); - Bind (wxEVT_IDLE, boost::bind (&App::idle, this)); + signal_manager = new wxSignalManager (this); + Bind (wxEVT_IDLE, boost::bind (&App::idle, this)); + } + catch (exception& e) + { + if (splash) { + splash->Destroy (); + } + error_dialog (0, _("DCP-o-matic could not start"), std_to_wx(e.what())); + } return true; } - catch (exception& e) - { - error_dialog (0, wxString::Format ("DCP-o-matic could not start: %s", e.what ())); - return true; - } /* An unhandled exception has occurred inside the main event loop */ bool OnExceptionInMainLoop () @@ -591,6 +667,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; };