X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fjob_manager_view.h;h=c1a1744bf69aae6deab0d9b9230f3c5c13f054f5;hb=865316f0129c85cdd0248b87502fe97dec94b3f0;hp=72ac85c02640423ee4c2f23b1756c8680adf645b;hpb=a00ebbc68438e84076c65e99d0e70403afb4407d;p=dcpomatic.git

diff --git a/src/wx/job_manager_view.h b/src/wx/job_manager_view.h
index 72ac85c02..c1a1744bf 100644
--- a/src/wx/job_manager_view.h
+++ b/src/wx/job_manager_view.h
@@ -1,31 +1,40 @@
 /*
-    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/>.
 
 */
 
+
 /** @file src/job_manager_view.h
  *  @brief Class which is a wxPanel for showing the progress of jobs.
  */
 
-#include <string>
-#include <boost/shared_ptr.hpp>
+
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
+#include <list>
+#include <memory>
+
 
 class Job;
+class JobView;
+
 
 /** @class JobManagerView
  *  @brief Class which is a wxPanel for showing the progress of jobs.
@@ -33,25 +42,18 @@ class Job;
 class JobManagerView : public wxScrolledWindow
 {
 public:
-	JobManagerView (wxWindow *);
-
-	void update ();
+	JobManagerView (wxWindow *, bool batch);
 
 private:
-	void periodic (wxTimerEvent &);
-	void cancel_clicked (wxCommandEvent &);
-	void details_clicked (wxCommandEvent &);
+	void job_added (std::weak_ptr<Job>);
+	void periodic ();
+	void replace ();
+	void job_list_changed ();
 
-	boost::shared_ptr<wxTimer> _timer;
 	wxPanel* _panel;
 	wxFlexGridSizer* _table;
-	struct JobRecord {
-		wxGauge* gauge;
-		wxStaticText* message;
-		wxButton* cancel;
-		wxButton* details;
-		bool finalised;
-	};
-		
-	std::map<boost::shared_ptr<Job>, JobRecord> _job_records;
+	std::shared_ptr<wxTimer> _timer;
+	bool _batch;
+
+	std::list<std::shared_ptr<JobView>> _job_records;
 };