Rename ConfigDialog -> FullConfigDialog.

[dcpomatic.git] / src / tools / dcpomatic_kdm.cc

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 072cc2b0ebc8afa70dacfe1cef2bf23143a45512..ee2e87161abb2377a70eeb11c827dd568b4369ff 100644 (file)
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -18,7 +18,7 @@
 
 */
 
-#include "wx/config_dialog.h"
+#include "wx/full_config_dialog.h"
 #include "wx/about_dialog.h"
 #include "wx/report_problem_dialog.h"
 #include "wx/file_picker_ctrl.h"
@@ -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));
@@ -196,7 +198,7 @@ private:
        void edit_preferences ()
        {
                if (!_config_dialog) {
-                       _config_dialog = create_config_dialog ();
+                       _config_dialog = create_full_config_dialog ();
                }
                _config_dialog->Show (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, 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 ()
        {
                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,29 +446,35 @@ 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, optional<wxTreeItemId> previous = optional<wxTreeItemId>())
        {
-               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;
+                       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<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);
                        }
                }
        }
 
        /** @param group Group to add dkdm to */
-       void add_dkdm_model (shared_ptr<DKDMBase> dkdm, shared_ptr<DKDMGroup> group)
+       void add_dkdm_model (shared_ptr<DKDMBase> dkdm, shared_ptr<DKDMGroup> group, shared_ptr<DKDM> previous = shared_ptr<DKDM> ())
        {
-               group->add (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.
                */