Add a dialog to show which screens have potentially-problematic

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

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index e2993f9f27ab163c449584d7bf0e5a7d03892b6c..9bb8e20a86ea1c2c208e583326a75cb46f85e6d5 100644 (file)
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -22,6 +22,7 @@
 #include "wx/about_dialog.h"
 #include "wx/dcpomatic_button.h"
 #include "wx/editable_list.h"
+#include "wx/invalid_certificate_period_dialog.h"
 #include "wx/file_dialog.h"
 #include "wx/file_picker_ctrl.h"
 #include "wx/full_config_dialog.h"
@@ -53,6 +54,7 @@
 #include <dcp/encrypted_kdm.h>
 #include <dcp/decrypted_kdm.h>
 #include <dcp/exceptions.h>
+#include <dcp/filesystem.h>
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/dnd.h>
@@ -74,6 +76,7 @@ LIBDCP_ENABLE_WARNINGS
 #endif
 
 
+using std::dynamic_pointer_cast;
 using std::exception;
 using std::list;
 using std::make_shared;
@@ -86,7 +89,6 @@ using std::vector;
 using boost::bind;
 using boost::optional;
 using boost::ref;
-using std::dynamic_pointer_cast;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
@@ -243,6 +245,7 @@ public:
                _remove_dkdm->Bind (wxEVT_BUTTON, bind (&DOMFrame::remove_dkdm_clicked, this));
                _export_dkdm->Bind (wxEVT_BUTTON, bind (&DOMFrame::export_dkdm_clicked, this));
                _dkdm_search->Bind(wxEVT_TEXT, boost::bind(&DOMFrame::dkdm_search_changed, this));
+               _timing->TimingChanged.connect(boost::bind(&DOMFrame::setup_sensitivity, this));
 
                setup_sensitivity ();
 
@@ -312,7 +315,7 @@ private:
 
        bool confirm_overwrite (boost::filesystem::path path)
        {
-               if (boost::filesystem::is_directory(path)) {
+               if (dcp::filesystem::is_directory(path)) {
                        return confirm_dialog (
                                this,
                                wxString::Format(_("Folder %s already exists.  Do you want to overwrite it?"), std_to_wx(path.string()).data())
@@ -417,19 +420,16 @@ private:
                                return;
                        }
 
-                       if (find(period_checks.begin(), period_checks.end(), KDMCertificatePeriod::KDM_OUTSIDE_CERTIFICATE) != period_checks.end()) {
-                               error_dialog(
-                                       this,
-                                       _("Some KDMs would have validity periods which are completely outside the recipient certificate periods.  Such KDMs are very unlikely to work, so will not be created.")
-                                       );
-                               return;
-                       }
-
-                       if (find(period_checks.begin(), period_checks.end(), KDMCertificatePeriod::KDM_OVERLAPS_CERTIFICATE) != period_checks.end()) {
-                               message_dialog(
-                                       this,
-                                       _("For some of these KDMs the recipient certificate's validity period will not cover the whole of the KDM validity period.  This might cause problems with the KDMs.")
-                                       );
+                       if (
+                               find_if(
+                                       period_checks.begin(),
+                                       period_checks.end(),
+                                       [](KDMCertificatePeriod const& p) { return p.overlap != KDMCertificateOverlap::KDM_WITHIN_CERTIFICATE; }
+                                      ) != period_checks.end()) {
+                               InvalidCertificatePeriodDialog dialog(this, period_checks);
+                               if (dialog.ShowModal() == wxID_CANCEL) {
+                                       return;
+                               }
                        }
 
                        auto result = _output->make (
@@ -458,7 +458,7 @@ private:
                        if (e.starts_too_early()) {
                                error_dialog(this, _("The KDM start period is before (or close to) the start of the signing certificate's validity period.  Use a later start time for this KDM."));
                        } else {
-                               error_dialog(this, _("The KDM end period is after (or close to) the end of the signing certficates' validity period.  Either use an earlier end time for this KDM or re-create your signing certificates in the DCP-o-matic preferences window."));
+                               error_dialog(this, _("The KDM end period is after (or close to) the end of the signing certificates' validity period.  Either use an earlier end time for this KDM or re-create your signing certificates in the DCP-o-matic preferences window."));
                        }
                        return;
                } catch (dcp::NotEncryptedError& e) {
@@ -478,7 +478,7 @@ private:
                _dkdm->GetSelections (sel);
                auto group = dynamic_pointer_cast<DKDMGroup>(selected_dkdm());
                auto dkdm = dynamic_pointer_cast<DKDM>(selected_dkdm());
-               _create->Enable (!_screens->screens().empty() && sel.GetCount() > 0 && dkdm);
+               _create->Enable(!_screens->screens().empty() && _timing->valid() && sel.GetCount() > 0 && dkdm);
                _remove_dkdm->Enable (sel.GetCount() > 0 && (!group || group->name() != "root"));
                _export_dkdm->Enable (sel.GetCount() > 0 && dkdm);
        }
@@ -527,6 +527,15 @@ private:
                        group = to->second->parent();
                }
 
+               /* Check we're not adding a group to one of its children */
+               auto to_parent = group;
+               while (to_parent) {
+                       if (from->second == to_parent) {
+                               return;
+                       }
+                       to_parent = to_parent->parent();
+               }
+
                DCPOMATIC_ASSERT (group);
                DCPOMATIC_ASSERT (from->second->parent ());
 
@@ -559,6 +568,15 @@ private:
                        dcp::DecryptedKDM dkdm(ekdm, chain->key().get());
 
                        auto new_dkdm = make_shared<DKDM>(ekdm);
+
+                       if (Config::instance()->dkdms()->contains(new_dkdm->dkdm().id())) {
+                               error_dialog(
+                                       this,
+                                       wxString::Format(_("DKDM %s is already in the DKDM list and will not be added again."), std_to_wx(new_dkdm->dkdm().id()))
+                                       );
+                               return;
+                       }
+
                        auto group = dynamic_pointer_cast<DKDMGroup> (selected_dkdm());
                        if (!group) {
                                group = Config::instance()->dkdms ();
@@ -714,12 +732,14 @@ private:
                        return;
                }
 
-               if (NagDialog::maybe_nag (
-                           this, Config::NAG_DELETE_DKDM,
-                           _("You are about to remove a DKDM.  This will make it impossible to decrypt the DCP that the DKDM was made for, and it cannot be undone.  "
-                             "Are you sure?"),
-                           true)) {
-                       return;
+               if (removed->contains_dkdm()) {
+                       if (NagDialog::maybe_nag(
+                                   this, Config::NAG_DELETE_DKDM,
+                                   _("You are about to remove a DKDM.  This will make it impossible to decrypt the DCP that the DKDM was made for, and it cannot be undone.  "
+                                     "Are you sure?"),
+                                   true)) {
+                               return;
+                       }
                }
 
                _dkdm->Delete (dkdm_to_id (removed));