X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm.cc;h=aeb1cf2de9463e06e03a6cbd520378e0491cb72b;hb=0062a0ad4e8bde2866cd42404ea103ed29fa59db;hp=851dacd54fd39c2c8ad066c2a98c55489ce9c565;hpb=94903b113b78ad8b939c067f91739a2752b8019e;p=dcpomatic.git diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index 851dacd54..aeb1cf2de 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -33,6 +33,7 @@ #include "wx/report_problem_dialog.h" #include "wx/screens_panel.h" #include "wx/static_text.h" +#include "wx/wx_ptr.h" #include "wx/wx_signal_manager.h" #include "wx/wx_util.h" #include "lib/cinema.h" @@ -47,7 +48,6 @@ #include "lib/file_log.h" #include "lib/job_manager.h" #include "lib/kdm_with_metadata.h" -#include "lib/scope_guard.h" #include "lib/screen.h" #include "lib/send_kdm_email_job.h" #include @@ -55,6 +55,7 @@ #include #include LIBDCP_DISABLE_WARNINGS +#include #include #include #include @@ -165,7 +166,7 @@ public: h = new StaticText (overall_panel, _("DKDM")); h->SetFont (subheading_font); - right->Add (h, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); + right->Add(h, 0, wxTOP, DCPOMATIC_SUBHEADING_TOP_PAD); _dkdm_search = new wxSearchCtrl(overall_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(200, search_ctrl_height())); #ifndef __WXGTK3__ @@ -175,12 +176,33 @@ public: right->Add(_dkdm_search, 0, wxTOP | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP); + class DKDMDropTarget : public wxFileDropTarget + { + public: + DKDMDropTarget(DOMFrame* frame) + : _frame(frame) + {} + + bool OnDropFiles(wxCoord, wxCoord, wxArrayString const& filenames) override + { + for (size_t i = 0; i < filenames.GetCount(); ++i) { + _frame->add_dkdm(boost::filesystem::path(wx_to_std(filenames[0]))); + } + + return true; + } + + private: + DOMFrame* _frame; + }; + 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->SetDropTarget(new DKDMDropTarget(this)); dkdm_sizer->Add(_dkdm, 1, wxEXPAND | wxBOTTOM, DCPOMATIC_SIZER_Y_GAP); - wxBoxSizer* dkdm_buttons = new wxBoxSizer(wxVERTICAL); + auto 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...")); @@ -196,7 +218,7 @@ public: h = new StaticText (overall_panel, _("Output")); h->SetFont (subheading_font); - right->Add (h, 0, wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); + right->Add(h, 0, wxTOP, DCPOMATIC_SUBHEADING_TOP_PAD); _output = new KDMOutputPanel (overall_panel); right->Add (_output, 0, wxALL, DCPOMATIC_SIZER_Y_GAP); @@ -244,18 +266,16 @@ private: void help_about () { - auto d = new AboutDialog (this); + auto d = make_wx(this); d->ShowModal (); - d->Destroy (); } void help_report_a_problem () { - auto d = new ReportProblemDialog (this, shared_ptr()); + auto d = make_wx(this, shared_ptr()); if (d->ShowModal () == wxID_OK) { d->report (); } - d->Destroy (); } void setup_menu (wxMenuBar* m) @@ -490,65 +510,69 @@ private: void add_dkdm_clicked () { - auto dialog = new FileDialog(this, _("Select DKDM file"), wxT("XML files|*.xml|All files|*.*"), wxFD_MULTIPLE, "AddDKDMPath"); - - ScopeGuard sg = [dialog]() { dialog->Destroy(); }; - + auto dialog = make_wx(this, _("Select DKDM file"), wxT("XML files|*.xml|All files|*.*"), wxFD_MULTIPLE, "AddDKDMPath"); if (!dialog->show()) { return; } + for (auto path: dialog->paths()) { + add_dkdm(path); + } + } + + void add_dkdm(boost::filesystem::path path) + { auto chain = Config::instance()->decryption_chain(); DCPOMATIC_ASSERT (chain->key()); - for (auto path: dialog->paths()) { - try { - dcp::EncryptedKDM ekdm(dcp::file_to_string(path, 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(new_dkdm, group); - } 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()) - ); + try { + dcp::EncryptedKDM ekdm(dcp::file_to_string(path, 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(new_dkdm, group); + } 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()) + ); } + update_dkdm_view(); } void add_dkdm_folder_clicked () { - auto d = new NewDKDMFolderDialog (this); - if (d->ShowModal() == wxID_OK) { - auto new_dkdm = make_shared(wx_to_std(d->get())); - auto parent = dynamic_pointer_cast(selected_dkdm()); - if (!parent) { - parent = Config::instance()->dkdms (); - } - add_dkdm(new_dkdm, parent); - update_dkdm_view(); + auto d = make_wx(this); + if (d->ShowModal() != wxID_OK) { + return; + } + + auto new_dkdm = make_shared(wx_to_std(d->get())); + auto parent = dynamic_pointer_cast(selected_dkdm()); + if (!parent) { + parent = Config::instance()->dkdms (); } - d->Destroy (); + add_dkdm(new_dkdm, parent); + update_dkdm_view(); } void update_dkdm_view() @@ -688,7 +712,7 @@ private: return; } - auto d = new wxFileDialog ( + auto d = make_wx( this, _("Select DKDM File"), wxEmptyString, wxEmptyString, wxT("XML files (*.xml)|*.xml"), wxFD_SAVE | wxFD_OVERWRITE_PROMPT ); @@ -696,7 +720,6 @@ private: if (d->ShowModal() == wxID_OK) { dkdm->dkdm().as_xml(wx_to_std(d->GetPath())); } - d->Destroy (); } void dkdm_search_changed() @@ -747,7 +770,7 @@ private: bool OnInit () override { - wxSplashScreen* splash = nullptr; + wx_ptr splash; try { wxInitAllImageHandlers ();