X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_menu.h;h=240a9e64f9be2c18da7daa99fe6135f6e83f735f;hb=313319ba2d8544bc25524e02e634804a503b54f1;hp=43480888a5007ed306bc49f0468dd71fe1d01379;hpb=a3a38dcdab89d3c7fa21917ea7caec82d1586035;p=dcpomatic.git diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h index 43480888a..240a9e64f 100644 --- a/src/wx/content_menu.h +++ b/src/wx/content_menu.h @@ -18,56 +18,65 @@ */ + #ifndef DCPOMATIC_CONTENT_MENU_H #define DCPOMATIC_CONTENT_MENU_H + #include "timeline_content_view.h" #include "lib/types.h" #include -#include -#include +#include + +class DCPContent; class Film; class Job; -class ContentMenu : public boost::noncopyable + +class ContentMenu { public: - ContentMenu (wxWindow* p); - ~ContentMenu (); + explicit ContentMenu (wxWindow* p); + + ContentMenu (ContentMenu const &) = delete; + ContentMenu& operator= (ContentMenu const &) = delete; - void popup (boost::weak_ptr, ContentList, TimelineContentViewList, wxPoint); + void popup (std::weak_ptr, ContentList, TimelineContentViewList, wxPoint); private: void repeat (); void join (); void find_missing (); void properties (); + void advanced (); void re_examine (); void kdm (); void ov (); + void set_dcp_settings (); void remove (); - void maybe_found_missing (boost::weak_ptr, boost::weak_ptr, boost::weak_ptr); + void maybe_found_missing (std::weak_ptr, std::weak_ptr, std::weak_ptr); void cpl_selected (wxCommandEvent& ev); wxMenu* _menu; wxMenu* _cpl_menu; /** Film that we are working with; set up by popup() */ - boost::weak_ptr _film; + std::weak_ptr _film; wxWindow* _parent; + bool _pop_up_open; ContentList _content; TimelineContentViewList _views; wxMenuItem* _repeat; wxMenuItem* _join; wxMenuItem* _find_missing; wxMenuItem* _properties; + wxMenuItem* _advanced; wxMenuItem* _re_examine; wxMenuItem* _kdm; wxMenuItem* _ov; wxMenuItem* _choose_cpl; + wxMenuItem* _set_dcp_settings; wxMenuItem* _remove; - - boost::signals2::scoped_connection _job_connection; }; #endif