Use pofilter to check i18n and fix some .po file glitches.

[dcpomatic.git] / src / wx / job_manager_view.cc

diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc
index cba22178415473cbe9e9300c9452c10eb5800a50..42d5f9dbeb5e5aade18cec6c3216abc3ff4a5234 100644 (file)
--- a/src/wx/job_manager_view.cc
+++ b/src/wx/job_manager_view.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -19,18 +19,19 @@
 */
 
 /** @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 <boost/foreach.hpp>
 #include <iostream>
 
 using std::string;
@@ -39,19 +40,24 @@ using std::map;
 using std::min;
 using std::cout;
 using boost::shared_ptr;
-using boost::make_shared;
 using boost::weak_ptr;
+using boost::bind;
 
-/** 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);
 
@@ -63,6 +69,7 @@ JobManagerView::JobManagerView (wxWindow* parent)
        _timer->Start (1000);
 
        JobManager::instance()->JobAdded.connect (bind (&JobManagerView::job_added, this, _1));
+       JobManager::instance()->JobsReordered.connect (bind (&JobManagerView::replace, this));
 }
 
 void
@@ -70,8 +77,18 @@ 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();
+       job_list_changed ();
 }
 
 void
@@ -81,3 +98,41 @@ JobManagerView::periodic ()
                (*i)->maybe_pulse ();
        }
 }
+
+void
+JobManagerView::replace ()
+{
+       /* Make a new version of _job_records which reflects the order in JobManager's job list */
+
+       list<shared_ptr<JobView> > new_job_records;
+
+       BOOST_FOREACH (shared_ptr<Job> i, JobManager::instance()->get()) {
+               /* Find this job's JobView */
+               BOOST_FOREACH (shared_ptr<JobView> j, _job_records) {
+                       if (j->job() == i) {
+                               new_job_records.push_back (j);
+                               break;
+                       }
+               }
+       }
+
+       BOOST_FOREACH (shared_ptr<JobView> i, _job_records) {
+               i->detach ();
+       }
+
+       _job_records = new_job_records;
+
+       BOOST_FOREACH (shared_ptr<JobView> i, _job_records) {
+               i->insert (i->insert_position ());
+       }
+
+       job_list_changed ();
+}
+
+void
+JobManagerView::job_list_changed ()
+{
+       BOOST_FOREACH (shared_ptr<JobView> i, _job_records) {
+               i->job_list_changed ();
+       }
+}