X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm.cc;h=7a8d7cf349d532749ba69b8cfaf217d7bc232d41;hp=26e7f8479ec465f5d34011af2b0ab846d5106d14;hb=25eb7aa723af004162fc7f95995df250c4e4571b;hpb=660d365faf784a8ea80d5fdc21a1384e81153194 diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index 26e7f8479..7a8d7cf34 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Carl Hetherington + Copyright (C) 2015-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,71 +18,86 @@ */ -#include "wx/full_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/kdm_output_panel.h" +#include "wx/kdm_timing_panel.h" +#include "wx/nag_dialog.h" #include "wx/new_dkdm_folder_dialog.h" -#include "wx/editable_list.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/dkdm_wrapper.h" -#include "lib/cross.h" +#include "lib/util.h" #include #include #include -#include +#include +LIBDCP_DISABLE_WARNINGS +#include #include #include -#include +#include +#include +LIBDCP_ENABLE_WARNINGS #ifdef __WXOSX__ #include #endif -#include -#include +#include #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 std::pair; -using std::map; -using boost::shared_ptr; using boost::bind; using boost::optional; using boost::ref; -using boost::dynamic_pointer_cast; +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 DOMFrame : public wxFrame { public: - DOMFrame (wxString const & title) - : wxFrame (0, -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 ()) { @@ -104,7 +119,7 @@ public: } #endif - wxMenuBar* bar = new wxMenuBar; + auto bar = new wxMenuBar; setup_menu (bar); SetMenuBar (bar); @@ -116,12 +131,12 @@ public: /* 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* horizontal = new wxBoxSizer (wxHORIZONTAL); - wxBoxSizer* left = new wxBoxSizer (wxVERTICAL); - wxBoxSizer* right = 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); @@ -129,47 +144,48 @@ public: 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); - left->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP); + left->Add (h, 0, 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); + right->Add (h); _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); + 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 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); + _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 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 (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")); + _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); @@ -186,8 +202,11 @@ public: _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 (); + + dcpomatic_log = make_shared(State::write_path("kdm.log")); } private: @@ -207,14 +226,14 @@ private: 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 ()); + auto d = new ReportProblemDialog (this, shared_ptr()); if (d->ShowModal () == wxID_OK) { d->report (); } @@ -223,7 +242,7 @@ private: void setup_menu (wxMenuBar* m) { - wxMenu* file = new wxMenu; + auto file = new wxMenu; #ifdef __WXOSX__ file->Append (wxID_EXIT, _("&Exit")); @@ -277,7 +296,7 @@ private: *id = selections[0]; } - DKDMMap::const_iterator i = _dkdm_id.find (selections[0]); + auto i = _dkdm_id.find (selections[0]); if (i == _dkdm_id.end()) { return shared_ptr (); } @@ -288,51 +307,74 @@ private: void create_kdms () { try { - shared_ptr dkdm_base = selected_dkdm (); + auto dkdm_base = selected_dkdm (); if (!dkdm_base) { return; } - shared_ptr dkdm = boost::dynamic_pointer_cast (dkdm_base); - if (!dkdm) { - return; - } - /* Decrypt the DKDM */ - dcp::DecryptedKDM decrypted (dkdm->dkdm(), Config::instance()->decryption_chain()->key().get()); + list kdms; + string title; - /* This is the signer for our new KDMs */ - shared_ptr signer = Config::instance()->signer_chain (); - if (!signer->valid ()) { - throw InvalidSignerError (); - } + auto dkdm = std::dynamic_pointer_cast(dkdm_base); + if (dkdm) { - list screen_kdms; - BOOST_FOREACH (shared_ptr 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_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 */ - 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() : 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(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; } - pair, int> result = _output->make ( - screen_kdms, decrypted.content_title_text(), _timing, bind (&DOMFrame::confirm_overwrite, this, _1), shared_ptr () + auto result = _output->make ( + kdms, title, bind (&DOMFrame::confirm_overwrite, this, _1) ); if (result.first) { @@ -356,7 +398,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.")); } @@ -368,7 +410,11 @@ private: _output->setup_sensitivity (); wxArrayTreeItemIds sel; _dkdm->GetSelections (sel); - _create->Enable (!_screens->screens().empty() && sel.GetCount() > 0); + auto group = dynamic_pointer_cast(selected_dkdm()); + auto dkdm = dynamic_pointer_cast(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) @@ -378,13 +424,13 @@ private: 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()) { + 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; } - shared_ptr group = dynamic_pointer_cast (to->second); + auto group = dynamic_pointer_cast (to->second); if (!group) { group = to->second->parent(); } @@ -402,40 +448,52 @@ private: void add_dkdm_clicked () { - wxFileDialog* d = new wxFileDialog (this, _("Select DKDM file")); + auto d = new wxFileDialog (this, _("Select DKDM file")); if (d->ShowModal() == wxID_OK) { - shared_ptr new_dkdm; + auto chain = Config::instance()->decryption_chain(); + DCPOMATIC_ASSERT (chain->key()); + 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 */ + dcp::DecryptedKDM dkdm(ekdm, chain->key().get()); + + auto new_dkdm = make_shared(ekdm); + auto 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); } d->Destroy (); } void add_dkdm_folder_clicked () { - NewDKDMFolderDialog* d = new NewDKDMFolderDialog (this); + auto d = new NewDKDMFolderDialog (this); if (d->ShowModal() == wxID_OK) { - shared_ptr new_dkdm (new DKDMGroup (wx_to_std (d->get ()))); - shared_ptr parent = dynamic_pointer_cast (selected_dkdm ()); + auto new_dkdm = make_shared(wx_to_std(d->get())); + auto parent = dynamic_pointer_cast(selected_dkdm()); if (!parent) { parent = Config::instance()->dkdms (); } @@ -465,9 +523,9 @@ private: } /* Add children */ - shared_ptr g = dynamic_pointer_cast (base); + auto g = dynamic_pointer_cast(base); if (g) { - BOOST_FOREACH (shared_ptr i, g->children()) { + for (auto i: g->children()) { add_dkdm_view (i); } } @@ -485,9 +543,9 @@ private: wxTreeItemId dkdm_to_id (shared_ptr dkdm) { - for (DKDMMap::iterator i = _dkdm_id.begin(); i != _dkdm_id.end(); ++i) { - if (i->second == dkdm) { - return i->first; + for (auto const& i: _dkdm_id) { + if (i.second == dkdm) { + return i.first; } } DCPOMATIC_ASSERT (false); @@ -495,31 +553,64 @@ private: void remove_dkdm_clicked () { - shared_ptr removed = selected_dkdm (); + 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)); - shared_ptr dkdms = Config::instance()->dkdms (); + 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(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; wxTreeCtrl* _dkdm; - typedef std::map > DKDMMap; + typedef std::map> 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. */ @@ -528,78 +619,82 @@ class App : public wxApp public: App () : wxApp () - , _frame (0) + , _frame (nullptr) {} private: - bool OnInit () - try + bool OnInit () override { - wxInitAllImageHandlers (); + wxSplashScreen* splash = nullptr; - Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this)); - Config::Warning.connect (boost::bind (&App::config_warning, this, _1)); + try { + wxInitAllImageHandlers (); - wxSplashScreen* splash = maybe_show_splash (); + Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this)); + Config::Warning.connect (boost::bind (&App::config_warning, this, _1)); - SetAppName (_("DCP-o-matic KDM Creator")); + splash = maybe_show_splash (); - if (!wxApp::OnInit()) { - return false; - } + 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); +#ifdef DCPOMATIC_OSX + make_foreground_application (); #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 (); + 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 (); - _frame = new DOMFrame (_("DCP-o-matic KDM Creator")); - SetTopWindow (_frame); - _frame->Maximize (); - if (splash) { - splash->Destroy (); + 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())); } - _frame->Show (); - - signal_manager = new wxSignalManager (this); - Bind (wxEVT_IDLE, boost::bind (&App::idle, this)); 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; @@ -614,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 (...) { @@ -628,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 () @@ -645,7 +740,7 @@ private: void config_warning (string m) { - message_dialog (_frame, std_to_wx (m)); + message_dialog (_frame, std_to_wx(m)); } DOMFrame* _frame;