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

diff --git a/src/wx/kdm_dialog.h b/src/wx/kdm_dialog.h
index 6400ebb6c..b475bde70 100644
--- a/src/wx/kdm_dialog.h
+++ b/src/wx/kdm_dialog.h
@@ -1,71 +1,61 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+
 #include "wx_util.h"
 #include <dcp/types.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-#include <wx/treectrl.h>
-#include <boost/shared_ptr.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <map>
 
-class wxTreeCtrl;
+
+namespace dcpomatic {
+	class Screen;
+}
 
 class Cinema;
-class Screen;
 class Film;
-class ScreensPanel;
-class KDMTimingPanel;
+class KDMCPLPanel;
 class KDMOutputPanel;
+class KDMTimingPanel;
+class ScreensPanel;
 struct CPLSummary;
 
+
 class KDMDialog : public wxDialog
 {
 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 cpl () const;
-
-	boost::filesystem::path directory () const;
-	bool write_to () const;
-	dcp::Formulation formulation () const;
+	KDMDialog (wxWindow *, std::shared_ptr<const Film> film);
 
 private:
 	void setup_sensitivity ();
-	void update_cpl_choice ();
-	void update_cpl_summary ();
-	void cpl_browse_clicked ();
+	void make_clicked ();
+	bool confirm_overwrite (boost::filesystem::path path);
 
+	std::weak_ptr<const Film> _film;
 	ScreensPanel* _screens;
 	KDMTimingPanel* _timing;
+	KDMCPLPanel* _cpl;
 	KDMOutputPanel* _output;
-	wxChoice* _cpl;
-	wxButton* _cpl_browse;
-	wxStaticText* _dcp_directory;
-	wxStaticText* _cpl_id;
-	wxStaticText* _cpl_annotation_text;
-
-	std::vector<CPLSummary> _cpls;
+	wxButton* _make;
 };