X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fjob_manager_view.cc;h=cd6918b7268e730c7a93d4e8d1a796293c7cadf9;hb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;hp=3a72a5a309a8956b829d6d1d4a2dbaca83b129cd;hpb=9f8d836c6cfb0e7f2b41e17990b774137615e4f6;p=dcpomatic.git

diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc
index 3a72a5a30..cd6918b72 100644
--- a/src/wx/job_manager_view.cc
+++ b/src/wx/job_manager_view.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 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/>.
 
 */
 
@@ -21,12 +22,15 @@
  *  @brief Class generating a GTK widget to show the progress of jobs.
  */
 
+#include "job_manager_view.h"
+#include "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 <iostream>
 
 using std::string;
 using std::list;
@@ -36,121 +40,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;
-
-		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;
-	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)
@@ -179,14 +68,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 ();
 	}
 }