JobRecord -> JobView.

5 files changed, 205 insertions, 127 deletions

diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc
index 1b809edec..b32c695a9 100644
--- a/src/wx/job_manager_view.cc
+++ b/src/wx/job_manager_view.cc
@@ -22,6 +22,7 @@
  */
 
 #include "job_manager_view.h"
+#include "job_view.h"
 #include "wx_util.h"
 #include "lib/job_manager.h"
 #include "lib/job.h"
@@ -38,129 +39,6 @@ using std::cout;
 using boost::shared_ptr;
 using boost::weak_ptr;
 
-class JobRecord : public boost::noncopyable
-{
-public:
-	JobRecord (shared_ptr<Job> job, wxScrolledWindow* window, wxPanel* panel, wxFlexGridSizer* table)
-		: _job (job)
-		, _window (window)
-		, _panel (panel)
-	{
-		int n = 0;
-
-		_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, 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, 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));
-
-		progress ();
-
-		table->Layout ();
-	}
-
-	void maybe_pulse ()
-	{
-		if (_job->running() && !_job->progress ()) {
-			_gauge->Pulse ();
-		}
-	}
-
-private:
-
-	void progress ()
-	{
-		string whole = "<b>" + _job->name () + "</b>\n";
-		if (!_job->sub_name().empty ()) {
-			whole += _job->sub_name() + " ";
-		}
-		whole += _job->status ();
-		if (whole != _last_message) {
-			_message->SetLabelMarkup (std_to_wx (whole));
-			_gauge_message->Layout ();
-			_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;
-	wxBoxSizer* _gauge_message;
-	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)
 	: wxScrolledWindow (parent)
@@ -189,14 +67,14 @@ JobManagerView::job_added (weak_ptr<Job> j)
 {
 	shared_ptr<Job> job = j.lock ();
 	if (job) {
-		_job_records.push_back (shared_ptr<JobRecord> (new JobRecord (job, this, _panel, _table)));
+		_job_records.push_back (shared_ptr<JobView> (new JobView (job, this, _panel, _table)));
 	}
 }
 
 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 ();
 	}
 }
diff --git a/src/wx/job_manager_view.h b/src/wx/job_manager_view.h
index ccba75fb9..79cc4743c 100644
--- a/src/wx/job_manager_view.h
+++ b/src/wx/job_manager_view.h
@@ -26,7 +26,7 @@
 #include <list>
 
 class Job;
-class JobRecord;
+class JobView;
 
 /** @class JobManagerView
  *  @brief Class which is a wxPanel for showing the progress of jobs.
@@ -44,5 +44,5 @@ private:
 	wxFlexGridSizer* _table;
 	boost::shared_ptr<wxTimer> _timer;
 
-	std::list<boost::shared_ptr<JobRecord> > _job_records;
+	std::list<boost::shared_ptr<JobView> > _job_records;
 };
diff --git a/src/wx/job_view.cc b/src/wx/job_view.cc
new file mode 100644
index 000000000..fca297430
--- /dev/null
+++ b/src/wx/job_view.cc
@@ -0,0 +1,137 @@
+/*
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+
+    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
+    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,
+    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.
+
+*/
+
+#include "job_view.h"
+#include "wx_util.h"
+#include "lib/job.h"
+#include "lib/compose.hpp"
+#include <wx/wx.h>
+
+using std::string;
+using std::min;
+using boost::shared_ptr;
+
+JobView::JobView (shared_ptr<Job> job, wxScrolledWindow* window, wxPanel* panel, wxFlexGridSizer* table)
+	: _job (job)
+	, _window (window)
+	, _panel (panel)
+{
+	int n = 0;
+
+	_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, 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, &JobView::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, &JobView::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, &JobView::details_clicked, this);
+	_details->Enable (false);
+	table->Insert (n, _details, 1, wxALIGN_CENTER_VERTICAL | wxALL, 3);
+	++n;
+
+	_progress_connection = job->Progress.connect (boost::bind (&JobView::progress, this));
+	_finished_connection = job->Finished.connect (boost::bind (&JobView::finished, this));
+
+	progress ();
+
+	table->Layout ();
+}
+
+void
+JobView::maybe_pulse ()
+{
+	if (_job->running() && !_job->progress ()) {
+		_gauge->Pulse ();
+	}
+}
+
+void
+JobView::progress ()
+{
+	string whole = "<b>" + _job->name () + "</b>\n";
+	if (!_job->sub_name().empty ()) {
+		whole += _job->sub_name() + " ";
+	}
+	whole += _job->status ();
+	if (whole != _last_message) {
+		_message->SetLabelMarkup (std_to_wx (whole));
+		_gauge_message->Layout ();
+		_last_message = whole;
+	}
+	if (_job->progress ()) {
+		_gauge->SetValue (min (100.0f, _job->progress().get() * 100));
+	}
+}
+
+void
+JobView::finished ()
+{
+	progress ();
+
+	if (!_job->finished_cancelled ()) {
+		_gauge->SetValue (100);
+	}
+
+	_cancel->Enable (false);
+	_pause->Enable (false);
+	if (!_job->error_details().empty ()) {
+		_details->Enable (true);
+	}
+}
+
+void
+JobView::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
+JobView::cancel_clicked (wxCommandEvent &)
+{
+	_job->cancel ();
+}
+
+void
+JobView::pause_clicked (wxCommandEvent &)
+{
+	if (_job->paused()) {
+		_job->resume ();
+		_pause->SetLabel (_("Pause"));
+	} else {
+		_job->pause ();
+		_pause->SetLabel (_("Resume"));
+	}
+}
diff --git a/src/wx/job_view.h b/src/wx/job_view.h
new file mode 100644
index 000000000..0ca0d4cff
--- /dev/null
+++ b/src/wx/job_view.h
@@ -0,0 +1,62 @@
+/*
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+
+    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
+    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,
+    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.
+
+*/
+
+#include <boost/noncopyable.hpp>
+#include <boost/shared_ptr.hpp>
+#include <boost/signals2.hpp>
+
+class Job;
+class wxScrolledWindow;
+class wxPanel;
+class wxFlexGridSizer;
+class wxCommandEvent;
+class wxBoxSizer;
+class wxGauge;
+class wxStaticText;
+class wxButton;
+
+class JobView : public boost::noncopyable
+{
+public:
+	JobView (boost::shared_ptr<Job> job, wxScrolledWindow* window, wxPanel* panel, wxFlexGridSizer* table);
+
+	void maybe_pulse ();
+
+private:
+
+	void progress ();
+	void finished ();
+	void details_clicked (wxCommandEvent &);
+	void cancel_clicked (wxCommandEvent &);
+	void pause_clicked (wxCommandEvent &);
+
+	boost::shared_ptr<Job> _job;
+	wxScrolledWindow* _window;
+	wxPanel* _panel;
+	wxBoxSizer* _gauge_message;
+	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;
+};
diff --git a/src/wx/wscript b/src/wx/wscript
index d643f9965..e0750941e 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -53,6 +53,7 @@ sources = """
           fonts_dialog.cc
           gain_calculator_dialog.cc
           hints_dialog.cc
+          job_view.cc
           job_manager_view.cc
           kdm_dialog.cc
           kdm_output_panel.cc