projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
swaroop: alphabetically sort playlists.
[dcpomatic.git]
/
src
/
wx
/
content_menu.h
diff --git
a/src/wx/content_menu.h
b/src/wx/content_menu.h
index a0ac3f48148730bb01c24414c13b4fc4131c5be4..a38109b0738e84914139a38ca0350c47b6c54604 100644
(file)
--- a/
src/wx/content_menu.h
+++ b/
src/wx/content_menu.h
@@
-1,19
+1,20
@@
/*
Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2013-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/>.
*/
*/
@@
-28,13
+29,13
@@
class Film;
class Job;
class Film;
class Job;
+class DCPContent;
class ContentMenu : public boost::noncopyable
{
public:
class ContentMenu : public boost::noncopyable
{
public:
- ContentMenu (wxWindow* p);
- ~ContentMenu ();
-
+ explicit ContentMenu (wxWindow* p);
+
void popup (boost::weak_ptr<Film>, ContentList, TimelineContentViewList, wxPoint);
private:
void popup (boost::weak_ptr<Film>, ContentList, TimelineContentViewList, wxPoint);
private:
@@
-44,13
+45,17
@@
private:
void properties ();
void re_examine ();
void kdm ();
void properties ();
void re_examine ();
void kdm ();
+ void ov ();
void remove ();
void maybe_found_missing (boost::weak_ptr<Job>, boost::weak_ptr<Content>, boost::weak_ptr<Content>);
void remove ();
void maybe_found_missing (boost::weak_ptr<Job>, boost::weak_ptr<Content>, boost::weak_ptr<Content>);
-
+ void cpl_selected (wxCommandEvent& ev);
+
wxMenu* _menu;
wxMenu* _menu;
+ wxMenu* _cpl_menu;
/** Film that we are working with; set up by popup() */
boost::weak_ptr<Film> _film;
wxWindow* _parent;
/** Film that we are working with; set up by popup() */
boost::weak_ptr<Film> _film;
wxWindow* _parent;
+ bool _pop_up_open;
ContentList _content;
TimelineContentViewList _views;
wxMenuItem* _repeat;
ContentList _content;
TimelineContentViewList _views;
wxMenuItem* _repeat;
@@
-59,9
+64,9
@@
private:
wxMenuItem* _properties;
wxMenuItem* _re_examine;
wxMenuItem* _kdm;
wxMenuItem* _properties;
wxMenuItem* _re_examine;
wxMenuItem* _kdm;
+ wxMenuItem* _ov;
+ wxMenuItem* _choose_cpl;
wxMenuItem* _remove;
wxMenuItem* _remove;
-
- boost::signals2::scoped_connection _job_connection;
};
#endif
};
#endif