Hand-apply 111f02f4fc8ace359a16aea1c88c2821bf3dde31 from master; improve progress...
[dcpomatic.git] / src / wx / job_manager_view.cc
index 7361f29a815896d1021a5a1ed06a1500cc293f8c..fd3ea6bf782c2e7af7304095846f34cd358e4dd5 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 using std::string;
 using std::list;
 using std::map;
+using std::min;
+using std::cout;
 using boost::shared_ptr;
+using boost::weak_ptr;
+
+class JobRecord
+{
+public:
+       JobRecord (shared_ptr<Job> job, wxScrolledWindow* window, wxPanel* panel, wxFlexGridSizer* table)
+               : _job (job)
+               , _window (window)
+               , _panel (panel)
+               , _table (table)
+       {
+               int n = 0;
+               
+               _name = new wxStaticText (panel, wxID_ANY, "");
+               string const jn = "<b>" + _job->name () + "</b>";
+               _name->SetLabelMarkup (std_to_wx (jn));
+               table->Insert (n, _name, 0, wxALIGN_CENTER_VERTICAL | wxALL, 6);
+               ++n;
+       
+               _gauge = new wxGauge (panel, wxID_ANY, 100);
+               /* This seems to be required to allow the gauge to shrink under OS X */
+               _gauge->SetMinSize (wxSize (0, -1));
+               table->Insert (n, _gauge, 1, wxEXPAND | wxLEFT | wxRIGHT);
+               ++n;
+               
+               _message = new wxStaticText (panel, wxID_ANY, std_to_wx (""));
+               table->Insert (n, _message, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
+               ++n;
+       
+               _cancel = new wxButton (panel, wxID_ANY, _("Cancel"));
+               _cancel->Bind (wxEVT_COMMAND_BUTTON_CLICKED, &JobRecord::cancel_clicked, this);
+               table->Insert (n, _cancel, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
+               ++n;
+       
+               _pause = new wxButton (_panel, wxID_ANY, _("Pause"));
+               _pause->Bind (wxEVT_COMMAND_BUTTON_CLICKED, &JobRecord::pause_clicked, this);
+               table->Insert (n, _pause, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
+               ++n;
+       
+               _details = new wxButton (_panel, wxID_ANY, _("Details..."));
+               _details->Bind (wxEVT_COMMAND_BUTTON_CLICKED, &JobRecord::details_clicked, this);
+               _details->Enable (false);
+               table->Insert (n, _details, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
+               ++n;
+       
+               job->Progress.connect (boost::bind (&JobRecord::progress, this));
+               job->Finished.connect (boost::bind (&JobRecord::finished, this));
+       
+               table->Layout ();
+               panel->FitInside ();
+       }
+
+       void maybe_pulse ()
+       {
+               if (_job->running() && !_job->progress ()) {
+                       _gauge->Pulse ();
+               }
+       }
+
+private:
+
+       void update_job_name ()
+       {
+               string n = "<b>" + _job->name () + "</b>";
+               if (!_job->sub_name().empty ()) {
+                       n += "\n" + _job->sub_name ();
+               }
+               
+               if (n != _last_name) {
+                       _name->SetLabelMarkup (std_to_wx (n));
+                       _last_name = n;
+               }
+       }
+
+       void progress ()
+       {
+               checked_set (_message, _job->status ());
+               update_job_name ();
+               if (_job->progress ()) {
+                       _gauge->SetValue (min (100.0f, _job->progress().get() * 100));
+               }
+               _table->Layout ();
+               _window->FitInside ();
+       }
+
+       void finished ()
+       {
+               checked_set (_message, _job->status ());
+               update_job_name ();
+               
+               if (!_job->finished_cancelled ()) {
+                       _gauge->SetValue (100);
+               }
+               
+               _cancel->Enable (false);
+               _pause->Enable (false);
+               if (!_job->error_details().empty ()) {
+                       _details->Enable (true);
+               }
+               
+               _table->Layout ();
+               _window->FitInside ();
+       }
+
+       void details_clicked (wxCommandEvent &)
+       {
+               string s = _job->error_summary();
+               s[0] = toupper (s[0]);
+               error_dialog (_window, std_to_wx (String::compose ("%1.\n\n%2", s, _job->error_details())));
+       }
+       
+       void cancel_clicked (wxCommandEvent &)
+       {
+               _job->cancel ();
+       }
+
+       void pause_clicked (wxCommandEvent &)
+       {
+               if (_job->paused()) {
+                       _job->resume ();
+                       _pause->SetLabel (_("Pause"));
+               } else {
+                       _job->pause ();
+                       _pause->SetLabel (_("Resume"));
+               }
+       }
+       
+       boost::shared_ptr<Job> _job;
+       wxScrolledWindow* _window;
+       wxPanel* _panel;
+       wxFlexGridSizer* _table;
+       wxStaticText* _name;
+       wxGauge* _gauge;
+       wxStaticText* _message;
+       wxButton* _cancel;
+       wxButton* _pause;
+       wxButton* _details;
+       std::string _last_name;
+};
 
 /** Must be called in the GUI thread */
 JobManagerView::JobManagerView (wxWindow* parent)
@@ -41,98 +182,43 @@ JobManagerView::JobManagerView (wxWindow* parent)
        wxSizer* sizer = new wxBoxSizer (wxVERTICAL);
        sizer->Add (_panel, 1, wxEXPAND);
        SetSizer (sizer);
-       
-       _table = new wxFlexGridSizer (4, 6, 6);
+
+       _table = new wxFlexGridSizer (6, 6, 6);
        _table->AddGrowableCol (1, 1);
        _panel->SetSizer (_table);
 
        SetScrollRate (0, 32);
+       EnableScrolling (false, true);
 
-       Connect (wxID_ANY, wxEVT_TIMER, wxTimerEventHandler (JobManagerView::periodic), 0, this);
+       Bind (wxEVT_TIMER, boost::bind (&JobManagerView::periodic, this));
        _timer.reset (new wxTimer (this));
        _timer->Start (1000);
 
-       update ();
+       Bind (wxEVT_SIZE, boost::bind (&JobManagerView::sized, this, _1));
+       JobManager::instance()->JobAdded.connect (bind (&JobManagerView::job_added, this, _1));
 }
 
 void
-JobManagerView::periodic (wxTimerEvent &)
+JobManagerView::sized (wxSizeEvent& ev)
 {
-       update ();
+       _table->FitInside (_panel);
+       _table->Layout ();
+       ev.Skip ();
 }
 
-/** Update the view by examining the state of each job.
- *  Must be called in the GUI thread.
- */
 void
-JobManagerView::update ()
+JobManagerView::job_added (weak_ptr<Job> j)
 {
-       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->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;
-               }
-
-               string const st = (*i)->status ();
-
-               if (!(*i)->finished ()) {
-                       float const p = (*i)->overall_progress ();
-                       if (p >= 0) {
-                               checked_set (_job_records[*i].message, st);
-                               _job_records[*i].gauge->SetValue (p * 100);
-                       } else {
-                               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);
-                       checked_set (_job_records[*i].message, st);
-                       (*i)->Finished ();
-                       _job_records[*i].finalised = true;
-                       if (!(*i)->error_details().empty ()) {
-                               _job_records[*i].details->Enable (true);
-                       }
-               }
-
-               index += 4;
+       shared_ptr<Job> job = j.lock ();
+       if (job) {
+               _job_records.push_back (shared_ptr<JobRecord> (new JobRecord (job, this, _panel, _table)));
        }
-
-       _table->Layout ();
-       FitInside ();
 }
 
 void
-JobManagerView::details_clicked (wxCommandEvent& ev)
+JobManagerView::periodic ()
 {
-       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, std_to_wx (String::compose ("%1.\n\n%2", s, i->first->error_details())));
-               }
+       for (list<shared_ptr<JobRecord> >::iterator i = _job_records.begin(); i != _job_records.end(); ++i) {
+               (*i)->maybe_pulse ();
        }
 }