X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm.cc;h=0c4141cedc570eb44f1b02ffadd17969c350963c;hb=28f6eff123979f00944a290794695e31540ecaa2;hp=643aaeb7730a8cc830175d9a99253159cf731510;hpb=c55877926307d7018942beb5fd65a39f278e05de;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 643aaeb77..0c4141ced 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -38,6 +38,7 @@
 #include "lib/cinema_kdms.h"
 #include "lib/send_kdm_email_job.h"
 #include "lib/compose.hpp"
+#include "lib/cinema.h"
 #include <dcp/encrypted_kdm.h>
 #include <dcp/decrypted_kdm.h>
 #include <dcp/exceptions.h>
@@ -85,7 +86,7 @@ class DOMFrame : public wxFrame
 {
 public:
 	DOMFrame (wxString const & title)
-		: wxFrame (NULL, -1, title)
+		: wxFrame (0, -1, title)
 		, _config_dialog (0)
 		, _job_view (0)
 	{
@@ -145,7 +146,7 @@ public:
 		vector<string> columns;
 		columns.push_back (wx_to_std (_("CPL")));
 		_dkdm = new EditableList<dcp::EncryptedKDM, KDMFileDialogWrapper> (
-			overall_panel, columns, bind (&DOMFrame::dkdms, this), bind (&DOMFrame::set_dkdms, this, _1), bind (&column, _1), false
+			overall_panel, columns, bind (&DOMFrame::dkdms, this), bind (&DOMFrame::set_dkdms, this, _1), bind (&always_valid), bind (&column, _1), false
 			);
 		vertical->Add (_dkdm, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP);
 
@@ -159,7 +160,7 @@ public:
 		_create = new wxButton (overall_panel, wxID_ANY, _("Create KDMs"));
 		vertical->Add (_create, 0, wxALL, DCPOMATIC_SIZER_GAP);
 
-		main_sizer->Add (vertical, 1, wxALL, DCPOMATIC_DIALOG_BORDER);
+		main_sizer->Add (vertical, 1, wxALL | wxEXPAND, DCPOMATIC_DIALOG_BORDER);
 		overall_panel->SetSizer (main_sizer);
 
 		/* Instantly save any config changes when using a DCP-o-matic GUI */
@@ -270,7 +271,11 @@ private:
 
 				/* Make an empty KDM */
 				dcp::DecryptedKDM kdm (
-					_timing->from(), _timing->until(), decrypted.annotation_text(), decrypted.content_title_text(), dcp::LocalTime().as_string()
+					dcp::LocalTime (_timing->from(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
+					dcp::LocalTime (_timing->until(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
+					decrypted.annotation_text(),
+					decrypted.content_title_text(),
+					dcp::LocalTime().as_string()
 					);
 
 				/* Add keys from the DKDM */
@@ -354,7 +359,7 @@ private:
 	{
 		wxInitAllImageHandlers ();
 
-		SetAppName (_("DCP-o-matic KDM creator"));
+		SetAppName (_("DCP-o-matic KDM Creator"));
 
 		if (!wxApp::OnInit()) {
 			return false;
@@ -390,7 +395,7 @@ private:
 		*/
 		Config::drop ();
 
-		_frame = new DOMFrame (_("DCP-o-matic KDM creator"));
+		_frame = new DOMFrame (_("DCP-o-matic KDM Creator"));
 		SetTopWindow (_frame);
 		_frame->Maximize ();
 		_frame->Show ();