X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fjob_view.cc;h=28b171b825371ed686d3a8c0a9c760d5da5d2d2d;hb=9c1bb2e5ca7c80c4e26b1b2e41159aa171360a94;hp=43d6f2fedd9ca90f44d4ec3e191fb673af560f2f;hpb=ab1c8a67afba072b1c29f0c3c34aa9779643e66a;p=dcpomatic.git

diff --git a/src/wx/job_view.cc b/src/wx/job_view.cc
index 43d6f2fed..28b171b82 100644
--- a/src/wx/job_view.cc
+++ b/src/wx/job_view.cc
@@ -20,6 +20,9 @@
 
 #include "job_view.h"
 #include "wx_util.h"
+#include "message_dialog.h"
+#include "static_text.h"
+#include "check_box.h"
 #include "lib/job.h"
 #include "lib/job_manager.h"
 #include "lib/compose.hpp"
@@ -55,7 +58,7 @@ JobView::setup ()
 	/* This seems to be required to allow the gauge to shrink under OS X */
 	_gauge->SetMinSize (wxSize (0, -1));
 	_gauge_message->Add (_gauge, 0, wxEXPAND | wxLEFT | wxRIGHT);
-	_message = new wxStaticText (_container, wxID_ANY, wxT (" \n "), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_MIDDLE);
+	_message = new StaticText (_container, wxT(" \n "), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_MIDDLE);
 	_gauge_message->Add (_message, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 6);
 	_table->Insert (n, _gauge_message, 1, wxEXPAND | wxLEFT | wxRIGHT);
 	++n;
@@ -75,7 +78,7 @@ JobView::setup ()
 
 	_controls = new wxBoxSizer (wxVERTICAL);
 	_controls->Add (_buttons);
-	_notify = new wxCheckBox (_container, wxID_ANY, _("Notify when complete"));
+	_notify = new CheckBox (_container, _("Notify when complete"));
 	_notify->Bind (wxEVT_CHECKBOX, bind (&JobView::notify_clicked, this));
 	_notify->SetValue (Config::instance()->default_notify());
 	_controls->Add (_notify);
@@ -134,6 +137,12 @@ JobView::finished ()
 		_details->Enable (true);
 	}
 
+	if (_job->message()) {
+		MessageDialog* d = new MessageDialog (_parent, _job->name(), _job->message().get());
+		d->ShowModal ();
+		d->Destroy ();
+	}
+
 	if ((dynamic_pointer_cast<TranscodeJob>(_job) || dynamic_pointer_cast<AnalyseAudioJob>(_job)) && _notify->GetValue()) {
 		if (Config::instance()->notification(Config::MESSAGE_BOX)) {
 			wxMessageBox (std_to_wx(_job->name() + ": " + _job->status()), _("DCP-o-matic"), wxICON_INFORMATION);