No-op; fix GPL address and use the explicit-program-name version.

[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 b382c342937f5d01ab77c43a527ab259958fcadd..995e80f6b6c705c0fee404103bd6792fd0164fec 100644 (file)
--- a/src/wx/content_colour_conversion_dialog.cc
+++ b/src/wx/content_colour_conversion_dialog.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2013-2015 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/>.
 
 */
 
@@ -25,21 +26,22 @@
 #include "colour_conversion_editor.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_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+       wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_Y_GAP - 2, DCPOMATIC_SIZER_X_GAP);
        _preset_check = new wxCheckBox (this, wxID_ANY, _("Use preset"));
        table->Add (_preset_check, 0, wxALIGN_CENTER_VERTICAL);
        _preset_choice = new wxChoice (this, wxID_ANY);
@@ -89,11 +91,11 @@ ContentColourConversionDialog::check_for_preset ()
        if (_setting) {
                return;
        }
-       
+
        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 +124,3 @@ ContentColourConversionDialog::preset_choice_changed ()
                set (presets[s].conversion);
        }
 }
-
-