/*
- Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ DCP-o-matic is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
* @brief Class generating a GTK widget to show the progress of jobs.
*/
+#include "job_manager_view.h"
+#include "batch_job_view.h"
+#include "normal_job_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 <boost/foreach.hpp>
+#include <iostream>
using std::string;
using std::list;
using std::cout;
using boost::shared_ptr;
using boost::weak_ptr;
+using boost::bind;
-class JobRecord : public boost::noncopyable
-{
-public:
- JobRecord (shared_ptr<Job> job, wxScrolledWindow* window, wxPanel* panel, wxFlexGridSizer* table)
- : _job (job)
- , _window (window)
- , _panel (panel)
- , _table (table)
- {
- int n = 0;
-
- 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));
- 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, 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, 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, 3);
- ++n;
-
- _progress_connection = job->Progress.connect (boost::bind (&JobRecord::progress, this));
- _finished_connection = job->Finished.connect (boost::bind (&JobRecord::finished, this));
-
- table->Layout ();
- }
-
- void maybe_pulse ()
- {
- if (_job->running() && !_job->progress ()) {
- _gauge->Pulse ();
- }
- }
-
-private:
-
- void progress ()
- {
- string whole = "<b>" + _job->name () + "</b>: " + _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));
- }
- }
-
- void finished ()
- {
- progress ();
-
- if (!_job->finished_cancelled ()) {
- _gauge->SetValue (100);
- }
-
- _cancel->Enable (false);
- _pause->Enable (false);
- if (!_job->error_details().empty ()) {
- _details->Enable (true);
- }
- }
-
- 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;
- wxGauge* _gauge;
- wxStaticText* _message;
- wxButton* _cancel;
- wxButton* _pause;
- wxButton* _details;
- 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)
+/** @param parent Parent window.
+ * @param batch true to use BatchJobView, false to use NormalJobView.
+ *
+ * Must be called in the GUI thread.
+ */
+JobManagerView::JobManagerView (wxWindow* parent, bool batch)
: wxScrolledWindow (parent)
+ , _batch (batch)
{
_panel = new wxPanel (this);
wxSizer* sizer = new wxBoxSizer (wxVERTICAL);
sizer->Add (_panel, 1, wxEXPAND);
SetSizer (sizer);
- _table = new wxFlexGridSizer (4, 4, 6);
+ _table = new wxFlexGridSizer (2, 6, 6);
_table->AddGrowableCol (0, 1);
_panel->SetSizer (_table);
_timer->Start (1000);
JobManager::instance()->JobAdded.connect (bind (&JobManagerView::job_added, this, _1));
+ JobManager::instance()->JobsReordered.connect (bind (&JobManagerView::replace, this));
}
void
{
shared_ptr<Job> job = j.lock ();
if (job) {
- _job_records.push_back (shared_ptr<JobRecord> (new JobRecord (job, this, _panel, _table)));
+ shared_ptr<JobView> v;
+ if (_batch) {
+ v.reset (new BatchJobView (job, this, _panel, _table));
+ } else {
+ v.reset (new NormalJobView (job, this, _panel, _table));
+ }
+ v->setup ();
+ _job_records.push_back (v);
}
+
+ FitInside();
+ job_list_changed ();
}
void
JobManagerView::periodic ()
{
- for (list<shared_ptr<JobRecord> >::iterator i = _job_records.begin(); i != _job_records.end(); ++i) {
+ for (list<shared_ptr<JobView> >::iterator i = _job_records.begin(); i != _job_records.end(); ++i) {
(*i)->maybe_pulse ();
}
}
+
+void
+JobManagerView::replace ()
+{
+ /* Make a new version of _job_records which reflects the order in JobManager's job list */
+
+ list<shared_ptr<JobView> > new_job_records;
+
+ BOOST_FOREACH (shared_ptr<Job> i, JobManager::instance()->get()) {
+ /* Find this job's JobView */
+ BOOST_FOREACH (shared_ptr<JobView> j, _job_records) {
+ if (j->job() == i) {
+ new_job_records.push_back (j);
+ break;
+ }
+ }
+ }
+
+ BOOST_FOREACH (shared_ptr<JobView> i, _job_records) {
+ i->detach ();
+ }
+
+ _job_records = new_job_records;
+
+ BOOST_FOREACH (shared_ptr<JobView> i, _job_records) {
+ i->insert (i->insert_position ());
+ }
+
+ job_list_changed ();
+}
+
+void
+JobManagerView::job_list_changed ()
+{
+ BOOST_FOREACH (shared_ptr<JobView> i, _job_records) {
+ i->job_list_changed ();
+ }
+}
projects / dcpomatic.git / blobdiff