projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve OpenFileError so that it doesn't say "opening for read"
[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 72ac85c02640423ee4c2f23b1756c8680adf645b..77114a97c382b170f06758d58d1d8f2d41fb52af 100644
(file)
--- a/
src/wx/job_manager_view.h
+++ b/
src/wx/job_manager_view.h
@@
-1,19
+1,20
@@
/*
/*
- 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
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-21,11
+22,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,25
+35,18
@@
class Job;
class JobManagerView : public wxScrolledWindow
{
public:
class JobManagerView : public wxScrolledWindow
{
public:
- JobManagerView (wxWindow *);
-
- void update ();
+ JobManagerView (wxWindow *, bool batch);
private:
private:
- void periodic (wxTimerEvent &);
- void cancel_clicked (wxCommandEvent &);
- void details_clicked (wxCommandEvent &);
+ void job_added (boost::weak_ptr<Job>);
+ void periodic ();
+ void replace ();
+ void job_list_changed ();
- boost::shared_ptr<wxTimer> _timer;
wxPanel* _panel;
wxFlexGridSizer* _table;
wxPanel* _panel;
wxFlexGridSizer* _table;
- struct JobRecord {
- wxGauge* gauge;
- wxStaticText* message;
- wxButton* cancel;
- wxButton* details;
- bool finalised;
- };
-
- std::map<boost::shared_ptr<Job>, JobRecord> _job_records;
+ boost::shared_ptr<wxTimer> _timer;
+ bool _batch;
+
+ std::list<boost::shared_ptr<JobView> > _job_records;
};
};