X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fjob_manager_view.h;h=77114a97c382b170f06758d58d1d8f2d41fb52af;hp=ef74b3cf86600bd66825deeee63bd416dafa3388;hb=6ea0becd89bb223f26196aa9db13371990f5a1a8;hpb=81e0ec64eccf10232628fdf89149b3a66f231312

diff --git a/src/wx/job_manager_view.h b/src/wx/job_manager_view.h
index ef74b3cf8..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,70 +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;
-		bool informed_of_finish;
-	};
-		
-	std::map<boost::shared_ptr<Job>, JobRecord> _job_records;
-#if 0	
-	/** Scroller for all our contents */
-	Gtk::ScrolledWindow _scroller;
-	/** View for the jobs */
-	Gtk::TreeView _view;
-	/** Store for the jobs */
-	Glib::RefPtr<Gtk::TreeStore> _store;
-
-	/** The TreeModelColumnRecord for the store */
-	class StoreColumns : public Gtk::TreeModelColumnRecord
-	{
-	public:
-		StoreColumns ()
-		{
-			add (name);
-			add (job);
-			add (progress);
-			add (progress_unknown);
-			add (text);
-			add (informed_of_finish);
-		}
-
-		/** Job name */
-		Gtk::TreeModelColumn<std::string> name;
-		/** Job */
-		Gtk::TreeModelColumn<boost::shared_ptr<Job> > job;
-		/** Progress */
-		Gtk::TreeModelColumn<float> progress;
-		/** An increasing integer number if the progress is unknown */
-		Gtk::TreeModelColumn<int> progress_unknown;
-		/** Text to write into the progress bar */
-		Gtk::TreeModelColumn<std::string> text;
-		/** true if the job has been informed of its finish */
-		Gtk::TreeModelColumn<bool> informed_of_finish;
-	};
+	bool _batch;
 
-	/** The columns for the store */
-	StoreColumns _columns;
-#endif	
+	std::list<boost::shared_ptr<JobView> > _job_records;
 };