X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fjob_view.cc;h=77620142473af4a6d0823da4c283d2ffefbad0d9;hb=5f206d32ff60148ab72b35d5823f56bdbb7f50bf;hp=03ade7598dae67c38af3ab0c8b50b6ed5a065fea;hpb=3ee5431c7e270d7bf706fcf7530a6eb2c78480c3;p=dcpomatic.git

diff --git a/src/wx/job_view.cc b/src/wx/job_view.cc
index 03ade7598..776201424 100644
--- a/src/wx/job_view.cc
+++ b/src/wx/job_view.cc
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "job_view.h"
 #include "wx_util.h"
 #include "message_dialog.h"
@@ -34,11 +35,13 @@
 #include <wx/wx.h>
 #include <boost/algorithm/string.hpp>
 
+
 using std::string;
 using std::min;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::bind;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
+
 
 JobView::JobView (shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table)
 	: _job (job)
@@ -50,6 +53,7 @@ JobView::JobView (shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wx
 
 }
 
+
 void
 JobView::setup ()
 {
@@ -83,7 +87,7 @@ JobView::setup ()
 	_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);
+	_controls->Add (_notify, 0, wxTOP, DCPOMATIC_BUTTON_STACK_GAP);
 
 	_table->Insert (n, _controls, 1, wxALIGN_CENTER_VERTICAL | wxALL, 3);
 
@@ -95,14 +99,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 > 2) {
+			_gauge->Pulse ();
+		}
 	}
 }
 
+
 void
 JobView::progress ()
 {
@@ -110,7 +119,7 @@ JobView::progress ()
 	if (!_job->sub_name().empty ()) {
 		whole += _job->sub_name() + " ";
 	}
-	string s = _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;");
@@ -128,6 +137,7 @@ JobView::progress ()
 	}
 }
 
+
 void
 JobView::finished ()
 {
@@ -144,7 +154,7 @@ JobView::finished ()
 	}
 
 	if (_job->message()) {
-		MessageDialog* d = new MessageDialog (_parent, _job->name(), _job->message().get());
+		auto d = new MessageDialog (_parent, std_to_wx(_job->name()), std_to_wx(_job->message().get()));
 		d->ShowModal ();
 		d->Destroy ();
 	}
@@ -162,14 +172,16 @@ JobView::finished ()
 	}
 }
 
+
 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 &)
 {
@@ -178,6 +190,7 @@ JobView::cancel_clicked (wxCommandEvent &)
 	}
 }
 
+
 void
 JobView::insert (int pos)
 {
@@ -186,6 +199,7 @@ JobView::insert (int pos)
 	_table->Layout ();
 }
 
+
 void
 JobView::detach ()
 {
@@ -193,6 +207,7 @@ JobView::detach ()
 	_table->Detach (_controls);
 }
 
+
 void
 JobView::notify_clicked ()
 {