Add some logging to the KDM creator.
[dcpomatic.git] / src / tools / dcpomatic_kdm.cc
index b98ec84a9aa939cf165c84bd1283afc8aad10e56..7a8d7cf349d532749ba69b8cfaf217d7bc232d41 100644 (file)
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2021 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/config_dialog.h"
+
 #include "wx/about_dialog.h"
-#include "wx/report_problem_dialog.h"
+#include "wx/dcpomatic_button.h"
+#include "wx/editable_list.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/full_config_dialog.h"
 #include "wx/job_view_dialog.h"
-#include "wx/file_dialog_wrapper.h"
-#include "wx/editable_list.h"
+#include "wx/kdm_output_panel.h"
+#include "wx/kdm_timing_panel.h"
+#include "wx/nag_dialog.h"
+#include "wx/new_dkdm_folder_dialog.h"
+#include "wx/report_problem_dialog.h"
+#include "wx/screens_panel.h"
+#include "wx/static_text.h"
+#include "wx/wx_signal_manager.h"
+#include "wx/wx_util.h"
+#include "lib/cinema.h"
+#include "lib/compose.hpp"
 #include "lib/config.h"
-#include "lib/util.h"
-#include "lib/screen.h"
-#include "lib/job_manager.h"
-#include "lib/screen_kdm.h"
+#include "lib/cross.h"
+#include "lib/dcpomatic_log.h"
+#include "lib/dkdm_wrapper.h"
 #include "lib/exceptions.h"
-#include "lib/cinema_kdms.h"
+#include "lib/file_log.h"
+#include "lib/job_manager.h"
+#include "lib/kdm_with_metadata.h"
+#include "lib/screen.h"
 #include "lib/send_kdm_email_job.h"
-#include "lib/compose.hpp"
-#include "lib/cinema.h"
+#include "lib/util.h"
 #include <dcp/encrypted_kdm.h>
 #include <dcp/decrypted_kdm.h>
 #include <dcp/exceptions.h>
-#include <wx/wx.h>
-#include <wx/preferences.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/filepicker.h>
+#include <wx/preferences.h>
+#include <wx/splash.h>
+#include <wx/treectrl.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
 #ifdef __WXOSX__
 #include <ApplicationServices/ApplicationServices.h>
 #endif
-#include <boost/bind.hpp>
-#include <boost/foreach.hpp>
+#include <boost/bind/bind.hpp>
 
 #ifdef check
 #undef check
 #endif
 
+
 using std::exception;
 using std::list;
+using std::make_shared;
+using std::map;
+using std::pair;
+using std::shared_ptr;
 using std::string;
 using std::vector;
-using boost::shared_ptr;
 using boost::bind;
+using boost::optional;
+using boost::ref;
+using std::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+using namespace dcpomatic;
+
 
 enum {
        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)
-               , _config_dialog (0)
-               , _job_view (0)
+       explicit DOMFrame (wxString const & title)
+               : wxFrame (nullptr, -1, title)
+               , _config_dialog (nullptr)
+               , _job_view (nullptr)
        {
 #if defined(DCPOMATIC_WINDOWS)
                if (Config::instance()->win32_console ()) {
@@ -110,80 +119,97 @@ public:
                }
 #endif
 
-               wxMenuBar* bar = new wxMenuBar;
+               auto bar = new wxMenuBar;
                setup_menu (bar);
                SetMenuBar (bar);
 
-               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::file_exit, this),             wxID_EXIT);
-               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::edit_preferences, this),      wxID_PREFERENCES);
-               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::help_about, this),            wxID_ABOUT);
-               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::help_report_a_problem, this), ID_help_report_a_problem);
+               Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_exit, this),             wxID_EXIT);
+               Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_preferences, this),      wxID_PREFERENCES);
+               Bind (wxEVT_MENU, boost::bind (&DOMFrame::help_about, this),            wxID_ABOUT);
+               Bind (wxEVT_MENU, boost::bind (&DOMFrame::help_report_a_problem, this), ID_help_report_a_problem);
 
                /* Use a panel as the only child of the Frame so that we avoid
                   the dark-grey background on Windows.
                */
