Fix last-but-one commit.

[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 16fd7a3dc039921214bd09243536637eaa77d42e..fde9199ffb80d5890e0397a08e006d719a07c414 100644 (file)
--- a/src/wx/job_manager_view.h
+++ b/src/wx/job_manager_view.h
@@ -26,66 +26,24 @@
 #include <wx/wx.h>
 
 class Job;
+class JobRecord;
 
 /** @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 ();
-
 private:
-       void periodic (wxTimerEvent &);
+       void job_added (boost::weak_ptr<Job>);
+       void periodic ();
+       void sized (wxSizeEvent &);
 
+       wxPanel* _panel;
+       wxFlexGridSizer* _table;
        boost::shared_ptr<wxTimer> _timer;
-       wxFlexGridSizer* _sizer;
-       struct JobRecord {
-               wxGauge* gauge;
-               wxStaticText* message;
-               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;
-       };
-
-       /** The columns for the store */
-       StoreColumns _columns;
-#endif 
+       std::list<boost::shared_ptr<JobRecord> > _job_records;
 };