X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fjob_manager_view.cc;h=05dff36c504fbf0a7c910d419964cebf6e723e4b;hb=1858190cff2f960f3d1f0a5cc02c69da86088f5b;hp=fd3ea6bf782c2e7af7304095846f34cd358e4dd5;hpb=68f662ac50a00ad986e3bd258c3f7daac374ab26;p=dcpomatic.git diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc index fd3ea6bf7..05dff36c5 100644 --- a/src/wx/job_manager_view.cc +++ b/src/wx/job_manager_view.cc @@ -21,12 +21,14 @@ * @brief Class generating a GTK widget to show the progress of jobs. */ +#include "job_manager_view.h" +#include "wx_util.h" #include "lib/job_manager.h" #include "lib/job.h" #include "lib/util.h" #include "lib/exceptions.h" -#include "job_manager_view.h" -#include "wx_util.h" +#include "lib/compose.hpp" +#include using std::string; using std::list; @@ -36,54 +38,48 @@ 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) : _job (job) , _window (window) , _panel (panel) - , _table (table) { 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 ")); + 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; - + _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); + 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)); + + progress (); + table->Layout (); - panel->FitInside (); } void maybe_pulse () @@ -95,47 +91,35 @@ public: 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 (std_to_wx (whole)); + _last_message = whole; } - } - - 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 (); - + 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 &) @@ -144,7 +128,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 (); @@ -160,18 +144,19 @@ 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 */ @@ -183,8 +168,8 @@ JobManagerView::JobManagerView (wxWindow* parent) sizer->Add (_panel, 1, wxEXPAND); SetSizer (sizer); - _table = new wxFlexGridSizer (6, 6, 6); - _table->AddGrowableCol (1, 1); + _table = new wxFlexGridSizer (4, 4, 6); + _table->AddGrowableCol (0, 1); _panel->SetSizer (_table); SetScrollRate (0, 32); @@ -194,18 +179,9 @@ JobManagerView::JobManagerView (wxWindow* parent) _timer.reset (new wxTimer (this)); _timer->Start (1000); - Bind (wxEVT_SIZE, boost::bind (&JobManagerView::sized, this, _1)); JobManager::instance()->JobAdded.connect (bind (&JobManagerView::job_added, this, _1)); } -void -JobManagerView::sized (wxSizeEvent& ev) -{ - _table->FitInside (_panel); - _table->Layout (); - ev.Skip (); -} - void JobManagerView::job_added (weak_ptr j) {