X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fjob_manager_view.cc;h=24cacf6b01ec88bd43b91745416e035220b3f6b0;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=df9c6f5f1d996dfcbccff08753d71b5789c007c6;hpb=d2137ac5db409e686b4d9b3fa567935a5e416d41;p=dcpomatic.git diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc index df9c6f5f1..24cacf6b0 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 @@ -36,114 +36,86 @@ 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) - , _pause (0) { int n = 0; - - _name = new wxStaticText (panel, wxID_ANY, ""); - string const jn = "" + _job->name () + ""; - _name->SetLabelMarkup (std_to_wx (jn)); - table->Insert (n, _name, 0, wxALIGN_CENTER_VERTICAL | wxALL, 6); - ++n; - + + wxBoxSizer* gauge_message = new wxBoxSizer (wxVERTICAL); _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); + gauge_message->Add (_gauge, 0, wxEXPAND | wxLEFT | wxRIGHT); + _message = new wxStaticText (panel, wxID_ANY, wxT (" \n "), 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() && _job->progress_unknown ()) { + if (_job->running() && !_job->progress ()) { _gauge->Pulse (); } } private: - void update_job_name () + void progress () { - string n = "" + _job->name () + ""; + string whole = "" + _job->name () + "\n"; if (!_job->sub_name().empty ()) { - n += "\n" + _job->sub_name (); + whole += _job->sub_name() + " "; } - - if (n != _last_name) { - _name->SetLabelMarkup (std_to_wx (n)); - _last_name = n; + whole += _job->status (); + if (whole != _last_message) { + _message->SetLabelMarkup (whole); + _last_message = whole; } - } - - void progress () - { - float const p = _job->progress (); - if (p >= 0) { - checked_set (_message, _job->status ()); - update_job_name (); - int const pp = min (100.0f, p * 100); - _gauge->SetValue (pp); + 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 (); - + progress (); + if (!_job->finished_cancelled ()) { _gauge->SetValue (100); } - + _cancel->Enable (false); - if (_pause) { - _pause->Enable (false); - } + _pause->Enable (false); if (!_job->error_details().empty ()) { _details->Enable (true); } - - _table->Layout (); - _window->FitInside (); } void details_clicked (wxCommandEvent &) @@ -152,7 +124,7 @@ private: 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 (); @@ -168,45 +140,41 @@ private: _pause->SetLabel (_("Resume")); } } - + boost::shared_ptr _job; wxScrolledWindow* _window; wxPanel* _panel; - wxFlexGridSizer* _table; - wxStaticText* _name; wxGauge* _gauge; wxStaticText* _message; wxButton* _cancel; wxButton* _pause; wxButton* _details; - std::string _last_name; + 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)); } @@ -215,7 +183,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))); } }