X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_menu.h;h=c750ae852d982c6f327cee7fbafc4f0dc4b17f53;hb=ea5d9d74713720433c2e8d3908624f6a05bfb407;hp=910afc7200f27a61d17e0a1930da8d7f12fc1b3c;hpb=3c29aa6531a4046a8db72dcac81189eb8893233c;p=dcpomatic.git diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h index 910afc720..c750ae852 100644 --- a/src/wx/content_menu.h +++ b/src/wx/content_menu.h @@ -23,7 +23,9 @@ #define DCPOMATIC_CONTENT_MENU_H +#include "auto_crop_dialog.h" #include "timeline_content_view.h" +#include "wx_ptr.h" #include "lib/types.h" #include LIBDCP_DISABLE_WARNINGS @@ -34,13 +36,14 @@ LIBDCP_ENABLE_WARNINGS class DCPContent; class Film; +class FilmViewer; class Job; class ContentMenu { public: - explicit ContentMenu (wxWindow* p); + ContentMenu(wxWindow* parent, FilmViewer& viewer); ContentMenu (ContentMenu const &) = delete; ContentMenu& operator= (ContentMenu const &) = delete; @@ -54,11 +57,11 @@ private: void properties (); void advanced (); void re_examine (); + void auto_crop (); void kdm (); void ov (); void set_dcp_settings (); void remove (); - void maybe_found_missing (std::weak_ptr, std::weak_ptr, std::weak_ptr); void cpl_selected (wxCommandEvent& ev); wxMenu* _menu; @@ -67,6 +70,7 @@ private: std::weak_ptr _film; wxWindow* _parent; bool _pop_up_open; + FilmViewer& _viewer; ContentList _content; TimelineContentViewList _views; wxMenuItem* _repeat; @@ -75,11 +79,17 @@ private: wxMenuItem* _properties; wxMenuItem* _advanced; wxMenuItem* _re_examine; + wxMenuItem* _auto_crop; wxMenuItem* _kdm; wxMenuItem* _ov; wxMenuItem* _choose_cpl; wxMenuItem* _set_dcp_settings; wxMenuItem* _remove; + + wx_ptr _auto_crop_dialog; + boost::signals2::scoped_connection _auto_crop_config_connection; + boost::signals2::scoped_connection _auto_crop_viewer_connection; }; + #endif