X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fjob_manager_view.cc;h=6cea40c8912859b36d55b2dad5df61dc022446b3;hb=c8be0644833dce6ff39202430bba0ab358f3e096;hp=cba22178415473cbe9e9300c9452c10eb5800a50;hpb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;p=dcpomatic.git

diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc
index cba221784..6cea40c89 100644
--- a/src/wx/job_manager_view.cc
+++ b/src/wx/job_manager_view.cc
@@ -19,18 +19,18 @@
 */
 
 /** @file src/job_manager_view.cc
- *  @brief Class generating a widget to show the progress of jobs.
+ *  @brief Class generating a GTK widget to show the progress of jobs.
  */
 
 #include "job_manager_view.h"
-#include "job_view.h"
+#include "batch_job_view.h"
+#include "normal_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 "lib/compose.hpp"
-#include <boost/make_shared.hpp>
 #include <iostream>
 
 using std::string;
@@ -39,19 +39,23 @@ using std::map;
 using std::min;
 using std::cout;
 using boost::shared_ptr;
-using boost::make_shared;
 using boost::weak_ptr;
 
-/** Must be called in the GUI thread */
-JobManagerView::JobManagerView (wxWindow* parent)
+/** @param parent Parent window.
+ *  @param batch true to use BatchJobView, false to use NormalJobView.
+ *
+ *  Must be called in the GUI thread.
+ */
+JobManagerView::JobManagerView (wxWindow* parent, bool batch)
 	: wxScrolledWindow (parent)
+	, _batch (batch)
 {
 	_panel = new wxPanel (this);
 	wxSizer* sizer = new wxBoxSizer (wxVERTICAL);
 	sizer->Add (_panel, 1, wxEXPAND);
 	SetSizer (sizer);
 
-	_table = new wxFlexGridSizer (4, 4, 6);
+	_table = new wxFlexGridSizer (2, 6, 6);
 	_table->AddGrowableCol (0, 1);
 	_panel->SetSizer (_table);
 
@@ -70,8 +74,17 @@ JobManagerView::job_added (weak_ptr<Job> j)
 {
 	shared_ptr<Job> job = j.lock ();
 	if (job) {
-		_job_records.push_back (make_shared<JobView> (job, this, _panel, _table));
+		shared_ptr<JobView> v;
+		if (_batch) {
+			v.reset (new BatchJobView (job, this, _panel, _table));
+		} else {
+			v.reset (new NormalJobView (job, this, _panel, _table));
+		}
+		v->setup ();
+		_job_records.push_back (v);
 	}
+
+	FitInside();
 }
 
 void