Merge.

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

diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index 50c3b6848929487637f00b9398c7b86e4ab8b4ad..7bd256d038a6527b25b4740b76186e6bce988308 100644 (file)
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -18,14 +18,11 @@
 */
 
 #include "kdm_dialog.h"
-#include "cinema_dialog.h"
-#include "screen_dialog.h"
 #include "wx_util.h"
 #include "screens_panel.h"
 #include "kdm_timing_panel.h"
 #include "kdm_output_panel.h"
-#include "lib/cinema.h"
-#include "lib/config.h"
+#include "kdm_cpl_panel.h"
 #include "lib/film.h"
 #include "lib/screen.h"
 #include <libcxml/cxml.h>
@@ -70,31 +67,8 @@ KDMDialog::KDMDialog (wxWindow* parent, boost::shared_ptr<const Film> film)
        h = new wxStaticText (this, wxID_ANY, _("CPL"));
        h->SetFont (subheading_font);
        vertical->Add (h, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_SIZER_Y_GAP * 2);
-
-       /* CPL choice */
-       wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-       add_label_to_sizer (s, this, _("CPL"), true);
-       _cpl = new wxChoice (this, wxID_ANY);
-       s->Add (_cpl, 1, wxEXPAND);
-       _cpl_browse = new wxButton (this, wxID_ANY, _("Browse..."));
-       s->Add (_cpl_browse, 0);
-       vertical->Add (s, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP + 2);
-
-       /* CPL details */
-       wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-       add_label_to_sizer (table, this, _("DCP directory"), true);
-       _dcp_directory = new wxStaticText (this, wxID_ANY, "");
-       table->Add (_dcp_directory);
-       add_label_to_sizer (table, this, _("CPL ID"), true);
-       _cpl_id = new wxStaticText (this, wxID_ANY, "");
-       table->Add (_cpl_id);
-       add_label_to_sizer (table, this, _("CPL annotation text"), true);
-       _cpl_annotation_text = new wxStaticText (this, wxID_ANY, "");
-       table->Add (_cpl_annotation_text);
-       vertical->Add (table, 0, wxEXPAND | wxTOP, DCPOMATIC_SIZER_GAP + 2);
-
-       _cpls = film->cpls ();
-       update_cpl_choice ();
+       _cpl = new KDMCPLPanel (this, film->cpls ());
+       vertical->Add (_cpl);
 
        /* Sub-heading: Output */
        h = new wxStaticText (this, wxID_ANY, _("Output"));
@@ -117,9 +91,6 @@ KDMDialog::KDMDialog (wxWindow* parent, boost::shared_ptr<const Film> film)
 
        _screens->ScreensChanged.connect (boost::bind (&KDMDialog::setup_sensitivity, this));
 
-       _cpl->Bind           (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&KDMDialog::update_cpl_summary, this));
-       _cpl_browse->Bind    (wxEVT_COMMAND_BUTTON_CLICKED,  boost::bind (&KDMDialog::cpl_browse_clicked, this));
-
        setup_sensitivity ();
 
        SetSizer (overall_sizer);
@@ -133,7 +104,7 @@ KDMDialog::setup_sensitivity ()
        _screens->setup_sensitivity ();
        _output->setup_sensitivity ();
 
-       bool const sd = _cpl->GetSelection() != -1;
+       bool const sd = _cpl->has_selected ();
 
        wxButton* ok = dynamic_cast<wxButton *> (FindWindowById (wxID_OK, this));
        if (ok) {
@@ -144,75 +115,7 @@ KDMDialog::setup_sensitivity ()
 boost::filesystem::path
 KDMDialog::cpl () const
 {
-       int const item = _cpl->GetSelection ();
-       DCPOMATIC_ASSERT (item >= 0);
-       return _cpls[item].cpl_file;
-}
-
-void
-KDMDialog::update_cpl_choice ()
-{
-       _cpl->Clear ();
-
-       for (vector<CPLSummary>::const_iterator i = _cpls.begin(); i != _cpls.end(); ++i) {
-               _cpl->Append (std_to_wx (i->cpl_id));
-
-               if (_cpls.size() > 0) {
-                       _cpl->SetSelection (0);
-               }
-       }
-
-       update_cpl_summary ();
-}
-
-void
-KDMDialog::update_cpl_summary ()
-{
-       int const n = _cpl->GetSelection();
-       if (n == wxNOT_FOUND) {
-               return;
-       }
-
-       _dcp_directory->SetLabel (std_to_wx (_cpls[n].dcp_directory));
-       _cpl_id->SetLabel (std_to_wx (_cpls[n].cpl_id));
-       _cpl_annotation_text->SetLabel (std_to_wx (_cpls[n].cpl_annotation_text));
-}
-
-void
-KDMDialog::cpl_browse_clicked ()
-{
-       wxFileDialog* d = new wxFileDialog (this, _("Select CPL XML file"), wxEmptyString, wxEmptyString, "*.xml");
-       if (d->ShowModal() == wxID_CANCEL) {
-               d->Destroy ();
-               return;
-       }
-
-       boost::filesystem::path cpl_file (wx_to_std (d->GetPath ()));
-       boost::filesystem::path dcp_dir = cpl_file.parent_path ();
-
-       d->Destroy ();
-
-       /* XXX: hack alert */
-       cxml::Document cpl_document ("CompositionPlaylist");
-       cpl_document.read_file (cpl_file);
-
-       try {
-               _cpls.push_back (
-                       CPLSummary (
-                               dcp_dir.filename().string(),
-                               cpl_document.string_child("Id").substr (9),
-                               cpl_document.string_child ("ContentTitleText"),
-                               cpl_file
-                               )
-                       );
-       } catch (cxml::Error) {
-               error_dialog (this, _("This is not a valid CPL file"));
-               return;
-       }
-
-       update_cpl_choice ();
-       _cpl->SetSelection (_cpls.size() - 1);
-       update_cpl_summary ();
+       return _cpl->cpl ();
 }
 
 list<shared_ptr<Screen> >