X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fkdm_dialog.h;h=5588aa9f235ecf2f9a9d3a98a4d9d876eb7df156;hb=e02afbbc64a6f615e450a3c68b8900588bd21fd0;hp=db51d6d0380baf0dba4c8f510d5625396cac0c46;hpb=e3b80115077e5c473df008fe2345420a547df1d2;p=dcpomatic.git

diff --git a/src/wx/kdm_dialog.h b/src/wx/kdm_dialog.h
index db51d6d03..5588aa9f2 100644
--- a/src/wx/kdm_dialog.h
+++ b/src/wx/kdm_dialog.h
@@ -17,12 +17,13 @@
 
 */
 
-#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;
@@ -32,6 +33,9 @@ class DirPickerCtrl;
 
 class Cinema;
 class Screen;
+class Film;
+class ScreensPanel;
+struct CPLSummary;
 
 class KDMDialog : public wxDialog
 {
@@ -44,38 +48,31 @@ public:
 	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;
+
+	ScreensPanel* _screens;
 	wxDatePickerCtrl* _from_date;
 	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;
@@ -84,7 +81,5 @@ private:
 #endif
 	wxRadioButton* _email;
 
-	wxTreeItemId _root;
-	std::map<wxTreeItemId, boost::shared_ptr<Cinema> > _cinemas;
-	std::map<wxTreeItemId, boost::shared_ptr<Screen> > _screens;
+	std::vector<CPLSummary> _cpls;
 };