-               wxPanel* overall_panel = new wxPanel (this, wxID_ANY);
-               wxBoxSizer* main_sizer = new wxBoxSizer (wxHORIZONTAL);
+               auto overall_panel = new wxPanel (this, wxID_ANY);
+               auto main_sizer = new wxBoxSizer (wxHORIZONTAL);
 
-               wxBoxSizer* vertical = new wxBoxSizer (wxVERTICAL);
+               auto horizontal = new wxBoxSizer (wxHORIZONTAL);
+               auto left = new wxBoxSizer (wxVERTICAL);
+               auto 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"));
+               auto h = new StaticText (overall_panel, _("Screens"));
                h->SetFont (subheading_font);
-               vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL);
+               left->Add (h, 0, 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 StaticText (overall_panel, S_("KDM|Timing"));
+               h->SetFont (subheading_font);
+               right->Add (h);
                _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 = new StaticText (overall_panel, _("DKDM"));
                h->SetFont (subheading_font);
-               vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
-
-               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 (&column, _1), false
-                       );
-               vertical->Add (_dkdm, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP);
-
-               h = new wxStaticText (overall_panel, wxID_ANY, _("Output"));
+               right->Add (h, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
+               auto dkdm_sizer = new wxBoxSizer (wxHORIZONTAL);
+               _dkdm = new wxTreeCtrl (
+                       overall_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_HIDE_ROOT | wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT
+               );
+               dkdm_sizer->Add (_dkdm, 1, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP);
+               wxBoxSizer* dkdm_buttons = new wxBoxSizer(wxVERTICAL);
+               _add_dkdm = new Button (overall_panel, _("Add..."));
+               dkdm_buttons->Add (_add_dkdm, 0, wxALL | wxEXPAND, DCPOMATIC_BUTTON_STACK_GAP);
+               _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 Button (overall_panel, _("Remove"));
+               dkdm_buttons->Add (_remove_dkdm, 0, wxALL | wxEXPAND, DCPOMATIC_BUTTON_STACK_GAP);
+               _export_dkdm = new Button (overall_panel, _("Export..."));
+               dkdm_buttons->Add (_export_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());
+
+               h = new StaticText (overall_panel, _("Output"));
                h->SetFont (subheading_font);
-               vertical->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 (h, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
+               _output = new KDMOutputPanel (overall_panel);
+               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);
+               _create = new Button (overall_panel, _("Create KDMs"));
+               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 */
                Config::instance()->Changed.connect (boost::bind (&Config::write, Config::instance ()));
 
                _screens->ScreensChanged.connect (boost::bind (&DOMFrame::setup_sensitivity, this));
-               _create->Bind (wxEVT_COMMAND_BUTTON_CLICKED, bind (&DOMFrame::create_kdms, this));
-               _dkdm->SelectionChanged.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));
+               _export_dkdm->Bind (wxEVT_BUTTON, bind (&DOMFrame::export_dkdm_clicked, 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);
+               dcpomatic_log = make_shared<FileLog>(State::write_path("kdm.log"));
        }
 
