Merge branch '1.0' of ssh://carlh.dnsalias.org/home/carl/git/dvdomatic into 1.0

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

diff --git a/src/wx/job_manager_view.h b/src/wx/job_manager_view.h
index 3d1ad30c07f60e60a53d4473b374fe7d82c13f39..c4bb1e2189b6e32850a0694c52e65121c957a316 100644 (file)
--- a/src/wx/job_manager_view.h
+++ b/src/wx/job_manager_view.h
@@ -26,6 +26,7 @@
 #include <wx/wx.h>
 
 class Job;
+class JobRecord;
 
 /** @class JobManagerView
  *  @brief Class which is a wxPanel for showing the progress of jobs.
@@ -39,27 +40,14 @@ public:
                
        JobManagerView (wxWindow *, Buttons);
 
-       void update ();
-
 private:
-       void periodic (wxTimerEvent &);
-       void cancel_clicked (wxCommandEvent &);
-       void pause_clicked (wxCommandEvent &);
-       void details_clicked (wxCommandEvent &);
+       void job_added (boost::weak_ptr<Job>);
+       void periodic ();
 
-       boost::shared_ptr<wxTimer> _timer;
        wxPanel* _panel;
        wxFlexGridSizer* _table;
-       struct JobRecord {
-               wxGauge* gauge;
-               wxStaticText* message;
-               wxButton* cancel;
-               wxButton* pause;
-               wxButton* details;
-               bool finalised;
-               bool scroll_nudged;
-       };
+       boost::shared_ptr<wxTimer> _timer;
                
-       std::map<boost::shared_ptr<Job>, JobRecord> _job_records;
+       std::list<boost::shared_ptr<JobRecord> > _job_records;
        Buttons _buttons;
 };