projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #10 from matmat/v2.15.x
[dcpomatic.git]
/
src
/
wx
/
content_menu.h
diff --git
a/src/wx/content_menu.h
b/src/wx/content_menu.h
index b62f066624df46b17966dc93747eac06fd6401dd..7743d0712b7bb27008378ea60cac0c2977ab3601 100644
(file)
--- a/
src/wx/content_menu.h
+++ b/
src/wx/content_menu.h
@@
-24,45
+24,52
@@
#include "timeline_content_view.h"
#include "lib/types.h"
#include <wx/wx.h>
#include "timeline_content_view.h"
#include "lib/types.h"
#include <wx/wx.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
+#include <memory>
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);
+ void popup (
std
::weak_ptr<Film>, ContentList, TimelineContentViewList, wxPoint);
private:
void repeat ();
void join ();
void find_missing ();
void properties ();
private:
void repeat ();
void join ();
void find_missing ();
void properties ();
+ void advanced ();
void re_examine ();
void kdm ();
void re_examine ();
void kdm ();
+ void ov ();
+ void set_dcp_settings ();
void remove ();
void remove ();
- void maybe_found_missing (boost::weak_ptr<Job>, boost::weak_ptr<Content>, boost::weak_ptr<Content>);
+ void maybe_found_missing (std::weak_ptr<Job>, std::weak_ptr<Content>, std::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() */
/** Film that we are working with; set up by popup() */
-
boost
::weak_ptr<Film> _film;
+
std
::weak_ptr<Film> _film;
wxWindow* _parent;
wxWindow* _parent;
+ bool _pop_up_open;
ContentList _content;
TimelineContentViewList _views;
wxMenuItem* _repeat;
wxMenuItem* _join;
wxMenuItem* _find_missing;
wxMenuItem* _properties;
ContentList _content;
TimelineContentViewList _views;
wxMenuItem* _repeat;
wxMenuItem* _join;
wxMenuItem* _find_missing;
wxMenuItem* _properties;
+ wxMenuItem* _advanced;
wxMenuItem* _re_examine;
wxMenuItem* _kdm;
wxMenuItem* _re_examine;
wxMenuItem* _kdm;
+ wxMenuItem* _ov;
+ wxMenuItem* _choose_cpl;
+ wxMenuItem* _set_dcp_settings;
wxMenuItem* _remove;
wxMenuItem* _remove;
-
- boost::signals2::scoped_connection _job_connection;
};
#endif
};
#endif