X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fjob_manager_view.cc;h=b5c66bd3ed5740f74136b29a49195b56e5543f8e;hp=a7788ddd01334cd0a8d2dba94afb3f3b8e489321;hb=89115db77729a2c99f1a09ff6a461720e16f889e;hpb=d62877ae6c4e316e43f4052e4b9ba673610012cf

diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc
index a7788ddd0..b5c66bd3e 100644
--- a/src/wx/job_manager_view.cc
+++ b/src/wx/job_manager_view.cc
@@ -34,15 +34,21 @@ using std::map;
 using boost::shared_ptr;
 
 /** Must be called in the GUI thread */
-JobManagerView::JobManagerView (wxWindow* parent)
+JobManagerView::JobManagerView (wxWindow* parent, Buttons buttons)
 	: wxScrolledWindow (parent)
+	, _buttons (buttons)
 {
 	_panel = new wxPanel (this);
 	wxSizer* sizer = new wxBoxSizer (wxVERTICAL);
 	sizer->Add (_panel, 1, wxEXPAND);
 	SetSizer (sizer);
+
+	int N = 5;
+	if (buttons & PAUSE) {
+		++N;
+	}
 	
-	_table = new wxFlexGridSizer (5, 6, 6);
+	_table = new wxFlexGridSizer (N, 6, 6);
 	_table->AddGrowableCol (1, 1);
 	_panel->SetSizer (_table);
 
@@ -78,23 +84,37 @@ JobManagerView::update ()
 			_table->Insert (index, m, 0, wxALIGN_CENTER_VERTICAL | wxALL, 6);
 			
 			JobRecord r;
+			int n = 1;
 			r.finalised = false;
+			r.scroll_nudged = false;
 			r.gauge = new wxGauge (_panel, wxID_ANY, 100);
-			_table->Insert (index + 1, r.gauge, 1, wxEXPAND | wxLEFT | wxRIGHT);
+			_table->Insert (index + n, r.gauge, 1, wxEXPAND | wxLEFT | wxRIGHT);
+			++n;
 			
 			r.message = new wxStaticText (_panel, wxID_ANY, std_to_wx (""));
-			_table->Insert (index + 2, r.message, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
+			_table->Insert (index + n, r.message, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
+			++n;
 
 			r.cancel = new wxButton (_panel, wxID_ANY, _("Cancel"));
 			r.cancel->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (JobManagerView::cancel_clicked), 0, this);
-			_table->Insert (index + 3, r.cancel, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
-
+			_table->Insert (index + n, r.cancel, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
+			++n;
+
+			if (_buttons & PAUSE) {
+				r.pause = new wxButton (_panel, wxID_ANY, _("Pause"));
+				r.pause->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (JobManagerView::pause_clicked), 0, this);
+				_table->Insert (index + n, r.pause, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
+				++n;
+			}
+			
 			r.details = new wxButton (_panel, wxID_ANY, _("Details..."));
 			r.details->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (JobManagerView::details_clicked), 0, this);
 			r.details->Enable (false);
-			_table->Insert (index + 4, r.details, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
+			_table->Insert (index + n, r.details, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
+			++n;
 			
 			_job_records[*i] = r;
+
 		}
 
 		string const st = (*i)->status ();
@@ -108,14 +128,30 @@ JobManagerView::update ()
 				checked_set (_job_records[*i].message, wx_to_std (_("Running")));
 				_job_records[*i].gauge->Pulse ();
 			}
+
 		}
 
+		if (!_job_records[*i].scroll_nudged && ((*i)->running () || (*i)->finished())) {
+			int x, y;
+			_job_records[*i].gauge->GetPosition (&x, &y);
+			int px, py;
+			GetScrollPixelsPerUnit (&px, &py);
+			int vx, vy;
+			GetViewStart (&vx, &vy);
+			int sx, sy;
+			GetClientSize (&sx, &sy);
+
+			if (y > (vy * py + sy / 2)) {
+				Scroll (-1, y / py);
+				_job_records[*i].scroll_nudged = true;
+			}
+		}
+			
 		if ((*i)->finished() && !_job_records[*i].finalised) {
 			checked_set (_job_records[*i].message, st);
 			if (!(*i)->finished_cancelled()) {
 				_job_records[*i].gauge->SetValue (100);
 			}
-			(*i)->Finished ();
 			_job_records[*i].finalised = true;
 			_job_records[*i].cancel->Enable (false);
 			if (!(*i)->error_details().empty ()) {
@@ -124,6 +160,9 @@ JobManagerView::update ()
 		}
 
 		index += 5;
+		if (_buttons & PAUSE) {
+			++index;
+		}
 	}
 
 	_table->Layout ();
@@ -155,3 +194,21 @@ JobManagerView::cancel_clicked (wxCommandEvent& ev)
 		}
 	}
 }
+
+void
+JobManagerView::pause_clicked (wxCommandEvent& ev)
+{
+	wxObject* o = ev.GetEventObject ();
+	for (map<boost::shared_ptr<Job>, JobRecord>::iterator i = _job_records.begin(); i != _job_records.end(); ++i) {
+		if (i->second.pause == o) {
+			if (i->first->paused()) {
+				i->first->resume ();
+				i->second.pause->SetLabel (_("Pause"));
+			} else {
+				i->first->pause ();
+				i->second.pause->SetLabel (_("Resume"));
+			}
+		}
+	}
+}
+