X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fjob_manager_view.cc;h=1594dfc91e62a51523d033b281015c7dbc7903ca;hb=92cafb6fc686a041354da2eabde6bcb2f6846e1d;hp=9938d3a88bbd7e78cc509993f53d3a740c094d58;hpb=81e0ec64eccf10232628fdf89149b3a66f231312;p=dcpomatic.git diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc index 9938d3a88..1594dfc91 100644 --- a/src/wx/job_manager_view.cc +++ b/src/wx/job_manager_view.cc @@ -28,26 +28,32 @@ #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) - : wxPanel (parent) +JobManagerView::JobManagerView (wxWindow* parent, Buttons buttons) + : wxScrolledWindow (parent) + , _buttons (buttons) { - _sizer = new wxFlexGridSizer (2, 6, 6); - SetSizer (_sizer); - -#if 0 - add_label_to_sizer (_sizer, this, "Hello world"); - wxGauge* g = new wxGauge (this, wxID_ANY, 100); - _sizer->Add (g, 1, wxEXPAND | wxALL); - - add_label_to_sizer (_sizer, this, "Shit"); - g = new wxGauge (this, wxID_ANY, 100); - _sizer->Add (g, 1, wxEXPAND | wxALL); -#endif + _panel = new wxPanel (this); + wxSizer* sizer = new wxBoxSizer (wxVERTICAL); + sizer->Add (_panel, 1, wxEXPAND); + SetSizer (sizer); + + int N = 5; + if (buttons & PAUSE) { + ++N; + } + _table = new wxFlexGridSizer (N, 6, 6); + _table->AddGrowableCol (1, 1); + _panel->SetSizer (_table); + + SetScrollRate (0, 32); + Connect (wxID_ANY, wxEVT_TIMER, wxTimerEventHandler (JobManagerView::periodic), 0, this); _timer.reset (new wxTimer (this)); _timer->Start (1000); @@ -69,62 +75,141 @@ JobManagerView::update () { list > jobs = JobManager::instance()->get (); + int index = 0; + for (list >::iterator i = jobs.begin(); i != jobs.end(); ++i) { if (_job_records.find (*i) == _job_records.end ()) { - add_label_to_sizer (_sizer, this, (*i)->name ()); - + 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.gauge = new wxGauge (this, wxID_ANY, 100); - r.informed_of_finish = false; + int n = 1; + r.finalised = false; + r.scroll_nudged = false; + r.gauge = new wxGauge (_panel, wxID_ANY, 100); + _table->Insert (index + n, r.gauge, 1, wxEXPAND | wxLEFT | wxRIGHT); + ++n; + + r.message = new wxStaticText (_panel, wxID_ANY, std_to_wx ("")); + _table->Insert (index + n, r.message, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6); + ++n; + + 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 + n, r.cancel, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6); + ++n; + + if (_buttons & PAUSE) { + r.pause = new wxButton (_panel, wxID_ANY, _("Pause")); + r.pause->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (JobManagerView::pause_clicked), 0, this); + _table->Insert (index + n, r.pause, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6); + ++n; + } + + 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 + n, r.details, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6); + ++n; - _sizer->Add (r.gauge, 1, wxEXPAND); _job_records[*i] = r; - _sizer->Layout (); + } - bool inform_of_finish = false; string const st = (*i)->status (); if (!(*i)->finished ()) { float const p = (*i)->overall_progress (); if (p >= 0) { -// r[_columns.text] = st; + checked_set (_job_records[*i].message, st); _job_records[*i].gauge->SetValue (p * 100); } else { -// r[_columns.text] = "Running"; + checked_set (_job_records[*i].message, wx_to_std (_("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_ok ()) { - if (!_job_records[*i].informed_of_finish) { - _job_records[*i].gauge->SetValue (100); -// r[_columns.text] = st; - inform_of_finish = true; + + if (!_job_records[*i].scroll_nudged && ((*i)->running () || (*i)->finished())) { + int x, y; + _job_records[*i].gauge->GetPosition (&x, &y); + int px, py; + GetScrollPixelsPerUnit (&px, &py); + int vx, vy; + GetViewStart (&vx, &vy); + int sx, sy; + GetClientSize (&sx, &sy); + + if (y > (vy * py + sy / 2)) { + Scroll (-1, y / py); + _job_records[*i].scroll_nudged = true; } - } else if ((*i)->finished_in_error ()) { - if (!_job_records[*i].informed_of_finish) { + } + + if ((*i)->finished() && !_job_records[*i].finalised) { + checked_set (_job_records[*i].message, st); + if (!(*i)->finished_cancelled()) { _job_records[*i].gauge->SetValue (100); -// r[_columns.text] = st; - inform_of_finish = true; + } + (*i)->Finished (); + _job_records[*i].finalised = true; + _job_records[*i].cancel->Enable (false); + if (!(*i)->error_details().empty ()) { + _job_records[*i].details->Enable (true); } } - if (inform_of_finish) { - try { - (*i)->emit_finished (); - } catch (OpenFileError& e) { - stringstream s; - s << "Error: " << e.what(); - error_dialog (this, s.str ()); + index += 5; + if (_buttons & PAUSE) { + ++index; + } + } + + _table->Layout (); + FitInside (); +} + +void +JobManagerView::details_clicked (wxCommandEvent& ev) +{ + wxObject* o = ev.GetEventObject (); + + for (map, 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, JobRecord>::iterator i = _job_records.begin(); i != _job_records.end(); ++i) { + if (i->second.cancel == o) { + i->first->cancel (); + } + } +} + +void +JobManagerView::pause_clicked (wxCommandEvent& ev) +{ + wxObject* o = ev.GetEventObject (); + for (map, JobRecord>::iterator i = _job_records.begin(); i != _job_records.end(); ++i) { + if (i->second.pause == o) { + if (i->first->paused()) { + i->first->resume (); + i->second.pause->SetLabel (_("Pause")); + } else { + i->first->pause (); + i->second.pause->SetLabel (_("Resume")); } - _job_records[*i].informed_of_finish = true; } } } +