X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_colour_conversion_dialog.cc;h=45d19d78d616b80a279a896f7ca0f18c02a890ee;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=d8e768bcd6d16b069ab273ae0eb414a5e8d3bce1;hpb=5f64a83b76dd015cc03d106061bf890d3d80d788;p=dcpomatic.git

diff --git a/src/wx/content_colour_conversion_dialog.cc b/src/wx/content_colour_conversion_dialog.cc
index d8e768bcd..45d19d78d 100644
--- a/src/wx/content_colour_conversion_dialog.cc
+++ b/src/wx/content_colour_conversion_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-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
@@ -17,12 +17,14 @@
 
 */
 
-#include <wx/statline.h>
 #include "lib/colour_conversion.h"
 #include "lib/config.h"
+#include "lib/util.h"
 #include "wx_util.h"
 #include "content_colour_conversion_dialog.h"
 #include "colour_conversion_editor.h"
+#include <wx/statline.h>
+#include <boost/foreach.hpp>
 
 using std::string;
 using std::vector;
@@ -37,7 +39,7 @@ ContentColourConversionDialog::ContentColourConversionDialog (wxWindow* parent)
 	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);
@@ -58,11 +60,10 @@ ContentColourConversionDialog::ContentColourConversionDialog (wxWindow* parent)
 	_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));
 
-	_editor->Changed.connect (boost::bind (&ContentColourConversionDialog::check_for_preset, this));
+	_editor_connection = _editor->Changed.connect (boost::bind (&ContentColourConversionDialog::check_for_preset, this));
 
-	vector<PresetColourConversion> presets = Config::instance()->colour_conversions ();
-	for (vector<PresetColourConversion>::const_iterator i = presets.begin(); i != presets.end(); ++i) {
-		_preset_choice->Append (std_to_wx (i->name));
+	BOOST_FOREACH (PresetColourConversion const &i, PresetColourConversion::all ()) {
+		_preset_choice->Append (std_to_wx (i.name));
 	}
 }
 
@@ -78,7 +79,7 @@ ContentColourConversionDialog::set (ColourConversion c)
 	_setting = true;
 	_editor->set (c);
 	_setting = false;
-	
+
 	check_for_preset ();
 }
 
@@ -88,12 +89,16 @@ ContentColourConversionDialog::check_for_preset ()
 	if (_setting) {
 		return;
 	}
-	
+
 	optional<size_t> preset = _editor->get().preset ();
 
 	_preset_check->SetValue (preset);
 	_preset_choice->Enable (preset);
-	_preset_choice->SetSelection (preset.get_value_or (-1));
+	if (preset) {
+		_preset_choice->SetSelection (preset.get ());
+	} else {
+		_preset_choice->SetSelection (-1);
+	}
 }
 
 void
@@ -111,11 +116,11 @@ ContentColourConversionDialog::preset_check_clicked ()
 void
 ContentColourConversionDialog::preset_choice_changed ()
 {
-	vector<PresetColourConversion> presets = Config::instance()->colour_conversions ();
-	int const s = _preset_choice->GetSelection();
+	vector<PresetColourConversion> presets = PresetColourConversion::all ();
+	int const s = _preset_choice->GetCurrentSelection();
 	if (s != -1) {
 		set (presets[s].conversion);
 	}
 }
 
-	
+