X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm.cc;h=35bad59586bb4b0f8a9e3584b4e1aaa8d0d74e8f;hb=5d00c2f6e25c15a7699167f4f135257281c4b218;hp=e79448be7b376398c0562f22da8702e3bb7b8ff3;hpb=ccc8409dceedcf71872b2846b9b4a4dea9042bda;p=dcpomatic.git diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc index e79448be7..35bad5958 100644 --- a/src/tools/dcpomatic_kdm.cc +++ b/src/tools/dcpomatic_kdm.cc @@ -29,6 +29,7 @@ #include "wx/kdm_output_panel.h" #include "wx/job_view_dialog.h" #include "wx/file_dialog_wrapper.h" +#include "wx/new_dkdm_folder_dialog.h" #include "wx/editable_list.h" #include "lib/config.h" #include "lib/util.h" @@ -40,6 +41,7 @@ #include "lib/send_kdm_email_job.h" #include "lib/compose.hpp" #include "lib/cinema.h" +#include "lib/dkdm_wrapper.h" #include #include #include @@ -61,42 +63,17 @@ using std::list; 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; enum { ID_help_report_a_problem = 1, }; -class KDMFileDialogWrapper : public FileDialogWrapper -{ -public: - KDMFileDialogWrapper (wxWindow* parent) - : FileDialogWrapper (parent, _("Select DKDM file")) - { - - } - - optional get () - { - try { - return dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (_dialog->GetPath ()), MAX_KDM_SIZE)); - } catch (cxml::Error& e) { - error_dialog (_parent, wxString::Format ("This file does not look like a KDM (%s)", std_to_wx (e.what()).data())); - } - - return optional (); - } -}; - -static string -column (dcp::EncryptedKDM k) -{ - return String::compose ("%1 (%2)", k.content_title_text(), k.cpl_id()); -} - class DOMFrame : public wxFrame { public: @@ -166,13 +143,22 @@ public: h = new wxStaticText (overall_panel, wxID_ANY, _("DKDM")); h->SetFont (subheading_font); right->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2); - - vector columns; - columns.push_back (wx_to_std (_("CPL"))); - _dkdm = new EditableList ( - overall_panel, columns, bind (&DOMFrame::dkdms, this), bind (&DOMFrame::set_dkdms, this, _1), bind (&column, _1), false - ); - right->Add (_dkdm, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP); + wxBoxSizer* 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...")); + dkdm_buttons->Add (_add_dkdm, 0, wxALL | wxEXPAND, DCPOMATIC_BUTTON_STACK_GAP); + _add_dkdm_folder = new wxButton (overall_panel, wxID_ANY, _("Add folder...")); + dkdm_buttons->Add (_add_dkdm_folder, 0, wxALL | wxEXPAND, DCPOMATIC_BUTTON_STACK_GAP); + _remove_dkdm = new wxButton (overall_panel, wxID_ANY, _("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()); h = new wxStaticText (overall_panel, wxID_ANY, _("Output")); h->SetFont (subheading_font); @@ -192,22 +178,17 @@ public: _screens->ScreensChanged.connect (boost::bind (&DOMFrame::setup_sensitivity, this)); _create->Bind (wxEVT_BUTTON, bind (&DOMFrame::create_kdms, this)); - _dkdm->SelectionChanged.connect (boost::bind (&DOMFrame::setup_sensitivity, 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)); setup_sensitivity (); } private: - vector dkdms () const - { - return Config::instance()->dkdms (); - } - - void set_dkdms (vector dkdms) - { - Config::instance()->set_dkdms (dkdms); - } - void file_exit () { /* false here allows the close handler to veto the close request */ @@ -278,15 +259,44 @@ private: ); } + /** @id if not 0 this is filled in with the wxTreeItemId of the selection */ + shared_ptr selected_dkdm (wxTreeItemId* id = 0) const + { + wxArrayTreeItemIds selections; + _dkdm->GetSelections (selections); + if (selections.GetCount() != 1) { + if (id) { + *id = 0; + } + return shared_ptr (); + } + + if (id) { + *id = selections[0]; + } + + DKDMMap::const_iterator i = _dkdm_id.find (selections[0]); + if (i == _dkdm_id.end()) { + return shared_ptr (); + } + + return i->second; + } + void create_kdms () { try { - if (!_dkdm->selection()) { + shared_ptr 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->selection().get(), Config::instance()->decryption_chain()->key().get()); + dcp::DecryptedKDM decrypted (dkdm->dkdm(), Config::instance()->decryption_chain()->key().get()); /* This is the signer for our new KDMs */ shared_ptr signer = Config::instance()->signer_chain (); @@ -354,13 +364,155 @@ private: { _screens->setup_sensitivity (); _output->setup_sensitivity (); - _create->Enable (!_screens->screens().empty() && _dkdm->selection()); + wxArrayTreeItemIds sel; + _dkdm->GetSelections (sel); + _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()) { + 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))) + ); + } 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() + ) + ); + return; + } + + 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); + if (d->ShowModal() == wxID_OK) { + shared_ptr new_dkdm (new DKDMGroup (wx_to_std (d->get ()))); + shared_ptr parent = dynamic_pointer_cast (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 base, optional previous = optional()) + { + 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 */ + shared_ptr g = dynamic_pointer_cast (base); + if (g) { + BOOST_FOREACH (shared_ptr i, g->children()) { + add_dkdm_view (i); + } + } + } + + /** @param group Group to add dkdm to */ + void add_dkdm_model (shared_ptr dkdm, shared_ptr group, shared_ptr previous = shared_ptr ()) + { + 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 dkdm) + { + for (DKDMMap::iterator i = _dkdm_id.begin(); i != _dkdm_id.end(); ++i) { + if (i->second == dkdm) { + return i->first; + } + } + DCPOMATIC_ASSERT (false); + } + + void remove_dkdm_clicked () + { + shared_ptr removed = selected_dkdm (); + if (!removed) { + return; + } + + _dkdm->Delete (dkdm_to_id (removed)); + shared_ptr dkdms = Config::instance()->dkdms (); + dkdms->remove (removed); + Config::instance()->changed (); } wxPreferencesEditor* _config_dialog; ScreensPanel* _screens; KDMTimingPanel* _timing; - EditableList* _dkdm; + wxTreeCtrl* _dkdm; + typedef std::map > DKDMMap; + DKDMMap _dkdm_id; + wxButton* _add_dkdm; + wxButton* _add_dkdm_folder; + wxButton* _remove_dkdm; wxButton* _create; KDMOutputPanel* _output; JobViewDialog* _job_view;