font.SetPointSize(font.GetPointSize() - 1);
_reference_note->SetFont(font);
- _grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
- _sizer->Add (_grid, 0, wxALL, 8);
-
_type_label = create_label (this, _("Type"), true);
_frame_type = new ContentChoice<VideoContent, VideoFrameType> (
this,
&caster<VideoFrameType, int>
);
- _crop_label = create_label (this, _("Crop"), true);
-
- _left_crop_label = create_label (this, _("Left"), true);
+ _left_crop_label = create_label (this, _("Left crop"), true);
_left_crop = new ContentSpinCtrl<VideoContent> (
this,
new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
boost::mem_fn (&VideoContent::set_left_crop)
);
- _right_crop_label = create_label (this, _("Right"), true);
+ _right_crop_label = create_label (this, _("Right crop"), true);
_right_crop = new ContentSpinCtrl<VideoContent> (
this,
new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
boost::mem_fn (&VideoContent::set_right_crop)
);
- _top_crop_label = create_label (this, _("Top"), true);
+ _top_crop_label = create_label (this, _("Top crop"), true);
_top_crop = new ContentSpinCtrl<VideoContent> (
this,
new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
boost::mem_fn (&VideoContent::set_top_crop)
);
- _bottom_crop_label = create_label (this, _("Bottom"), true);
+ _bottom_crop_label = create_label (this, _("Bottom crop"), true);
_bottom_crop = new ContentSpinCtrl<VideoContent> (
this,
new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)),
_colour_conversion->Bind (wxEVT_CHOICE, boost::bind (&VideoPanel::colour_conversion_changed, this));
_edit_colour_conversion_button->Bind (wxEVT_BUTTON, boost::bind (&VideoPanel::edit_colour_conversion_clicked, this));
- Config::instance()->Changed.connect (boost::bind (&VideoPanel::config_changed, this, _1));
-
add_to_grid ();
}
-void
-VideoPanel::config_changed (Config::Property p)
-{
- if (p == Config::INTERFACE_COMPLEXITY) {
- _grid->Clear ();
- add_to_grid ();
- _sizer->Layout ();
- _grid->Layout ();
- }
-}
-
void
VideoPanel::add_to_grid ()
{
- Config::Interface const interface = Config::instance()->interface_complexity();
+ bool const full = Config::instance()->interface_complexity() == Config::INTERFACE_FULL;
int r = 0;
- _reference->Show (interface == Config::INTERFACE_FULL);
- _reference_note->Show (interface == Config::INTERFACE_FULL);
+ _reference->Show (full);
+ _reference_note->Show (full);
- if (interface == Config::INTERFACE_FULL) {
+ if (full) {
wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL);
reference_sizer->Add (_reference, 0);
reference_sizer->Add (_reference_note, 0);
_frame_type->add (_grid, wxGBPosition(r, 1), wxGBSpan(1, 2));
++r;
- int flags = wxTOP;
-#ifdef __WXOSX__
- flags |= wxALIGN_RIGHT;
-#endif
- _grid->Add (_crop_label, wxGBPosition(r, 0), wxDefaultSpan, flags, DCPOMATIC_SIZER_Y_GAP / 2);
-
int cr = 0;
wxGridBagSizer* crop = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
add_label_to_sizer (crop, _left_crop_label, true, wxGBPosition (cr, 0));
_top_crop->add (crop, wxGBPosition (cr, 1));
add_label_to_sizer (crop, _bottom_crop_label, true, wxGBPosition (cr, 2));
_bottom_crop->add (crop, wxGBPosition (cr, 3));
- _grid->Add (crop, wxGBPosition (r, 1), wxGBSpan (2, 3));
+ _grid->Add (crop, wxGBPosition (r, 0), wxGBSpan (2, 4));
r += 2;
- _fade_in_label->Show (interface == Config::INTERFACE_FULL);
- _fade_in->Show (interface == Config::INTERFACE_FULL);
- _fade_out_label->Show (interface == Config::INTERFACE_FULL);
- _fade_out->Show (interface == Config::INTERFACE_FULL);
- _scale_to_label->Show (interface == Config::INTERFACE_FULL);
- _scale->show (interface == Config::INTERFACE_FULL);
- _filters_label->Show (interface == Config::INTERFACE_FULL);
- _filters->Show (interface == Config::INTERFACE_FULL);
- _filters_button->Show (interface == Config::INTERFACE_FULL);
- _colour_conversion_label->Show (interface == Config::INTERFACE_FULL);
- _colour_conversion->Show (interface == Config::INTERFACE_FULL);
- _edit_colour_conversion_button->Show (interface == Config::INTERFACE_FULL);
-
- if (interface == Config::INTERFACE_FULL) {
+ _fade_in_label->Show (full);
+ _fade_in->Show (full);
+ _fade_out_label->Show (full);
+ _fade_out->Show (full);
+ _scale_to_label->Show (full);
+ _scale->show (full);
+ _filters_label->Show (full);
+ _filters->Show (full);
+ _filters_button->Show (full);
+ _colour_conversion_label->Show (full);
+ _colour_conversion->Show (full);
+ _edit_colour_conversion_button->Show (full);
+
+ if (full) {
add_label_to_sizer (_grid, _fade_in_label, true, wxGBPosition (r, 0));
_grid->Add (_fade_in, wxGBPosition (r, 1), wxGBSpan (1, 3));
++r;