-
- _enable_colour_conversion = new wxCheckBox (this, wxID_ANY, _("Colour conversion"));
- grid->Add (_enable_colour_conversion, wxGBPosition (r, 0), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL);
- _colour_conversion = new wxStaticText (this, wxID_ANY, wxT (""), wxDefaultPosition, size);
- grid->Add (_colour_conversion, wxGBPosition (r, 2), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
- _colour_conversion_button = new wxButton (this, wxID_ANY, _("Edit..."));
- grid->Add (_colour_conversion_button, wxGBPosition (r, 3), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+
+ add_label_to_grid_bag_sizer (grid, this, _("Colour conversion"), true, wxGBPosition (r, 0));
+ {
+ wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+
+ _colour_conversion = new wxChoice (this, wxID_ANY, wxDefaultPosition, size);
+ _colour_conversion->Append (_("None"));
+ BOOST_FOREACH (PresetColourConversion const & i, PresetColourConversion::all()) {
+ _colour_conversion->Append (std_to_wx (i.name));
+ }
+ _colour_conversion->Append (_("Custom"));
+ s->Add (_colour_conversion, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
+
+ _edit_colour_conversion_button = new wxButton (this, wxID_ANY, _("Edit..."));
+ s->Add (_edit_colour_conversion_button, 0, wxALIGN_CENTER_VERTICAL);
+
+ grid->Add (s, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+ }