Rearrange JobManagerView / JobRecord relationship.

diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc
index dffe3a90a3e7d4b9f74cdab9c67c3f57429a546d..d45d6e65de0e8e0fba637d7c038e56d6cdf3d28a 100644 (file)
--- a/src/wx/job_manager_view.cc
+++ b/src/wx/job_manager_view.cc
@@ -31,180 +31,155 @@
 using std::string;
 using std::list;
 using std::map;
+using std::cout;
 using boost::shared_ptr;
 using boost::weak_ptr;
 
-/** Must be called in the GUI thread */
-JobManagerView::JobManagerView (wxWindow* parent, Buttons buttons)
-       : wxScrolledWindow (parent)
-       , _buttons (buttons)
-{
-       _panel = new wxPanel (this);
-       wxSizer* sizer = new wxBoxSizer (wxVERTICAL);
-       sizer->Add (_panel, 1, wxEXPAND);
-       SetSizer (sizer);
-
-       int N = 5;
-       if (buttons & PAUSE) {
-               ++N;
-       }
-       
-       _table = new wxFlexGridSizer (N, 6, 6);
-       _table->AddGrowableCol (1, 1);
-       _panel->SetSizer (_table);
-
-       SetScrollRate (0, 32);
-
-       JobManager::instance()->JobAdded.connect (bind (&JobManagerView::job_added, this, _1));
-}
-
-void
-JobManagerView::job_added (weak_ptr<Job> j)
+class JobRecord
 {
-       shared_ptr<Job> job = j.lock ();
-       if (!job) {
-               return;
-       }
-
-       wxStaticText* m = new wxStaticText (_panel, wxID_ANY, std_to_wx (job->name ()));
-       _table->Insert (0, m, 0, wxALIGN_CENTER_VERTICAL | wxALL, 6);
+public:
+       JobRecord (shared_ptr<Job> job, wxScrolledWindow* window, wxPanel* panel, wxFlexGridSizer* table, bool pause)
+               : _job (job)
+               , _window (window)
+               , _panel (panel)
+               , _table (table)
+       {
+               int n = 0;
+               
+               wxStaticText* m = new wxStaticText (panel, wxID_ANY, std_to_wx (_job->name ()));
+               table->Insert (n, m, 0, wxALIGN_CENTER_VERTICAL | wxALL, 6);
+               ++n;
        
-       JobRecord r;
-       int n = 1;
-       r.scroll_nudged = false;
-       r.gauge = new wxGauge (_panel, wxID_ANY, 100);
-       _table->Insert (n, r.gauge, 1, wxEXPAND | wxLEFT | wxRIGHT);
-       ++n;
+               _gauge = new wxGauge (panel, wxID_ANY, 100);
+               table->Insert (n, _gauge, 1, wxEXPAND | wxLEFT | wxRIGHT);
+               ++n;
+               
+               _message = new wxStaticText (panel, wxID_ANY, std_to_wx (""));
+               table->Insert (n, _message, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
+               ++n;
        
-       r.message = new wxStaticText (_panel, wxID_ANY, std_to_wx (""));
-       _table->Insert (n, r.message, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
-       ++n;
+               _cancel = new wxButton (panel, wxID_ANY, _("Cancel"));
+               _cancel->Bind (wxEVT_COMMAND_BUTTON_CLICKED, &JobRecord::cancel_clicked, this);
+               table->Insert (n, _cancel, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
+               ++n;
        
-       r.cancel = new wxButton (_panel, wxID_ANY, _("Cancel"));
-       r.cancel->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (JobManagerView::cancel_clicked), 0, this);
-       _table->Insert (n, r.cancel, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
-       ++n;
+               if (pause) {
+                       _pause = new wxButton (_panel, wxID_ANY, _("Pause"));
+                       _pause->Bind (wxEVT_COMMAND_BUTTON_CLICKED, &JobRecord::pause_clicked, this);
+                       table->Insert (n, _pause, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
+                       ++n;
+               }
        
-       if (_buttons & PAUSE) {
-               r.pause = new wxButton (_panel, wxID_ANY, _("Pause"));
-               r.pause->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (JobManagerView::pause_clicked), 0, this);
-               _table->Insert (n, r.pause, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
+               _details = new wxButton (_panel, wxID_ANY, _("Details..."));
+               _details->Bind (wxEVT_COMMAND_BUTTON_CLICKED, &JobRecord::details_clicked, this);
+               _details->Enable (false);
+               table->Insert (n, _details, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
                ++n;
-       }
-       
-       r.details = new wxButton (_panel, wxID_ANY, _("Details..."));
-       r.details->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (JobManagerView::details_clicked), 0, this);
-       r.details->Enable (false);
-       _table->Insert (n, r.details, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
-       ++n;
        
-       _job_records[job] = r;
-
-       job->Progress.connect (bind (&JobManagerView::progress, this, j));
-       job->Progress.connect (bind (&JobManagerView::finished, this, j));
+               job->Progress.connect (boost::bind (&JobRecord::progress, this));
+               job->Finished.connect (boost::bind (&JobRecord::finished, this));
        
-       _table->Layout ();
-       FitInside ();
-}
-
-void
-JobManagerView::progress (weak_ptr<Job> j)
-{
-       shared_ptr<Job> job = j.lock ();
-       if (!job) {
-               return;
+               table->Layout ();
+               panel->FitInside ();
        }
 
-       float const p = job->overall_progress ();
-       if (p >= 0) {
-               checked_set (_job_records[job].message, job->status ());
-               _job_records[job].gauge->SetValue (p * 100);
-       } else {
-               checked_set (_job_records[job].message, wx_to_std (_("Running")));
-               _job_records[job].gauge->Pulse ();
+private:
+
+       void progress ()
+       {
+               float const p = _job->overall_progress ();
+               if (p >= 0) {
+                       checked_set (_message, _job->status ());
+                       _gauge->SetValue (p * 100);
+               } else {
+                       checked_set (_message, wx_to_std (_("Running")));
+                       _gauge->Pulse ();
+               }
+
+               _table->Layout ();
+               _window->FitInside ();
        }
 
-       if (!_job_records[job].scroll_nudged && (job->running () || job->finished())) {
-               int x, y;
-               _job_records[job].gauge->GetPosition (&x, &y);
-               int px, py;
-               GetScrollPixelsPerUnit (&px, &py);
-               int vx, vy;
-               GetViewStart (&vx, &vy);
-               int sx, sy;
-               GetClientSize (&sx, &sy);
+       void finished ()
+       {
+               checked_set (_message, _job->status ());
+               if (!_job->finished_cancelled ()) {
+                       _gauge->SetValue (100);
+               }
                
-               if (y > (vy * py + sy / 2)) {
-                       Scroll (-1, y / py);
-                       _job_records[job].scroll_nudged = true;
+               _cancel->Enable (false);
+               if (!_job->error_details().empty ()) {
+                       _details->Enable (true);
                }
+               
+               _table->Layout ();
+               _window->FitInside ();
        }
 
-       _table->Layout ();
-       FitInside ();
-}
-
-void
-JobManagerView::finished (weak_ptr<Job> j)
-{
-       shared_ptr<Job> job = j.lock ();
-       if (!job) {
-               return;
+       void details_clicked (wxCommandEvent &)
+       {
+               string s = _job->error_summary();
+               s[0] = toupper (s[0]);
+               error_dialog (_window, std_to_wx (String::compose ("%1.\n\n%2", s, _job->error_details())));
        }
        
-       checked_set (_job_records[job].message, job->status ());
-       if (!job->finished_cancelled ()) {
-               _job_records[job].gauge->SetValue (100);
+       void cancel_clicked (wxCommandEvent &)
+       {
+               _job->cancel ();
        }
-       _job_records[job].cancel->Enable (false);
-       if (!job->error_details().empty ()) {
-               _job_records[job].details->Enable (true);
-       }
-
-       _table->Layout ();
-       FitInside ();
-}
-
-void
-JobManagerView::details_clicked (wxCommandEvent& ev)
-{
-       wxObject* o = ev.GetEventObject ();
 
-       for (map<shared_ptr<Job>, JobRecord>::iterator i = _job_records.begin(); i != _job_records.end(); ++i) {
-               if (i->second.details == o) {
-                       string s = i->first->error_summary();
-                       s[0] = toupper (s[0]);
-                       error_dialog (this, std_to_wx (String::compose ("%1.\n\n%2", s, i->first->error_details())));
+       void pause_clicked (wxCommandEvent &)
+       {
+               if (_job->paused()) {
+                       _job->resume ();
+                       _pause->SetLabel (_("Pause"));
+               } else {
+                       _job->pause ();
+                       _pause->SetLabel (_("Resume"));
                }
        }
-}
+       
+       boost::shared_ptr<Job> _job;
+       wxScrolledWindow* _window;
+       wxPanel* _panel;
+       wxFlexGridSizer* _table;
+       wxGauge* _gauge;
+       wxStaticText* _message;
+       wxButton* _cancel;
+       wxButton* _pause;
+       wxButton* _details;
+};
 
-void
-JobManagerView::cancel_clicked (wxCommandEvent& ev)
+/** Must be called in the GUI thread */
+JobManagerView::JobManagerView (wxWindow* parent, Buttons buttons)
+       : wxScrolledWindow (parent)
+       , _buttons (buttons)
 {
-       wxObject* o = ev.GetEventObject ();
+       _panel = new wxPanel (this);
+       wxSizer* sizer = new wxBoxSizer (wxVERTICAL);
+       sizer->Add (_panel, 1, wxEXPAND);
+       SetSizer (sizer);
 
-       for (map<shared_ptr<Job>, JobRecord>::iterator i = _job_records.begin(); i != _job_records.end(); ++i) {
-               if (i->second.cancel == o) {
-                       i->first->cancel ();
-               }
+       int N = 5;
+       if (buttons & PAUSE) {
+               ++N;
        }
+       
+       _table = new wxFlexGridSizer (N, 6, 6);
+       _table->AddGrowableCol (1, 1);
+       _panel->SetSizer (_table);
+
+       SetScrollRate (0, 32);
+
+       JobManager::instance()->JobAdded.connect (bind (&JobManagerView::job_added, this, _1));
 }
 
 void
-JobManagerView::pause_clicked (wxCommandEvent& ev)
+JobManagerView::job_added (weak_ptr<Job> j)
 {
-       wxObject* o = ev.GetEventObject ();
-       for (map<boost::shared_ptr<Job>, JobRecord>::iterator i = _job_records.begin(); i != _job_records.end(); ++i) {
-               if (i->second.pause == o) {
-                       if (i->first->paused()) {
-                               i->first->resume ();
-                               i->second.pause->SetLabel (_("Pause"));
-                       } else {
-                               i->first->pause ();
-                               i->second.pause->SetLabel (_("Resume"));
-                       }
-               }
+       shared_ptr<Job> job = j.lock ();
+       if (job) {
+               _job_records.push_back (shared_ptr<JobRecord> (new JobRecord (job, this, _panel, _table, _buttons & PAUSE)));
        }
 }
-       
+

diff --git a/src/wx/job_manager_view.h b/src/wx/job_manager_view.h
index e3d885f94884bf95e86e20089c7f7d3a84925316..4653118378676e8ccbb8529984a4f7fbf00cad50 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.
@@ -40,25 +41,11 @@ public:
        JobManagerView (wxWindow *, Buttons);
 
 private:
-       void cancel_clicked (wxCommandEvent &);
-       void pause_clicked (wxCommandEvent &);
-       void details_clicked (wxCommandEvent &);
-
        void job_added (boost::weak_ptr<Job>);
-       void progress (boost::weak_ptr<Job>);
-       void finished (boost::weak_ptr<Job>);
 
        wxPanel* _panel;
        wxFlexGridSizer* _table;
-       struct JobRecord {
-               wxGauge* gauge;
-               wxStaticText* message;
-               wxButton* cancel;
-               wxButton* pause;
-               wxButton* details;
-               bool scroll_nudged;
-       };
                
-       std::map<boost::shared_ptr<Job>, JobRecord> _job_records;
+       std::list<boost::shared_ptr<JobRecord> > _job_records;
        Buttons _buttons;
 };