X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fjob_view.cc;h=efe17f4deba2a01c1939f9764464c5fa8b021cba;hb=742d96e86a262d0238105bc869ec8f350e36ccae;hp=d0086ff81aae2acbbe332164f36489355b5f9a0f;hpb=1f12c554e58f13fbed38313279c1c5418e0721ca;p=dcpomatic.git

diff --git a/src/wx/job_view.cc b/src/wx/job_view.cc
index d0086ff81..efe17f4de 100644
--- a/src/wx/job_view.cc
+++ b/src/wx/job_view.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,22 +18,32 @@
 
 */
 
+
+#include "check_box.h"
+#include "dcpomatic_button.h"
 #include "job_view.h"
+#include "message_dialog.h"
+#include "static_text.h"
 #include "wx_util.h"
-#include "lib/job.h"
-#include "lib/job_manager.h"
+#include "lib/analyse_audio_job.h"
 #include "lib/compose.hpp"
 #include "lib/config.h"
+#include "lib/job.h"
+#include "lib/job_manager.h"
 #include "lib/send_notification_email_job.h"
 #include "lib/transcode_job.h"
-#include "lib/analyse_audio_job.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
+#include <boost/algorithm/string.hpp>
+
 
-using std::string;
 using std::min;
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::string;
 using boost::bind;
-using boost::dynamic_pointer_cast;
+
 
 JobView::JobView (shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table)
 	: _job (job)
@@ -45,6 +55,7 @@ JobView::JobView (shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wx
 
 }
 
+
 void
 JobView::setup ()
 {
@@ -55,30 +66,30 @@ 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);
-	_gauge_message->Add (_message, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 6);
+	_message = new StaticText (_container, wxT(" \n "), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_MIDDLE);
+	_gauge_message->Add (_message, 1, wxEXPAND | wxALL, 6);
 	_table->Insert (n, _gauge_message, 1, wxEXPAND | wxLEFT | wxRIGHT);
 	++n;
 
 	_buttons = new wxBoxSizer (wxHORIZONTAL);
 
-	_cancel = new wxButton (_container, wxID_ANY, _("Cancel"));
+	_cancel = new Button (_container, _("Cancel"));
 	_cancel->Bind (wxEVT_BUTTON, &JobView::cancel_clicked, this);
-	_buttons->Add (_cancel, 1, wxALIGN_CENTER_VERTICAL);
+	_buttons->Add (_cancel, 1, wxALIGN_CENTER_VERTICAL | wxRIGHT, DCPOMATIC_BUTTON_STACK_GAP);
 
-	_details = new wxButton (_container, wxID_ANY, _("Details..."));
+	_details = new Button (_container, _("Details..."));
 	_details->Bind (wxEVT_BUTTON, &JobView::details_clicked, this);
 	_details->Enable (false);
-	_buttons->Add (_details, 1, wxALIGN_CENTER_VERTICAL);
+	_buttons->Add (_details, 1, wxALIGN_CENTER_VERTICAL | wxRIGHT, DCPOMATIC_BUTTON_STACK_GAP);
 
 	finish_setup (_container, _buttons);
 
 	_controls = new wxBoxSizer (wxVERTICAL);
 	_controls->Add (_buttons);
-	_notify = new wxCheckBox (_container, wxID_ANY, _("Notify when complete"));
-	_notify->Bind (wxEVT_CHECKBOX, bind (&JobView::notify_clicked, this));
+	_notify = new CheckBox (_container, _("Notify when complete"));
+	_notify->bind(&JobView::notify_clicked, this);
 	_notify->SetValue (Config::instance()->default_notify());
-	_controls->Add (_notify);
+	_controls->Add (_notify, 0, wxTOP, DCPOMATIC_BUTTON_STACK_GAP);
 
 	_table->Insert (n, _controls, 1, wxALIGN_CENTER_VERTICAL | wxALL, 3);
 
@@ -90,14 +101,19 @@ JobView::setup ()
 	_table->Layout ();
 }
 
+
 void
 JobView::maybe_pulse ()
 {
-	if (_gauge && _job->running() && !_job->progress()) {
-		_gauge->Pulse ();
+	if (_gauge && _job->running()) {
+		auto elapsed = _job->seconds_since_last_progress_update();
+		if (!_job->progress() || !elapsed || *elapsed > 4) {
+			_gauge->Pulse ();
+		}
 	}
 }
 
+
 void
 JobView::progress ()
 {
@@ -105,7 +121,14 @@ JobView::progress ()
 	if (!_job->sub_name().empty ()) {
 		whole += _job->sub_name() + " ";
 	}
-	whole += _job->status ();
+	auto s = _job->status ();
+	/* Watch out for < > in the error string */
+	boost::algorithm::replace_all (s, "<", "&lt;");
+	boost::algorithm::replace_all (s, ">", "&gt;");
+#ifdef DCPOMATIC_LINUX
+	boost::algorithm::replace_all(s, "_", "__");
+#endif
+	whole += s;
 	if (whole != _last_message) {
 		_message->SetLabelMarkup (std_to_wx (whole));
 		/* This hack fixes the size of _message on OS X */
@@ -119,6 +142,7 @@ JobView::progress ()
 	}
 }
 
+
 void
 JobView::finished ()
 {
@@ -134,7 +158,12 @@ JobView::finished ()
 		_details->Enable (true);
 	}
 
-	if ((dynamic_pointer_cast<TranscodeJob>(_job) || dynamic_pointer_cast<AnalyseAudioJob>(_job)) && _notify->GetValue()) {
+	if (_job->message()) {
+		MessageDialog dialog(_parent, std_to_wx(_job->name()), std_to_wx(_job->message().get()));
+		dialog.ShowModal();
+	}
+
+	if (_job->enable_notify() && _notify->GetValue()) {
 		if (Config::instance()->notification(Config::MESSAGE_BOX)) {
 			wxMessageBox (std_to_wx(_job->name() + ": " + _job->status()), _("DCP-o-matic"), wxICON_INFORMATION);
 		}
@@ -142,19 +171,21 @@ JobView::finished ()
 			string body = Config::instance()->notification_email();
 			boost::algorithm::replace_all (body, "$JOB_NAME", _job->name());
 			boost::algorithm::replace_all (body, "$JOB_STATUS", _job->status());
-			JobManager::instance()->add (shared_ptr<Job> (new SendNotificationEmailJob (body)));
+			JobManager::instance()->add_after (_job, shared_ptr<Job> (new SendNotificationEmailJob (body)));
 		}
 	}
 }
 
+
 void
 JobView::details_clicked (wxCommandEvent &)
 {
-	string s = _job->error_summary();
+	auto s = _job->error_summary();
 	s[0] = toupper (s[0]);
 	error_dialog (_parent, std_to_wx(s), std_to_wx(_job->error_details()));
 }
 
+
 void
 JobView::cancel_clicked (wxCommandEvent &)
 {
@@ -163,6 +194,7 @@ JobView::cancel_clicked (wxCommandEvent &)
 	}
 }
 
+
 void
 JobView::insert (int pos)
 {
@@ -171,6 +203,7 @@ JobView::insert (int pos)
 	_table->Layout ();
 }
 
+
 void
 JobView::detach ()
 {
@@ -178,6 +211,7 @@ JobView::detach ()
 	_table->Detach (_controls);
 }
 
+
 void
 JobView::notify_clicked ()
 {