--- /dev/null
+/*
+ Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+
+ This program 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,
+ 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.
+
+*/
+
+#include "kdm_cpl_panel.h"
+#include "wx_util.h"
+#include <libcxml/cxml.h>
+
+using std::vector;
+
+KDMCPLPanel::KDMCPLPanel (wxWindow* parent, vector<CPLSummary> cpls)
+ : wxPanel (parent, wxID_ANY)
+ , _cpls (cpls)
+{
+ wxBoxSizer* vertical = new wxBoxSizer (wxVERTICAL);
+
+ /* 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);
+
+ update_cpl_choice ();
+
+ _cpl->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&KDMCPLPanel::update_cpl_summary, this));
+ _cpl_browse->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KDMCPLPanel::cpl_browse_clicked, this));
+
+ SetSizerAndFit (vertical);
+}
+
+void
+KDMCPLPanel::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
+KDMCPLPanel::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
+KDMCPLPanel::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 ();
+}
+
+boost::filesystem::path
+KDMCPLPanel::cpl () const
+{
+ int const item = _cpl->GetSelection ();
+ DCPOMATIC_ASSERT (item >= 0);
+ return _cpls[item].cpl_file;
+}
+
+bool
+KDMCPLPanel::has_selected () const
+{
+ return _cpl->GetSelection() != -1;
+}
--- /dev/null
+/*
+ Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+
+ This program 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,
+ 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.
+
+*/
+
+#include "lib/types.h"
+#include <boost/filesystem.hpp>
+#include <wx/wx.h>
+
+class KDMCPLPanel : public wxPanel
+{
+public:
+ KDMCPLPanel (wxWindow* parent, std::vector<CPLSummary> cpls);
+
+ boost::filesystem::path cpl () const;
+ bool has_selected () const;
+
+private:
+ void update_cpl_choice ();
+ void update_cpl_summary ();
+ void cpl_browse_clicked ();
+
+ wxChoice* _cpl;
+ wxButton* _cpl_browse;
+ wxStaticText* _dcp_directory;
+ wxStaticText* _cpl_id;
+ wxStaticText* _cpl_annotation_text;
+
+ std::vector<CPLSummary> _cpls;
+};
#include "screens_panel.h"
#include "kdm_timing_panel.h"
#include "kdm_output_panel.h"
+#include "kdm_cpl_panel.h"
#include "lib/cinema.h"
#include "lib/config.h"
#include "lib/film.h"
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"));
_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);
_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) {
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> >
class ScreensPanel;
class KDMTimingPanel;
class KDMOutputPanel;
+class KDMCPLPanel;
struct CPLSummary;
class KDMDialog : public wxDialog
private:
void setup_sensitivity ();
- void update_cpl_choice ();
- void update_cpl_summary ();
- void cpl_browse_clicked ();
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;
};
job_view.cc
job_view_dialog.cc
job_manager_view.cc
+ kdm_cpl_panel.cc
kdm_dialog.cc
kdm_output_panel.cc
kdm_timing_panel.cc
projects / dcpomatic.git / commitdiff