1 files changed, 24 insertions, 5 deletions

diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc
index 7361f29a8..f7d2315cc 100644
--- a/src/wx/job_manager_view.cc
+++ b/src/wx/job_manager_view.cc
@@ -42,7 +42,7 @@ JobManagerView::JobManagerView (wxWindow* parent)
 	sizer->Add (_panel, 1, wxEXPAND);
 	SetSizer (sizer);
 	
-	_table = new wxFlexGridSizer (4, 6, 6);
+	_table = new wxFlexGridSizer (5, 6, 6);
 	_table->AddGrowableCol (1, 1);
 	_panel->SetSizer (_table);
 
@@ -85,10 +85,14 @@ JobManagerView::update ()
 			r.message = new wxStaticText (_panel, wxID_ANY, std_to_wx (""));
 			_table->Insert (index + 2, r.message, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
 
+			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);
+
 			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 + 3, r.details, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
+			_table->Insert (index + 4, r.details, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
 			
 			_job_records[*i] = r;
 		}
@@ -105,18 +109,21 @@ JobManagerView::update ()
 				_job_records[*i].gauge->Pulse ();
 			}
 		}
-		
+
 		if ((*i)->finished() && !_job_records[*i].finalised) {
-			_job_records[*i].gauge->SetValue (100);
 			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 ()) {
 				_job_records[*i].details->Enable (true);
 			}
 		}
 
-		index += 4;
+		index += 5;
 	}
 
 	_table->Layout ();
@@ -136,3 +143,15 @@ JobManagerView::details_clicked (wxCommandEvent& ev)
 		}
 	}
 }
+
+void
+JobManagerView::cancel_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.cancel == o) {
+			i->first->cancel ();
+		}
+	}
+}