X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fjob_manager_view.cc;h=3a72a5a309a8956b829d6d1d4a2dbaca83b129cd;hb=2ed96cf8baea81ab3b6331ae029bfa76ef2522e1;hp=20f885a9b284cf7b8b0b12256413bf1ea3f618f3;hpb=ec7c27b80a07bffcdb175512fa6d3811c277d959;p=dcpomatic.git diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc index 20f885a9b..3a72a5a30 100644 --- a/src/wx/job_manager_view.cc +++ b/src/wx/job_manager_view.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington 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 @@ -31,97 +31,87 @@ 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 +class JobRecord : public boost::noncopyable { public: - JobRecord (shared_ptr job, wxScrolledWindow* window, wxPanel* panel, wxFlexGridSizer* table, bool pause) + JobRecord (shared_ptr job, wxScrolledWindow* window, wxPanel* panel, wxFlexGridSizer* table) : _job (job) , _window (window) , _panel (panel) - , _table (table) - , _needs_pulse (false) { int n = 0; - - wxStaticText* m = new wxStaticText (panel, wxID_ANY, std_to_wx (_job->name ())); - table->Insert (n, m, 0, wxALIGN_CENTER_VERTICAL | wxALL, 6); - ++n; - + + wxBoxSizer* gauge_message = new wxBoxSizer (wxVERTICAL); _gauge = new wxGauge (panel, wxID_ANY, 100); - 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); + /* This seems to be required to allow the gauge to shrink under OS X */ + _gauge->SetMinSize (wxSize (0, -1)); + gauge_message->Add (_gauge, 1, wxEXPAND | wxLEFT | wxRIGHT); + _message = new wxStaticText (panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END); + gauge_message->Add (_message, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 6); + table->Insert (n, gauge_message, 1, wxEXPAND | wxLEFT | wxRIGHT); ++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); + table->Insert (n, _cancel, 1, wxALIGN_CENTER_VERTICAL | wxALL, 3); ++n; - if (pause) { - _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; - } + _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, 3); + ++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); + table->Insert (n, _details, 1, wxALIGN_CENTER_VERTICAL | wxALL, 3); ++n; - job->Progress.connect (boost::bind (&JobRecord::progress, this)); - job->Finished.connect (boost::bind (&JobRecord::finished, this)); + _progress_connection = job->Progress.connect (boost::bind (&JobRecord::progress, this)); + _finished_connection = job->Finished.connect (boost::bind (&JobRecord::finished, this)); table->Layout (); - panel->FitInside (); } void maybe_pulse () { - if (_job->running() && _needs_pulse) { + if (_job->running() && !_job->progress ()) { _gauge->Pulse (); } - - _needs_pulse = true; } private: void progress () { - float const p = _job->overall_progress (); - if (p >= 0) { - checked_set (_message, _job->status ()); - _gauge->SetValue (p * 100); - _needs_pulse = false; + string whole = "" + _job->name () + ": " + _job->sub_name() + " " + _job->status (); + if (whole != _last_message) { + _message->SetLabelMarkup (whole); + _last_message = whole; + } + if (_job->progress ()) { + _gauge->SetValue (min (100.0f, _job->progress().get() * 100)); } - - _table->Layout (); - _window->FitInside (); } void finished () { - checked_set (_message, _job->status ()); + progress (); + 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 &) @@ -150,40 +140,37 @@ private: boost::shared_ptr _job; wxScrolledWindow* _window; wxPanel* _panel; - wxFlexGridSizer* _table; wxGauge* _gauge; wxStaticText* _message; wxButton* _cancel; wxButton* _pause; wxButton* _details; - bool _needs_pulse; + std::string _last_message; + + boost::signals2::scoped_connection _progress_connection; + boost::signals2::scoped_connection _finished_connection; }; /** Must be called in the GUI thread */ -JobManagerView::JobManagerView (wxWindow* parent, Buttons buttons) +JobManagerView::JobManagerView (wxWindow* parent) : wxScrolledWindow (parent) - , _buttons (buttons) { _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); + _table = new wxFlexGridSizer (4, 4, 6); + _table->AddGrowableCol (0, 1); _panel->SetSizer (_table); SetScrollRate (0, 32); + EnableScrolling (false, true); Bind (wxEVT_TIMER, boost::bind (&JobManagerView::periodic, this)); _timer.reset (new wxTimer (this)); _timer->Start (1000); - + JobManager::instance()->JobAdded.connect (bind (&JobManagerView::job_added, this, _1)); } @@ -192,7 +179,7 @@ JobManagerView::job_added (weak_ptr j) { shared_ptr job = j.lock (); if (job) { - _job_records.push_back (shared_ptr (new JobRecord (job, this, _panel, _table, _buttons & PAUSE))); + _job_records.push_back (shared_ptr (new JobRecord (job, this, _panel, _table))); } }