Add console to dcpomatic_kdm on Windows. Tweak layout a bit more.

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

diff --git a/src/wx/kdm_dialog.h b/src/wx/kdm_dialog.h
index 90354a2d1310dfc2e7f50138ab34f7bc4aea3336..a9edd121a5a41b5161ad2b2da1446199af81c4c2 100644 (file)
--- a/src/wx/kdm_dialog.h
+++ b/src/wx/kdm_dialog.h
@@ -17,21 +17,20 @@
 
 */
 
-#include <map>
+#include "wx_util.h"
+#include <dcp/types.h>
+#include <wx/wx.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
-#include <wx/wx.h>
-#include <wx/treectrl.h>
-#include "wx_util.h"
-
-class wxTreeCtrl;
-class wxDatePickerCtrl;
-class wxTimePickerCtrl;
-class wxDirPickerCtrl;
-class DirPickerCtrl;
+#include <map>
 
 class Cinema;
 class Screen;
+class Film;
+class ScreensPanel;
+class KDMTimingPanel;
+class KDMOutputPanel;
+struct CPLSummary;
 
 class KDMDialog : public wxDialog
 {
@@ -39,48 +38,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;
 };