Interface levels in audio tab.

[dcpomatic.git] / src / wx / video_panel.cc

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index dc77bdc97cbf36d6306ef4aff2bd75ddfeb9148e..dbba9e3b01b08a781bef5c288429ea8318b48bef 100644 (file)
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -82,9 +82,6 @@ VideoPanel::VideoPanel (ContentPanel* p)
        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,
@@ -97,9 +94,7 @@ VideoPanel::VideoPanel (ContentPanel* p)
                &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)),
@@ -109,7 +104,7 @@ VideoPanel::VideoPanel (ContentPanel* p)
                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)),
@@ -119,7 +114,7 @@ VideoPanel::VideoPanel (ContentPanel* p)
                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)),
@@ -129,7 +124,7 @@ VideoPanel::VideoPanel (ContentPanel* p)
                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)),
@@ -207,22 +202,9 @@ VideoPanel::VideoPanel (ContentPanel* p)
        _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 ()
 {
@@ -249,8 +231,6 @@ VideoPanel::add_to_grid ()
 #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));
@@ -262,7 +242,7 @@ VideoPanel::add_to_grid ()
        _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);