projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Supporters update.
[dcpomatic.git]
/
src
/
wx
/
content_menu.h
diff --git
a/src/wx/content_menu.h
b/src/wx/content_menu.h
index 910afc7200f27a61d17e0a1930da8d7f12fc1b3c..c750ae852d982c6f327cee7fbafc4f0dc4b17f53 100644
(file)
--- a/
src/wx/content_menu.h
+++ b/
src/wx/content_menu.h
@@
-23,7
+23,9
@@
#define DCPOMATIC_CONTENT_MENU_H
#define DCPOMATIC_CONTENT_MENU_H
+#include "auto_crop_dialog.h"
#include "timeline_content_view.h"
#include "timeline_content_view.h"
+#include "wx_ptr.h"
#include "lib/types.h"
#include <dcp/warnings.h>
LIBDCP_DISABLE_WARNINGS
#include "lib/types.h"
#include <dcp/warnings.h>
LIBDCP_DISABLE_WARNINGS
@@
-34,13
+36,14
@@
LIBDCP_ENABLE_WARNINGS
class DCPContent;
class Film;
class DCPContent;
class Film;
+class FilmViewer;
class Job;
class ContentMenu
{
public:
class Job;
class ContentMenu
{
public:
-
explicit ContentMenu (wxWindow* p
);
+
ContentMenu(wxWindow* parent, FilmViewer& viewer
);
ContentMenu (ContentMenu const &) = delete;
ContentMenu& operator= (ContentMenu const &) = delete;
ContentMenu (ContentMenu const &) = delete;
ContentMenu& operator= (ContentMenu const &) = delete;
@@
-54,11
+57,11
@@
private:
void properties ();
void advanced ();
void re_examine ();
void properties ();
void advanced ();
void re_examine ();
+ void auto_crop ();
void kdm ();
void ov ();
void set_dcp_settings ();
void remove ();
void kdm ();
void ov ();
void set_dcp_settings ();
void remove ();
- void maybe_found_missing (std::weak_ptr<Job>, std::weak_ptr<Content>, std::weak_ptr<Content>);
void cpl_selected (wxCommandEvent& ev);
wxMenu* _menu;
void cpl_selected (wxCommandEvent& ev);
wxMenu* _menu;
@@
-67,6
+70,7
@@
private:
std::weak_ptr<Film> _film;
wxWindow* _parent;
bool _pop_up_open;
std::weak_ptr<Film> _film;
wxWindow* _parent;
bool _pop_up_open;
+ FilmViewer& _viewer;
ContentList _content;
TimelineContentViewList _views;
wxMenuItem* _repeat;
ContentList _content;
TimelineContentViewList _views;
wxMenuItem* _repeat;
@@
-75,11
+79,17
@@
private:
wxMenuItem* _properties;
wxMenuItem* _advanced;
wxMenuItem* _re_examine;
wxMenuItem* _properties;
wxMenuItem* _advanced;
wxMenuItem* _re_examine;
+ wxMenuItem* _auto_crop;
wxMenuItem* _kdm;
wxMenuItem* _ov;
wxMenuItem* _choose_cpl;
wxMenuItem* _set_dcp_settings;
wxMenuItem* _remove;
wxMenuItem* _kdm;
wxMenuItem* _ov;
wxMenuItem* _choose_cpl;
wxMenuItem* _set_dcp_settings;
wxMenuItem* _remove;
+
+ wx_ptr<AutoCropDialog> _auto_crop_dialog;
+ boost::signals2::scoped_connection _auto_crop_config_connection;
+ boost::signals2::scoped_connection _auto_crop_viewer_connection;
};
};
+
#endif
#endif