Merge remote-tracking branch 'origin/master' into 2.0

[dcpomatic.git] / src / wx / kdm_dialog.h

diff --git a/src/wx/kdm_dialog.h b/src/wx/kdm_dialog.h
index db51d6d0380baf0dba4c8f510d5625396cac0c46..0fc95db8443dee447023e7170b3ee964c0daef85 100644 (file)
--- a/src/wx/kdm_dialog.h
+++ b/src/wx/kdm_dialog.h
@@ -45,9 +45,10 @@ public:
        /** @return KDM until time in local time */
        boost::posix_time::ptime until () const;
        
-       boost::filesystem::path dcp () const;
+       boost::filesystem::path cpl () const;
        boost::filesystem::path directory () const;
        bool write_to () const;
+       dcp::Formulation formulation () const;
 
 private:
        void add_cinema (boost::shared_ptr<Cinema>);
@@ -61,6 +62,9 @@ private:
        std::list<std::pair<wxTreeItemId, boost::shared_ptr<Cinema> > > selected_cinemas () const;
        std::list<std::pair<wxTreeItemId, boost::shared_ptr<Screen> > > selected_screens () const;
        void setup_sensitivity ();
+       void update_cpl_choice ();
+       void update_cpl_summary ();
+       void cpl_browse_clicked ();
 
        static boost::posix_time::ptime posix_time (wxDatePickerCtrl *, wxTimePickerCtrl *);
        
@@ -75,7 +79,12 @@ private:
        wxDatePickerCtrl* _until_date;
        wxTimePickerCtrl* _from_time;
        wxTimePickerCtrl* _until_time;
-       wxListCtrl* _dcps;
+       wxChoice* _cpl;
+       wxButton* _cpl_browse;
+       wxStaticText* _dcp_directory;
+       wxStaticText* _cpl_id;
+       wxStaticText* _cpl_annotation_text;
+       wxChoice* _type;
        wxRadioButton* _write_to;
 #ifdef DCPOMATIC_USE_OWN_DIR_PICKER
        DirPickerCtrl* _folder;
@@ -87,4 +96,5 @@ private:
        wxTreeItemId _root;
        std::map<wxTreeItemId, boost::shared_ptr<Cinema> > _cinemas;
        std::map<wxTreeItemId, boost::shared_ptr<Screen> > _screens;
+       std::vector<CPLSummary> _cpls;
 };