Merge master.

[dcpomatic.git] / src / wx / job_manager_view.cc

diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc
index 9c70405846cc1587baf8e3fcfd350a4bfd2267df..a7788ddd01334cd0a8d2dba94afb3f3b8e489321 100644 (file)
--- a/src/wx/job_manager_view.cc
+++ b/src/wx/job_manager_view.cc
@@ -30,6 +30,7 @@
 
 using std::string;
 using std::list;
+using std::map;
 using boost::shared_ptr;
 
 /** Must be called in the GUI thread */
@@ -41,7 +42,7 @@ JobManagerView::JobManagerView (wxWindow* parent)
        sizer->Add (_panel, 1, wxEXPAND);
        SetSizer (sizer);
        
-       _table = new wxFlexGridSizer (3, 6, 6);
+       _table = new wxFlexGridSizer (5, 6, 6);
        _table->AddGrowableCol (1, 1);
        _panel->SetSizer (_table);
 
@@ -83,6 +84,15 @@ 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 + 4, r.details, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
                        
                        _job_records[*i] = r;
                }
@@ -92,23 +102,56 @@ JobManagerView::update ()
                if (!(*i)->finished ()) {
                        float const p = (*i)->overall_progress ();
                        if (p >= 0) {
-                               _job_records[*i].message->SetLabel (std_to_wx (st));
+                               checked_set (_job_records[*i].message, st);
                                _job_records[*i].gauge->SetValue (p * 100);
                        } else {
-                               _job_records[*i].message->SetLabel (wxT ("Running"));
+                               checked_set (_job_records[*i].message, wx_to_std (_("Running")));
                                _job_records[*i].gauge->Pulse ();
                        }
                }
-               
+
                if ((*i)->finished() && !_job_records[*i].finalised) {
-                       _job_records[*i].gauge->SetValue (100);
-                       _job_records[*i].message->SetLabel (std_to_wx (st));
+                       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 += 3;
+               index += 5;
        }
 
        _table->Layout ();
        FitInside ();
 }
+
+void
+JobManagerView::details_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.details == o) {
+                       string s = i->first->error_summary();
+                       s[0] = toupper (s[0]);
+                       error_dialog (this, std_to_wx (String::compose ("%1.\n\n%2", s, i->first->error_details())));
+               }
+       }
+}
+
+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 ();
+               }
+       }
+}