Add details button to job manager; stretch jobs across the whole of the bottom of...

[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 f385fb2697204cf2510f485347fb3e9fb3a4d7de..75842a8d4e5569cc3746728032201169d5326ca2 100644 (file)
--- a/src/wx/job_manager_view.cc
+++ b/src/wx/job_manager_view.cc
@@ -28,8 +28,10 @@
 #include "job_manager_view.h"
 #include "wx_util.h"
 
-using namespace std;
-using namespace boost;
+using std::string;
+using std::list;
+using std::map;
+using boost::shared_ptr;
 
 /** Must be called in the GUI thread */
 JobManagerView::JobManagerView (wxWindow* parent)
@@ -40,7 +42,7 @@ JobManagerView::JobManagerView (wxWindow* parent)
        sizer->Add (_panel, 1, wxEXPAND);
        SetSizer (sizer);
        
-       _table = new wxFlexGridSizer (3, 6, 6);
+       _table = new wxFlexGridSizer (4, 6, 6);
        _table->AddGrowableCol (1, 1);
        _panel->SetSizer (_table);
 
@@ -67,14 +69,26 @@ JobManagerView::update ()
 {
        list<shared_ptr<Job> > jobs = JobManager::instance()->get ();
 
+       int index = 0;
+
        for (list<shared_ptr<Job> >::iterator i = jobs.begin(); i != jobs.end(); ++i) {
                
                if (_job_records.find (*i) == _job_records.end ()) {
+                       wxStaticText* m = new wxStaticText (_panel, wxID_ANY, std_to_wx ((*i)->name ()));
+                       _table->Insert (index, m, 0, wxALIGN_CENTER_VERTICAL | wxALL, 6);
+                       
                        JobRecord r;
+                       r.finalised = false;
                        r.gauge = new wxGauge (_panel, wxID_ANY, 100);
-                       _table->Add (r.gauge, 1, wxEXPAND | wxLEFT | wxRIGHT);
-                       r.informed_of_finish = false;
-                       r.message = add_label_to_sizer (_table, _panel, "", 1);
+                       _table->Insert (index + 1, r.gauge, 1, wxEXPAND | wxLEFT | wxRIGHT);
+                       
+                       r.message = new wxStaticText (_panel, wxID_ANY, std_to_wx (""));
+                       _table->Insert (index + 2, r.message, 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);
                        
                        _job_records[*i] = r;
                }
@@ -87,32 +101,37 @@ JobManagerView::update ()
                                _job_records[*i].message->SetLabel (std_to_wx (st));
                                _job_records[*i].gauge->SetValue (p * 100);
                        } else {
-                               _job_records[*i].message->SetLabel (wxT ("Running"));
+                               _job_records[*i].message->SetLabel (_("Running"));
                                _job_records[*i].gauge->Pulse ();
                        }
                }
                
-               /* Hack to work around our lack of cross-thread
-                  signalling; we tell the job to emit_finished()
-                  from here (the GUI thread).
-               */
-               
-               if ((*i)->finished () && !_job_records[*i].informed_of_finish) {
+               if ((*i)->finished() && !_job_records[*i].finalised) {
                        _job_records[*i].gauge->SetValue (100);
                        _job_records[*i].message->SetLabel (std_to_wx (st));
-
-                       try {
-                               (*i)->emit_finished ();
-                       } catch (OpenFileError& e) {
-                               stringstream s;
-                               s << "Error: " << e.what();
-                               error_dialog (this, s.str ());
+                       _job_records[*i].finalised = true;
+                       if (!(*i)->error_details().empty ()) {
+                               _job_records[*i].details->Enable (true);
                        }
-                       
-                       _job_records[*i].informed_of_finish = true;
                }
+
+               index += 3;
        }
 
        _table->Layout ();
        FitInside ();
 }
+
+void
+JobManagerView::details_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.details == o) {
+                       string s = i->first->error_summary();
+                       s[0] = toupper (s[0]);
+                       error_dialog (this, String::compose ("%1.\n\n%2", s, i->first->error_details()));
+               }
+       }
+}