X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fwx%2Fjob_manager_view.h;h=77114a97c382b170f06758d58d1d8f2d41fb52af;hb=8414829693900c3d6362a4f15d677bb7e1462c3e;hp=96a37693cadb1ae8a3315714dec465e61585237e;hpb=c1d603f3bc051f3b35546c201a683f2a0e15ab22;p=dcpomatic.git

diff --git a/src/wx/job_manager_view.h b/src/wx/job_manager_view.h
index 96a37693c..77114a97c 100644
--- a/src/wx/job_manager_view.h
+++ b/src/wx/job_manager_view.h
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    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,32 +22,31 @@
  *  @brief Class which is a wxPanel for showing the progress of jobs.
  */
 
-#include <string>
-#include <boost/shared_ptr.hpp>
 #include <wx/wx.h>
+#include <boost/shared_ptr.hpp>
+#include <list>
 
 class Job;
+class JobView;
 
 /** @class JobManagerView
  *  @brief Class which is a wxPanel for showing the progress of jobs.
  */
-class JobManagerView : public wxPanel
+class JobManagerView : public wxScrolledWindow
 {
 public:
-	JobManagerView (wxWindow *);
-
-	void update ();
+	JobManagerView (wxWindow *, bool batch);
 
 private:
-	void periodic (wxTimerEvent &);
+	void job_added (boost::weak_ptr<Job>);
+	void periodic ();
+	void replace ();
+	void job_list_changed ();
 
+	wxPanel* _panel;
+	wxFlexGridSizer* _table;
 	boost::shared_ptr<wxTimer> _timer;
-	wxFlexGridSizer* _sizer;
-	struct JobRecord {
-		wxGauge* gauge;
-		wxStaticText* message;
-		bool informed_of_finish;
-	};
-		
-	std::map<boost::shared_ptr<Job>, JobRecord> _job_records;
+	bool _batch;
+
+	std::list<boost::shared_ptr<JobView> > _job_records;
 };