Support basic drag-and-drop of DKDMs.

diff --git a/src/lib/dkdm_wrapper.cc b/src/lib/dkdm_wrapper.cc
index 316a0581ee058418291a164345b19b702fff9ae6..809739e06fd471d14a564fbc1de468d6a1f93f59 100644 (file)
--- a/src/lib/dkdm_wrapper.cc
+++ b/src/lib/dkdm_wrapper.cc
@@ -75,6 +75,7 @@ DKDMGroup::add (shared_ptr<DKDMBase> child)
 {
        DCPOMATIC_ASSERT (child);
        _children.push_back (child);
+       child->set_parent (dynamic_pointer_cast<DKDMGroup> (shared_from_this ()));
 }
 
 void
@@ -83,6 +84,7 @@ DKDMGroup::remove (shared_ptr<DKDMBase> child)
        for (list<shared_ptr<DKDMBase> >::iterator i = _children.begin(); i != _children.end(); ++i) {
                if (*i == child) {
                        _children.erase (i);
+                       child->set_parent (shared_ptr<DKDMGroup> ());
                        return;
                }
                shared_ptr<DKDMGroup> g = dynamic_pointer_cast<DKDMGroup> (*i);

diff --git a/src/lib/dkdm_wrapper.h b/src/lib/dkdm_wrapper.h
index b877722d91732eb103a42bee80e86b81ca11e44b..d3ee2a09566c34afaa48036fa8bff507ed6ccf9b 100644 (file)
--- a/src/lib/dkdm_wrapper.h
+++ b/src/lib/dkdm_wrapper.h
@@ -20,18 +20,32 @@
 
 #include <dcp/encrypted_kdm.h>
 #include <libcxml/cxml.h>
+#include <boost/enable_shared_from_this.hpp>
 
 namespace xmlpp {
        class Element;
 }
 
-class DKDMBase
+class DKDMGroup;
+
+class DKDMBase : public boost::enable_shared_from_this<DKDMBase>
 {
 public:
        virtual std::string name () const = 0;
        virtual void as_xml (xmlpp::Element *) const = 0;
 
        static boost::shared_ptr<DKDMBase> read (cxml::ConstNodePtr node);
+
+       boost::shared_ptr<DKDMGroup> parent () const {
+               return _parent;
+       }
+
+       void set_parent (boost::shared_ptr<DKDMGroup> parent) {
+               _parent = parent;
+       }
+
+private:
+       boost::shared_ptr<DKDMGroup> _parent;
 };
 
 class DKDM : public DKDMBase

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 072cc2b0ebc8afa70dacfe1cef2bf23143a45512..95ed07769e94b07d90d0340df3587ab4c19fe40b 100644 (file)
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -158,7 +158,7 @@ public:
                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<DKDMGroup> ());
+               add_dkdm_view (Config::instance()->dkdms());
 
                h = new wxStaticText (overall_panel, wxID_ANY, _("Output"));
                h->SetFont (subheading_font);
@@ -179,6 +179,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));
@@ -367,6 +369,35 @@ 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()) {
+                       return;
+               }
+
+               shared_ptr<DKDMGroup> 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);
+
+               _dkdm->Delete (from->first);
+               _dkdm_id.erase (from->first);
+               add_dkdm_view (from->second);
+       }
+
        void add_dkdm_clicked ()
        {
                wxFileDialog* d = new wxFileDialog (this, _("Select DKDM file"));
@@ -392,7 +423,7 @@ private:
                                group = Config::instance()->dkdms ();
                        }
                        add_dkdm_model (new_dkdm, group);
-                       add_dkdm_view (new_dkdm, group);
+                       add_dkdm_view (new_dkdm);
                }
                d->Destroy ();
        }
@@ -407,7 +438,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,21 +446,21 @@ private:
        /** @param dkdm Thing to add.
         *  @param parent Parent group, or 0.
         */
-       void add_dkdm_view (shared_ptr<DKDMBase> base, shared_ptr<DKDMGroup> parent)
+       void add_dkdm_view (shared_ptr<DKDMBase> base)
        {
-               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;
+                       _dkdm_id[_dkdm->AppendItem(dkdm_to_id(base->parent()), std_to_wx(base->name()))] = base;
                }
 
                /* Add children */
                shared_ptr<DKDMGroup> g = dynamic_pointer_cast<DKDMGroup> (base);
                if (g) {
                        BOOST_FOREACH (shared_ptr<DKDMBase> i, g->children()) {
-                               add_dkdm_view (i, g);
+                               add_dkdm_view (i);
                        }
                }
        }