projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Logging improvements to allow prettier displays in the server GUI.
[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 fc29eadb4760c3bb74d9f2a55b4142c9f7967e19..79cc4743cef789ae8deb715bd5133272a710fd06 100644
(file)
--- a/
src/wx/job_manager_view.h
+++ b/
src/wx/job_manager_view.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012
-2015
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-21,11
+21,12
@@
* @brief Class which is a wxPanel for showing the progress of jobs.
*/
* @brief Class which is a wxPanel for showing the progress of jobs.
*/
-#include <string>
-#include <boost/shared_ptr.hpp>
#include <wx/wx.h>
#include <wx/wx.h>
+#include <boost/shared_ptr.hpp>
+#include <list>
class Job;
class Job;
+class JobView;
/** @class JobManagerView
* @brief Class which is a wxPanel for showing the progress of jobs.
/** @class JobManagerView
* @brief Class which is a wxPanel for showing the progress of jobs.
@@
-33,32
+34,15
@@
class Job;
class JobManagerView : public wxScrolledWindow
{
public:
class JobManagerView : public wxScrolledWindow
{
public:
- enum Buttons {
- PAUSE = 0x1,
- };
-
- JobManagerView (wxWindow *, Buttons);
-
- void update ();
+ JobManagerView (wxWindow *);
private:
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;
wxPanel* _panel;
wxFlexGridSizer* _table;
- struct JobRecord {
- wxGauge* gauge;
- wxStaticText* message;
- wxButton* cancel;
- wxButton* pause;
- wxButton* details;
- bool finalised;
- };
-
- std::map<boost::shared_ptr<Job>, JobRecord> _job_records;
- Buttons _buttons;
+ boost::shared_ptr<wxTimer> _timer;
+
+ std::list<boost::shared_ptr<JobView> > _job_records;
};
};