projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
std::shared_ptr
[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 3d1ad30c07f60e60a53d4473b374fe7d82c13f39..392d7504ce2878b2bca4773102aebb77bb993785 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,18
@@
* @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 "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 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,33
+41,18
@@
class Job;
class JobManagerView : public wxScrolledWindow
{
public:
class JobManagerView : public wxScrolledWindow
{
public:
- enum Buttons {
- PAUSE = 0x1,
- };
-
- JobManagerView (wxWindow *, Buttons);
-
- void update ();
+ JobManagerView (wxWindow *, bool batch);
private:
private:
- void
periodic (wxTimerEvent &
);
- void
cancel_clicked (wxCommandEvent &
);
- void
pause_clicked (wxCommandEvent &
);
- void
details_clicked (wxCommandEvent &
);
+ void
job_added (std::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* pause;
- wxButton* details;
- bool finalised;
- bool scroll_nudged;
- };
-
- std::map<boost::shared_ptr<Job>, JobRecord> _job_records;
- Buttons _buttons;
+ std::shared_ptr<wxTimer> _timer;
+ bool _batch;
+
+ std::list<std::shared_ptr<JobView> > _job_records;
};
};