diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-02 12:06:20 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-02 12:06:20 +0100 |
| commit | 3574212ee42b2bd924eb95d5c0f4f69ec9e0a2f0 (patch) | |
| tree | 24e46f4f566bfb98aa48e9dab602ec1c8d0591d6 /src/wx/kdm_dialog.h | |
| parent | 24d54ea7fe1ba128cf8d3521d6738fc73a7c623e (diff) | |
| parent | 8fb0f4eaa6d91ca9369f45dd7a57c29149edaaac (diff) | |
Merge master.
Diffstat (limited to 'src/wx/kdm_dialog.h')
| -rw-r--r-- | src/wx/kdm_dialog.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/wx/kdm_dialog.h b/src/wx/kdm_dialog.h index db51d6d03..6327b29e8 100644 --- a/src/wx/kdm_dialog.h +++ b/src/wx/kdm_dialog.h @@ -45,7 +45,7 @@ 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; @@ -61,6 +61,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 +78,11 @@ 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; wxRadioButton* _write_to; #ifdef DCPOMATIC_USE_OWN_DIR_PICKER DirPickerCtrl* _folder; @@ -87,4 +94,5 @@ private: wxTreeItemId _root; std::map<wxTreeItemId, boost::shared_ptr<Cinema> > _cinemas; std::map<wxTreeItemId, boost::shared_ptr<Screen> > _screens; + std::vector<CPLSummary> _cpls; }; |