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);
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;
}
_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 ();
{
wxObject* o = ev.GetEventObject ();
- for (map<boost::shared_ptr<Job>, JobRecord>::iterator i = _job_records.begin(); i != _job_records.end(); ++i) {
+ for (map<shared_ptr<Job>, JobRecord>::iterator i = _job_records.begin(); i != _job_records.end(); ++i) {
if (i->second.details == o) {
string s = i->first->error_summary();
s[0] = toupper (s[0]);
}
}
}
+
+void
+JobManagerView::cancel_clicked (wxCommandEvent& ev)
+{
+ wxObject* o = ev.GetEventObject ();
+
+ for (map<shared_ptr<Job>, JobRecord>::iterator i = _job_records.begin(); i != _job_records.end(); ++i) {
+ if (i->second.cancel == o) {
+ i->first->cancel ();
+ }
+ }
+}