X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_dialog.h;h=6400ebb6c807b8cba9cedf499c580b70540a4753;hb=22917c031a262ce6e90252a65d6f70a340fafbed;hp=db51d6d0380baf0dba4c8f510d5625396cac0c46;hpb=9e758fddfb8bbadb1fc84e393daa815445d5e9d5;p=dcpomatic.git

diff --git a/src/wx/kdm_dialog.h b/src/wx/kdm_dialog.h
index db51d6d03..6400ebb6c 100644
--- a/src/wx/kdm_dialog.h
+++ b/src/wx/kdm_dialog.h
@@ -17,21 +17,23 @@
 
 */
 
-#include <map>
-#include <boost/shared_ptr.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
+#include "wx_util.h"
+#include <dcp/types.h>
 #include <wx/wx.h>
 #include <wx/treectrl.h>
-#include "wx_util.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <map>
 
 class wxTreeCtrl;
-class wxDatePickerCtrl;
-class wxTimePickerCtrl;
-class wxDirPickerCtrl;
-class DirPickerCtrl;
 
 class Cinema;
 class Screen;
+class Film;
+class ScreensPanel;
+class KDMTimingPanel;
+class KDMOutputPanel;
+struct CPLSummary;
 
 class KDMDialog : public wxDialog
 {
@@ -39,52 +41,31 @@ public:
 	KDMDialog (wxWindow *, boost::shared_ptr<const Film>);
 
 	std::list<boost::shared_ptr<Screen> > screens () const;
-
 	/** @return KDM from time in local time */
 	boost::posix_time::ptime from () const;
 	/** @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>);
-	void add_screen (boost::shared_ptr<Cinema>, boost::shared_ptr<Screen>);
-	void add_cinema_clicked ();
-	void edit_cinema_clicked ();
-	void remove_cinema_clicked ();
-	void add_screen_clicked ();
-	void edit_screen_clicked ();
-	void remove_screen_clicked ();
-	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 *);
-	
-	wxTreeCtrl* _targets;
-	wxButton* _add_cinema;
-	wxButton* _edit_cinema;
-	wxButton* _remove_cinema;
-	wxButton* _add_screen;
-	wxButton* _edit_screen;
-	wxButton* _remove_screen;
-	wxDatePickerCtrl* _from_date;
-	wxDatePickerCtrl* _until_date;
-	wxTimePickerCtrl* _from_time;
-	wxTimePickerCtrl* _until_time;
-	wxListCtrl* _dcps;
-	wxRadioButton* _write_to;
-#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
-	DirPickerCtrl* _folder;
-#else
-	wxDirPickerCtrl* _folder;
-#endif
-	wxRadioButton* _email;
+	ScreensPanel* _screens;
+	KDMTimingPanel* _timing;
+	KDMOutputPanel* _output;
+	wxChoice* _cpl;
+	wxButton* _cpl_browse;
+	wxStaticText* _dcp_directory;
+	wxStaticText* _cpl_id;
+	wxStaticText* _cpl_annotation_text;
 
-	wxTreeItemId _root;
-	std::map<wxTreeItemId, boost::shared_ptr<Cinema> > _cinemas;
-	std::map<wxTreeItemId, boost::shared_ptr<Screen> > _screens;
+	std::vector<CPLSummary> _cpls;
 };