X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_kdm.cc;h=bc58be914a93ae1c13ad243748a9f9f1b9004908;hb=fa8bdd16e1b3742e921b928708614613b6a21036;hp=b0821361276b242ce3d0717cf83f07c7d09ba1cf;hpb=5cd49a43b0c453f714bb654d0f23b726b39dadec;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index b08213612..bc58be914 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -20,11 +20,13 @@
 #include "wx/config_dialog.h"
 #include "wx/about_dialog.h"
 #include "wx/report_problem_dialog.h"
+#include "wx/file_picker_ctrl.h"
 #include "wx/wx_util.h"
 #include "wx/wx_signal_manager.h"
 #include "wx/screens_panel.h"
 #include "wx/kdm_timing_panel.h"
 #include "wx/kdm_output_panel.h"
+#include "wx/job_view_dialog.h"
 #include "lib/config.h"
 #include "lib/util.h"
 #include "lib/screen.h"
@@ -61,6 +63,7 @@ public:
 	DOMFrame (wxString const & title)
 		: wxFrame (NULL, -1, title)
 		, _config_dialog (0)
+		, _job_view (0)
 	{
 		wxMenuBar* bar = new wxMenuBar;
 		setup_menu (bar);
@@ -99,11 +102,7 @@ public:
 		vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
 		wxSizer* dkdm = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 		add_label_to_sizer (dkdm, overall_panel, _("DKDM file"), true);
-#ifdef DCPOMATIC_USE_OWN_PICKER
-		_dkdm = new FilePicker (overall_panel, _("Select a DKDM XML file..."), "*.xml");
-#else
-		_dkdm = new wxFilePickerCtrl (overall_panel, wxID_ANY, wxEmptyString, _("Select a DKDM XML file..."), "*.xml", wxDefaultPosition, wxSize (300, -1));
-#endif
+		_dkdm = new FilePickerCtrl (overall_panel, _("Select a DKDM XML file..."), "*.xml");
 		dkdm->Add (_dkdm, 1, wxEXPAND);
 		add_label_to_sizer (dkdm, overall_panel, _("Annotation"), true);
 		_annotation_text = new wxStaticText (overall_panel, wxID_ANY, wxT(""));
@@ -204,6 +203,10 @@ private:
 
 	void dkdm_changed ()
 	{
+		if (_dkdm->GetPath().IsEmpty()) {
+			return;
+		}
+
 		try {
 			dcp::EncryptedKDM encrypted (dcp::file_to_string (wx_to_std (_dkdm->GetPath())));
 			dcp::DecryptedKDM decrypted (encrypted, Config::instance()->decryption_chain()->key().get());
@@ -270,14 +273,20 @@ private:
 					wxString::Format (s, int(screen_kdms.size()), std_to_wx(_output->directory().string()).data())
 					);
 			} else {
-				JobManager::instance()->add (
-					shared_ptr<Job> (new SendKDMEmailJob (
-								 decrypted.annotation_text(),
-								 decrypted.content_title_text(),
-								 _timing->from(), _timing->until(),
-								 CinemaKDMs::collect (screen_kdms)
-								 ))
-					);
+				shared_ptr<Job> job (new SendKDMEmailJob (
+							     decrypted.annotation_text(),
+							     decrypted.content_title_text(),
+							     _timing->from(), _timing->until(),
+							     CinemaKDMs::collect (screen_kdms)
+							     ));
+
+				JobManager::instance()->add (job);
+				if (_job_view) {
+					_job_view->Destroy ();
+					_job_view = 0;
+				}
+				_job_view = new JobViewDialog (this, _("Send KDM emails"), job);
+				_job_view->ShowModal ();
 			}
 		} catch (dcp::NotEncryptedError& e) {
 			error_dialog (this, _("CPL's content is not encrypted."));
@@ -298,17 +307,14 @@ private:
 	wxPreferencesEditor* _config_dialog;
 	ScreensPanel* _screens;
 	KDMTimingPanel* _timing;
-#ifdef DCPOMATIC_USE_OWN_PICKER
-	FilePicker* _dkdm;
-#else
-	wxFilePickerCtrl* _dkdm;
-#endif
+	/* I can't seem to clear the value in a wxFilePickerCtrl, so use our own */
+	FilePickerCtrl* _dkdm;
 	wxStaticText* _annotation_text;
 	wxStaticText* _content_title_text;
 	wxStaticText* _issue_date;
 	wxButton* _create;
 	KDMOutputPanel* _output;
-	JobManagerView* _jobs;
+	JobViewDialog* _job_view;
 };
 
 /** @class App