+private:
        void file_exit ()
        {
                /* false here allows the close handler to veto the close request */
@@ -193,21 +219,21 @@ private:
        void edit_preferences ()
        {
                if (!_config_dialog) {
-                       _config_dialog = create_config_dialog ();
+                       _config_dialog = create_full_config_dialog ();
                }
                _config_dialog->Show (this);
        }
 
        void help_about ()
        {
-               AboutDialog* d = new AboutDialog (this);
+               auto d = new AboutDialog (this);
                d->ShowModal ();
                d->Destroy ();
        }
 
        void help_report_a_problem ()
        {
-               ReportProblemDialog* d = new ReportProblemDialog (this, shared_ptr<Film> ());
+               auto d = new ReportProblemDialog (this, shared_ptr<Film>());
                if (d->ShowModal () == wxID_OK) {
                        d->report ();
                }
@@ -216,7 +242,7 @@ private:
 
        void setup_menu (wxMenuBar* m)
        {
-               wxMenu* file = new wxMenu;
+               auto file = new wxMenu;
 
 #ifdef __WXOSX__
                file->Append (wxID_EXIT, _("&Exit"));
@@ -246,80 +272,133 @@ private:
                m->Append (help, _("&Help"));
        }
 
+       bool confirm_overwrite (boost::filesystem::path path)
+       {
+               return confirm_dialog (
+                       this,
+                       wxString::Format (_("File %s already exists.  Do you want to overwrite it?"), std_to_wx(path.string()).data())
+                       );
+       }
+
+       /** @id if not 0 this is filled in with the wxTreeItemId of the selection */
+       shared_ptr<DKDMBase> selected_dkdm (wxTreeItemId* id = 0) const
+       {
+               wxArrayTreeItemIds selections;
+               _dkdm->GetSelections (selections);
+               if (selections.GetCount() != 1) {
+                       if (id) {
+                               *id = 0;
+                       }
+                       return shared_ptr<DKDMBase> ();
+               }
+
+               if (id) {
+                       *id = selections[0];
+               }
+
+               auto i = _dkdm_id.find (selections[0]);
+               if (i == _dkdm_id.end()) {
+                       return shared_ptr<DKDMBase> ();
+               }
+
+               return i->second;
+       }
+
        void create_kdms ()
        {
                try {
-                       if (!_dkdm->selection()) {
+                       auto dkdm_base = selected_dkdm ();
+                       if (!dkdm_base) {
                                return;
                        }
 
-                       /* Decrypt the DKDM */
-                       dcp::DecryptedKDM decrypted (_dkdm->selection().get(), Config::instance()->decryption_chain()->key().get());
+                       list<KDMWithMetadataPtr> kdms;
+                       string title;
 
-                       /* This is the signer for our new KDMs */
-                       shared_ptr<const dcp::CertificateChain> signer = Config::instance()->signer_chain ();
-                       if (!signer->valid ()) {
-                               throw InvalidSignerError ();
-                       }
+                       auto dkdm = std::dynamic_pointer_cast<DKDM>(dkdm_base);
+                       if (dkdm) {
 
-                       list<ScreenKDM> screen_kdms;
-                       BOOST_FOREACH (shared_ptr<Screen> i, _screens->screens()) {
+                               /* Decrypt the DKDM */
+                               dcp::DecryptedKDM decrypted (dkdm->dkdm(), Config::instance()->decryption_chain()->key().get());
+                               title = decrypted.content_title_text ();
 
-                               if (!i->recipient) {
-                                       continue;
+                               /* This is the signer for our new KDMs */
+                               auto signer = Config::instance()->signer_chain ();
+                               if (!signer->valid ()) {
+                                       throw InvalidSignerError ();
                                }
 
-                               /* 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(),
-                                       decrypted.content_title_text(),
-                                       dcp::LocalTime().as_string()
-                                       );
-
-                               /* Add keys from the DKDM */
-                               BOOST_FOREACH (dcp::DecryptedKDMKey const & j, decrypted.keys()) {
-                                       kdm.add_key (j);
+                               for (auto i: _screens->screens()) {
+
+                                       if (!i->recipient) {
+                                               continue;
+                                       }
+
+                                       dcp::LocalTime begin(_timing->from(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute());
+                                       dcp::LocalTime end(_timing->until(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute());
+
+                                       /* Make an empty KDM */
+                                       dcp::DecryptedKDM kdm (
+                                               begin,
+                                               end,
+                                               decrypted.annotation_text().get_value_or (""),
+                                               title,
+                                               dcp::LocalTime().as_string()
+                                               );
+
+                                       /* Add keys from the DKDM */
+                                       for (auto const& j: decrypted.keys()) {
+                                               kdm.add_key (j);
+                                       }
+
+                                       auto const encrypted = kdm.encrypt(
+                                                       signer, i->recipient.get(), i->trusted_device_thumbprints(), _output->formulation(),
+                                                       !_output->forensic_mark_video(), _output->forensic_mark_audio() ? boost::optional<int>() : 0
+                                                       );
+
+                                       dcp::NameFormat::Map name_values;
+                                       name_values['c'] = i->cinema->name;
+                                       name_values['s'] = i->name;
+                                       name_values['f'] = title;
+                                       name_values['b'] = begin.date() + " " + begin.time_of_day(true, false);
+                                       name_values['e'] = end.date() + " " + end.time_of_day(true, false);
+                                       name_values['i'] = encrypted.cpl_id ();
+
+                                       /* Encrypt */
+                                       kdms.push_back (make_shared<KDMWithMetadata>(name_values, i->cinema.get(), i->cinema->emails, encrypted));
                                }
+                       }
 
-                               /* Encrypt */
-                               screen_kdms.push_back (ScreenKDM (i, kdm.encrypt (signer, i->recipient.get(), i->trusted_devices, _output->formulation())));
+                       if (kdms.empty()) {
+                               return;
                        }
 
-                       if (_output->write_to()) {
-                               ScreenKDM::write_files (decrypted.content_title_text(), screen_kdms, _output->directory());
-                               /* 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 (
-                                       this,
-                                       wxString::Format (s, int(screen_kdms.size()), std_to_wx(_output->directory().string()).data())
-                                       );
-                       } else {
-                               string film_name = decrypted.annotation_text ();
-                               if (film_name.empty ()) {
-                                       film_name = decrypted.content_title_text ();
-                               }
-                               shared_ptr<Job> job (new SendKDMEmailJob (
-                                                            film_name,
-                                                            decrypted.content_title_text(),
-                                                            _timing->from(), _timing->until(),
-                                                            CinemaKDMs::collect (screen_kdms),
-                                                            shared_ptr<Log> ()
-                                                            ));
-
-                               JobManager::instance()->add (job);
+                       auto result = _output->make (
+                               kdms, title, bind (&DOMFrame::confirm_overwrite, this, _1)
+                               );
+
+                       if (result.first) {
+                               JobManager::instance()->add (result.first);
                                if (_job_view) {
                                        _job_view->Destroy ();
                                        _job_view = 0;
                                }
-                               _job_view = new JobViewDialog (this, _("Send KDM emails"), job);
+                               _job_view = new JobViewDialog (this, _("Send KDM emails"), result.first);
                                _job_view->ShowModal ();
                        }
+
+                       if (result.second > 0) {
+                               /* XXX: proper plural form support in wxWidgets? */
+                               wxString s = result.second == 1 ? _("%d KDM written to %s") : _("%d KDMs written to %s");
+                               message_dialog (
+                                       this,
+                                       wxString::Format (s, result.second, std_to_wx(_output->directory().string()).data())
+                                       );
+                       }
                } 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."));
                }
@@ -329,18 +408,209 @@ private:
        {
                _screens->setup_sensitivity ();
                _output->setup_sensitivity ();
-               _create->Enable (!_screens->screens().empty() && _dkdm->selection());
+               wxArrayTreeItemIds sel;
+               _dkdm->GetSelections (sel);
+               auto group = dynamic_pointer_cast<DKDMGroup>(selected_dkdm());
+               auto dkdm = dynamic_pointer_cast<DKDM>(selected_dkdm());
+               _create->Enable (!_screens->screens().empty() && sel.GetCount() > 0 && dkdm);
+               _remove_dkdm->Enable (sel.GetCount() > 0 && (!group || group->name() != "root"));
+               _export_dkdm->Enable (sel.GetCount() > 0 && dkdm);
+       }
+
+       void dkdm_begin_drag (wxTreeEvent& ev)
+       {
+               ev.Allow ();
+       }
+
+       void dkdm_end_drag (wxTreeEvent& ev)
+       {
+               auto from = _dkdm_id.find (_dkdm->GetSelection ());
+               auto to = _dkdm_id.find (ev.GetItem ());
+               if (from == _dkdm_id.end() || to == _dkdm_id.end() || from->first == to->first) {
+                       return;
+               }
+
+               auto group = dynamic_pointer_cast<DKDMGroup> (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<DKDM>(to->second));
+
+               _dkdm->Delete (from->first);
+               _dkdm_id.erase (from->first);
+               add_dkdm_view (from->second, dynamic_pointer_cast<DKDM>(to->second) ? to->first : optional<wxTreeItemId>());
+       }
+
+       void add_dkdm_clicked ()
+       {
+               auto d = new wxFileDialog (this, _("Select DKDM file"));
+               if (d->ShowModal() == wxID_OK) {
+                       auto chain = Config::instance()->decryption_chain();
+                       DCPOMATIC_ASSERT (chain->key());
+
+                       try {
+                               dcp::EncryptedKDM ekdm(dcp::file_to_string (wx_to_std (d->GetPath ()), MAX_KDM_SIZE));
+                               /* Decrypt the DKDM to make sure that we can */
+                               dcp::DecryptedKDM dkdm(ekdm, chain->key().get());
+
+                               auto new_dkdm = make_shared<DKDM>(ekdm);
+                               auto group = dynamic_pointer_cast<DKDMGroup> (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,
+                                       _("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())
+                                       );
+                       }
+               }
+               d->Destroy ();
+       }
+
+       void add_dkdm_folder_clicked ()
+       {
+               auto d = new NewDKDMFolderDialog (this);
+               if (d->ShowModal() == wxID_OK) {
+                       auto new_dkdm = make_shared<DKDMGroup>(wx_to_std(d->get()));
+                       auto parent = dynamic_pointer_cast<DKDMGroup>(selected_dkdm());
+                       if (!parent) {
+                               parent = Config::instance()->dkdms ();
+                       }
+                       add_dkdm_model (new_dkdm, parent);
+                       add_dkdm_view (new_dkdm);
+               }
+               d->Destroy ();
+       }
+
+       /** @param dkdm Thing to add.
+        *  @param parent Parent group, or 0.
+        */
+       void add_dkdm_view (shared_ptr<DKDMBase> base, optional<wxTreeItemId> previous = optional<wxTreeItemId>())
+       {
+               if (!base->parent()) {
+                       /* This is the root group */
+                       _dkdm_id[_dkdm->AddRoot("root")] = base;
+               } else {
+                       /* Add base to the view */
+                       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 */
+               auto g = dynamic_pointer_cast<DKDMGroup>(base);
+               if (g) {
+                       for (auto i: g->children()) {
+                               add_dkdm_view (i);
+                       }
+               }
+       }
+
+       /** @param group Group to add dkdm to */
+       void add_dkdm_model (shared_ptr<DKDMBase> dkdm, shared_ptr<DKDMGroup> group, shared_ptr<DKDM> previous = shared_ptr<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.
+               */
+               Config::instance()->changed ();
+       }
+
+       wxTreeItemId dkdm_to_id (shared_ptr<DKDMBase> dkdm)
+       {
+               for (auto const& i: _dkdm_id) {
+                       if (i.second == dkdm) {
+                               return i.first;
+                       }
+               }
+               DCPOMATIC_ASSERT (false);
+       }
+
+       void remove_dkdm_clicked ()
+       {
+               auto removed = selected_dkdm ();
+               if (!removed) {
+                       return;
+               }
+
+               if (NagDialog::maybe_nag (
+                           this, Config::NAG_DELETE_DKDM,
+                           _("You are about to remove a DKDM.  This will make it impossible to decrypt the DCP that the DKDM was made for, and it cannot be undone.  "
+                             "Are you sure?"),
+                           true)) {
+                       return;
+               }
+
+               _dkdm->Delete (dkdm_to_id (removed));
+               auto dkdms = Config::instance()->dkdms ();
+               dkdms->remove (removed);
+               Config::instance()->changed ();
+       }
+
+       void export_dkdm_clicked ()
+       {
+               auto removed = selected_dkdm ();
+               if (!removed) {
+                       return;
+               }
+
+               auto dkdm = dynamic_pointer_cast<DKDM>(removed);
+               if (!dkdm) {
+                       return;
+               }
+
+               auto d = new wxFileDialog (
+                       this, _("Select DKDM File"), wxEmptyString, wxEmptyString, wxT("XML files (*.xml)|*.xml"),
+                       wxFD_SAVE | wxFD_OVERWRITE_PROMPT
+                       );
+
+               if (d->ShowModal() == wxID_OK) {
+                       dkdm->dkdm().as_xml(wx_to_std(d->GetPath()));
+               }
+               d->Destroy ();
        }
 
        wxPreferencesEditor* _config_dialog;
        ScreensPanel* _screens;
        KDMTimingPanel* _timing;
-       EditableList<dcp::EncryptedKDM, KDMFileDialogWrapper>* _dkdm;
+       wxTreeCtrl* _dkdm;
+       typedef std::map<wxTreeItemId, std::shared_ptr<DKDMBase>> DKDMMap;
+       DKDMMap _dkdm_id;
+       wxButton* _add_dkdm;
+       wxButton* _add_dkdm_folder;
+       wxButton* _remove_dkdm;
+       wxButton* _export_dkdm;
        wxButton* _create;
        KDMOutputPanel* _output;
        JobViewDialog* _job_view;
 };
 
+
 /** @class App
  *  @brief The magic App class for wxWidgets.
  */
@@ -349,70 +619,82 @@ class App : public wxApp
 public:
        App ()
                : wxApp ()
-               , _frame (0)
+               , _frame (nullptr)
        {}
 
 private:
 
-       bool OnInit ()
-       try
+       bool OnInit () override
        {
-               wxInitAllImageHandlers ();
+               wxSplashScreen* splash = nullptr;
 
-               SetAppName (_("DCP-o-matic KDM creator"));
+               try {
+                       wxInitAllImageHandlers ();
 
-               if (!wxApp::OnInit()) {
-                       return false;
-               }
+                       Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this));
+                       Config::Warning.connect (boost::bind (&App::config_warning, this, _1));
 
-#ifdef DCPOMATIC_LINUX
-               unsetenv ("UBUNTU_MENUPROXY");
-#endif
+                       splash = maybe_show_splash ();
 
-#ifdef __WXOSX__
-               ProcessSerialNumber serial;
-               GetCurrentProcess (&serial);
-               TransformProcessType (&serial, kProcessTransformToForegroundApplication);
-#endif
+                       SetAppName (_("DCP-o-matic KDM Creator"));
 
-               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 ();
+                       if (!wxApp::OnInit()) {
+                               return false;
+                       }
 
-               /* Set things up, including filters etc.
-                  which will now be internationalised correctly.
-               */
-               dcpomatic_setup ();
+#ifdef DCPOMATIC_LINUX
+                       unsetenv ("UBUNTU_MENUPROXY");
+#endif
 
-               /* Force the configuration to be re-loaded correctly next
-                  time it is needed.
-               */
-               Config::drop ();
+#ifdef DCPOMATIC_OSX
+                       make_foreground_application ();
+#endif
 
-               _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 = nullptr;
+                       }
+                       _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 ()
+       bool OnExceptionInMainLoop () override
        {
                try {
                        throw;
@@ -427,10 +709,10 @@ private:
                                );
                } catch (exception& e) {
                        error_dialog (
-                               0,
+                               nullptr,
                                wxString::Format (
                                        _("An exception occurred: %s.\n\n") + " " + REPORT_PROBLEM,
-                                       std_to_wx (e.what ())
+                                       std_to_wx(e.what())
                                        )
                                );
                } catch (...) {
@@ -441,9 +723,9 @@ private:
                return false;
        }
 
-       void OnUnhandledException ()
+       void OnUnhandledException () override
        {
-               error_dialog (0, _("An unknown exception occurred.") + "  " + REPORT_PROBLEM);
+               error_dialog (nullptr, _("An unknown exception occurred.") + "  " + REPORT_PROBLEM);
        }
 
        void idle ()
@@ -451,6 +733,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;
 };