Add FilmViewer::time_until_next_frame.

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

diff --git a/src/wx/content_colour_conversion_dialog.cc b/src/wx/content_colour_conversion_dialog.cc
index 45d19d78d616b80a279a896f7ca0f18c02a890ee..351d5aa65db086689df835820798eaf78941ee11 100644 (file)
--- a/src/wx/content_colour_conversion_dialog.cc
+++ b/src/wx/content_colour_conversion_dialog.cc
@@ -1,46 +1,49 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 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 "lib/colour_conversion.h"
-#include "lib/config.h"
-#include "lib/util.h"
 #include "wx_util.h"
+#include "check_box.h"
 #include "content_colour_conversion_dialog.h"
 #include "colour_conversion_editor.h"
+#include "lib/colour_conversion.h"
+#include "lib/config.h"
+#include "lib/util.h"
 #include <wx/statline.h>
 #include <boost/foreach.hpp>
+#include <iostream>
 
 using std::string;
 using std::vector;
 using std::cout;
 using boost::optional;
 
-ContentColourConversionDialog::ContentColourConversionDialog (wxWindow* parent)
+ContentColourConversionDialog::ContentColourConversionDialog (wxWindow* parent, bool yuv)
        : wxDialog (parent, wxID_ANY, _("Colour conversion"))
-       , _editor (new ColourConversionEditor (this))
+       , _editor (new ColourConversionEditor (this, yuv))
        , _setting (false)
 {
        wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
        SetSizer (overall_sizer);
 
        wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_Y_GAP - 2, DCPOMATIC_SIZER_X_GAP);
-       _preset_check = new wxCheckBox (this, wxID_ANY, _("Use preset"));
+       _preset_check = new CheckBox (this, _("Use preset"));
        table->Add (_preset_check, 0, wxALIGN_CENTER_VERTICAL);
        _preset_choice = new wxChoice (this, wxID_ANY);
        table->Add (_preset_choice);
@@ -49,7 +52,7 @@ ContentColourConversionDialog::ContentColourConversionDialog (wxWindow* parent)
        overall_sizer->Add (new wxStaticLine (this, wxID_ANY), 0, wxEXPAND);
        overall_sizer->Add (_editor);
 
-       wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
+       wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
        if (buttons) {
                overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
        }
@@ -57,8 +60,8 @@ ContentColourConversionDialog::ContentColourConversionDialog (wxWindow* parent)
        overall_sizer->Layout ();
        overall_sizer->SetSizeHints (this);
 
-       _preset_check->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&ContentColourConversionDialog::preset_check_clicked, this));
-       _preset_choice->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&ContentColourConversionDialog::preset_choice_changed, this));
+       _preset_check->Bind (wxEVT_CHECKBOX, boost::bind (&ContentColourConversionDialog::preset_check_clicked, this));
+       _preset_choice->Bind (wxEVT_CHOICE, boost::bind (&ContentColourConversionDialog::preset_choice_changed, this));
 
        _editor_connection = _editor->Changed.connect (boost::bind (&ContentColourConversionDialog::check_for_preset, this));
 
@@ -92,8 +95,8 @@ ContentColourConversionDialog::check_for_preset ()
 
        optional<size_t> preset = _editor->get().preset ();
 
-       _preset_check->SetValue (preset);
-       _preset_choice->Enable (preset);
+       _preset_check->SetValue (static_cast<bool>(preset));
+       _preset_choice->Enable (static_cast<bool>(preset));
        if (preset) {
                _preset_choice->SetSelection (preset.get ());
        } else {
@@ -122,5 +125,3 @@ ContentColourConversionDialog::preset_choice_changed ()
                set (presets[s].conversion);
        }
 }
-
-