projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Give markers dialog a close button (#2070).
[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 c4bb1e2189b6e32850a0694c52e65121c957a316..e960bc2f667a33e2c291fd79dffb3fbe9ac0ce18 100644
(file)
--- a/
src/wx/job_manager_view.h
+++ b/
src/wx/job_manager_view.h
@@
-1,32
+1,40
@@
/*
/*
- 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/>.
*/
*/
+
/** @file src/job_manager_view.h
* @brief Class which is a wxPanel for showing the progress of jobs.
*/
/** @file src/job_manager_view.h
* @brief Class which is a wxPanel for showing the progress of jobs.
*/
-#include <string>
-#include <boost/shared_ptr.hpp>
+
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
+#include <list>
+#include <memory>
+
class Job;
class Job;
-class JobRecord;
+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.
@@
-34,20
+42,18
@@
class JobRecord;
class JobManagerView : public wxScrolledWindow
{
public:
class JobManagerView : public wxScrolledWindow
{
public:
- enum Buttons {
- PAUSE = 0x1,
- };
-
- JobManagerView (wxWindow *, Buttons);
+ JobManagerView (wxWindow *, bool batch);
private:
private:
- void job_added (
boost
::weak_ptr<Job>);
+ void job_added (
std
::weak_ptr<Job>);
void periodic ();
void periodic ();
+ void replace ();
+ void job_list_changed ();
wxPanel* _panel;
wxFlexGridSizer* _table;
wxPanel* _panel;
wxFlexGridSizer* _table;
-
boost
::shared_ptr<wxTimer> _timer;
-
- std::list<boost::shared_ptr<JobRecord> > _job_records;
-
Buttons _button
s;
+
std
::shared_ptr<wxTimer> _timer;
+ bool _batch;
+
+
std::list<std::shared_ptr<JobView>> _job_record
s;
};
};