Make player/KDM creator and main DCP-o-matic all behave the same with respect to...

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

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 95ed07769e94b07d90d0340df3587ab4c19fe40b..26e7f8479ec465f5d34011af2b0ab846d5106d14 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"
@@ -42,11 +42,13 @@
 #include "lib/compose.hpp"
 #include "lib/cinema.h"
 #include "lib/dkdm_wrapper.h"
+#include "lib/cross.h"
 #include <dcp/encrypted_kdm.h>
 #include <dcp/decrypted_kdm.h>
 #include <dcp/exceptions.h>
 #include <wx/wx.h>
 #include <wx/preferences.h>
+#include <wx/splash.h>
 #include <wx/filepicker.h>
 #ifdef __WXOSX__
 #include <ApplicationServices/ApplicationServices.h>
@@ -198,7 +200,7 @@ private:
        void edit_preferences ()
        {
                if (!_config_dialog) {
-                       _config_dialog = create_config_dialog ();
+                       _config_dialog = create_full_config_dialog ();
                }
                _config_dialog->Show (this);
        }
@@ -391,11 +393,11 @@ private:
                DCPOMATIC_ASSERT (from->second->parent ());
 
                from->second->parent()->remove (from->second);
-               add_dkdm_model (from->second, group);
+               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);
+               add_dkdm_view (from->second, dynamic_pointer_cast<DKDM>(to->second) ? to->first : optional<wxTreeItemId>());
        }
 
        void add_dkdm_clicked ()
@@ -446,14 +448,20 @@ private:
        /** @param dkdm Thing to add.
         *  @param parent Parent group, or 0.
         */
-       void add_dkdm_view (shared_ptr<DKDMBase> base)
+       void add_dkdm_view (shared_ptr<DKDMBase> base, optional<wxTreeItemId> previous = optional<wxTreeItemId>())
        {
                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(base->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 */
@@ -466,9 +474,9 @@ private:
        }
 
        /** @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.
                */
@@ -530,6 +538,11 @@ private:
        {
                wxInitAllImageHandlers ();
 
+               Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this));
+               Config::Warning.connect (boost::bind (&App::config_warning, this, _1));
+
+               wxSplashScreen* splash = maybe_show_splash ();
+
                SetAppName (_("DCP-o-matic KDM Creator"));
 
                if (!wxApp::OnInit()) {
@@ -569,6 +582,9 @@ private:
                _frame = new DOMFrame (_("DCP-o-matic KDM Creator"));
                SetTopWindow (_frame);
                _frame->Maximize ();
+               if (splash) {
+                       splash->Destroy ();
+               }
                _frame->Show ();
 
                signal_manager = new wxSignalManager (this);
@@ -622,6 +638,16 @@ private:
                signal_manager->ui_idle ();
        }
 
+       void config_failed_to_load ()
+       {
+               message_dialog (_frame, _("The existing configuration failed to load.  Default values will be used instead.  These may take a short time to create."));
+       }
+
+       void config_warning (string m)
+       {
+               message_dialog (_frame, std_to_wx (m));
+       }
+
        DOMFrame* _frame;
 };