X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm.cc;h=9adef0ab016ec42a228a2f28900bd30a606dfd54;hb=HEAD;hp=8cf38128347c58e00a45fc102152a7a78c337d8b;hpb=9d1d75e474bc92d8b0f823141073ad9dd639c8e0;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 8cf381283..9adef0ab0 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -22,6 +22,8 @@
 #include "wx/about_dialog.h"
 #include "wx/dcpomatic_button.h"
 #include "wx/editable_list.h"
+#include "wx/id.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"
@@ -95,7 +97,7 @@ using namespace dcpomatic;
 
 
 enum {
-	ID_help_report_a_problem = 1,
+	ID_help_report_a_problem = DCPOMATIC_MAIN_MENU,
 };
 
 
@@ -245,6 +247,7 @@ public:
 		_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));
+		_output->MethodChanged.connect(boost::bind(&DOMFrame::setup_sensitivity, this));
 
 		setup_sensitivity ();
 
@@ -291,7 +294,7 @@ private:
 #endif
 
 #ifdef __WXOSX__
-		file->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P"));
+		file->Append(wxID_PREFERENCES, _("&Preferences...\tCtrl-,"));
 #else
 		wxMenu* edit = new wxMenu;
 		edit->Append (wxID_PREFERENCES, _("&Preferences...\tCtrl-P"));
@@ -379,12 +382,12 @@ private:
 
 			vector<KDMCertificatePeriod> period_checks;
 
-			std::function<dcp::DecryptedKDM (dcp::LocalTime, dcp::LocalTime)> make_kdm = [decrypted, title](dcp::LocalTime begin, dcp::LocalTime end) {
+			std::function<dcp::DecryptedKDM (dcp::LocalTime, dcp::LocalTime)> make_kdm = [this, decrypted, title](dcp::LocalTime begin, dcp::LocalTime end) {
 				/* Make an empty KDM */
 				dcp::DecryptedKDM kdm (
 					begin,
 					end,
-					decrypted.annotation_text().get_value_or(""),
+					_output->annotation_text(),
 					title,
 					dcp::LocalTime().as_string()
 					);
@@ -419,19 +422,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 (
@@ -480,7 +480,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() && _timing->valid() && sel.GetCount() > 0 && dkdm);
+		_create->Enable(!_screens->screens().empty() && _timing->valid() && sel.GetCount() > 0 && dkdm && _output->method_selected());
 		_remove_dkdm->Enable (sel.GetCount() > 0 && (!group || group->name() != "root"));
 		_export_dkdm->Enable (sel.GetCount() > 0 && dkdm);
 	}
@@ -488,6 +488,17 @@ private:
 	void dkdm_selection_changed()
 	{
 		_selected_dkdm = selected_dkdm();
+		if (_selected_dkdm) {
+			auto dkdm = std::dynamic_pointer_cast<DKDM>(_selected_dkdm);
+			if (dkdm) {
+				try {
+					dcp::DecryptedKDM decrypted(dkdm->dkdm(), Config::instance()->decryption_chain()->key().get());
+					if (decrypted.annotation_text()) {
+						_output->set_annotation_text(*decrypted.annotation_text());
+					}
+				} catch (...) {}
+			}
+		}
 		setup_sensitivity();
 	}