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

diff --git a/src/wx/content_colour_conversion_dialog.cc b/src/wx/content_colour_conversion_dialog.cc
index 500a168f5..45d19d78d 100644
--- a/src/wx/content_colour_conversion_dialog.cc
+++ b/src/wx/content_colour_conversion_dialog.cc
@@ -17,13 +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;
@@ -38,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);
@@ -61,9 +62,8 @@ ContentColourConversionDialog::ContentColourConversionDialog (wxWindow* parent)
 
 	_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));
 	}
 }
 
@@ -89,7 +89,7 @@ ContentColourConversionDialog::check_for_preset ()
 	if (_setting) {
 		return;
 	}
-	
+
 	optional<size_t> preset = _editor->get().preset ();
 
 	_preset_check->SetValue (preset);
@@ -116,11 +116,11 @@ ContentColourConversionDialog::preset_check_clicked ()
 void
 ContentColourConversionDialog::preset_choice_changed ()
 {
-	vector<PresetColourConversion> presets = Config::instance()->colour_conversions ();
+	vector<PresetColourConversion> presets = PresetColourConversion::all ();
 	int const s = _preset_choice->GetCurrentSelection();
 	if (s != -1) {
 		set (presets[s].conversion);
 	}
 }
 
-	
+