projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hand-apply c165ea8ccadf5bb8c4401a23bb2e998fabdc8a9b from master.
[dcpomatic.git]
/
src
/
wx
/
content_menu.h
diff --git
a/src/wx/content_menu.h
b/src/wx/content_menu.h
index fccd5f38a4b714070f7c2db7f6f4822be446313c..5f2a7f7b6dd35c0bbdbbd5b7ca29bb38fbe602ca 100644
(file)
--- a/
src/wx/content_menu.h
+++ b/
src/wx/content_menu.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013 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
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-23,22
+23,24
@@
#include <wx/wx.h>
#include <boost/shared_ptr.hpp>
#include <boost/weak_ptr.hpp>
#include <wx/wx.h>
#include <boost/shared_ptr.hpp>
#include <boost/weak_ptr.hpp>
+#include "timeline_content_view.h"
#include "lib/types.h"
class Film;
#include "lib/types.h"
class Film;
-class ContentMenu
+class ContentMenu
: public boost::noncopyable
{
public:
ContentMenu (wxWindow* p);
~ContentMenu ();
{
public:
ContentMenu (wxWindow* p);
~ContentMenu ();
- void popup (boost::weak_ptr<Film>, ContentList, wxPoint);
+ void popup (boost::weak_ptr<Film>, ContentList,
TimelineContentViewList,
wxPoint);
private:
void repeat ();
void join ();
void find_missing ();
private:
void repeat ();
void join ();
void find_missing ();
+ void re_examine ();
void kdm ();
void remove ();
void maybe_found_missing (boost::weak_ptr<Job>, boost::weak_ptr<Content>, boost::weak_ptr<Content>);
void kdm ();
void remove ();
void maybe_found_missing (boost::weak_ptr<Job>, boost::weak_ptr<Content>, boost::weak_ptr<Content>);
@@
-48,11
+50,15
@@
private:
boost::weak_ptr<Film> _film;
wxWindow* _parent;
ContentList _content;
boost::weak_ptr<Film> _film;
wxWindow* _parent;
ContentList _content;
+ TimelineContentViewList _views;
wxMenuItem* _repeat;
wxMenuItem* _join;
wxMenuItem* _find_missing;
wxMenuItem* _repeat;
wxMenuItem* _join;
wxMenuItem* _find_missing;
+ wxMenuItem* _re_examine;
wxMenuItem* _kdm;
wxMenuItem* _remove;
wxMenuItem* _kdm;
wxMenuItem* _remove;
+
+ boost::signals2::scoped_connection _job_connection;
};
#endif
};
#endif